Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

components/bert-suggest/suggest.vue

@@ -6,7 +6,7 @@
 				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
 			</uni-card>
 			<uni-card class="box contact" :isFull="true" title="联系方式" >
-				<input v-model="data.contact" placeholder="请输入您的手机号，方便我们联系您" />
+				<input v-model="data.contact" placeholder="请输入您的手机号，方便我们联系您" maxlength="11" type="number" />
 			</uni-card>
 		</view>
 		

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/goodSource/index.vue

@@ -87,7 +87,7 @@
 								<view class="fontsize-46">
 									{{good.freightPrice}}
 								</view>
-								<view class="flex dw">元/吨</view>
+								<view class="flex dw">{{good.billingMethod == 0?"元/吨":"元/车"}}</view>
 							</view>
 						</view>
 					</view>

pages/mine/driverCertification.vue

@@ -221,7 +221,7 @@
 				<view class="flex row flex-space-between">
 					<view class="left-text">银行卡卡号</view>
 					<view class="flex">
-						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard">
+						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard" maxlength="19">
 						</u--input>
 					</view>
 				</view>
@@ -251,7 +251,7 @@
 				<view class="flex row flex-space-between">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" disabled>
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" readonly>
 						</u--input>
 					</view>
 				</view>
@@ -789,6 +789,14 @@
 													_this.dataDetails.cardAddress = res.data
 														.recPersonAddr
 													_this.dataDetails.numberCard = res.data.recPersonNo
+													if(res.data.recPersonNo && res.data.recPersonNo.length == 18){  //自动获取性别
+														let sex = res.data.recPersonNo.substr(-2,1)
+														if(sex % 2 == 0){
+															_this.dataDetails.driverSex = "女"
+														}else{
+															_this.dataDetails.driverSex = "男"
+														}
+													}
 													if (res.data.recPerson) {
 														_this.dataDetails.driverName = res.data
 															.recPerson
@@ -800,7 +808,6 @@
 															_this.dataDetails.hyDriverPayeeInfoList[i]
 																.payeeName = res.data.recPerson
 														}
-														console.log()
 													}
 													_this.dataDetails.driverBirthday = res.data
 														.recPersonBrithday

pages/mine/driverCertificationNext.vue

@@ -166,7 +166,7 @@
 				</view>
 				<view class="flex row ">
 					<view class="left-text">从业资格证号</view>
-					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='30' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 <!--
@@ -714,7 +714,7 @@
 				// 	return true
 				// }
 
-				if (this.dataDetails.qualificationCertificateNumber.length!=19) {
+				if (this.dataDetails.qualificationCertificateNumber.length > 30) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "从业资格证号输入错误！",

pages/mine/index.vue

@@ -13,8 +13,8 @@
 				<view class="right-text">
 					<!-- <view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} -->
 					<!-- {{hasLogin?driverSex:""}} -->
-					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}
-					</view>
+					<!-- <view class="name" v-if='userName'></view> -->
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
@@ -238,7 +238,8 @@
 								this.userName = this.firstAuthentication.driverCall
 								this.driverSex = "先生"
 							} else {
-								this.userName = this.firstAuthentication.driverCall
+								// this.userName = this.firstAuthentication.driverCall
+								this.userName = this.userInfo.userName //未认证时  显示（用户 + 电话号）未认证没有性别,通过性别判断认证或未认证
 								this.driverSex = ""
 							}
 

pages/mine/manageVehicles/addVehicle.vue

@@ -1128,6 +1128,13 @@
 					})
 					return true
 				}
+				if(!this.dataDetails.vehicleType){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证车辆类型不能为空！",
+					})
+					return true
+				}
 				if (this.dataDetails.vehicleType.length<2||this.dataDetails.vehicleType.length>10) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1394,15 +1401,20 @@
 						})
 						return true
 					}
-					// if (this.dataDetails.fileList2.length == 0) {
-					// 	this.$refs.uToast.show({
-					// 		type: 'error',
-					// 		message: "人和挂车合影不能为空！",
-					// 	})
-					// 	return true
-					// }
-					
-					
+					if (this.fileList1.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传人和牵引车合影！",
+						})
+						return true
+					}
+					if (this.fileList2.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传人和挂车合影！",
+						})
+						return true
+					}	
 				}
 
 				

pages/mine/set.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<view class="content2">
-<!-- 
+			<!-- 
 			<view class='flex flex-space-between' @click='UpdataAccount'>
 				<view>
 					<text>修改账号</text>
@@ -93,7 +93,7 @@
 		},
 		onShow() {
 			this.getList()
-			this.firstAuthentication=uni.getStorageSync("firstAuthentication")
+			this.firstAuthentication = uni.getStorageSync("firstAuthentication")
 		},
 		onLoad() {
 			_this = this
@@ -101,12 +101,12 @@
 			console.log(this.hasLogin)
 		},
 		methods: {
-				editName(){
-					uni.showToast({
-						icon:'none',
-						title:'可在司机认证中修改'
-					})
-				},
+			editName() {
+				uni.showToast({
+					icon: 'none',
+					title: '可在司机认证中修改'
+				})
+			},
 			UpdataAccount() {
 				uni.navigateTo({
 					url: `/pages/mine/settings/editPhone`
@@ -121,18 +121,18 @@
 				let that = this
 				uni.clearStorageSync();
 				this.$request.baseRequest('post', '/auth/api/logout').then(res => {
-					if (res.code==200) {
+					if (res.code == 200) {
 						that.$store.commit('logout')
 						// that.$api.logout()
-								uni.navigateTo({
-									url: `/pages/public/login`
-								})
+						uni.navigateTo({
+							url: `/pages/public/login`
+						})
 					}
 				})
-				
-		
+
+
 			},
-		
+
 			cancelClick() {
 				this.isShowAlert = false
 			},
@@ -204,9 +204,9 @@
 
 <style lang="scss" scoped>
 	.content {
-		height: 100vh;
+		height: calc(100vh - 7vh);
 
-color: #333333;
+		color: #333333;
 	}
 
 	.content1,
@@ -217,7 +217,8 @@ color: #333333;
 
 	.content2 {
 		margin-top: 10rpx;
-		.flex{
+
+		.flex {
 			height: 70rpx;
 		}
 	}

pages/order/addEvaluation.vue

@@ -280,7 +280,8 @@
 		.ziti {
 			color: #909090;
 			margin-right: 20rpx;
-			width: 160rpx;
+			width: 200rpx;
+			min-width: 180rpx;
 		}
 
 		.xkuang {

pages/public/code.vue

@@ -35,8 +35,8 @@
 		<view class="top_four">
 			<input type="number" class="input_show" maxlength="6" @input='submit' v-model="inputList" focus="true" />
 		</view>
-		<!-- 重新获取 -->
-		<view class="top_five" @click='regain' :class="!status ? 'active' : '' "><text v-if="!status">重新发送</text><text
+		<!-- 重新获取 regain -->
+		<view class="top_five" @click='judge' :class="!status ? 'active' : '' "><text v-if="!status">重新发送</text><text
 				v-if="status">{{count_down}}秒后重新发送</text></view>
 	</view>
 </template>
@@ -73,8 +73,15 @@
 			navBack() {
 				uni.navigateBack();
 			},
+			judge(){
+				if(this.count_down > 0){
+					return
+				}else{
+					this.regain()
+				}
+			},
 			regain() {
-				console.log("regain", this.phone);
+				this.count_down = 60
 				this.status = true
 				// console.log(e)150500
 				// 设定一个定时器 1000是1秒的意思
@@ -89,6 +96,7 @@
 					this.status = false
 					clearInterval(interval) //括号里面的名字要与setInterval定义的相同
 				}, 60000)
+				
 				this.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
 						phone: this.phone
 					}).then(res => {
@@ -115,7 +123,7 @@
 					var that = this
 					that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 						driverPhone: this.phone,
-					}).then(res2 => {
+					}).then(res => {
 						if (res.data.authenticationStatus == '已禁用') {
 							that.$refs.uToast.show({
 								type: 'error',
@@ -158,11 +166,11 @@
 										}
 									}
 								})
-								uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companyShortName=
+								uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companySh041500ortName=
 								'黑龙江中天昊元贸易有限公司'; ws_login_rememberMe=1; ws_login_account=${that.phone}; ws_login_pwd=${that.password}; shiro.session=65500189-7bb5-457f-9ff6-0db069150e78`))
 									uni.setStorageSync('pcuserInfo', res.data)
 									uni.setStorageSync('userInfo', res.data)
-									uni.setStorageSync('firstAuthentication', res2.data)
+									uni.setStorageSync('firstAuthentication', res.data)
 									helper.getListByUserId()
 									that.$store.commit('login', res.data)
 									var name = 'userInfo';

pages/public/login.vue

@@ -21,7 +21,7 @@
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
 				<view style='position:relative;'>
 					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
-					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-else type="text" placeholder="请输入密码">
+					<input maxlength='16' placeholder-style="color:#AFB3BF" class='password' v-model='password' v-else type="text" placeholder="请输入密码">
 					<!-- <u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon> -->
 						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/yioncang.png" mode=""></image>

pages/public/register.vue

@@ -161,6 +161,9 @@
 			},
 			getcode() {
 				var that = this
+				if(that.sendText != "获取验证码"){
+					return
+				}
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
 					that.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
 							phone: this.phone
@@ -247,7 +250,7 @@
 				}
 				if (this.password.length < 6) {
 					uni.showToast({
-						title: '密码请输入6-16字符格式',
+						title: '密码输入错误',
 						icon: 'none',
 						duration: 2000
 					})

pages/riders/index.vue

@@ -534,7 +534,7 @@
 			},
 			joinFleet(item) {
 				this.addMember.commonId = this.commonId
-				this.addMember.driverNickname = uni.getStorageSync("firstAuthentication").driverCall
+				this.addMember.driverNickname = uni.getStorageSync("firstAuthentication").driverCall + "师傅"
 				this.addMember.driverPortrait = uni.getStorageSync("userInfo").avatarUrl
 				this.addMember.fleetId = item.id
 				this.alertTitle = "确定申请加入该车队？"