zhongtianhaoyuan 3 年之前
父节点
当前提交
3e522db62c

+ 2 - 2
pages/carSource/driverSee.vue

@@ -18,7 +18,7 @@
 			</view>
 		</view>
 			<view class="row2 flex">
-			<view class="flex item">&
+			<view class="flex item">
 				<view class="pf-name">评分</view>
 				<view class="pf-number">{{ping.zong}}</view>
 			</view>
@@ -67,7 +67,7 @@
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 				class="mescroll">
 				<view class="flex flex-space-between">
-					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}}})</view>
+					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
 					<view :class="haoType == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{ping.haoPing}})</view>
 					<view :class="haoType == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{ping.chaPing}})</view>

+ 3 - 2
pages/carSource/index.vue

@@ -26,7 +26,7 @@
 				</itmisterAddressPickerOther>
 			</view>
 			<view class="route">
-				<view v-for="(item,index) in routeData">
+				<view v-for="(item,index) in routeData" @click="driverLook(item)">
 					<view class="flex route_item">
 						<view style="width: 20%;">
 							<u-avatar :src="item.driverPortrait" size="60"></u-avatar>
@@ -213,6 +213,7 @@
 		},
 		onLoad() {},
 		methods: {
+			
 			driverLook(item) {
 				this.$u.route("/pages/carSource/driverSee", {
 					commonId: item.commonId
@@ -545,7 +546,7 @@
 
 			.center_top {
 				width: 40%;
-				margin: 60rpx auto 0;
+				margin: 70rpx auto 0;
 
 				.center_top_btn {
 					width: 50%;

+ 2 - 2
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" v-if="datastatus"></u-icon>
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{phone}}
@@ -119,7 +119,7 @@
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}else{
-					
+					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}
 			},
 			edit(val){

+ 93 - 51
pages/mine/company/addcompany.vue

@@ -33,7 +33,7 @@
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
-					@click="selectValidityPeriod(0)">
+					@click="selectData(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
 					</view>
@@ -76,26 +76,50 @@
 				</view>
 			</view>
 			<view class="title">上传身份证人像面</view>
-			<view @click.stop="uploadImg(1,1)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
+			<view @click.stop="uploadImg(2)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
 				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 				<view class="text">上传身份证人像面</view>
 			</view>
-			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,1)"
+			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(2)"
 				class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 			</view>
-			<!-- <view class="flex mt20 align-center">
-				<view class="left">注册实缴金额</view>
-				<view class="flex right align-center">
-					<u--input placeholder="输入企业注册实缴金额" inputAlign='left' border="none"
-						v-model="dataDetails.registeredPaidAmount">
+			<view class="title">上传身份证国徽面</view>
+			<view @click="uploadImg(3)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
+				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+				<view class="text">上传身份证国徽面</view>
+			</view>
+			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(3)"
+				class="preview-card-img picture">
+				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">身份证号</view>
+				<view class="flex right">
+					<u--input disabledColor='#fff' placeholder="输入身份证号" inputAlign='left' border="none"
+						v-model="dataDetails.cardNumber">
 					</u--input>
-					<view>万元</view>
 				</view>
-			</view> -->
+			</view>
+		<view class="flex row">
+			<view class="left-text">身份证有效期</view>
+			<view style='font-size:14px;width:50%;' class='flex flex-space-between'
+				@click="selectData(1)">
+				<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
+					{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择期限截止日期'}}
+				</view>
+				<view>
+					<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+				</view>
+			</view>
+		</view>
+		<!-- 	<view class="flex row noborder">
+					<view class="left-text">身份证截止日期</view>
+					<view class="" @click="selectData(1)">
+						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
+					</view>
+				</view> -->
 		</view>
-		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
-		<!-- dataDetails.videoAddressUrl -->
 		<view class='content3' v-if="!dataDetails.videoAddressUrl"
 			@click="goDetailPage('/pages/mine/company/companyvideo')">
 			<view class="left-text">视频验证(打开摄像头并阅读提示文字)</view>
@@ -245,7 +269,8 @@
 					videoAddressUrl: null,
 					legalPersonName: ''
 
-				}
+				},
+				dataType:""
 			}
 		},
 		onShow() {
@@ -276,6 +301,29 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			selectData(num) {
+				this.dataType = num
+				this.isShowcardValidity = true
+			},
+			confirmValidityPeriod(e) {
+				switch (this.dataType) {
+					case 0:
+						if (e.value[0] == '长期') {
+							this.dataDetails.businessTermDate = e.value[0]
+						} else {
+							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
+					case 1:
+						if (e.value[0] == '长期') {
+							this.dataDetails.cardValidityDate = e.value[0]
+						} else {
+							this.dataDetails.cardValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
+				}
+				this.isShowcardValidity = false
+			},
 			screenChange(e) {
 				let fullScreen = e.detail.fullScreen; // 值true为进入全屏,false为退出全屏
 				console.log(e, "全屏");
@@ -527,11 +575,10 @@
 
 				}
 			},
-			clickcancel() {
-				this.isShowcardValidity = false
-			},
+			// clickcancel() {
+			// 	this.isShowcardValidity = false
+			// },
 			imgTypeSelect(val) {
-				debugger
 				var _this = this
 				// if (val.name == '相册') {
 					uni.chooseImage({
@@ -542,9 +589,8 @@
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
-									console.log('图片地址', result)
-
 									switch (_this.uploadType) {
+										
 										// 身份正面
 										case 1:
 											_this.dataDetails.businessLicenseAddressUrl = result
@@ -580,10 +626,23 @@
 											break
 											// 身份反面
 										case 2:
-											_this.dataDetails.propertyAddressUrl = result
-											console.log(_this.dataDetails.propertyAddressUrl)
+											_this.dataDetails.cardAddressUrl = result
+											// 识别
+											_this.$request.baseRequest('get',
+													'/driverInfo/personShibie', {
+														personImg: result,
+													}).then(res => {
+													_this.dataDetails.cardNumber = res.data.recPersonNo
+													_this.$forceUpdate()
+												})
+												.catch(res => {
+													uni.$u.toast(res.message);
+												});
+											
 											break
 										case 3:
+										_this.dataDetails.cardBackAddressUrl = result
+											_this.$forceUpdate()
 											break;
 									}
 								}
@@ -656,30 +715,8 @@
 			selectValidityPeriod(type) {
 				this.ValidityPeriodType = type
 				this.imgTypeSelect()
-				// this.isShowcardValidity = true
-			},
-			confirmValidityPeriod(e) {
-				switch (this.ValidityPeriodType) {
-					case 0:
-						if (e.value[0] == '长期') {
-							this.dataDetails.businessTermDate = e.value[0]
-						} else {
-							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-						}
-						break
-					case 1:
-						if (e.value[0] == '长期') {
-							this.dataDetails.siteLeaseDate = e.value[0]
-						} else {
-							this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-						}
-						break
-				}
-				console.log('confirm', e)
-
-
-				this.isShowcardValidity = false
 			},
+			
 			changeHandler(e) {
 				const {
 					columnIndex,
@@ -749,8 +786,8 @@
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
-		width: 212rpx;
-		height: 212rpx;
+		width: 100%;
+		height: 440rpx;
 		border-radius: 20rpx;
 		display: flex;
 		flex-direction: column;
@@ -758,6 +795,15 @@
 		align-items: center;
 		color: #6A7282;
 	}
+	.picture1 {
+		background: url(../../../static/images/mine/zm.png);
+		background-size: 100% 100%;
+	}
+	.picture2 {
+		background: url(../../../static/images/mine/gh.png);
+		background-size: 100% 100%;
+	}
+	
 
 	.content1 {
 		background: #fff;
@@ -794,11 +840,7 @@
 				margin-top: 20rpx;
 			}
 		}
-		.picture1 {
-			background: url(../../../static/images/mine/zm.png);
-			background-size: 100% 100%;
-		}
-
+		
 		.picture7 {
 			background: url(../../../static/mine/cy.png);
 			background-size: 100% 100%;

+ 174 - 51
pages/mine/company/editcompany.vue

@@ -24,7 +24,7 @@
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
-					@click="selectValidityPeriod(0)">
+					@click="selectData(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
 					</view>
@@ -66,6 +66,44 @@
 					</u--input>
 				</view>
 			</view>
+			<view class="title">上传身份证人像面</view>
+				<view @click.stop="uploadImg(2)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
+					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+					<view class="text">上传身份证人像面</view>
+				</view>
+				<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(2)"
+					class="preview-card-img picture">
+					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
+				</view>
+				<view class="title">上传身份证国徽面</view>
+				<view @click="uploadImg(3)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
+					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+					<view class="text">上传身份证国徽面</view>
+				</view>
+				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(3)"
+					class="preview-card-img picture">
+					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
+				</view>
+				<view class="flex border-bottom mt20 align-center">
+					<view class="left">身份证号</view>
+					<view class="flex right">
+						<u--input disabledColor='#fff' placeholder="输入身份证号" inputAlign='left' border="none"
+							v-model="dataDetails.cardNumber">
+						</u--input>
+					</view>
+				</view>
+			<view class="flex row">
+				<view class="left-text">身份证有效期</view>
+				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
+					@click="selectData(1)">
+					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
+						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择期限截止日期'}}
+					</view>
+					<view>
+						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					</view>
+				</view>
+			</view>
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">通讯地址</view>
 				<view class="flex right">
@@ -235,11 +273,11 @@
 					videoAddressUrl: null,
 					legalPersonName: ''
 
-				}
+				},
+				dataType:""
 			}
 		},
 		onShow() {
-			console.log(uni.getStorageSync("videoSrc"))
 			var viderSrc = uni.getStorageSync("videoSrc")
 			if (viderSrc) {
 				this.dataDetails.videoAddressUrl = viderSrc
@@ -248,7 +286,6 @@
 		onLoad(options) {
 			this.dataDetails.id = options.id
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
-			console.log(this)
 			this.dataDetails.commonId = this.userInfo.id
 			this.dataDetails.phone = this.userInfo.phone
 			console.log('```````````````')
@@ -263,6 +300,29 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			selectData(num) {
+				this.dataType = num
+				this.isShowcardValidity = true
+			},
+			confirmValidityPeriod(e) {
+				switch (this.dataType) {
+					case 0:
+						if (e.value[0] == '长期') {
+							this.dataDetails.businessTermDate = e.value[0]
+						} else {
+							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
+					case 1:
+						if (e.value[0] == '长期') {
+							this.dataDetails.cardValidityDate = e.value[0]
+						} else {
+							this.dataDetails.cardValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
+				}
+				this.isShowcardValidity = false
+			},
 			screenChange(e) {
 				let fullScreen = e.detail.fullScreen; // 值true为进入全屏,false为退出全屏
 				console.log(e, "全屏");
@@ -505,55 +565,131 @@
 			},
 			imgTypeSelect(val) {
 				var _this = this
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: ,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
-									console.log('图片地址', result)
-
 									switch (_this.uploadType) {
+										
 										// 身份正面
 										case 1:
 											_this.dataDetails.businessLicenseAddressUrl = result
+											// 识别
+											_this.$request.baseRequest('get',
+													'/cargoOwnerInfo/api/licenseShibie', {
+														licenseImg: result,
+													}).then(res => {
+													if (res.code == '200') {
+														if(res.data){
+															if (res.data.validPeriod == '29991231') {
+																_this.dataDetails.businessTermDate = '长期'
+															}
+															_this.dataDetails.unifiedSocialCreditCode = res
+																.data.regNum
+															_this.dataDetails.legalPersonName = res.data
+																.licensePerson
+															_this.dataDetails.companyName = res.data
+																.licenseName
+															console.log(res)
+															_this.$forceUpdate()
+														}else{
+															uni.$u.toast('请上传营业执照');
+														}
+													}
+			
+												})
+												.catch(res => {
+													console.log(res)
+													uni.$u.toast(res.message);
+												});
 											console.log(_this.dataDetails.businessLicenseAddressUrl)
 											break
 											// 身份反面
 										case 2:
-											_this.dataDetails.propertyAddressUrl = result
-											console.log(_this.dataDetails.propertyAddressUrl)
+											_this.dataDetails.cardAddressUrl = result
+											// 识别
+											_this.$request.baseRequest('get',
+													'/driverInfo/personShibie', {
+														personImg: result,
+													}).then(res => {
+													_this.dataDetails.cardNumber = res.data.recPersonNo
+													_this.$forceUpdate()
+												})
+												.catch(res => {
+													uni.$u.toast(res.message);
+												});
+											
 											break
 										case 3:
+										_this.dataDetails.cardBackAddressUrl = result
+											_this.$forceUpdate()
 											break;
 									}
 								}
 							)
 						}
 					});
-				} else {
-					uni.chooseImage({
-						count: 1,
-						sourceType: ['camera'],
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功回调函数
-									console.log('图片地址', result)
-									_this.dataDetails.businessLicenseAddressUrl = result
-								}
-							)
-						}
-					});
-				}
+				// } else {
+				// 	uni.chooseImage({
+				// 		count: 1,
+				// 		sourceType: ['camera'],
+				// 		success: function(res) {
+				// 			console.log(JSON.stringify(res.tempFilePaths));
+				// 			uploadImage('image', res.tempFilePaths[0], 'appData/',
+				// 				result => {
+				// 					// 上传成功回调函数
+				// 					console.log('图片地址', result)
+				// 					switch (_this.uploadType) {
+				// 						// 身份正面
+				// 						case 1:
+				// 							// 识别
+				// 							_this.$request.baseRequest('get',
+				// 									'/cargoOwnerInfo/api/licenseShibie', {
+				// 										licenseImg: result,
+				// 									}).then(res => {
+				// 									if (res.code == '200') {
+				// 										if (res.data.validPeriod == '29991231') {
+				// 											_this.dataDetails.businessTermDate = '长期'
+				// 										}
+				// 										_this.dataDetails.unifiedSocialCreditCode = res
+				// 											.data.regNum
+				// 										_this.dataDetails.legalPersonName = res.data
+				// 											.licensePerson
+				// 										_this.dataDetails.companyName = res.data
+				// 											.licenseName
+				// 										console.log(res)
+				// 										_this.$forceUpdate()
+				// 									}
+			
+				// 								})
+				// 								.catch(res => {
+				// 									uni.$u.toast(res.message);
+				// 								});
+				// 							_this.dataDetails.businessLicenseAddressUrl = result
+				// 							console.log(_this.dataDetails.businessLicenseAddressUrl)
+				// 							break
+				// 							// 身份反面
+				// 						case 2:
+				// 							_this.dataDetails.propertyAddressUrl = result
+				// 							console.log(_this.dataDetails.propertyAddressUrl)
+				// 							break
+				// 						case 3:
+				// 							break;
+				// 					}
+				// 				}
+				// 			)
+				// 		}
+				// 	});
+				// }
 			},
 			uploadImg(type) {
 				this.uploadType = type
-				this.isShowimgType = true
+				this.imgTypeSelect()
 				// this.index = index
 			},
 			goDetailPage(src) {
@@ -564,28 +700,7 @@
 				this.ValidityPeriodType = type
 				this.isShowcardValidity = true
 			},
-			confirmValidityPeriod(e) {
-				switch (this.ValidityPeriodType) {
-					case 0:
-						if (e.value[0] == '长期') {
-							this.dataDetails.businessTermDate = e.value[0]
-						} else {
-							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-						}
-						break
-					case 1:
-						if (e.value[0] == '长期') {
-							this.dataDetails.siteLeaseDate = e.value[0]
-						} else {
-							this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-						}
-						break
-				}
-				console.log('confirm', e)
-
-
-				this.isShowcardValidity = false
-			},
+		
 			changeHandler(e) {
 				const {
 					columnIndex,
@@ -656,8 +771,8 @@
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
-		width: 212rpx;
-		height: 212rpx;
+		width: 100%;
+		height: 440rpx;
 		border-radius: 20rpx;
 		display: flex;
 		flex-direction: column;
@@ -665,6 +780,14 @@
 		align-items: center;
 		color: #6A7282;
 	}
+	.picture1 {
+		background: url(../../../static/images/mine/zm.png);
+		background-size: 100% 100%;
+	}
+	.picture2 {
+		background: url(../../../static/images/mine/gh.png);
+		background-size: 100% 100%;
+	}
 
 	.content1 {
 		background: #fff;

二进制
static/images/mine/gh.png