bug

pages/goodSource/index.vue

@@ -192,7 +192,11 @@
 				this.startPlace = uni.getStorageSync('fPlaceObj');
 			} else {
 				// #ifdef APP-PLUS
-				this.getLngLat();
+				var that=this
+				this.$nextTick(function(){
+					that.getLngLat();
+				})
+				
 				// #endif
 				if(!this.startPlace.selected){
 					this.startPlace.selected = ''
@@ -401,6 +405,7 @@
 				this.show = true
 			},
 			getLngLat() {
+				var that=this
 				uni.showLoading({
 					title: '获取定位信息'
 				})
@@ -409,7 +414,12 @@
 					geocode: true,
 					success: res => {
 						if (res.latitude) {
-							that.startPlace.selected = res.address.city
+							// console.log(that.startPlace)
+							if(res.address.city.indexOf('市')!=-1){
+								res.address.city=res.address.city.substring(0,res.address.city.length-1)
+							}
+							
+							that.$set(that.startPlace,'selected',res.address.city)
 							that.lng = res.longitude;
 							that.lat = res.latitude;
 							uni.hideLoading()
@@ -492,7 +502,10 @@
 
 				}
 				// if (this.tabIndex == 2) {
-					this.getLngLat();
+					if(!this.startPlace.selected){
+						console.log(1111111)
+						this.getLngLat();
+					}
 					_data.driverLongitude = this.lng
 					_data.driverLatitude = this.lat
 				// }
@@ -537,6 +550,9 @@
 						if (res.code == 200) {
 							uni.hideLoading()
 							this.mescroll.endBySize(res.data.records.length, res.data.total);
+							// for (var i = 0; i < res.data.records.length; i++) {
+							// 	res.data.records[i].cargoOwnerName1=
+							// }
 							if (page.num == 1) {
 								this.goods = [];
 								// this.otherGoods = []

pages/goodSource/selectCity.vue

@@ -260,7 +260,11 @@
 					}
 					//选择市
 					if (this.fchoosearea == '全部') {
-						_obj.selected = this.fchoosecity
+						if(this.fchoosecity=='市辖区'){
+							_obj.selected = this.fchooseprovince
+						}else{
+							_obj.selected = this.fchoosecity
+						}
 						this.historyFcityList.unshift(_obj)
 						let _newList = this.makeHistoryList(_obj)
 						uni.setStorageSync('fPlaceList', _newList);
@@ -325,7 +329,12 @@
 					}
 					//选择市
 					if (this.schoosearea == '全部') {
-						_obj.selected = this.schoosecity
+						if(this.schoosecity=='市辖区'){
+							_obj.selected = this.schooseprovince
+						}else{
+							_obj.selected = this.schoosecity
+						}
+						
 						this.historyScityList.unshift(_obj)
 						let _newList = this.makeHistoryList(_obj)
 						uni.setStorageSync('sPlaceList', _newList);

pages/mine/driverCertification.vue

@@ -680,18 +680,17 @@
 			},
 			uploadImg(type, index) {
 				this.uploadType = type
-				this.isShowimgType = true
+				// this.isShowimgType = true
 				this.index = index
-
+				this.imgTypeSelect()
 			},
 			// 上传图片
-			imgTypeSelect(val) {
-				console.log(val)
+			imgTypeSelect() {
+				// console.log(val)
 				console.log(this.uploadType)
-				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
@@ -768,27 +767,27 @@
 						}
 					});
 
-				} else {
-					switch (this.uploadType) {
-						// case 0:
-						// 	console.log('人车合影')
-						// 	break
-						case 1:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
-							console.log('身份正面')
-							break
-						case 2:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
-							console.log('身份反面')
-							break
-						case 3:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
-							console.log('银行卡')
-
-							break
-						case 4:
-					}
-				}
+				// } else {
+				// 	switch (this.uploadType) {
+				// 		// case 0:
+				// 		// 	console.log('人车合影')
+				// 		// 	break
+				// 		case 1:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
+				// 			console.log('身份正面')
+				// 			break
+				// 		case 2:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
+				// 			console.log('身份反面')
+				// 			break
+				// 		case 3:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
+				// 			console.log('银行卡')
+
+				// 			break
+				// 		case 4:
+				// 	}
+				// }
 
 			},
 			//车牌号弹出键盘

pages/mine/evaluate.vue

@@ -121,7 +121,7 @@
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatoredId: this.userInfo.id,
-						flag: 1,
+						flag: 2,
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {

pages/mine/index.vue

@@ -11,7 +11,9 @@
 				<u--image class="flex-end" :showLoading="true" :src="headUrl" width="60px" height="60px" shape='circle'>
 				</u--image>
 				<view class="right-text">
-					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} 
+					<!-- {{hasLogin?driverSex:""}} -->
+					</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 

pages/mine/manageBankCards/addBankCard.vue

@@ -102,7 +102,7 @@
 		},
 		onLoad() {
 			_this = this;
-			this.dataDetails.driverId = this.userInfo.driverId
+			this.dataDetails.driverId = this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id
 		},
 		methods: {
 			delCard() {
@@ -184,16 +184,16 @@
 				// });
 			},
 			uploadImg() {
-
-				this.isShowimgType = true
+				this.imgTypeSelect()
+				// this.isShowimgType = true
 			},
 
 			imgTypeSelect(val) {
 				console.log(val)
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
@@ -225,9 +225,9 @@
 							)
 						}
 					});
-				} else {
-					uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
-				}
+				// } else {
+				// 	uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
+				// }
 			},
 			//身份证正面
 			getImgUrl1(src) {
@@ -278,7 +278,7 @@
 				// 	.catch(res => {
 				// 		uni.$u.toast(res.message);
 				// 	});
-				if(this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").numberCard){
+				if(this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").driverName){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "收款人须为司机本人！",

pages/mine/manageBankCards/index.vue

@@ -136,7 +136,7 @@
 			},
 			init() {
 				this.$request.baseRequest('post', '/driverPayeeInfo/selectDriverPayee', {
-						driverId: this.userInfo.driverId,
+						driverId: this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id,
 					}).then(res => {
 						if (res.code == '200') {
 							this.bankList = res.data

pages/mine/settings/editPassword.vue

@@ -8,7 +8,7 @@
 				<view style='width:85%;'><input maxlength="11" @input='phoneinput' style='padding-left:10px;' v-model='phone' placeholder="请输入手机号码" type="text"></view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-				<view style='width:85%;'><input v-model='verifyCode' placeholder="请输入验证码" type="text"></view>
+				<view style='width:85%;'><input maxlength="6" v-model='verifyCode' placeholder="请输入验证码" type="text"></view>
 				<button @click='getcode' :class='status&&!sendDisabled?"active":""' class='getcode'>{{sendText}}</button>
 			</view>
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
@@ -178,7 +178,7 @@
 						})
 					}else{
 						uni.showToast({
-							title: "系统异常或验证码已过期，请退出重试",
+							title: res.message,
 							icon:'none',
 							duration: 2000
 						})

pages/public/login.vue

@@ -5,39 +5,28 @@
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
 			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
 			<view
-				style='position:relative;width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
+				style='position:relative;width:93%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 				<view style='width:85%;'>
 					<!-- <u--input class="phone-number" border="none" maxlength='11' v-model='phone'
 						placeholder="请输入手机号码" type="number"></u--input>
 					<u-input /> -->
-					<u--input v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
-						maxlength='11' :clearable='true'></u--input>
+					<!-- <u--input v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
+						maxlength='11' :clearable='true'></u--input> -->
+					<input placeholder-style="color:#AFB3BF" v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
+							maxlength='11' >
 				</view>
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
-				<!-- <u--input class='password' border="none" v-model='password'
-					placeholder="请输入密码，6-16位字符" :type="type" value="">
-					</u--input> -->
-				<u-input v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					type="password" :clearable='true'>
-					<template slot="suffix">
-						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
+				<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="请输入密码">
+					<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
 							v-if="isShowPassword=='password'"></u-icon>
-						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
+					<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon>
-					</template>
-				</u-input>
-				<u-input v-else class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					type="text" :clearable='true'>
-					<template slot="suffix">
-						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
-							v-if="isShowPassword=='password'"></u-icon>
-						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
-						</u-icon>
-					</template>
-				</u-input>
+				</view>
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin'
 				class='Regular verificationCode'>登录</button>
@@ -277,7 +266,12 @@
 	page {
 		background: #fff;
 	}
-
+	.u-icon{
+		position:absolute;
+		right:0;
+		top:50%;
+		transform: translate(-50%,-50%);
+	}
 	.close {
 		width: 20px;
 		height: 20px;

pages/public/register.vue

@@ -7,22 +7,28 @@
 				class="flex">
 				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
 				<view style='width:85%;'>
-					<u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
-						placeholder="请输入手机号码" type="number" class="Regular" />
+					<!-- <u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+						placeholder="请输入手机号码" type="number" class="Regular" /> -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+							placeholder="请输入手机号码" type="number" class="Regular" />
 				</view>
 				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
 				<view style='width:70%;position:relative;'>
-					<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
-					<!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
+				<!-- 	<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
+					 -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode'  style='padding-left:10px;'
+							placeholder="请输入验证码" type="number" class="Regular" /><!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
 				</view>
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode Regular'>{{sendText}}</button>
 			</view>
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
-				<u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
-					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" />
+				<!-- <u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
+					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" /> -->
+				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style='padding-left:10px;'
+							placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
 				<!-- 				<input maxlength='16' class='password Regular input-style' style='height:30px;' v-model='password' placeholder="请输入密码，6-16位字符" :type="type"> -->
 				<!-- <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> -->
@@ -147,8 +153,10 @@
 				return name
 			},
 			phoneinput(e) {
-				if (e.length == 11) {
+				if (e.detail.value.length == 11) {
 					this.codestatus = true
+				}else{
+					this.codestatus = false
 				}
 			},
 			getcode() {
@@ -157,7 +165,9 @@
 					that.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
 							phone: this.phone
 						}).then(res => {
+							console.log(2222222)
 							if (res.code == 200) {
+								console.log(1121212)
 								that.sendDisabled = true
 								let sec = 60
 								let interval = setInterval(() => {
@@ -178,6 +188,7 @@
 							}
 						})
 						.catch(res => {
+							console.log(res.data.message)
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',