APK更新，部分字段优化

common/http.js

@@ -2,10 +2,10 @@
 // const ip = 'http://192.168.2.8:8080'; //线下
 //const ip = 'http://hs-server.aseanbusiness.cn'; //线上
 // const ngip = 'http://hs.tbgjhc.top:7010'
-const ip = 'http://hs-server.tbgjhc.top:8018';
+// const ip = 'http://hs-server.tbgjhc.top:8018';
 //静态图片地址前缀
 // const ngip = 'http://192.168.3.15:8080/sp-admin'
-// const ip = 'http:///192.168.31.251:8080'; //线下
+const ip = 'http:///192.168.3.15:8080'; //线下
 
 /**
  * 封装的http请求

pages/index/index.vue

@@ -175,19 +175,21 @@
 		methods: {
 			getUpdateInfo() {
 				let currentVersion = uni.getAppBaseInfo().appVersion;
+				this.update.visible=false;
 				this.http.request({
 					url: '/sp-admin/app/updateInfo',
 					loading: 'false',
 					success: resp => {
-						let version = resp.data.data.version;
-						this.update = {
-							visible: currentVersion != version,
-							currentVersion: currentVersion,
-							content: resp.data.data.content,
-							version: version,
-							url: resp.data.data.url
-						};
-						console.log(this.update)
+						if(resp.data.data){
+							let version = resp.data.data.version;
+							this.update = {
+								visible: currentVersion != version,
+								currentVersion: currentVersion,
+								content: resp.data.data.content,
+								version: version,
+								url: resp.data.data.url
+							};
+						}
 					}
 				})
 			},
@@ -213,6 +215,7 @@
 			},
 			checkFace() {
 				let user = this.getUser();
+				console.log(user)
 				this.faceRegister = false;
 				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
 					this.faceRegister = true;
@@ -236,7 +239,6 @@
 							this.purchaser = true;
 							return;
 						}
-						console.log(resp);
 					}
 				})
 			},

pages/login/login.vue

@@ -69,6 +69,7 @@ export default {
 			this.common.to('/pages/login/faceLogin');
 		},
 		submit() {
+			uni.clearStorage();
 			let rule = [
 				{ name: 'phone', checkType: 'notnull', errorMsg: '手机号不能为空' },
 				{ name: 'phone', checkType: 'phoneno', errorMsg: '请输入正确的手机号' },

pages/market/one/leader/handle.vue

@@ -90,8 +90,13 @@
 						<text class="desc">{{ item2.itrdclDeclareId }}</text>
 					</view>
 					<view class="item">
-						<text class="label">申报人类型</text>
-						<text class="desc">{{ item2.declareType }}</text>
+						<text class="label">申报类型</text>
+						<text class="desc">
+							<text v-if=" item2.declareType==1">个人申报</text>
+							<text v-if=" item2.declareType==2">商铺或代理人</text>
+							<text v-if=" item2.declareType==3">合作社</text>
+							<text v-if=" item2.declareType==4">互助组</text>
+						</text>
 					</view>
 					<view class="item">
 						<text class="label">申报人姓名</text>
@@ -119,18 +124,14 @@
 						<text class="desc">{{ item2.sumAmt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总毛重</text>
+						<text class="label">总毛重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumGrossWt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总净重</text>
+						<text class="label">总净重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumNetWt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">币制</text>
-						<text class="desc">{{ item2.currCode }}</text>
-					</view>
-					<view class="item">
 						<text class="label">件数</text>
 						<text class="desc">{{ item2.packNo }}</text>
 					</view>
@@ -138,10 +139,6 @@
 						<text class="label">车牌号</text>
 						<text class="desc">{{ item2.veNo }}</text>
 					</view>
-					<view class="item">
-						<text class="label">运输方式</text>
-						<text class="desc">{{ item2.trafMode }}</text>
-					</view>
 					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
 						<text class="label" v-if="item2.declareType == '3'">互助组备案编号</text>
 						<text class="label" v-if="item2.declareType == '4'">合作社备案编号</text>

pages/market/one/leader/handleThree.vue

@@ -53,11 +53,12 @@
 						<text class="desc">¥ {{ item.totalPrice }}</text>
 					</view>
 					<view class="item">
-						<text class="label">净重(kg)</text>
+						<text class="label">净重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item.netWt }}</text>
 					</view>
+				
 					<view class="item">
-						<text class="label">毛重(kg)</text>
+						<text class="label">毛重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item.grossWt }}</text>
 					</view>
 					<view class="item">
@@ -91,12 +92,17 @@
 						<text class="desc">{{ item2.preNo }}</text>
 					</view>
 					<view class="item">
-						<text class="label">进境申报单编号</text>
+						<text class="label">报单编号</text>
 						<text class="desc">{{ item2.itrdclDeclareId }}</text>
 					</view>
 					<view class="item">
-						<text class="label">申报人类型</text>
-						<text class="desc">{{ item2.declareType }}</text>
+						<text class="label">申报类型</text>
+						<text class="desc">
+							<text v-if=" item2.declareType==1">个人申报</text>
+							<text v-if=" item2.declareType==2">商铺或代理人</text>
+							<text v-if=" item2.declareType==3">合作社</text>
+							<text v-if=" item2.declareType==4">互助组</text>
+						</text>
 					</view>
 					<view class="item">
 						<text class="label">申报人姓名</text>
@@ -129,11 +135,11 @@
 						<text class="desc">{{ item2.sumAmt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总毛重</text>
+						<text class="label">总毛重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumGrossWt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总净重</text>
+						<text class="label">总净重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumNetWt }}</text>
 					</view>
 					<view class="item">
@@ -148,10 +154,6 @@
 						<text class="label">车牌号</text>
 						<text class="desc">{{ item2.veNo }}</text>
 					</view>
-					<view class="item">
-						<text class="label">运输方式</text>
-						<text class="desc">{{ item2.trafMode }}</text>
-					</view>
 					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
 						<text class="label" v-if="item2.declareType == '3'">互助组备案编号</text>
 						<text class="label" v-if="item2.declareType == '4'">合作社备案编号</text>
@@ -171,10 +173,6 @@
 						<text class="desc">{{ item2.fieldName }}</text>
 					</view>
 					<view class="item">
-						<text class="label">贸易国别</text>
-						<text class="desc">{{ item2.tradeCountry }}</text>
-					</view>
-					<view class="item">
 						<text class="label">企业编码</text>
 						<text class="desc">{{ item2.entCode }}</text>
 					</view>
@@ -185,7 +183,7 @@
 					<view class="item">
 						<view class="lable">互助委托协议</view>
 						<view v-for="(url,index) in imgList">
-							<image :src="ip + url" style="margin-top: 20px; width: 200px;"></image>
+							<image :src="url" style="margin-top: 20px; width: 200px;"></image>
 						</view>
 					</view>
 				</view>