Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

pages/mine/cargoowner/cargoowner.vue

@@ -127,6 +127,12 @@
 			toEditPage(){
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
+				}else if(this.personage&&this.personage.authenticationStatus=='审核中'){
+					uni.showToast({
+						title: '信息审核中',
+						icon: 'none',
+						duration: 2000
+					})
 				}else{
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}

pages/mine/cargoowner/editpersonalinformation.vue

@@ -50,14 +50,14 @@
 			</view>
 			<view class="flex row row-ch flex-space-between" style='padding:10px 0 5px;'>
 				<view class="left-text" style='font-size:14px;'>称呼</view>
-				<view style='padding-right:10px;' class='flex'>
-					<view style="width: 60rpx;">
-						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
+				<view style='padding-right:10px;' class='flex flex-space-between'>
+					<view style="width: 160rpx;">
+						<u--input style='padding-right:4px;' placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
 							v-model="dataDetails.call">
 						</u--input>
 					</view>
-					<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
-					<view class="flex align-center" v-else>女士</view>
+					<view style='position:relative;top:0px;font-size:15px;' class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
+					<view style='position:relative;top:0px;font-size:15px;' class="flex align-center" v-else>女士</view>
 				</view>
 			</view>
 

pages/mine/index.vue

@@ -15,15 +15,16 @@
 						height="56px" shape='circle'></u--image>
 					<view class='information' v-if='hasLogin'>
 						<view class='flex items-center'>
-							<view class='username'>{{userName}} {{cargoCall}}</view>
+							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
+							<view v-else class='username'>{{userInfo.userName}} </view>
 							<view v-if='status' class='currectstatus'>已认证</view>
-							<view v-if='!status' class='currectstatus1'>{{CargoOwner.authenticationStatus}}</view>
+							<view v-if='!status' class='currectstatus1'>{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}</view>
 						</view>
 						<view class='phone'>{{starUserphone}}</view>
 					</view>
 					<view class='information' v-else @click="toLogin">立即登录</view>
 				</view>
-				<view v-if='hasLogin&&!status' class='authentication flex flex-space-between'>
+				<view v-if='hasLogin&&!status1' class='authentication flex flex-space-between'>
 					<view>
 						<view style='font-size:14px;'>货主身份认证</view>
 						<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
@@ -155,6 +156,7 @@
 				userName: '',
 				phone: '',
 				status: false,
+				status1:false,
 				alertContent: '您尚未登录，是否立即登录？',
 				cargoCall: "",
 			};
@@ -172,14 +174,21 @@
 						if (res.data) {
 							this.CargoOwner = res.data
 							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
-								.data.authenticationStatus == '未认证'||res.data.authenticationStatus == '已过期') {
+								.data.authenticationStatus == '未认证') {
+									if(res.data.authenticationStatus == '未认证'){
+										this.status1 = false
+									}else{
+										this.status1 = true
+									}
 								this.status = false
 							} else {
 								this.status = true
+								this.status1 = true
 							}
 
 						} else {
 							this.status = false
+							this.status1 = false
 						}
 					})
 					.catch(res => {
@@ -196,14 +205,13 @@
 					uni.setStorageSync("firstAuthentication", res.data)
 					if (res.data) {
 						this.userName = res.data.call
-						if (res.data.sex == '男') {
-							this.cargoCall = "先生"
-						} else {
-							this.cargoCall = "女士"
+						if(res.data.sex){
+							if (res.data.sex == '男') {
+								this.cargoCall = "先生"
+							} else {
+								this.cargoCall = "女士"
+							}
 						}
-					} else {
-						this.userName = this.userInfo.userName
-						this.cargoCall = ""
 					}
 					this.$forceUpdate()
 				})

pages/release/addAddress.vue

@@ -14,8 +14,9 @@
 			<view class="">
 				<u--form labelPosition="left" :model="addressInfo" ref="form1" labelWidth='100'>
 					<u-form-item label="所属区域" ref="item1" borderBottom>
-						<view @click='toMap' :class="addressInfo.area?'':'select-color'">
-							{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}
+						<view style='width:100%;' class='flex flex-space-between' @click='toMap' :class="addressInfo.area?'':'select-color'">
+							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
+							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>

pages/release/editRelease.vue

@@ -539,8 +539,7 @@
 						return true
 					}
 				}
-				if (this.dataObj.loadWeightSmall && this.dataObj.loadWeight && (this.dataObj.loadWeightSmall > this.dataObj
-						.loadWeight)) {
+				if (this.dataObj.loadWeightSmall && this.dataObj.loadWeight && (Number(this.dataObj.loadWeightSmall)>Number(this.dataObj.loadWeight))) {
 					uni.showToast({
 						title: '最小载重应小于最大载重！',
 						duration: 2000,

pages/release/record.vue

@@ -70,8 +70,8 @@
 						<view class="normal" @click.stop="del(good)">删除</view>
 						<!-- v-if="good.status!='已通过'" -->
 						<view class="normal" @click.stop="Refresh(good)" v-if="good.status=='已通过'">刷新</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'">隐藏</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'">显示</view>
+						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'&&good.status=='已通过'">隐藏</view>
+						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'&&good.status=='已通过'">显示</view>
 					</view>
 				</view>
 			</view>
@@ -137,10 +137,10 @@
 
 		},
 		onShow() {
-			// this.upCallback({
-			// 	size: 10,
-			// 	num: 1
-			// })
+			this.upCallback({
+				size: 10,
+				num: 1
+			})
 		},
 		// onPageScroll(res) {
 		// 	this.scrollTop = res.scrollTop

pages/release/release.vue

@@ -106,7 +106,7 @@
 			<view class="row">
 				<view class="left">收货方信用代码（选填）</view>
 				<view class="right flex">
-					<input placeholder="统一社会信用代码" class="input" v-model="dataObj.receiverCreditCode" />
+					<input maxlength="18" placeholder="统一社会信用代码" class="input" v-model="dataObj.receiverCreditCode" />
 				</view>
 			</view>
 			<view class="flex row">
@@ -750,6 +750,9 @@
 				}
 			},
 			confirmClick() {
+				uni.$u.throttle(this.requestdata, 500)
+			},
+			requestdata(){
 				// // #ifdef APP-PLUS
 				// if (this.alertTitle == '账号审核中') {
 				// 	if (uni.getSystemInfoSync().platform == 'ios') {
@@ -760,7 +763,7 @@
 				// 	return
 				// }
 				// // #endif
-
+				
 				// if (this.alertTitle == '身份信息未认证，去认证?') {
 				// 	uni.switchTab({
 				// 		url: '/pages/mine/index'
@@ -768,7 +771,7 @@
 				// 	return
 				// }
 				// this.isShowAlert = false
-
+				
 				if (this.dataObj.billingMethod == '元/吨') {
 					this.dataObj.billingMethod = 0
 				} else {
@@ -850,7 +853,7 @@
 							}
 						})
 						this.isShowAlert = false
-
+				
 					})
 					.catch(res => {
 						uni.showToast({
@@ -859,7 +862,6 @@
 							duration: 2000
 						})
 					});
-
 			},
 			cancelClick() {
 				this.isShowAlert = false