Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

# Conflicts:
#	config/index.js

App.vue

@@ -22,7 +22,6 @@
 		onLaunch: function() {
 			let that = this
 			uni.onTabBarMidButtonTap(() => {
-				debugger
 				console.log("点击发布")
 				if (!that.hasLogin) {
 					// uni.$u.route('/pages/public/login');

pages/mine/company/addcompany.vue

@@ -13,41 +13,7 @@
 			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange" ></video>
 		</view>
 		<view style='margin:10px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
-		<view class='wrap'>
-			<view class="flex border-bottom mt20 align-center">
-				<view class="left">企业名称</view>
-				<view class="flex right">
-					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
-						@blur='companyNameBlur'>
-					</u--input>
-				</view>
-			</view>
-			<view class="flex border-bottom mt20 align-center">
-				<view class="left">法定代表人姓名</view>
-				<view class="flex right">
-					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
-						v-model="dataDetails.legalPersonName">
-					</u--input>
-				</view>
-			</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.phone">
-					</u--input>
-				</view>
-			</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">
-					</u--input>
-					<view>万元</view>
-				</view>
-			</view>
-		</view>
+		
 		<view class='content1'>
 			<view class="title">上传营业执照</view>
 			<view style='position:relative;' @click="uploadImg(1)">
@@ -84,7 +50,41 @@
 			</view>
 
 		</view>
-
+<view class='wrap'>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">企业名称</view>
+				<view class="flex right">
+					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+						@blur='companyNameBlur'>
+					</u--input>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">法定代表人姓名</view>
+				<view class="flex right">
+					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
+						v-model="dataDetails.legalPersonName">
+					</u--input>
+				</view>
+			</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.phone">
+					</u--input>
+				</view>
+			</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">
+					</u--input>
+					<view>万元</view>
+				</view>
+			</view>
+		</view>
 		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
 		<!-- dataDetails.videoAddressUrl -->
 		<view class='content3' v-if="!dataDetails.videoAddressUrl"
@@ -309,7 +309,6 @@
 						companyName: this.dataDetails.companyName
 					}).then(res => {
 						if (res.code == 200) {
-							debugger
 							// that.dataDetails.legalPersonName = res.data.name
 						} else {
 							uni.showToast({
@@ -334,7 +333,6 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.code == 200) {
-							debugger
 							that.dataDetails.legalPersonName = res.data.name
 						}
 					})
@@ -530,8 +528,27 @@
 									switch (_this.uploadType) {
 										// 身份正面
 										case 1:
-											debugger
 											_this.dataDetails.businessLicenseAddressUrl = result
+											// 识别
+											_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);
+												});
 											console.log(_this.dataDetails.businessLicenseAddressUrl)
 											break
 											// 身份反面
@@ -556,7 +573,40 @@
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
-									_this.dataDetails.businessLicenseAddressUrl = 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;
+									}
 								}
 							)
 						}

pages/mine/company/editcompany.vue

@@ -4,41 +4,7 @@
 			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange"></video>
 		</view>
 		<view style='margin:10px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
-		<view class='wrap'>
-			<view class="flex border-bottom mt20 align-center">
-				<view class="left">企业名称</view>
-				<view class="flex right">
-					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
-						@blur='companyNameBlur'>
-					</u--input>
-				</view>
-			</view>
-			<view class="flex border-bottom mt20 align-center">
-				<view class="left">法定代表人姓名</view>
-				<view class="flex right">
-					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
-						v-model="dataDetails.legalPersonName">
-					</u--input>
-				</view>
-			</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.phone">
-					</u--input>
-				</view>
-			</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">
-					</u--input>
-					<view>万元</view>
-				</view>
-			</view>
-		</view>
+		
 		<view class='content1'>
 			<view class="title">上传营业执照</view>
 			<view style='position:relative;' @click="uploadImg(1)">
@@ -75,7 +41,41 @@
 			</view>
 
 		</view>
-
+<view class='wrap'>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">企业名称</view>
+				<view class="flex right">
+					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+						@blur='companyNameBlur'>
+					</u--input>
+				</view>
+			</view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left">法定代表人姓名</view>
+				<view class="flex right">
+					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
+						v-model="dataDetails.legalPersonName">
+					</u--input>
+				</view>
+			</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.phone">
+					</u--input>
+				</view>
+			</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">
+					</u--input>
+					<view>万元</view>
+				</view>
+			</view>
+		</view>
 		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
 		<!-- dataDetails.videoAddressUrl -->
 		<view class='content3' v-if="!dataDetails.videoAddressUrl"

pages/mine/driverEvaluation.vue

@@ -127,7 +127,7 @@
 						flag:1,
 						pageSize: page.size,
 						currentPage: page.num
-					}).then(res => {debugger
+					}).then(res => {
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
 						for(let i = 0;i<that.list.length;i++){

pages/order/addEvaluation.vue

@@ -239,10 +239,8 @@
 				}
 			},
 			uploadFilePromise(file, url) {
-				debugger
 				uploadImage('image', url, 'appData/',
 					result => {
-						debugger
 						// 上传成功回调函数
 						console.log('图片地址', result)
 						that.imageList.push(result)

pages/order/evaluationRecord.vue

@@ -131,7 +131,6 @@
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
 						for (let i = 0; i < that.list.length; i++) {

pages/order/orderDetails.vue

@@ -411,7 +411,6 @@
 				this.isShowAlert = true
 			},
 			confirmLoading(type) {
-				debugger
 				if(this.dataObj.cargoOwnerContract!='1'){
 					uni.showToast({
 						title:'请先签订合同',
@@ -435,7 +434,6 @@
 				uni.$u.route('/pages/order/confirmUnloading', item);
 			},
 			confirmClick() {
-				debugger
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
 					let _title = ''
@@ -475,7 +473,6 @@
 							uni.$u.toast(res.message);
 						});
 				} else if (this.type == 3 || this.type == 4) {
-					debugger
 					let _flag = ''
 					if (this.type == 3) _flag = 1
 					if (this.type == 4) _flag = 2

pages/order/signContract.vue

@@ -167,7 +167,6 @@
 								_obj.id = that.dataDetails.id
 								_obj.typeFlag = 1
 								_obj.cargoOwnerAutograph = that.dataDetails.cargoOwnerAutograph
-								debugger
 								that.$request.baseRequest('get', '/orderInfo/setPdf', _obj).then(
 										res => {
 											uni.hideLoading()

pages/public/login.vue

@@ -140,7 +140,7 @@
 					this.isShowPassword = 'password'
 				}
 			},
-			passlogin(e) {debugger
+			passlogin(e) {
 				var that = this
 				uni.showLoading({
 					title: '登录中',

pages/release/editRelease.vue

@@ -301,7 +301,7 @@
 				],
 			}
 		},
-		onShow() {debugger
+		onShow() {
 			// this.getSFList()
 		},
 		onLoad(options) {

pages/release/release.vue

@@ -400,7 +400,6 @@
 		},
 		methods: {
 			getSFList() {
-				debugger
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
 						commonId: this.userInfo.id