Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

manifest.json

@@ -114,6 +114,10 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "iosStyle" : "common"
             }
         },
         "uniStatistics" : {

pages.json

@@ -323,7 +323,17 @@
         "enablePullDownRefresh": false
       }
     }
-  ],
+      ,{
+            "path" : "pages/start-page/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "启动页",
+				  "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",

pages/client-detail/base-paper-deals.vue

@@ -58,9 +58,10 @@ export default {
 			option: {
 				size: 10,
 				auto: true,
-				emptyText: '暂无数据~',
+				emptyText: '暂无原纸交易~',
 				background: '#F7F8FA',
-				disabled: false
+				disabled: false,
+				emptyImage: '/static/imgs/order/order-empty.png'
 			},
 			params: {
 				asc: '',

pages/client-detail/equipment-information.vue

@@ -122,9 +122,10 @@ export default {
       option: {
         size: 10,
         auto: true,
-        emptyText: '暂无数据~',
+        emptyText: '暂无设备信息~',
         background: '#F7F8FA',
-        disabled: false
+        disabled: false,
+		 emptyImage: '/static/imgs/order/order-empty.png'
       },
       seemoreFlag: 0,
       params: {

pages/start-page/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/trade/orderList.vue

@@ -68,14 +68,15 @@ export default {
         auto: true,
         emptyText: '暂无订单信息~',
         background: '#F7F8FA',
-        fontSize: '40rpx'
+        fontSize: '40rpx',
+		 emptyImage: '/static/imgs/client-detail/no-data-icon.png'
       },
       params: {
         asc: '',
         desc: '',
-        // customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
-        // mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
-        customerEnterpriseId: '651107734133018624',
+        customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
+        mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
+        // customerEnterpriseId: '651107734133018624',
         // mallSupplierId: '670334117090562048', // 供应商id
         status: '0' // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
         // enterpriseIds: [] //企业ID集合网关获取

pages/trade/quotationList.vue

@@ -71,13 +71,14 @@ export default {
 				auto: true,
 				emptyText: '暂无报价信息~',
 				background: '#F7F8FA',
-				fontSize: '40rpx'
+				fontSize: '40rpx',
+				emptyImage: '/static/imgs/client-detail/no-data-icon.png'
 			},
 			params: {
 				asc: '',
 				desc: '',
-				// mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合
-				mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合
+				mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合
+				// mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合
 			},
 			pagination: {
 				pageNum: 0, // 初始会执行一次下拉加载