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

App.vue

@@ -37,6 +37,7 @@
 		onLaunch: function() {
 			var that = this
 			// #ifdef APP-PLUS
+			// this.$tabbarView.init()
 			// uni.getNetworkType({
 			// 	success: function (res) {
 			// 		if(res.networkType=='none'){

config/index.js

@@ -1,6 +1,8 @@
 const dev = {
+	baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+		
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

main.js

@@ -12,14 +12,49 @@ import request from '@/util/request.js'
 import utils from '@/util/util.js'
 import webim from 'webim.js';
 import helper from'@/common/helper.js'
+// import axios from 'axios'
+// import TabbarView from "./common/TabBarView.js";
+// Vue.prototype.$tabbarView = new TabbarView();
 Vue.prototype.$api = baseApi
 Vue.prototype.$request = request
 Vue.prototype.$utils = utils
 Vue.prototype.$helper = helper
 Vue.prototype.$socket = webim;
 Vue.prototype.$store = store
+// Vue.prototype.$axios = axios
 
-
+// import axios from 'axios'
+ 
+ 
+ 
+// // 解决uniapp 适配axios请求，避免报adapter is not a function错误
+// axios.defaults.adapter = config => {
+// 	console.log(config)
+// 	return new Promise((resolve, reject) => {
+// 		let settle = require('axios/lib/core/settle');
+// 		let buildURL = require('axios/lib/helpers/buildURL');
+// 		uni.request({
+// 			method: config.method.toUpperCase(),
+// 			url: config.baseURL + buildURL(config.url, config.params, config.paramsSerializer),
+// 			header: config.headers,
+// 			data: config.data,
+// 			dataType: config.dataType,
+// 			responseType: config.responseType,
+// 			sslVerify: config.sslVerify,
+// 			complete: function complete(response) {
+// 				// console.log("执行完成：", response)
+// 				response = {
+// 					data: response.data,
+// 					status: response.statusCode,
+// 					errMsg: response.errMsg,
+// 					header: response.header,
+// 					config: config
+// 				};
+// 				settle(resolve, reject, response);
+// 			}
+// 		})
+// 	})
+// }
 Vue.config.productionTip = false
 
 App.mpType = 'app'

package.json

@@ -9,5 +9,9 @@
         "没有网络",
         "遮罩",
         "遮罩页面"
-    ]
-}
+    ],
+    "dependencies": {
+        "axios": "^0.27.2",
+        "weapp-cookie": "^1.4.8"
+    }
+}

pages.json

@@ -515,7 +515,7 @@
 		}, {
 			"path": "pages/goodSource/fk",
 			"style": {
-				"navigationBarTitleText": "反馈",
+				"navigationBarTitleText": "投诉",
 				"enablePullDownRefresh": false
 			}
 

pages/goodSource/fk.vue

@@ -3,8 +3,8 @@
 		<view class="row1 flex flex-space-between">
 			<view>被投诉人</view>
 			<view class='flex'>
-				<image :src="dataDetails.driverPortrait" mode="widthFix"  style="width: 40rpx;height: 40rpx;" class="img_css"> </image>
-				<view>{{dataDetails.cargoOwnerName}}</view>
+				<image :src="dataDetails.cargoOwnerPortrait" mode="widthFix"  style="width: 40rpx;height: 40rpx;" class="img_css"> </image>
+				<view>{{dataDetails.cargoOwnerName?dataDetails.cargoOwnerName:dataDetails.cargoOwner}}</view>
 			</view>
 		</view>
 		<u-line class="line"></u-line>

pages/goodSource/index.vue

@@ -1,6 +1,6 @@
 <!-- 货源 -->
 <template>
-	<view class="content">
+	<view  @touchend="end" @touchmove="move" :class="{popupShow:isShowAlert}" class="content">
 <!-- 		<fh-no-network></fh-no-network> -->
 		<view class="banner">
 			<image class="banner-img" src="@/static/images/goodSource/banner@2x.png" mode='widthFix'></image>
@@ -169,6 +169,7 @@
 				pickerSelect: '全部类型',
 				tabIndex: 0,
 				scrollTop: 0,
+				isdblclick:0,
 				count: 0,
 				lng: '',
 				lat: '',
@@ -177,11 +178,18 @@
 			}
 		},
 		onTabItemTap(e) {
+			this.isdblclick++
 			// tab 点击时执行，此处直接接收单击事件
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
+			if(this.scrollTop>1200){
+				if(this.isdblclick>1){
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
+				}
+				
+			}
+			
 		},
 		created() {
 
@@ -198,8 +206,24 @@
 		onLoad() {
 			this.checkOpenGPSServiceByAndroidIOS()
 		},
+		onHide() {
+			this.isdblclick=0
+		},
 		onShow() {
-			
+			if(this.scrollTop>1200){
+				uni.setTabBarItem({
+					index: 0,
+					text: '返回顶部',
+					iconPath: 's',
+					selectedIconPath: 'static/images/common/top@2x.png'
+				})
+			}
+			uni.setTabBarItem({
+				index: 2,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			var that= this
 			setTimeout(()=>{
 				// var photol=await permision.checkSystemEnableLocation()
@@ -261,6 +285,7 @@
 		// 	// #endif
 
 		// },
+		
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop
 			// console.log("页面滚动了", res.scrollTop)
@@ -282,6 +307,9 @@
 
 		},
 		methods: {
+			stopRoll(){
+				
+			},
 			async get_localtion_permission() {
 				var photol=await permision.checkSystemEnableLocation()
 				if(photol == true){
@@ -451,11 +479,31 @@
 				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.userInfo.phone,
 				}).then(res2 => {
+					if(res2.data.authenticationStatus=='已过期'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '证件已过期,请上传新证件！',
+						})
+						return
+					}else if(res2.data.authenticationStatus=='未认证'||res2.data.authenticationStatus=='已驳回'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '请先完成司机认证！',
+						})
+						return
+					}
+					else if(res2.data.authenticationStatus=='审核中'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '司机审核中！',
+						})
+						return
+					}
 					let _obj = {
 						driverCommonId: res2.data.commonId,
 						commonId: item.commonId,
 						compId:item.compId,
-						cargoOwnerName: item.cargoOwnerName,
+						cargoOwnerName: item.cargoOwnerReallyName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,
 						sendCity: item.sendCity,
@@ -895,6 +943,12 @@
 </script>
 
 <style scoped lang="scss">
+	.popupShow {
+		overflow: hidden;
+		position: fixed;
+		height: 100vh;
+		width: 100%;
+	}
 	.content {
 		background: #F2F4F7;
 	}

pages/goodSource/shippingDetails.vue

@@ -63,10 +63,11 @@
 			<view class="content2">
 				<view class="flex align-center">
 					<view class="left">货物</view>
-					<view class="flex">
+					<view class="right flex">
 						<view>{{detailData.goodsName}}</view>
 						<view style='margin: 0 10rpx;'>|</view>
-						<view>{{detailData.weight}}吨</view>
+						<view v-if='detailData.weight'>{{detailData.weight}}吨</view>
+						<view v-else>无</view>
 					</view>
 
 				</view>
@@ -106,10 +107,10 @@
 						| {{carWeight}}</view>
 						<view class="right" v-else>不限</view>
 				</view>
-				<view class="flex mt20">
+				<view  class="flex mt20">
 					<view class="left">描述</view>
 					<view class="right">
-						{{detailData.taskDescription}}
+						{{detailData.taskDescription?detailData.taskDescription:'无'}}
 					</view>
 				</view>
 			</view>
@@ -257,12 +258,36 @@
 			},
 			confirmClick() {
 				let item = this.detailData
+				var that=this
+				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone: this.userInfo.phone,
+				}).then(res2 => {
+					if(res2.data.authenticationStatus=='已过期'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '证件已过期,请上传新证件！',
+						})
+						return
+					}else if(res2.data.authenticationStatus=='未认证'||res2.data.authenticationStatus=='已驳回'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '请先完成司机认证！',
+						})
+						return
+					}
+					else if(res2.data.authenticationStatus=='审核中'){
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '司机审核中！',
+						})
+						return
+					}
 				let _obj = {
-					driverCommonId: this.firstAuthentication.commonId,
+					driverCommonId: res2.data.commonId,
 					commonId: item.commonId,
 					id:item.id,
 					compId:item.compId,
-					cargoOwnerName: item.cargoOwnerName,
+					cargoOwnerName: item.cargoOwnerReallyName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,
 					sendCity: item.sendCity,
@@ -275,14 +300,14 @@
 					goodsName: item.goodsName,
 					distance: item.distance,
 					freightPrice: item.freightPrice,
-					driverName: this.firstAuthentication.driverName,
-					driverPhone: this.firstAuthentication.driverPhone,
+					driverName: res2.data.driverName,
+					driverPhone: res2.data.driverPhone,
 					cargoOwnerPhone: item.cargoOwnerPhone
 				}
 
-				this.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
+				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
-							this.$refs.uToast.show({
+							that.$refs.uToast.show({
 								type: 'success',
 								message: "抢单成功！",
 								complete() {
@@ -292,13 +317,19 @@
 								}
 							})
 
+						}else{
+							that.$refs.uToast.show({
+								type: 'error',
+								message: res.message,
+							})
 						}
-
-
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
+					}).catch(res => {
+						uni.$u.toast(res.message);
+					});
 				this.isShowAlert = false
 			},
 			cancelClick() {

pages/mine/driverCertification.vue

@@ -15,16 +15,16 @@
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
-			
+
 					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 				</view>
-			
+
 				<view class="title">上传身份证国徽面</view>
 				<view @click="uploadImg(2,index)" 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(2,index)"
 					class="preview-card-img picture">
 					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
@@ -32,16 +32,17 @@
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
-			
+
 					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 				</view>
-			
+
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard" maxlength="18">
+					<u--input placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard"
+						maxlength="18">
 					</u--input>
 				</view>
-			
+
 				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
@@ -52,10 +53,11 @@
 					<view class="left-text">身份证地址</view>
 					<!-- <u--input placeholder="请输入身份证地址" inputAlign='right' border="none" v-model="dataDetails.cardAddress" maxlength="18">
 					</u--input> -->
-					<u--textarea v-model="dataDetails.cardAddress" border="none"  placeholder="请输入身份证地址" autoHeight  maxlength="30"></u--textarea>
+					<u--textarea v-model="dataDetails.cardAddress" border="none" placeholder="请输入身份证地址" autoHeight
+						maxlength="30"></u--textarea>
 				</view>
-				<u-picker  :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-				 @cancel='isShowcardValidity=false'	@confirm="confirmValidityPeriod" @change="changeHandler">
+				<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
+					@cancel='isShowcardValidity=false' @confirm="confirmValidityPeriod" @change="changeHandler">
 				</u-picker>
 			</view>
 			<view class="content1 content-other">
@@ -77,12 +79,13 @@
 					<view class="left-text">称呼</view>
 					<view class="flex">
 						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
-						v-model="dataDetails.driverCall" maxlength="1">
+							v-model="dataDetails.driverCall" maxlength="1">
 						</u--input>
-						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
+						<view style='margin-left:4px;font-size:15px;' class="flex align-center"
+							v-if="dataDetails.driverSex=='男'">先生</view>
 						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-else>女士</view>
 					</view>
-					
+
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
@@ -232,23 +235,23 @@
 						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='right' border="none"
 							v-model="item.bankDepositBranch">
 						</u--input>
-						<view @click="manualInput" class="type">选择支行</view>
+						<view @click="manualInput(index)" class="type">选择支行</view>
 					</view>
 					<view class="flex" v-if="!isShowManualInput">
-
-						<view class="select-bankzh point" @click="selectZhbank">
+						<u--input class="select-bankzh" placeholder="选择开户支行" inputAlign='right' border="none"
+							v-model="item.bankDepositBranch">
+						</u--input>
+						<!-- <view class="select-bankzh point" @click="selectZhbank">
 							{{item.bankDepositBranch?item.bankDepositBranch:'选择开户支行'}}
-						</view>
+						</view> -->
 						<view @click="manualInput" class="type">手动输入</view>
 					</view>
-
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<view>{{item.payeeName}}</view>
-						<!-- <u--input disabled placeholder="输入收款人姓名" inputAlign='right' border="none" v-model="item.payeeName">
-						</u--input> -->
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" disabled>
+						</u--input>
 					</view>
 				</view>
 				<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'
@@ -414,20 +417,20 @@
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			delCard(type) {
@@ -617,7 +620,7 @@
 				if (uni.$u.test.isEmpty(this.bankType[this.index])) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "请先上传银行卡！",
+						message: "请选择手动输入！",
 					})
 					return true
 				}
@@ -629,18 +632,25 @@
 				this.dataDetails.hyDriverPayeeInfoList[this.index].bankDepositBranch = e.value[0]
 				this.isShowBank = false
 			},
-			manualInput() {
+			manualInput(val) {
+				this.index = val
 
 				if (this.isShowManualInput) {
-					if (uni.$u.test.isEmpty(this.bankType[this.index])) {
+					if (!this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请先上传银行卡！",
 						})
 						return true
+					} else if (this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl && uni.$u.test.isEmpty(
+							this.bankType[this.index])) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入开户支行！",
+						})
+						return true
 					}
 					this.isShowBank = true
-
 				} else {
 					this.isShowBank = false
 				}
@@ -687,22 +697,23 @@
 						})
 						return
 					}
-					var date=new Date()
-					if(e.value[0]<date.getFullYear()){
+					var date = new Date()
+					if (e.value[0] < date.getFullYear()) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e.value[
+							2]) <= (date.getDate())) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
@@ -751,76 +762,83 @@
 			},
 			// 上传图片
 			imgTypeSelect() {
-				var _this=this
+				var _this = this
 				// console.log(val)
-					uni.chooseImage({
-						count: 1,
-						// sourceType: this.$helper.chooseImage.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.cardAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-														flag:1
-													}).then(res => {
-														if(res.data){
-															_this.dataDetails.cardAddress=res.data.recPersonAddr
-															_this.dataDetails.numberCard = res.data.recPersonNo
-															if (res.data.recPerson) {
-																_this.dataDetails.driverName = res.data.recPerson
-																_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
-																for (let i = 0; i < _this.dataDetails
-																	.hyDriverPayeeInfoList.length; i++
-																	) { //收款人需与司机本人一致
-																	_this.dataDetails.hyDriverPayeeInfoList[i]
-																		.payeeName = res.data.recPerson
-																}
-																console.log()
-															}
-															_this.dataDetails.driverBirthday=res.data.recPersonBrithday
+				uni.chooseImage({
+					count: 1,
+					// sourceType: this.$helper.chooseImage.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.cardAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 1
+												}).then(res => {
+												if (res.data) {
+													_this.dataDetails.cardAddress = res.data
+														.recPersonAddr
+													_this.dataDetails.numberCard = res.data.recPersonNo
+													if (res.data.recPerson) {
+														_this.dataDetails.driverName = res.data
+															.recPerson
+														_this.dataDetails.driverCall = res.data
+															.recPerson.substring(0, 1)
+														for (let i = 0; i < _this.dataDetails
+															.hyDriverPayeeInfoList.length; i++
+														) { //收款人需与司机本人一致
+															_this.dataDetails.hyDriverPayeeInfoList[i]
+																.payeeName = res.data.recPerson
 														}
-													
-
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break
-											// 身份反面
-										case 2:
-											_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('.', '-')
+														console.log()
 													}
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break
-											// 银行卡
-										case 3:
-											_this.bankType[_this.index] = []
-											_this.$request.baseRequest('get',
-													'/driverInfo/bankShibie', {
-														bankImg: result,
-													}).then(res => {
-													_this.dataDetails.hyDriverPayeeInfoList[_this.index].payeeAddressUrl = result
+													_this.dataDetails.driverBirthday = res.data
+														.recPersonBrithday
+												}
+
+
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
+										// 身份反面
+									case 2:
+										_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('.', '-')
+												}
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
+										// 银行卡
+									case 3:
+										_this.bankType[_this.index] = []
+										_this.$request.baseRequest('get',
+												'/driverInfo/bankShibie', {
+													bankImg: result,
+												}).then(res => {
+												_this.dataDetails.hyDriverPayeeInfoList[_this.index]
+													.payeeAddressUrl = result
+												if (res.data) {
 													if (res.data.bankNo) {
 														_this.dataDetails.hyDriverPayeeInfoList[_this
 															.index].bankCard = res.data.bankNo
@@ -834,17 +852,18 @@
 														_this.bankType[_this.index].push(res.data
 															.bankNameZhihang)
 													}
-													_this.$forceUpdate()
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break;
-									}
+												}
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break;
 								}
-							)
-						}
-					});
+							}
+						)
+					}
+				});
 				// } else {
 				// } 
 				// else {
@@ -967,7 +986,7 @@
 								if (res.data.distinguishNum != "01") { //不等于01 证明银行卡验证不通过
 									// this.payCheck = false //验证开关
 									uni.$u.toast(res.data.distinguish);
-								}else{
+								} else {
 									uni.$u.route('/pages/mine/driverCertificationNext', {
 										data: JSON.stringify(this.dataDetails),
 									});
@@ -992,6 +1011,7 @@
 					})
 					return true
 				}
+				
 				if (!uni.$u.test.chinese(this.dataDetails.driverName)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -999,7 +1019,20 @@
 					})
 					return true
 				}
-
+				if (uni.$u.test.isEmpty(this.dataDetails.driverCall)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "司机称呼不能为空！",
+					})
+					return true
+				}
+				if (!uni.$u.test.chinese(this.dataDetails.driverCall)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "称呼为汉字！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1032,14 +1065,14 @@
 				// 	}
 				// }
 
-				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.cardAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证人像页不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.cardBackAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证国徽页不能为空！",
@@ -1326,7 +1359,7 @@
 			padding: 4rpx 10rpx;
 			font-size: 26rpx;
 			display: flex;
-			margin-left:4px;
+			margin-left: 26rpx;
 			justify-content: center;
 			align-items: center;
 		}
@@ -1377,14 +1410,17 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+
 	/deep/.u-radio-group--row {
-	    justify-content: flex-end;
+		justify-content: flex-end;
 	}
-	/deep/.u-textarea{
-		padding:9px 0;
+
+	/deep/.u-textarea {
+		padding: 9px 0;
 	}
-	/deep/.u-textarea__field{
-		color:#000;
-		text-align:right;
+
+	/deep/.u-textarea__field {
+		color: #000;
+		text-align: right;
 	}
 </style>

pages/mine/driverCertificationNext.vue

@@ -299,7 +299,8 @@
 				this.dataDetails = JSON.parse(options.data)
 				this.dataDetails.driverType = 1
 			}
-			this.validityPeriod = this.$helper.makeValidityPeriod()
+			this.validityPeriod = this.$helper.makeValidityPeriod('kong',1980)
+			this.validityPeriod1 = this.$helper.makeValidityPeriod(0,1980)
 			console.log(this.validityPeriod)
 		},
 		methods: {

pages/mine/editDriverCertification.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone">
+					<u--input maxlength='11' placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone">
 					</u--input>
 				</view>
 				<view class="flex row noborder" v-if="dataDetails.driverPhone!=userInfo.phone">
@@ -48,6 +48,10 @@
 				</view>
 				<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,1)"
 					class="preview-card-img picture">
+					<view @click.stop="delCard(1)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
 					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 				</view>
 
@@ -58,6 +62,10 @@
 				</view>
 				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,2)"
 					class="preview-card-img picture">
+					<view @click.stop="delCard(2)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
 					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
 				</view>
 				<view class="flex row">
@@ -368,6 +376,17 @@
 				this.imgTypeSelect()
 
 			},
+			delCard(type) {
+				var _this=this
+				switch (type) {
+					case 1:
+						_this.dataDetails.cardAddressUrl = ""
+						break;
+					case 2:
+						_this.dataDetails.cardBackAddressUrl = ""
+						break;
+				}
+			},
 			// 上传图片
 			imgTypeSelect() {
 				// console.log(val)
@@ -466,6 +485,7 @@
 					})
 					return true
 				}
+				
 				if (!uni.$u.test.chinese(this.dataDetails.driverName)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -487,7 +507,6 @@
 					})
 					return true
 				}
-
 				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -502,16 +521,32 @@
 					})
 					return true
 				}
-
-
-				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
+				// for (let i = 0; i < this.dataDetails.hyDriverCarInfoList.length; i++) {
+				// 	let _item = this.dataDetails.hyDriverCarInfoList[i]
+				// 	if (uni.$u.test.isEmpty(_item.carNumber)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "车牌号不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// 	if (uni.$u.test.isEmpty(_item.fileList1)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "人车合影不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// }
+			
+				if (uni.$u.test.isEmpty(this.dataDetails.cardAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证人像页不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.driverPhone)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.cardBackAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证国徽页不能为空！",

pages/mine/editDriverCertificationNext.vue

@@ -244,7 +244,7 @@
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
 			<u-button class="btn-color" @click="btnBClick">提交</u-button>
-			<u-toast ref="uToast"></u-toast>
+			
 			<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 				@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true"
 				@close="isShowimgType=false">
@@ -255,6 +255,7 @@
 			<u-picker :show="isShowDrive" ref="uPicker" :columns="driveList" @confirm="confirmDriveType"
 				:closeOnClickOverlay='true' @close='isShowDrive=false' @cancel='isShowDrive=false'>
 			</u-picker>
+			<u-toast ref="uToast"></u-toast>
 		</view>
 		<!-- <u-modal :show="isShowAlert" :title="" :content='修改认证信息需要重新登录!' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#22C572'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal> -->
 	</view>
@@ -360,7 +361,6 @@
 				// 	data: this.consentStatus
 				// });
 			},
-			validate(data) {},
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if(e.value[0]=='长期'){
@@ -586,24 +586,31 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseBackPage)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseHomePage)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "驾驶证副页不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseValidityStartDate)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "驾驶证起始有效期不能为空！",
+						message: "驾驶证有效期不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseValidityDate)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.quasiDrivingVehicle)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "准驾车型不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.lssuingAuthority)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "驾驶证结束有效期不能为空！",
+						message: "驾驶证发证机关不能为空！",
 					})
 					return true
 				}
@@ -635,7 +642,45 @@
 				// 	})
 				// 	return true
 				// }
-
+				// if(this.radiovalue=='挂车司机'){
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseHomePage)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "挂车行驶证主页不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "挂车行驶证副页不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "挂车行驶证档案编号不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
+				// 		this.$refs.uToast.show({
+				// 			type: 'error',
+				// 			message: "挂车行驶证有效期不能为空！",
+				// 		})
+				// 		return true
+				// 	}
+				// }
+				
+				// if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "行驶证副页不能为空！",
+				// 	})
+				// 	return true
+				// }
+				
 				if (uni.$u.test.isEmpty(this.dataDetails.qualificationCertificate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -650,6 +695,7 @@
 					})
 					return true
 				}
+				
 				if (uni.$u.test.isEmpty(this.dataDetails.qualificationCertificateNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -657,15 +703,14 @@
 					})
 					return true
 				}
-
-				// if (uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
+				// if (!uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
 				// 		message: "从业资格证号输入错误！",
 				// 	})
 				// 	return true
 				// }
-
+			
 				if (this.dataDetails.qualificationCertificateNumber.length!=19) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -680,6 +725,13 @@
 				// 	})
 				// 	return true
 				// }
+				// if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateNumber)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "道路运输证号不能为空！",
+				// 	})
+				// 	return true
+				// }
 				// if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateValidityDate)) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
@@ -687,30 +739,7 @@
 				// 	})
 				// 	return true
 				// }
-
-
-				// if (this.radiovalue == '挂车司机') {
-				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseHomePage)) {
-				// 		this.$refs.uToast.show({
-				// 			type: 'error',
-				// 			message: "挂车行驶证主页不能为空！",
-				// 		})
-				// 		return true
-				// 	}
-				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
-				// 		this.$refs.uToast.show({
-				// 			type: 'error',
-				// 			message: "挂车行驶证副页不能为空！",
-				// 		})
-				// 		return true
-				// 	}
-				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
-				// 		this.$refs.uToast.show({
-				// 			type: 'error',
-				// 			message: "挂车行驶证有效期不能为空！",
-				// 		})
-				// 		return true
-				// 	}
+				// if(this.radiovalue=='挂车司机'){
 				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificate)) {
 				// 		this.$refs.uToast.show({
 				// 			type: 'error',
@@ -718,13 +747,6 @@
 				// 		})
 				// 		return true
 				// 	}
-				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
-				// 		this.$refs.uToast.show({
-				// 			type: 'error',
-				// 			message: "挂车道路运输证有效期不能为空！",
-				// 		})
-				// 		return true
-				// 	}
 				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateNumber)) {
 				// 		this.$refs.uToast.show({
 				// 			type: 'error',
@@ -732,10 +754,10 @@
 				// 		})
 				// 		return true
 				// 	}
-				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
+				// 	if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 				// 		this.$refs.uToast.show({
 				// 			type: 'error',
-				// 			message: "挂车行驶证档案编号不能为空！",
+				// 			message: "挂车道路运输证有效期不能为空！",
 				// 		})
 				// 		return true
 				// 	}

pages/mine/index.vue

@@ -146,6 +146,18 @@
 			};
 		},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '货源',
+				iconPath: 'static/images/common/huoyuan@2x(1).png',
+				selectedIconPath: 'static/images/common/huoyuan@2x.png'
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			// console.log("111111111111111111111111111", this.firstAuthentication)
 			//获取认证状态
 			// console.log(userInfo)

pages/mine/manageBankCards/addBankCard.vue

@@ -15,7 +15,6 @@
 				</view>
 				<image class="" :src="dataDetails.payeeAddressUrl" mode="aspectFit"></image>
 			</view>
-
 			<view class="flex row">
 				<view class="left-text">银行卡卡号</view>
 				<view class="flex">
@@ -39,9 +38,12 @@
 				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
-					<view class="select-bankzh" @click="selectZhbank">
+					<u--input class="select-bankzh point" placeholder="选择开户支行" inputAlign='left' border="none"
+						v-model="dataDetails.bankDepositBranch">
+					</u--input>
+					<!-- <view class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
-					</view>
+					</view> -->
 					<view @click="manualInput" class="type">手动输入</view>
 				</view>
 
@@ -104,24 +106,25 @@
 		onLoad() {
 			_this = this;
 			this.get_camera_permission()
-			this.dataDetails.driverId = this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id
+			this.dataDetails.driverId = this.userInfo.driverId ? this.userInfo.driverId : uni.getStorageSync(
+				"firstAuthentication").id
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			delCard() {
@@ -138,12 +141,18 @@
 			},
 			// 选择支行
 			selectZhbank() {
-				if (uni.$u.test.isEmpty(this.columns)) {
+				if (!this.dataDetails.payeeAddressUrl) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "请先上传银行卡！",
 					})
 					return true
+				} else if (this.dataDetails.payeeAddressUrl && uni.$u.test.isEmpty(this.columns)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择手动输入开户支行！",
+					})
+					return true
 				}
 
 				this.isShowBank = true
@@ -155,12 +164,19 @@
 			},
 			manualInput() {
 				if (this.isShowManualInput) {
+
 					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请先上传银行卡！",
 						})
 						return true
+					} else if (this.dataDetails.payeeAddressUrl && uni.$u.test.isEmpty(this.columns)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入开户支行！",
+						})
+						return true
 					}
 					this.isShowBank = true
 
@@ -210,40 +226,40 @@
 			imgTypeSelect(val) {
 				console.log(val)
 				// if (val.name == '相册') {
-					uni.chooseImage({
-						count: 1,
-						// sourceType: this.$helper.chooseImage.sourceType,
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功
-									console.log('图片地址', result)
-									_this.$request.baseRequest('get',
-											'/driverInfo/bankShibie', {
-												bankImg: result,
-											}).then(res => {
-											_this.dataDetails.payeeAddressUrl = result
-											if (res.data.bankNo) {
-												_this.dataDetails.bankCard = res.data.bankNo
-											}
-											if (res.data.bankName) {
-												_this.dataDetails.bankDeposit = res.data.bankName
-											}
-											// 开户支行LIst
-											if (res.data.bankNameZhihang) {
-												_this.columns.push(res.data
-													.bankNameZhihang)
-											}
-											_this.$forceUpdate()
-										})
-										.catch(res => {
-											uni.$u.toast(res.message);
-										});
-								}
-							)
-						}
-					});
+				uni.chooseImage({
+					count: 1,
+					// sourceType: this.$helper.chooseImage.sourceType,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功
+								console.log('图片地址', result)
+								_this.$request.baseRequest('get',
+										'/driverInfo/bankShibie', {
+											bankImg: result,
+										}).then(res => {
+										_this.dataDetails.payeeAddressUrl = result
+										if (res.data.bankNo) {
+											_this.dataDetails.bankCard = res.data.bankNo
+										}
+										if (res.data.bankName) {
+											_this.dataDetails.bankDeposit = res.data.bankName
+										}
+										// 开户支行LIst
+										if (res.data.bankNameZhihang) {
+											_this.columns.push(res.data
+												.bankNameZhihang)
+										}
+										_this.$forceUpdate()
+									})
+									.catch(res => {
+										uni.$u.toast(res.message);
+									});
+							}
+						)
+					}
+				});
 				// } else {
 				// 	uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
 				// }
@@ -264,7 +280,7 @@
 					})
 					return true
 				}
-				if(this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 20){
+				if (this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 20) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "银行卡号输入错误！",
@@ -279,7 +295,7 @@
 					return true
 				}
 
-				if(this.dataDetails.bankDeposit.length < 4 || this.dataDetails.bankDeposit.length > 25){
+				if (this.dataDetails.bankDeposit.length < 4 || this.dataDetails.bankDeposit.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户行输入错误！",
@@ -294,7 +310,7 @@
 					return true
 				}
 
-				if(this.dataDetails.bankDepositBranch.length < 4 || this.dataDetails.bankDepositBranch.length > 25){
+				if (this.dataDetails.bankDepositBranch.length < 4 || this.dataDetails.bankDepositBranch.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户支行输入错误！",
@@ -374,22 +390,23 @@
 				// 		uni.$u.toast(res.message);
 				// 	});
 				if (that.validate()) return
-				if(this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").driverName){
+				if (this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").driverName) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "收款人须为司机本人！",
 					})
 					return
-				}else{
+				} else {
 					this.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', {
 						name: this.dataDetails.payeeName,
 						idCard: uni.getStorageSync("firstAuthentication").numberCard,
 						accountNo: this.dataDetails.bankCard
 					}).then(
 						res => {
-							if(res.data.distinguishNum == "01"){
+							if (res.data.distinguishNum == "01") {
 								this.dataDetails.commonId = this.userInfo.id
-								this.$request.baseRequest('post', '/driverPayeeInfo/api/addInfo', this.dataDetails).then(
+								this.$request.baseRequest('post', '/driverPayeeInfo/api/addInfo', this.dataDetails)
+									.then(
 										res => {
 											if (res.code == '200') {
 												let params = {
@@ -403,16 +420,16 @@
 													delta: 1
 												});
 												// uni.$u.route('/pages/mine/manageBankCards/index');
-								
+
 											} else {
 												uni.$u.toast(res.message);
 											}
-								
+
 										})
 									.catch(res => {
 										uni.$u.toast(res.message);
 									});
-							}else{
+							} else {
 								uni.$u.toast(res.message);
 							}
 						})
@@ -431,7 +448,7 @@
 	.content {
 		padding: 20rpx;
 		padding-bottom: 50rpx;
-		height:100vh;
+		height: 100vh;
 	}
 
 	.content3 {
@@ -510,6 +527,7 @@
 		justify-content: center;
 		align-items: center;
 		height: 68rpx;
+		margin-left: 26rpx;
 	}
 
 	.submit-btn {

pages/mine/manageVehicles/addVehicle.vue

@@ -352,7 +352,7 @@
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">挂车核定载质量（千克）</view>
+					<view style='width:180px' class="left-text">挂车核定载质量（千克）</view>
 					<u--input type='number' placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
@@ -790,7 +790,13 @@
 									_this.$forceUpdate()
 								}
 							)
-						}
+						},
+						fail: function(req){
+							console.log(req,11111)
+						},
+						complete: function(req1){
+							console.log(req1,22222)
+						},
 					});
 
 				// }

pages/mine/manageVehicles/editVehicle.vue

@@ -255,7 +255,7 @@
 			</view>
 			<view class="flex row noborder input-ckg">
 				<view class="input-positon">
-					<u--input class="input" placeholder="长" inputAlign='left' border="none"
+					<u--input class="input" type='number' placeholder="长" inputAlign='left' border="none"
 						v-model="dataDetails.carLong">
 					</u--input>
 					<view class="position-right">
@@ -264,7 +264,7 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
-					<u--input placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.carWidth">
+					<u--input placeholder="宽" type='number' inputAlign='left' border="none" v-model="dataDetails.carWidth">
 					</u--input>
 					<view class="position-right">
 						mm
@@ -272,7 +272,7 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
-					<u--input placeholder="高" inputAlign='left' border="none" v-model="dataDetails.carHeight">
+					<u--input placeholder="高" type='number' inputAlign='left' border="none" v-model="dataDetails.carHeight">
 					</u--input>
 					<view class="position-right">
 						mm
@@ -294,7 +294,7 @@
 				<view class="flex row">
 					<view class="left left-text">挂车车牌号</view>
 					<view class="right flex">
-						<input class="car-uumber" maxlength="6" v-model='dataDetails.guaCarNumber'
+						<input class="car-uumber" maxlength="6" v-model='dataDetails.guaCarNumber1'
 							@click.stop="handleShowKeyboard1(index)" :disabled="true" placeholder="输入挂车牌号"
 							name="input"></input>
 							挂
@@ -313,7 +313,7 @@
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">挂车核定载质量（千克）</view>
+					<view style='width:180px' class="left-text">挂车核定载质量（千克）</view>
 					<u--input placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
@@ -323,7 +323,7 @@
 				</view>
 				<view class="flex row noborder input-ckg">
 					<view class="input-positon">
-						<u--input class="input" placeholder="长" inputAlign='left' border="none"
+						<u--input class="input" type='number' placeholder="长" inputAlign='left' border="none"
 							v-model="dataDetails.guaCarLong">
 						</u--input>
 						<view class="position-right">
@@ -332,7 +332,7 @@
 					</view>
 					<view class="star">*</view>
 					<view class="input-positon">
-						<u--input placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.guaCarWidth">
+						<u--input placeholder="宽" type='number' inputAlign='left' border="none" v-model="dataDetails.guaCarWidth">
 						</u--input>
 						<view class="position-right">
 							mm
@@ -340,7 +340,7 @@
 					</view>
 					<view class="star">*</view>
 					<view class="input-positon">
-						<u--input placeholder="高" inputAlign='left' border="none" v-model="dataDetails.guaCarHeight">
+						<u--input placeholder="高" type='number' inputAlign='left' border="none" v-model="dataDetails.guaCarHeight">
 						</u--input>
 						<view class="position-right">
 							mm
@@ -443,6 +443,7 @@
 			console.log(options)
 			if(options.guaCarNumber){
 				options.guaCarNumber=options.guaCarNumber.substring(0,6);
+				options.guaCarNumber1=options.guaCarNumber.substring(0,6);
 			}
 			this.dataDetails = options
 			this.sign = options.carCategory
@@ -1331,8 +1332,8 @@
 			submit() {
 					if (this.validate()) return
 					if(this.dataDetails.carCategory == "挂车"){
-						if(this.dataDetails.guaCarNumber.indexOf('挂')==-1){
-							this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+						if(this.dataDetails.guaCarNumber1.indexOf('挂')==-1){
+							this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber1+'挂'
 						}
 					}
 				this.$request.baseRequest('post', '/driverCarInfo/api/editInfo', this.dataDetails).then(res => {

pages/mine/settings/editPassword.vue

@@ -68,6 +68,9 @@
 		},
 		onLoad(options) {
 			this.phone = options.phone //个人首页修改密码
+			if(this.phone.length==11){
+				this.status=true
+			}
 			// this.isPhone = options.phone //个人首页修改密码成功后自动退出重新登录
 			// if( wx.getUserProfile ){  
 			//     console.log('--check getUserProfile--OK');  
@@ -104,23 +107,33 @@
 				}
 				if(/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)){
 				var that=this
-					this.$request.baseRequest('get','/commonUser/sendVerifyCode',{phone:this.phone}).then(res => {
-					that.sendDisabled = true
-					let sec = 60
-					let interval = setInterval(() => {
-						sec--;
-						that.sendText = sec + 's后重发'
-						if (sec <= 0) {
-							that.sendDisabled = false
-							that.sendText = "获取验证码"
-							clearInterval(interval)
-						}
-					}, 1000)
+					this.$request.baseRequest('get','/commonUser/sendVerifyCode',{phone:this.phone,identification:1}).then(res => {
+					
+					if(res.code==200){
+						that.sendDisabled = true
+						let sec = 60
+						let interval = setInterval(() => {
+							sec--;
+							that.sendText = sec + 's后重发'
+							if (sec <= 0) {
+								that.sendDisabled = false
+								that.sendText = "获取验证码"
+								clearInterval(interval)
+							}
+						}, 1000)
+					}else{
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					
 					})
 					.catch(res => {
-					    if(res.errmsg){
+					    if(res.message){
 					    	uni.showToast({
-					    		title: res.errmsg,
+					    		title: res.message,
 					    		icon: 'none',
 					    		duration: 2000
 					    	})

pages/news/index.vue

@@ -17,7 +17,7 @@
 						</image>
 
 					</view>
-					<view class="right">
+					<view class="right" :style="{'border-bottom':index==news.length-1?'1px solid #fff':'1px solid #e6e6e6'}">
 						<view class="row1 flex flex-space-between">
 							<view class="title">
 								{{item.newsType}}
@@ -27,8 +27,8 @@
 							</view>
 						</view>
 						<view class="row2 flex flex-space-between align-center">
-							<view class="text point1">
-								{{item.newsContent}}
+							<view style='white-space: pre-wrap;' class="text point1">
+								{{item.newsTitle}}
 							</view>
 							<view class="red-point" v-if="item.newsFlag==0"></view>
 						</view>
@@ -96,6 +96,18 @@
 
 		// },
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '货源',
+				iconPath: 'static/images/common/huoyuan@2x(1).png',
+				selectedIconPath: 'static/images/common/huoyuan@2x.png'
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			this.newsNumber()
 			this.upCallback({
 				size: 10,

pages/order/addEvaluation.vue

@@ -112,7 +112,7 @@
 		
 		onNavigationBarButtonTap() {
 			console.log(12112)
-			uni.$u.debounce(this.submit, 500)
+			uni.$u.throttle(this.submit(), 5000)
 		},
 		onLoad(options) {
 			that = this
@@ -177,6 +177,7 @@
 			clickStar(index) {
 				console.log(index)
 				this.selectStar = index
+				this.rate[index].value1=this.starIndex
 				if (index == 0 || index == 1) {
 					if (this.starIndex == '1') {
 						this.rate[index].level = '极差'

pages/order/confirmLoading.vue

@@ -84,7 +84,7 @@
 			<view class='s-flex'>
 				<view class="" style="margin:20rpx 0;">上传装车照片</view>
 				<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
-					name="1" multiple='true' :maxCount="3"></u-upload>
+					name="1" :multiple='true' :maxCount="3"></u-upload>
 			</view>
 			<!-- 			<view class='s-flex'>
 				<view class="">上传装车磅单</view>
@@ -218,7 +218,9 @@
 								console.log(this.fileList1)
 								this.detailData.carNo = res.data.carNo
 								this.detailData.loadingDate = res.data.loadingDate
-								this.detailData.loadingDate1=res.data.loadingDate.split(' ')[0]
+								if(res.data.loadingDate){
+									this.detailData.loadingDate1=res.data.loadingDate.split(' ')[0]
+								}
 								this.detailData.weight = res.data.loadingWeight
 								this.detailData.freight = res.data.estimatedFreight
 							}
@@ -270,7 +272,68 @@
 				this.carNumber = e.value
 				this.detailData.hyCarrierInfo.carNo = e.value //键盘输入值
 			},
+			checkOpenGPSServiceByAndroidIOS() {
+			    let system = uni.getSystemInfoSync(); // 获取系统信息
+			    if (system.platform === 'android') { // 判断平台
+			        var context = plus.android.importClass("android.content.Context");
+			        var locationManager = plus.android.importClass("android.location.LocationManager");
+			        var main = plus.android.runtimeMainActivity();
+			        var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+					console.log(mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER))
+			        if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+			            uni.showModal({
+			                title: '提示',
+			                content: '请打开定位服务功能',
+			                // showCancel: false, // 不显示取消按钮
+			                success(res) {
+								if(res.confirm){
+									if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+										
+										var Intent = plus.android.importClass('android.content.Intent');
+										var Settings = plus.android.importClass('android.provider.Settings');
+										var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+										main.startActivity(intent); // 打开系统设置GPS服务页面
+									} 
+								}
+			                }
+			            });
+			        }
+			    } else if (system.platform === 'ios') {
+			        // console.log("苹果");
+			        var cllocationManger = plus.ios.import("CLLocationManager");
+			        var enable = cllocationManger.locationServicesEnabled();
+			        var status = cllocationManger.authorizationStatus();
+			        plus.ios.deleteObject(cllocationManger);
+			        if (enable && status != 2) {
+			            console.log("手机系统的定位已经打开");
+			        } else {
+			            console.log("手机系统的定位没有打开");
+			            uni.showModal({
+			                title: '提示',
+			                content: '请前往设置-隐私-定位服务打开定位服务功能',
+			                // showCancel: false, // 不显示取消按钮
+			                success(res) {
+								if(res.confirm){
+									var UIApplication = plus.ios.import("UIApplication");
+									var application2 = UIApplication.sharedApplication();
+									var NSURL2 = plus.ios.import("NSURL");
+									// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("app-settings");
+									var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION_SERVICES");
+									application2.openURL(setting2);
+									plus.ios.deleteObject(setting2);
+									plus.ios.deleteObject(NSURL2);
+									plus.ios.deleteObject(application2);
+								}
+			                }
+			            });
+			        }
+			    }
+			},
 			getLngLat() {
+				this.checkOpenGPSServiceByAndroidIOS()
 				var that=this
 				uni.showLoading({
 					title: '获取定位中',
@@ -301,7 +364,6 @@
 				// 		});
 				// 	}
 				// );
-				console.log(111111)
 				// console.log(that.detailData,111111)
 				uni.getLocation({
 					type: 'gcj02',
@@ -379,6 +441,7 @@
 			// 删除图片
 			deletePic(event) {
 				this[`fileList${event.name}`].splice(event.index, 1)
+				this.imgList.splice(event.index, 1)
 			},
 			// 新增图片
 			async afterRead(event) {
@@ -471,20 +534,20 @@
 					})
 					return true
 				}
-				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendCity)) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "定位不能为空！",
-				// 	})
-				// 	return true
-				// }
-				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendArea)) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "定位不能为空！",
-				// 	})
-				// 	return true
-				// }
+				if (uni.$u.test.isEmpty(this.detailData.loadingCity)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "定位不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.detailData.loadingArea)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "定位不能为空！",
+					})
+					return true
+				}
 			
 				if(this.imgList.length == 0){
 					this.$refs.uToast.show({
@@ -531,7 +594,7 @@
 					id:this.detailData.hyCarrierInfo.id
 				}
 				
-				console.log("查看id--------",this.detailData.hyCarrierInfo.id)
+				// console.log("查看id--------",this.detailData.hyCarrierInfo.id)
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
 						if (res.code == 200) {
 							uni.hideLoading()
@@ -558,8 +621,8 @@
 									// }
 								},
 								res => {
-									console.log('====确认装车开启连续定位====');
-									console.log(res)
+									// console.log('====确认装车开启连续定位====');
+									// console.log(res)
 									let _data = {
 										orderId: that.id,
 										longitude: res.longitude,
@@ -570,9 +633,9 @@
 									}
 									this.$helper.gjList.push(_data)
 									uni.setStorageSync('mapGJ', this.$helper.gjList);
-									console.log('this.$helper.gjList')
-									console.log(this.$helper.gjList)
-									console.log("条数", uni.getStorageSync('mapGJ').length)
+									// console.log('this.$helper.gjList')
+									// console.log(this.$helper.gjList)
+									// console.log("条数", uni.getStorageSync('mapGJ').length)
 									if (uni.getStorageSync('mapGJ').length > 100) {
 										console.log(JSON.stringify(uni.getStorageSync('mapGJ')) )
 										this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo',  {

pages/order/confirmUnloading.vue

@@ -396,9 +396,25 @@
 			},
 
 			submit(type) {
+			
 				if (type == 1) {
 					this.alertContent = '确定暂存卸车信息？'
 				} else {
+					if (this.fileList1.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "卸车照片不能为空！",
+						})
+						return
+					}
+					
+					if (this.fileList2.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传回单照片！",
+						})
+						return
+					}
 					this.alertContent = '确定提交卸车信息？'
 				}
 				// if(!this.detailData.totalFreight){
@@ -444,22 +460,7 @@
 				// 	return
 				// }
 				
-				if (!this.detailData.carrierInfo.unloadingImg) {
-					uni.showToast({
-						title: '卸车照片不能为空！',
-						icon: "none",
-						duration: 2000
-					});
-					return
-				}
-				if (!this.detailData.carrierInfo.receiptImg) {
-					uni.showToast({
-						title: '请上传回单照片！',
-						icon: "none",
-						duration: 2000
-					});
-					return
-				}
+				
 				this.isShowAlert = false
 				uni.showLoading({
 					title:'加载中'

pages/order/index.vue

@@ -284,6 +284,7 @@
 				isSearch: false,
 				startPlace: '齐齐哈尔齐齐哈尔',
 				endPlace: '全国',
+				isdblclick:0,
 				goods: [], // 数据列表
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				height: "", // 需要固定swiper的高度
@@ -313,11 +314,17 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onTabItemTap(e) {
+			this.isdblclick++
 			// tab 点击时执行，此处直接接收单击事件
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
+			if(this.scrollTop>1200){
+				if(this.isdblclick>1){
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
+				}
+				
+			}
 		},
 		created() {
 			//#ifdef APP-PLUS
@@ -343,7 +350,24 @@
 		// 	// #endif
 
 		// },
+		onHide() {
+			this.isdblclick=0
+		},
 		onShow() {
+			if (this.scrollTop > 1200) {
+				uni.setTabBarItem({
+					index: 2,
+					text: '返回顶部',
+					iconPath: 'static/images/common/top@2x.png',
+					selectedIconPath: 'static/images/common/top@2x.png'
+				})
+			}
+			uni.setTabBarItem({
+				index: 0,
+				text: '货源',
+				iconPath: 'static/images/common/huoyuan@2x(1).png',
+				selectedIconPath: 'static/images/common/huoyuan@2x.png'
+			})
 			var that=this
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
@@ -396,6 +420,7 @@
 		},
 		methods: {
 			moveHandle(){
+				// this.closeMenu()
 				// console.log(1111)
 			},
 			closepopup(){

pages/order/orderDetails.vue

@@ -21,7 +21,7 @@
 			     <!-- <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></u-button> -->
 				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='待货主确认'||dataObj.orderStatus=='未装车'"></u-button>
 				<!-- <u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService()"></u-button> -->
-				<u-button class="btn" text="确认装车" @click="confirmLoading" ></u-button>
+				<u-button v-if="dataObj.orderStatus=='未装车'" class="btn" text="确认装车" @click="confirmLoading" ></u-button>
 				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading"></u-button> -->
 				<u-button class="btn" text="修改装车信息"  @click="confirmLoading" v-if="dataObj.orderStatus=='货主驳回装车信息'||dataObj.orderStatus=='平台驳回装车信息'"></u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.orderStatus=='运输中'"></u-button>
@@ -154,7 +154,7 @@
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车时间</view>
-				<view class="">{{carrierInfo.loadingDate1}}</view>
+				<view class="">{{carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车照片</view>
@@ -192,7 +192,7 @@
 			<view class="level2-title">运费信息（单位：元）</view>
 			<view class='row-between'>
 				<view class=" gray">预付运费</view>
-				<view class="">{{freightInfo.prepaidFreight}}</view>
+				<view class="">{{freightInfo.prepaidFreightDate?freightInfo.prepaidFreight:'未支付'}}</view>
 			</view>
 			<view class='flex flex-end'>
 				<view class="">{{freightInfo.prepaidFreightDate}}</view>
@@ -202,11 +202,12 @@
 				<view class="">{{freightInfo.freightBalance?freightInfo.freightBalance:'未支付'}}</view>
 			</view>
 			<view class='row-between mx ' v-if="freightInfo.freightBalance">
-				明细：预付{{freightInfo.prepaidFreight}}元，服务费{{freightInfo.driverServiceCharge}}元，尾款{{freightInfo.freightBalance}}元，合计收款{{freightInfo.totalCollection}}元。
+				<!-- 明细：预付{{freightInfo.prepaidFreight}}元，服务费{{freightInfo.driverServiceCharge}}元，尾款{{freightInfo.freightBalance}}元，合计收款{{freightInfo.totalCollection}}元。 -->
+			明细：预付{{freightInfo.prepaidFreight}}元，工本费{{freightInfo.driverServiceCharge}}元，尾款{{freightInfo.freightBalance}}元，合计收款{{freightInfo.totalCollection}}元。
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick" class="modal">
 			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
@@ -498,7 +499,10 @@
 							terminator:1
 						}).then(res => {
 							this.show=false
+							this.radiovalue1 == '已与货主协商'
+							this.value2=''
 							this.isShowAlert = false
+							
 							// this.mescroll.resetUpScroll()
 							this.$refs.uToast.show({
 								type: 'success',

pages/order/signContract.vue

@@ -38,13 +38,11 @@
 				<view class="gray">距离</view>
 				<view class="">约{{dataDetails.distance}}公里</view>
 			</view>
-			<view class='row-between'>
-				<!-- 后加 -->
-				<view class="gray">服务费（元）</view>
+			<!-- 司机没有工本费 -->
+		<!-- 	<view class='row-between'>
+				<view class="gray">工本费（元）</view>
 				<view class="">{{dataDetails.serviceCharge}}</view>
-			</view>
-
-
+			</view> -->
 			<view class="title">
 				完善信息
 			</view>
@@ -135,7 +133,7 @@
 			</view>
 			<view class='row-between'>
 				<view style='width:200px;' class="gray">收款账户</view>
-				<view style='word-wrap:break-word;word-break:normal;' class="" @click="collection">
+				<view style='word-wrap:break-word;word-break:normal;text-align:right;' class="" @click="collection">
 					{{dataDetails.bankDeposit?dataDetails.bankDeposit:"请选择收款账户"}}
 					(尾号{{dataDetails.bankCard?dataDetails.bankCard.substring(dataDetails.bankCard.length - 4):""}})
 				</view>
@@ -286,15 +284,13 @@
 
 			this.carList = []
 			that = this
-			this.dataDetails = JSON.parse(options.obj)
-			if(this.dataDetails.billingMethod==1){
-				this.dataDetails.freight1=this.dataDetails.freight
-			}else{
-				this.dataDetails.freight1=''
-			}
+			// this.dataDetails = JSON.parse(options.obj)
+			// console.log(this.dataDetails.billingMethod==1,this.dataDetails.freight)
+			
 			// console.log(this.dataDetails.carNo,this.dataDetails.carrierInfo)
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
+			console.log(this.dataDetails)
 			if (this.dataDetails.hyCarrierInfo) {
 				this.dataDetails.weight = this.dataDetails.hyCarrierInfo.loadingWeight
 			}
@@ -302,6 +298,15 @@
 				this.proportion = this.dataDetails.driverAdvancePayment >= this.dataDetails.ownerAdvancePayment ? this
 					.dataDetails.ownerAdvancePayment : this.dataDetails.driverAdvancePayment
 			}
+			if(this.dataDetails.billingMethod==1){
+				this.dataDetails.freight1=this.dataDetails.freight
+			}else{
+				if(this.dataDetails.driverContract!=1){
+					this.dataDetails.freight1=''
+				}else{
+					this.dataDetails.freight1=this.dataDetails.freight
+				}
+			}
 			// console.log(this.dataDetails)
 			this.dataDetails.carrierInfo = {}
 			this.ctx = uni.createCanvasContext("handWriting");

pages/public/code.vue

@@ -158,6 +158,8 @@
 										}
 									}
 								})
+								uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companyShortName=
+								'黑龙江中天昊元贸易有限公司'; ws_login_rememberMe=1; ws_login_account=${that.phone}; ws_login_pwd=${that.password}; shiro.session=65500189-7bb5-457f-9ff6-0db069150e78`))
 									uni.setStorageSync('pcuserInfo', res.data)
 									uni.setStorageSync('userInfo', res.data)
 									uni.setStorageSync('firstAuthentication', res2.data)

pages/public/login.vue

@@ -179,10 +179,12 @@
 						password: that.password,
 						loginFlag: 2,
 						identification: 1
-					}).then(res => {
+					},'application/x-www-form-urlencoded').then(res => {
 						if (res.code == 200) {
-							console.log("userInfo", res.data)
+// 							uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companyShortName=
+// '黑龙江中天昊元贸易有限公司'; ws_login_rememberMe=1; ws_login_account=${that.phone}; ws_login_pwd=${that.password}; shiro.session=65500189-7bb5-457f-9ff6-0db069150e78`)
 							uni.setStorageSync('userInfo', res.data)
+							// uni.setStorageSync("shiro",res.header['Set-Cookie'])
 							that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 								reCommonId: that.userInfo.id,
 							}).then(res3 => {

pages/public/register.vue

@@ -264,6 +264,8 @@
 									identification:1  //司机标识
 								}).then(res => {
 									if (res.code == 200) {
+										uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companyShortName=
+										'黑龙江中天昊元贸易有限公司'; ws_login_rememberMe=1; ws_login_account=${that.phone}; ws_login_pwd=${that.password}; shiro.session=65500189-7bb5-457f-9ff6-0db069150e78`))
 										// // pc登录
 										// that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
 										// 	mobilePhone: this.phone,

pages/riders/index.vue

@@ -189,6 +189,18 @@
 		},
 		created() {},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '货源',
+				iconPath: 'static/images/common/huoyuan@2x(1).png',
+				selectedIconPath: 'static/images/common/huoyuan@2x.png'
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			if (uni.getStorageSync("sendInfo")) { //从缓存中获取  上一次的装车地 卸车地
 				this.sendInfo = uni.getStorageSync("sendInfo")
 				this.title1 = this.sendInfo.sendProvince + this.sendInfo.sendCity + this.sendInfo.sendArea

util/request.js

@@ -6,6 +6,7 @@ const baseRequest = (method, url, data, header) => {
 	if (header) {
 		contentheader = header
 	}
+	console.log(uni.getStorageSync("shiro"))
 	let userInfo = uni.getStorageSync('userInfo');
 	let baseDefaultOpts = {
 		url: baseUrl + url,
@@ -21,7 +22,7 @@ const baseRequest = (method, url, data, header) => {
 	}
 	let promise = new Promise(function(resolve, reject) {
 		uni.getNetworkType({}).then((res) => {
-			console.log(res)
+			// console.log(res)
 			if (res[1].networkType === "none") {
 				uni.showToast({
 					icon: 'none',
@@ -29,9 +30,19 @@ const baseRequest = (method, url, data, header) => {
 					duration: 2000
 				});
 			} else {
+				// uni.request({
+				// 			...baseDefaultOpts,
+				// 			//请求成功的回调，可以在方法做返回状态码的判断。也可以直接返回resolve  ==》success: resolve，fail：reject
+				// 			success: (res) => {
+				// 				resolve(res)
+				// 			},
+				// 			//请求失败的回调，可以在方法。反馈用户、提示用户，也可以直接返回reject  ==》success: resolve，fail：reject
+				// 			fail: (err) => {
+				// 				reject(err)
+				// 			},
+				// 		})
 				uni.request(baseDefaultOpts).then(
 					(res) => {
-						debugger
 						if (res.cookies) {
 							console.log(res.cookies)
 							if (res.cookies.length != 0) {