Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/home/scancode/index.vue

@@ -262,7 +262,7 @@
 			scancodein() {
 				if (this.lisi == '') {
 					this.$refs.repeat.show({
-						title: '请扫码或录入后再点击！',
+						title: '请扫码或录入后再点击!',
 						type: 'default',
 						position: 'bottom'
 					})

pages/me/suppliers.vue

@@ -4,6 +4,9 @@
 		<view class="head">
 			<view class="behind"></view>
 			<view class="below">
+				<view class="nothing" v-if="judge==true">
+					<u-empty mode="page" text="出错了!请联系管理员"></u-empty>
+				</view>
 				<view class="content" v-for="(item, index) in supplier_s" :key="index">
 					<view class="content_s">
 						<view class="title">
@@ -28,9 +31,7 @@
 	export default {
 			data() {
 				return {
-					mobile: '经销商名称',
-					code: '张三',
-					code_s: '13412336446',
+					judge: true,
 					supplier_s: []		//经销商信息
 				}
 			},
@@ -50,9 +51,16 @@
 						console.log(res.data.data)
 						console.log(res)
 						this.supplier_s = res.data.data
+						console.log(this.supplier_s)
+						if(this.supplier_s.length != 0){
+							this.judge = false
+						}
 						console.log(res.data.data[1].brandList[1])
 					}).catch(err => {
 						console.log(err)
+						if(this.supplier_s.length != 0){
+							this.judge = false
+						}
 					}).finally(() => {
 						// Loading.close()
 					})
@@ -75,6 +83,15 @@
 	.below{
 		margin-top: -270rpx;
 	}
+	.nothing {
+		width: 96%;
+		height: 800rpx;
+		background-color: #FFFFFF;
+		margin: 0 auto;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
+	}
 	.content {
 		width: 667rpx;
 		height: auto;