Browse Source

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

gjy 3 năm trước cách đây
mục cha
commit
550b54e320

+ 4 - 5
pages.json

@@ -317,7 +317,7 @@
 		{
 			"path": "pages/mine/cargoowner/addEnerprise",
 			"style": {
-				"navigationBarTitleText": "企业认证",
+				"navigationBarTitleText": "认证信息",
 				"enablePullDownRefresh": false
 			}
 
@@ -487,7 +487,7 @@
 		}, {
 			"path": "pages/mine/cargoowner/editEnerprise",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "编辑",
 				"enablePullDownRefresh": false
 			}
 
@@ -519,7 +519,7 @@
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
-							"type":"menu"
+							"type": "menu"
 							// "text": "\f0112",
 							// "fontSrc": "/static/gengduo/iconfont.ttf",
 							// "fontSize": "20"
@@ -578,8 +578,7 @@
 		}, {
 			"path": "pages/mine/confirm",
 			"style": {
-				"navigationBarTitleText": "scss",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 
 		}

+ 16 - 8
pages/mine/cargoowner/addEnerprise.vue

@@ -56,7 +56,7 @@
 			</view>
 			</view> -->
 			<view class="flex row noborder">
-				<view class="left-text">营业期限截止日期</view>
+				<view class="left-text">授权截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">
 						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}
@@ -118,7 +118,8 @@
 				legalPersonName: '',
 				uploadType: '',
 				index: 0,
-				fileList1: []
+				fileList1: [],
+				urlList:[]
 			}
 		},
 		computed: {
@@ -152,22 +153,21 @@
 				console.log(event);
 				this.pathArr = event;
 			},
-			uploadFilePromise(file, url) {debugger
+			uploadFilePromise(file, url) {
 				uploadImage('image',url, 'appData/',
 					result => {
 						// 上传成功回调函数
-						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl = this.dataDetails.certificateAddressUrl + ',' + result
-
+						this.urlList.push(result)
 					}
 				)
 			},
 			// 删除图片
 			deletePic(event) {
+				this.urlList=this.urlList.splice(event.index,1)
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
-			async afterRead(event) {debugger
+			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
 				let lists = [].concat(event.file)
 				console.log(event)
@@ -265,7 +265,14 @@
 				// 	})
 				// 	return true
 				// }
-				if (uni.$u.test.isEmpty(this.dataDetails.certificateAddressUrl)) {
+				// if (uni.$u.test.isEmpty(this.dataDetails.certificateAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "企业授权书不能为空!",
+				// 	})
+				// 	return true
+				// }
+				if(this.urlList.length == 0){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业授权书不能为空!",
@@ -298,6 +305,7 @@
 				})
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
+				this.dataDetails.certificateAddressUrl = this.urlList.toString()
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(
 						res => {
 							uni.hideLoading()

+ 11 - 5
pages/mine/cargoowner/cargoowner.vue

@@ -31,7 +31,7 @@
 							<view v-else style='font-size:21px;'>{{personage.name}}</view>
 							<view v-if="personage.authenticationStatus!='已认证'" class='flex flex-space-between'
 								style='width:100%;color:#999999;font-size:14px;'>您的身份信息{{personage.authenticationStatus?personage.authenticationStatus:'未认证'}}状态
-								<u-icon name="arrow-right" color="#7E7E7E" size="10" v-if="datastatus"></u-icon>
+								<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{starUserphone}}
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 		<view>
-			<view class="content2-title">所属企业 <text style='color:#999;'>({{enterprise.length}})</text></view>
+			<view class="content2-title">所属企业 <text style='color:#999;'>{{enterprise.length}})</text></view>
 			<view v-if='enterprise.length>0'>
 				<view v-for='item in enterprise' class='wrap'>
 					<view class='flex flex-space-between'>
@@ -61,8 +61,7 @@
 					</view>
 					<view class="row3">
 						<view class="right">
-							<!-- v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"' -->
-							<image @click='edit(item)'
+							<image @click='edit(item)' 							v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"'
 								style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png">
 							</image>
 							<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
@@ -82,6 +81,7 @@
 				<view @click='goDetailPage("/pages/mine/cargoowner/editpersonalinformation")' class='newlyIncreased' v-if="!datastatus">去认证</view>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -125,6 +125,12 @@
 			toEditPage(){
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
+				}else if(this.personage&&this.personage.authenticationStatus == "审核中"){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份审核中,请耐心等待!",
+					})
+					return 
 				}else{
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}
@@ -224,7 +230,7 @@
 
 <style lang="scss" scoped>
 	.content {
-		padding-bottom: 320rpx;
+		padding-bottom: 460rpx;
 	}
 
 	.identity {

+ 17 - 5
pages/mine/cargoowner/editEnerprise.vue

@@ -50,7 +50,7 @@
 			</view>
 			</view> -->
 			<view class="flex row noborder">
-				<view class="left-text">营业期限截止日期</view>
+				<view class="left-text">授权截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between'  @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}</view>
 					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
@@ -101,7 +101,8 @@
 				isShowimgType:false,
 				uploadType:'',
 				index:0,
-				fileList1: []
+				fileList1: [],
+				urlList:[]
 			}
 		},
 		computed: {
@@ -116,7 +117,8 @@
 			
 			this.dataDetails = options
 			if(options.certificateAddressUrl){
-				var arr=options.certificateAddressUrl.split(',')
+				var arr = options.certificateAddressUrl.split(',')
+				this.urlList = options.certificateAddressUrl.split(',')
 				this.fileList1=[]
 				for(var i=0;i<arr.length;i++){
 					if(arr[i]!=''){
@@ -136,13 +138,15 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
+						this.urlList.push(result)
+						// this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
 
 					}
 				)
 			},
 			// 删除图片
 			deletePic(event) {
+				this.urlList=this.urlList.splice(event.index,1)
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
@@ -234,13 +238,21 @@
 			// 	});
 			// },
 			submit(){
+				if (!this.checked) {
+					uni.showToast({
+						title: '请勾选协议',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask:true
 				})
 				var _this=this
-				console.log(this.dataDetails)
 				this.dataDetails.commonId=this.userInfo.id
+				this.dataDetails.certificateAddressUrl = this.urlList.toString()
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(res => {
 					uni.hideLoading()
 					uni.removeStorage('cargoOwnerId')

+ 115 - 89
pages/mine/cargoowner/editpersonalinformation.vue

@@ -1,38 +1,5 @@
 <template>
 	<view class="content">
-		<view class='content1'>
-			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>姓名</view>
-				<view class="flex">
-					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.name">
-					</u--input>
-				</view>
-			</view>
-			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>联系电话</view>
-				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
-						v-model="dataDetails.phone">
-					</u--input>
-				</view>
-			</view>
-			<view class="flex row" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
-				<view style='width:100px;font-size:14px;'>性别</view>
-				<u-radio-group v-model="dataDetails.sex" placement="row">
-					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
-						:label="item.name" :name="item.name" @change="radioChange">
-					</u-radio>
-				</u-radio-group>
-			</view>
-			<view class="flex row row-ch" style='padding:10px 0 5px;'>
-				<view style='width:100px;font-size:14px;'>称呼</view>
-				<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' border="none"
-					v-model="dataDetails.call">
-				</u--input>
-				<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
-				<view class="flex align-center" v-else>女士</view>
-			</view>
-		</view>
 		<view class="content2 content-other">
 			<view class="title">上传身份证人像面</view>
 			<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
@@ -63,10 +30,45 @@
 
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 			</view>
+			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
+				<view style='width:100px;font-size:14px;'>姓名</view>
+				<view class="flex">
+					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none"
+						v-model="dataDetails.name">
+					</u--input>
+				</view>
+			</view>
+			<view class="flex row" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
+				<view style='width:100px;font-size:14px;'>性别</view>
+				<u-radio-group v-model="dataDetails.sex" placement="row">
+					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.name" :name="item.name" @change="radioChange">
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<view class="flex row row-ch" style='padding:10px 0 5px;'>
+				<view style='width:100px;font-size:14px;'>称呼</view>
+				<view style="width: 60rpx;">
+					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' 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>
 
+			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100">
+				<view style='width:100px;font-size:14px;'>联系电话</view>
+				<view class="flex">
+					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
+						v-model="dataDetails.phone">
+					</u--input>
+				</view>
+			</view>
 			<view class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.cardNumber">
+				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none"
+					v-model="dataDetails.cardNumber">
 				</u--input>
 			</view>
 
@@ -89,9 +91,9 @@
 
 		<view class="content4">
 			<view style='margin:0 0 18px;font-size:12px;color:#999;' class='flex items-center'>
-				<u--image style='margin-right:5px;' @click='consent'
+				<u--image style='margin-right:5px;margin-top: 4rpx;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
-					height="12px"></u--image>
+					height="12px" ></u--image>
 				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
@@ -126,7 +128,7 @@
 		data() {
 			return {
 				radioCustomStyle: {
-					margin: '0 0 0 20rpx'
+					margin: '0 20rpx 0 0'
 				},
 				radiolist1: [{
 						name: '男',
@@ -147,7 +149,8 @@
 					cardAddressUrl: '',
 					cardBackAddressUrl: '',
 					cardValidityDate: '',
-					driverSex: '男'
+					driverSex: '男',
+					cardValidityDate: "",
 				},
 				checked: false,
 				isShowcardValidity: false,
@@ -168,8 +171,8 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			nameinput(){
-				this.dataDetails.call=this.dataDetails.name[0]
+			nameinput() {
+				this.dataDetails.call = this.dataDetails.name[0]
 			},
 			// 性别切换
 			radioChange(n) {
@@ -196,11 +199,13 @@
 					_this.savePhoto(e.path);
 				}
 			},
-			delCard(status){
-				if(status==1){
-					this.dataDetails.cardAddressUrl=''
-				}else{
-					this.dataDetails.cardBackAddressUrl=''
+			delCard(status) {
+				if (status == 1) {
+					this.dataDetails.cardAddressUrl = ''
+					this.$forceUpdate()
+				} else {
+					this.dataDetails.cardBackAddressUrl = ''
+					this.$forceUpdate()
 				}
 			},
 			//保存图片到相册,方便核查
@@ -260,7 +265,7 @@
 				this.index = index
 				this.imgTypeSelect()
 				// this.isShowimgType = true
-				
+
 			},
 			validate() {
 				if (uni.$u.test.isEmpty(this.dataDetails.name)) {
@@ -270,14 +275,14 @@
 					})
 					return true
 				}
-				if (this.dataDetails.name.length<2||this.dataDetails.name.length>10) {
+				if (this.dataDetails.name.length < 2 || this.dataDetails.name.length > 10) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "姓名输入错误!",
 					})
 					return true
 				}
-				if (this.dataDetails.call.length>4) {
+				if (this.dataDetails.call.length > 4) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "称呼输入错误!",
@@ -298,7 +303,7 @@
 					})
 					return true
 				}
-				if(!this.checked){
+				if (!this.checked) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "请勾选细则!",
@@ -347,44 +352,62 @@
 
 			imgTypeSelect(val) {
 				let that = this
-					uni.chooseImage({
-						count: 1,
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage("image",res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功回调函数
-									console.log('图片地址', result)
-									
-									switch (that.uploadType) {
-										// 身份正面
-										case 1:
-											that.dataDetails.cardAddressUrl = result
-											// 识别
-											that.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-													}).then(res => {
+				uni.chooseImage({
+					count: 1,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage("image", res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功回调函数
+								console.log('图片地址', result)
+
+								switch (that.uploadType) {
+									// 身份正面
+									case 1:
+										that.dataDetails.cardAddressUrl = result
+										// 识别
+										that.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 1
+												}).then(res => {
+												if (res.data.recPersonNo) {
 													that.dataDetails.cardNumber = res.data.recPersonNo
-													if (!that.dataDetails.name) {
-														that.dataDetails.name = res.data.recPerson
-													}
-													that.$forceUpdate()
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break
-											// 身份反面
-										case 2:
-											that.dataDetails.cardBackAddressUrl = result
-											that.$forceUpdate()
-											break
-									}
+												}
+												if (res.data.recPerson) {
+													that.dataDetails.name = res.data.recPerson
+												}
+												that.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
+										// 身份反面
+									case 2:
+										that.dataDetails.cardBackAddressUrl = result
+										// 识别
+										that.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 2
+												}).then(res => {
+												if (res.data.idCardValidity) {
+													let date = res.data.idCardValidity.split("-")[1]
+													that.dataDetails.cardValidityDate = date.replace(
+														'.', '-').replace('.', '-')
+												}
+												that.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
 								}
-							)
-						}
-					});
+							}
+						)
+					}
+				});
 				// 	switch (this.uploadType) {
 				// 		case 1:
 				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
@@ -432,15 +455,15 @@
 </script>
 
 <style lang="scss" scoped>
-	
 	// .preview-card-img {
 	// 	/deep/uni-image>div, uni-image>img {
 	// 	    transform: scale(1.5) rotate(-90deg);
 	// 	}
 	// }
-	/deep/.uni-input-input:disabled{
-		background:#fff;
+	/deep/.uni-input-input:disabled {
+		background: #fff;
 	}
+
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
@@ -459,6 +482,7 @@
 		margin: 20rpx;
 		padding: 20rpx;
 		border-radius: 20rpx;
+
 		.row-ch {
 			padding-right: 180rpx;
 			box-sizing: border-box;
@@ -509,6 +533,7 @@
 			width: 100%;
 			height: 440rpx;
 			position: relative;
+
 			.text {
 				margin-top: 20rpx;
 			}
@@ -584,7 +609,8 @@
 		height: 80rpx;
 		z-index: 9;
 	}
-	.bz{
+
+	.bz {
 		font-size: 28rpx;
 	}
 </style>

+ 17 - 1
pages/mine/company/addcompany.vue

@@ -631,6 +631,7 @@
 											_this.$request.baseRequest('get',
 													'/driverInfo/personShibie', {
 														personImg: result,
+														flag:1
 													}).then(res => {
 													_this.dataDetails.cardNumber = res.data.recPersonNo
 													_this.$forceUpdate()
@@ -642,7 +643,22 @@
 											break
 										case 3:
 										_this.dataDetails.cardBackAddressUrl = result
-											_this.$forceUpdate()
+											// 识别
+											_this.$request.baseRequest('get',
+													'/driverInfo/personShibie', {
+														personImg: result,
+														flag:2
+													}).then(res => {
+														if(res.data.idCardValidity){
+															let date = res.data.idCardValidity.split("-")[1]
+														    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
+														}
+													_this.$forceUpdate()
+												})
+												.catch(res => {
+													uni.$u.toast(res.message);
+												});
+												_this.$forceUpdate()
 											break;
 									}
 								}

+ 20 - 4
pages/mine/company/editcompany.vue

@@ -572,10 +572,11 @@
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
+								result => {debugger
 									// 上传成功回调函数
 									switch (_this.uploadType) {
 										
+										
 										// 身份正面
 										case 1:
 											_this.dataDetails.businessLicenseAddressUrl = result
@@ -613,9 +614,9 @@
 										case 2:
 											_this.dataDetails.cardAddressUrl = result
 											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
+											_this.$request.baseRequest('get','/driverInfo/personShibie', {
 														personImg: result,
+														flag:1
 													}).then(res => {
 													_this.dataDetails.cardNumber = res.data.recPersonNo
 													_this.$forceUpdate()
@@ -623,10 +624,25 @@
 												.catch(res => {
 													uni.$u.toast(res.message);
 												});
-											
+											_this.$forceUpdate()
 											break
 										case 3:
 										_this.dataDetails.cardBackAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag:2
+												}).then(res => {
+													if(res.data.idCardValidity){
+														let date = res.data.idCardValidity.split("-")[1]
+													    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
+													}
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
 											_this.$forceUpdate()
 											break;
 									}

+ 64 - 18
pages/mine/confirm.vue

@@ -1,12 +1,19 @@
 <template>
 	<view>
-		<view class="username">{{username}}</view>
-		<view v-if="msg==''">
-			<button @click="mobileOkPcLogin()">确认登录</button>
-		</view>
-		<view class="msg" v-else>
-			{{msg}}
+		<!-- <view class="username">{{username}}</view> -->
+		<view class="content1">
+			<image src="../../static/sm.png" mode="widthFix" class="img"></image>
+			<view class="row1">
+				即将通过扫码
+			</view>
+			<view class="row2">
+				登录畅运通网站
+			</view>
+			<button @click="mobileOkPcLogin()" class="row3 btn">确认登录</button>
+			<button @click="mobileOkPcLogin()" class="row4 btn">取消登录</button>
 		</view>
+		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
+			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -18,8 +25,9 @@
 		data() {
 			return {
 				token: '',
-				msg: '',
 				phone: '',
+				alertTitle: '登录成功!',
+				isShowAlert: false
 			}
 		},
 		computed: {
@@ -30,6 +38,15 @@
 			console.log(option);
 		},
 		methods: {
+			confirmClick() {
+				this.isShowAlert = false
+				uni.switchTab({
+					url: '/pages/mine/index'
+				});
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
 			mobileOkPcLogin() {
 				this.$request.baseRequest('post', '/login/loginCode', {
 						phone: this.userInfo.phone,
@@ -37,8 +54,7 @@
 					}).then(res => {
 						console.log(1111111111111111111)
 						console.log(res)
-						this.msg = res.message;
-						console.log(this.msg);
+						this.isShowAlert = true
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -49,16 +65,46 @@
 	}
 </script>
 
-<style>
-	.username {
-		text-align: center;
-		font-size: 32rpx;
-		line-height: 50rpx;
+<style scoped lang="scss">
+	.content1 {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding-top: 300rpx;
+	}
+
+	.img {
+		width: 50%;
+	}
+
+	.row1 {
+		font-size: 14rpx;
+		color: #AFB3BF;
+		margin: 40rpx 0 10rpx 0;
+	}
+
+	.row2 {
+		font-size: 46rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.row3 {
+		margin-top: 300rpx;
+
+		background: #2772FB;
+		color: white;
+	}
+
+	.row4 {
+		margin-top: 60rpx;
+		background: #F1F3F6;
+		color: #AFB3BF;
 	}
 
-	.msg {
-		text-align: center;
-		font-size: 30rpx;
-		margin-top: 10rpx;
+	.btn {
+		border-radius: 50rpx;
+		width: 90%;
 	}
 </style>

+ 6 - 2
pages/mine/index.vue

@@ -104,7 +104,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view>
-				
+
 				<!-- 		<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/driverEvaluation')">
 					<view class='flex items-center'>
@@ -192,9 +192,11 @@
 						} else {
 							this.cargoCall = "女士"
 						}
-					}else{
+					} else {
 						this.userName = this.userInfo.userName
+						this.cargoCall=""
 					}
+					this.$forceUpdate()
 				})
 				// this.phone = this.userInfo.phone ? this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7),"****") : ''
 				this.phone = this.userInfo.phone
@@ -238,6 +240,8 @@
 				this.$request.baseRequest('get', '/login/loginInfo', {
 					token: this.token
 				}).then(res => {
+					console.log('111111111111111111111')
+					console.log(res)
 					let resultData = res;
 					console.log(resultData);
 					uni.navigateTo({

+ 1 - 1
pages/mine/settings/editPassword.vue

@@ -5,7 +5,7 @@
 				<h2 class="Semibold">重置密码</h2>
 			<u--form labelPosition="left" :model="registerData" ref="registerForm" labelWidth="80">
 				<u-form-item label="手机号" prop="phone" borderBottom>
-					<u--input v-model="registerData.phone" border="none" placeholder="请输入手机号码"></u--input>
+					<u--input v-model="registerData.phone" border="none" maxlength="11" placeholder="请输入手机号码"></u--input>
 				</u-form-item>
 			
 				<u-form-item label="验证码" prop="code"borderBottom>

+ 1 - 1
pages/order/index.vue

@@ -142,7 +142,7 @@
 						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal" @click.stop="toDetail(good.id)"
 							>确认装车</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
-						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click="$helper.contactCustomerService()">
+						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click.stop="$helper.contactCustomerService()">
 							联系客服</view>
 							<view class="start normal" @click.stop="toDetail(good.id)"
 								v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>

+ 1 - 1
pages/public/register.vue

@@ -33,7 +33,7 @@
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px"></u--image>
+					width="17px" height="17px" style="margin:0 10rpx"></u--image>
 				已阅读并同意
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"

+ 4 - 1
pages/release/release.vue

@@ -472,7 +472,10 @@
 						this.columns = [
 							[]
 						]
-						this.columns[0].push("个人货主")
+						let obj = uni.getStorageSync("firstAuthentication")
+						if(obj && obj.authenticationStatus == '已认证'){
+							this.columns[0].push("个人货主")
+						}
 						for (let i = 0; i < this.qyList.length; i++) {
 							this.columns[0].push(this.qyList[i].company ? this.qyList[i].company : this.qyList[i]
 								.companyName)

BIN
static/logo.png


BIN
static/sm.png