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

# Conflicts:
#	config/index.js
#	pages/release/addAddress.vue

config/index.js

@@ -2,7 +2,6 @@ const dev = {
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
-	
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/mine/index.vue

@@ -6,7 +6,7 @@
 				<view style='margin-bottom:14px;' class="row flex flex-end">
 					<u--image class='image' :showLoading="true" src="../../static/mine/saoma.png" width="20px"
 						height="20px" @click="scanCode()" v-if='hasLogin'></u--image>
-					<u--image @click="goDetailPage('/pages/mine/set')" style='margin-right:0;' class='image'
+					<u--image @click="goDetailPage('/pages/mine/set',true)" style='margin-right:0;' class='image'
 						:showLoading="true" src="../../static/mine/shezhi.png" width="20px" height="20px"></u--image>
 				</view>
 				<view class="flex">
@@ -17,9 +17,9 @@
 						<view class='flex items-center'>
 							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-else class='username'>{{userInfo.userName}} </view>
-							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" v-if='status'
+							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" v-if='status'
 								class='currectstatus'>已认证</view>
-							<view@click="goDetailPage(' /pages/mine/cargoowner/cargoowner')" v-if='!status'
+							<view@click="goDetailPage(' /pages/mine/cargoowner/cargoowner',true)" v-if='!status'
 								class='currectstatus1'>
 								{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}
 						</view>
@@ -33,7 +33,7 @@
 					<view style='font-size:14px;'>货主身份认证</view>
 					<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
 				</view>
-				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" class='promptlyAuthentication'>立即认证
+				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" class='promptlyAuthentication'>立即认证
 				</view>
 			</view>
 		</view>
@@ -305,11 +305,21 @@
 					// 	uni.$u.route(src);
 					// }
 				} else {
-					if (isClick) {
-						uni.$u.route(src);
-					} else {
-						uni.$u.toast('请先完成货主认证！')
-					}
+					this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.userInfo.phone
+					}).then(res => {
+						uni.setStorageSync("firstAuthentication", res.data)
+						if (res.data.authenticationStatus!='已认证'&&!isClick) {
+							uni.$u.toast('请先完成货主认证！')
+						}else{
+							uni.$u.route(src);
+						}
+					})
+					// if (isClick) {
+					// 	uni.$u.route(src);
+					// } else {
+					// 	uni.$u.toast('请先完成货主认证！')
+					// }
 
 
 				}

pages/order/index.vue

@@ -269,7 +269,7 @@
 					},
 					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						tip: '没有更多记录啦！'
+						tip: '暂无记录！'
 					}
 				},
 				searchKeyWord: '',

pages/order/orderDetails.vue

@@ -186,7 +186,7 @@
 						v-for="(item,index) in zcImgList" @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
-			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="已完结"'>
+			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
 				<view class='row-between'>
 					<view class="row-left-text gray">合计应付运费</view>
 					<view class="row-right-text">

pages/public/register.vue

@@ -34,7 +34,7 @@
 				<!-- <image v-if='password!=""' @click='password=""' class='close2' src='../../static/img/login/guanbi@2x.png'></image> -->
 				<!-- <view @click='switchover' style='position:absolute;right:0;top:38%;z-index:10;cursor:pointer;' class="iconfont " :class='type=="password"?"icon-yanjing-biyan":"icon-yanjing-zhengyan"'></view> -->
 			</view>
-			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='$u.throttle(register, 5000)'
+			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='$u.throttle(register(), 5000)'
 				class='verificationCode'>注册</button>
 			<view
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>

pages/release/addAddress.vue

@@ -20,7 +20,9 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" inputAlign="left"  placeholder="详细地址"></u--input>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" inputAlign="left"  placeholder="详细地址"></u--input> -->
+						<u--textarea v-model="addressInfo.detailedAddress" border="none"  placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -34,7 +36,7 @@
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<view class="submit" @click="$u.throttle(submit, 5000)">提交</view>
+		<view class="submit" @click="$u.throttle(submit(), 5000)">提交</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -160,7 +162,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符！",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -207,4 +219,11 @@
 	/deep/input{
 		word-break:break-all;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/release/editAddress.vue

@@ -19,7 +19,8 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none"  placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -154,7 +155,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符！",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -194,5 +205,12 @@
 		right: 0;
 		margin: auto;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>
 

pages/release/release.vue

@@ -867,7 +867,9 @@
 									taskDescription: '',
 									taskValidity: '',
 									sendLongitude: '',
+									receiverIdcard:'',
 									sendLatitude: '',
+									receiverCreditCode:'',
 									unsendLongitude: '',
 									unsendLatitude: '',
 								}
@@ -971,7 +973,7 @@
 							}else{
 								this.dataObj.compId=this.qyList[i].id
 							}
-							console.log(this.qyList[i].compStatus,this.dataObj.compId)
+							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
 							uni.setStorageSync('releasecompId', this.dataObj.compId)
 						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false