瀏覽代碼

bug修复【ID1006467】

chenrui 4 年之前
父節點
當前提交
f20bca9761
共有 5 個文件被更改,包括 14 次插入7 次删除
  1. 1 1
      pages/cleared/chooseNetwork.vue
  2. 1 1
      pages/cleared/details.vue
  3. 1 1
      pages/cleared/network.vue
  4. 10 3
      pages/index/index.vue
  5. 1 1
      pages/index/map.vue

+ 1 - 1
pages/cleared/chooseNetwork.vue

@@ -33,7 +33,7 @@
 					<view class="cell-item-c" @tap="goPage(item)">
 						<view class="cell-item-info">
 							<view class="cell-item-info-network">
-								{{item.stationName}}
+								{{item.stationName || '--'}}
 								<u-badge type="success" bgColor="#c90101" :count="item.unCleanNum" :offset="[-10,-32]" size="mini"></u-badge>
 							</view>
 							<view class="cell-item-info-weight">

+ 1 - 1
pages/cleared/details.vue

@@ -6,7 +6,7 @@
 				<view class="cell-item" v-for="(item, index) in listdata" :key="index">
 					<view class="cell-item-c">
 						<view class="cell-item-info">
-							<view class="cell-item-info-network">{{item.stationName}}</view>
+							<view class="cell-item-info-network">{{item.stationName || '--'}}</view>
 							<view class="cell-item-info-weight">清运总重量:<text>{{item.totalWeight}}kg</text></view>
 						</view>
 					</view>

+ 1 - 1
pages/cleared/network.vue

@@ -15,7 +15,7 @@
 			<view class="details-address">
 				<image src="/static/md-big-pic.png" class="store-pic"></image>
 				<view class="store-info">
-					<view>{{ stationData.name }}</view>
+					<view>{{ stationData.name || '--' }}</view>
 					<view>{{ stationData.provinceName||'' }}{{ stationData.cityName||'' }}{{ stationData.districtName||'' }}{{ stationData.address||'' }}</view>
 					<view>
 						营业时间:

+ 10 - 3
pages/index/index.vue

@@ -8,7 +8,7 @@
 					<view class="cell-item-c" @tap="goPage(item)">
 						<view class="cell-item-info">
 							<view class="cell-item-info-network">
-								{{item.stationName}}
+								{{item.stationName || '--'}}
 								<u-badge type="success" bgColor="#c90101" :count="item.unCleanNum" :offset="[-10,-32]" size="mini"></u-badge>
 							</view>
 							<view class="cell-item-info-weight">
@@ -120,9 +120,16 @@
 				uni.scanCode({
 					success(e) {
 						console.log(e)
-						// 普通二维码,用户扫箱体的二维码
+						//  箱体二维码数据
+						// {
+						// 	charSet: "ISO8859-1"
+						// 	errMsg: "scanCode:ok"
+						// 	rawData: "aHR0cDovL3d3dy5zeHp4eWoubmV0L3dlYi9zdGF0aWMvcXJjb2RlL2Rvd25sb2FkLWFwcC5odG1sP2lkPTFiODM3M2JhLWNmMDAtNDU2NS04Y2ZkLTVmOGZlNTYwYmNmMiZ0eXBlPWR1c3RiaW4="
+						// 	result: "http://www.sxzxyj.net/web/static/qrcode/download-app.html?id=1b8373ba-cf00-4565-8cfd-5f8fe560bcf2&type=dustbin"
+						// 	scanType: "QR_CODE"
+						// }
 						if(e.scanType == 'QR_CODE'){
-							//  将箱体二维码数据转换为json
+							//  将箱体二维码数据e.result携带参数转换为json
 							_this.boxData = parseQueryString(e.result)
 							_this.getNetworkInfo()
 						}

+ 1 - 1
pages/index/map.vue

@@ -95,7 +95,7 @@
 								height: '60rpx',
 								iconPath: '/static/store.png',
 								label: {
-									content: item.stationName,
+									content: item.stationName || '--',
 									bgColor: '#fff',
 								}
 							})