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

pages/mine/driverCertification.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone">
+					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone" maxlength="11">
 					</u--input>
 				</view>
 				<view class="flex row noborder" v-if="dataDetails.driverPhone!=userInfo.phone">
@@ -856,7 +856,7 @@
 				}
 			},
 			next(val) {
-				// if (this.validate()) return
+				if (this.validate()) return
 				uni.$u.route('/pages/mine/driverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
 				});

pages/mine/driverCertificationNext.vue

@@ -555,8 +555,7 @@
 				
 			
 				// 校验
-				// if (this.validate()) return
-				// debugger
+				if (this.validate()) return
 				if(this.dataDetails.driverSex=='男'){
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
 				}else{
@@ -569,9 +568,6 @@
 					})
 					return
 				}
-
-
-
 				this.$request.baseRequest('post', '/driverInfo/api/addInfo', this.dataDetails).then(res => {
 						if(res.code==200){
 							uni.$u.route('/pages/mine/index');

pages/mine/editDriverCertification.vue

@@ -375,7 +375,7 @@
 			},
 			next(val) {
 				// console.log(111111111111)
-				// if (this.validate()) return
+				if (this.validate()) return
 				uni.$u.route('/pages/mine/editDriverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
 				});

pages/mine/manageVehicles/addVehicle.vue

@@ -177,7 +177,12 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.addressUrl =this.dataDetails.addressUrl+','+ result
+						if(!this.dataDetails.addressUrl){
+								this.dataDetails.addressUrl = result
+						}else{
+							this.dataDetails.addressUrl = this.dataDetails.addressUrl+','+ result
+						}
+						
 
 					}
 				)

pages/mine/settings/editAvatar.vue

@@ -3,7 +3,7 @@
 		<view @click="upload" class="picture">
 			<image class="xj-image" v-if="!deptListurl.avatarUrl" src="@/static/images/common/tianjiazhaopian@2x.png">
 			</image>
-			<image class="xj-image" :src="deptListurl.avatarUrl" v-if="deptListurl.avatarUrl"></image>
+			<image  :src="deptListurl.avatarUrl" v-if="deptListurl.avatarUrl" style="width: 100%;height: 100%;"></image>
 
 		</view>
 		<view @click="submit" class="submit">提交</view>
@@ -41,7 +41,6 @@
 		methods: {
 			upload() {
 				this.isShowimgType = true
-
 			},
 			imgTypeSelect(val) {
 				console.log(val)