Merge branch 'master' of http://git.lcpcp.cc/root/uni-app

# Conflicts:
#	components/en-utils/en-blank/en-blank.vue
#	pages/text/index.vue

alais.config.js

@@ -0,0 +1,13 @@
+const path = require('path');
+
+function resolve(dir) {
+    return path.join(__dirname, dir);
+}
+
+module.exports = {
+    resolve: {
+        alias: {
+            '@': resolve('/')
+        }
+    }
+};

components/en-utils/en-blank.vue → components/en-utils/en-blank/en-blank.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="blank-page" v-if="showBlank">
 		<view class="blank-img-box">
-			<slot name="blankImg">
-				<image src="@/static/img/blank-box.svg" class="blank-img"></image>
-			</slot>
+			<text class="iconfont">
+        &#xe614;
+			</text>
 		</view>
 		<view class="blank-text">
 			<text>{{message}}</text>
@@ -57,6 +57,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import url("../../static/css/en-common.css") ;
 	.blank-page {
 		width: 100vw;
 		padding-top: 200rpx;
@@ -70,6 +71,9 @@
 		display: flex;
 		justify-content: center;
 		width: 100%;
+    .iconfont{
+      font-size: 200rpx;
+    }
 	}
 
 	.blank-img {

components/en-from/en-nav/en-nav.vue → components/en-utils/en-nav/en-nav.vue

@@ -6,6 +6,7 @@
         <view @tap="goBack">
           <text  class="iconfont" v-if="leftShow">
             &#xe60e;
+
           </text>
         </view>
         <!-- <view v-if="false">
@@ -109,6 +110,9 @@
     display: flex;
     justify-content: space-between;
     padding: 0 20px;
+    .iconfont{
+      color: #fff;
+    }
     .title-text {
       font-size: 36rpx;
       font-weight: 600;

components/static/css/en-common.css

@@ -1,3 +1,7 @@
+:root {
+
+}
+
 @font-face {
     font-family: 'iconfont';
     src:  url('/components/static/icon/iconfont.ttf') format('truetype');
@@ -8,7 +12,7 @@
     font-style: normal;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    color: #000;
+    color: #333333;
 }
 .box{
     background-color: #ffffff;

main.js

@@ -9,7 +9,7 @@ Vue.use(router)
 // #ifndef VUE3
 import Vue from 'vue'
 import store from './store'
-import Nav from './components/en-from/en-nav/en-nav.vue'
+import Nav from './components/en-utils/en-nav/en-nav.vue'
 
 Vue.component('Nav', Nav)
 Vue.config.productionTip = false

pages.json

@@ -31,7 +31,7 @@
 		"current": 0,
 		"list": [{
 			"name": "",
-			"path": "",
+			"path": "/pages/text/index",
 			"query": ""
 		}]
 	}

pages/text/index.vue

@@ -1,30 +1,20 @@
 <template>
 	<view>
-		<Nav title="列表组件演示" @leftClick='toBack'></Nav>
-		<!-- <enList>
-			<view :slot="listInfo">插入不同样式的内容</view>
-		</enList> -->
+		<Nav title="列表组件演示"></Nav>
+		<Black></Black>
 	</view>
 </template>
 
 <script>
-	// import enList from '../../components/en-list/en-list.vue'
-	
+	import Black from '@/components/en-utils/en-blank/en-blank'
+
 	export default {
-		// components:{enList,},
-		data(){
-			return{}
-		},
-		methods:{
-			toBack() {
-				uni.navigateBack({
-					delta: 1,
-				})
-			},
+		components:{
+			Black,
 		},
 	}
 </script>
 
 <style scoped lang="scss">
 
-</style>	
+</style>