twt hace 2 años
padre
commit
7652151b8e
Se han modificado 2 ficheros con 15 adiciones y 5 borrados
  1. 11 3
      pages/mobile/group.vue
  2. 4 2
      pages/mobile/modelTwo.vue

+ 11 - 3
pages/mobile/group.vue

@@ -23,7 +23,8 @@
 			<view class="topCont">
 				<view class="carBox">
 					<image src="../../static/img/nocar.png" mode="" class="carLogo"></image>
-					<view class="carTxt">{{brand_name}}</view>
+					<view class="carTxt" v-if="!description">{{brand_name}}</view>
+					<view class="carTxt" v-if="description">{{description}}</view>
 					<!-- <image src="../../static/img/jt.png" mode="" class="carJt"></image> -->
 				</view>
 				<view class="vinBox">
@@ -76,7 +77,8 @@
 				token: '',
 				epc_id: '',
 				chexingMesList:[],
-				chexing:''
+				chexing:'',
+				description:'',
 			}
 		},
 		onLoad(opt) {
@@ -113,6 +115,9 @@
 							this.groupShow = true;
 							this.token = res.data.result.list[0].token;
 							this.param = res.data.result.list[0].param;
+							if(res.data.result.vehicle.description){
+								this.description=res.data.result.vehicle.description
+							}
 						}
 						if (Object.keys(res.data.result.vehicle).length != 0)  {
 							this.chexingMesList = res.data.result.vehicle.tree;
@@ -164,6 +169,9 @@
 							this.zlist = res.data.result.list;
 							this.restrainShow = false;
 							this.groupShow = true;
+							if(res.data.result.vehicle.description){
+								this.description=res.data.result.vehicle.description
+							}
 						}
 						
 						if (Object.keys(res.data.result.vehicle).length != 0) {
@@ -224,7 +232,7 @@
 							success: function() {
 								uni.navigateTo({
 									url: 'modelTwo?vin=' + that.vin + '&zzTime=' + that.zzTime + '&param=' + item.param +
-										'&token=' + item.token + '&epc_id=' + that.epc_id
+										'&token=' + item.token + '&epc_id=' + that.epc_id+'&description='+that.description
 								})
 							}
 						});

+ 4 - 2
pages/mobile/modelTwo.vue

@@ -22,7 +22,7 @@
 			<view class="topCont">
 				<view class="carBox">
 					<image src="../../static/img/nocar.png" mode="" class="carLogo"></image>
-					<view class="carTxt">{{brand_name}}</view>
+					<view class="carTxt">{{description}}</view>
 					<!-- <image src="../../static/img/jt.png" mode="" class="carJt"></image> -->
 				</view>
 				<view class="vinBox">
@@ -104,6 +104,7 @@
 				childrenss: '',
 				iStatusBarHeight: '',
 				epc_id:'',
+				description:'',
 			}
 		},
 		onLoad(opt) {
@@ -111,7 +112,8 @@
 			this.zzTime = opt.zzTime;
 			this.param = opt.param;
 			this.token = opt.token;
-			this.epc_id = opt.epc_id;
+			this.epc_id = opt.epc_id;
+			this.description=opt.description;
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.getData()
 		},