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

components/upload.vue

@@ -33,7 +33,8 @@
 					width: width + 'rpx',
 					height: width + 'rpx'
 				}">
-				<u-icon v-if="custom&&!customBtn" name="camera-fill" class="" size="100" color="#617E8B"></u-icon>
+				<image style='width:23px;height:23px;' v-if="custom&&!customBtn" src="../static/images/tianjiazhaopian.png" mode=""></image>
+				<!-- <u-icon v-if="custom&&!customBtn" name="camera-fill" class="" size="100" color="#617E8B"></u-icon> -->
 				<image v-if="custom&&customBtn" :style="{
 				width: customBtnWidth + 'px',
 				height: customBtnHeight + 'px'
@@ -177,7 +178,7 @@
 				type: String,
 				default: '#fff'
 			},
-			// 成功icon颜色
+			// 成功icon
 			checkIcon:{
 				type: String,
 				default: 'checkbox-mark'

config/index.js

@@ -9,5 +9,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
-
+}

main.js

@@ -12,14 +12,48 @@ 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'
+
 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/goodSource/index.vue

@@ -73,11 +73,11 @@
 									<view class="gray " v-if="good.distance">运距 {{good.distance}}km</view>
 								</view>
 								<view class="u-flex-wrap flex gray row ">
-									<view>{{good.goodsName}} | </view>
+									<view>{{good.goodsName}}</view>
 									<!-- <u-line direction="col"></u-line> -->
-									<view v-if="carLength(good)"> {{carLength(good)}} | </view>
-									<view v-if="carType(good)">{{carType(good)}} | </view>
-									<view v-if="carWeight(good)">{{carWeight(good)}}</view>
+									<view v-if="carLength(good)">|{{carLength(good)}}</view>
+									<view v-if="carType(good)">|{{carType(good)}} </view>
+									<view v-if="carWeight(good)">|{{carWeight(good)}}</view>
 								</view>
 								<view class="flex row">
 									<view class="row-tips" v-if="good.taskDescription">{{good.taskDescription}}</view>
@@ -117,7 +117,7 @@
 		</mescroll-body>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -173,6 +173,7 @@
 				lng: '',
 				lat: '',
 				bool: false,
+				showMenu:false
 			}
 		},
 		onTabItemTap(e) {
@@ -453,6 +454,7 @@
 					let _obj = {
 						driverCommonId: res2.data.commonId,
 						commonId: item.commonId,
+						compId:item.compId,
 						cargoOwnerName: item.cargoOwnerName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,

pages/goodSource/shippingDetails.vue

@@ -19,7 +19,7 @@
 					<view class="right">
 						<view class="flex">
 							<view class="call fontsize-28" @click="$helper.contactCustomerService(detailData.cargoOwnerPhone)">
-								<u-icon name="phone-fill" color="#2772FB"></u-icon>联系货主
+								<image style='width:12px;height:12px;margin-right:4px;' src="../../static/images/goodSource/dianhua.png" mode=""></image>联系货主
 							</view>
 						</view>
 					</view>
@@ -65,16 +65,16 @@
 					<view class="left">货物</view>
 					<view class="flex">
 						<view>{{detailData.goodsName}}</view>
-						<view style='margin: 0 10rpx;'>|</view>
-						<view>{{detailData.weight}}吨</view>
+						<view style='margin: 0 10rpx;'></view>
+						<view v-if='detailData.weight'>| {{detailData.weight}}吨</view>
 					</view>
 
 				</view>
 				<view class="flex align-center msx20">
 					<view class="left">距离</view>
-					<view class="right flex">
+					<view class="right flex align-center">
 						<view>运输距离约{{detailData.distance}}公里</view>
-						<u-icon name="map-fill" color="#2772FB" @click="toMap()"></u-icon>
+						<image @click="toMap()" style='width:14px;height:14px;margin-left:4px;' src="../../static/images/goodSource/dituzuobiao.png" mode=""></image>
 					</view>
 				</view>
 				<view class="flex align-center">
@@ -106,10 +106,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>
@@ -125,7 +125,7 @@
 			</view>
 			 <u-toast ref="uToast"></u-toast>
 			<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		</view>
 	</view>
 </template>
@@ -257,10 +257,15 @@
 			},
 			confirmClick() {
 				let item = this.detailData
+				var that=this
+				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone: this.userInfo.phone,
+				}).then(res2 => {
 				let _obj = {
-					driverCommonId: this.firstAuthentication.commonId,
+					driverCommonId: that.firstAuthentication.commonId,
 					commonId: item.commonId,
 					id:item.id,
+					compId:item.compId,
 					cargoOwnerName: item.cargoOwnerName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,
@@ -274,14 +279,14 @@
 					goodsName: item.goodsName,
 					distance: item.distance,
 					freightPrice: item.freightPrice,
-					driverName: this.firstAuthentication.driverName,
-					driverPhone: this.firstAuthentication.driverPhone,
+					driverName: that.firstAuthentication.driverName,
+					driverPhone: that.firstAuthentication.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() {
@@ -298,6 +303,9 @@
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
+					}).catch(res => {
+						uni.$u.toast(res.message);
+					});
 				this.isShowAlert = false
 			},
 			cancelClick() {

pages/mine/driverCertification.vue

@@ -38,51 +38,55 @@
 			
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' 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 ">
+				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row">
 					<view class="left-text">身份证地址</view>
-					<u--input placeholder="请输入身份证地址" inputAlign='left' border="none" v-model="dataDetails.cardAddress" maxlength="18">
-					</u--input>
+					<!-- <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>
 				</view>
-				<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-					@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">
 				<view class="flex row">
 					<view class="left-text">姓名</view>
-					<u--input placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.driverName">
+					<u--input placeholder="输入姓名" inputAlign='right' border="none" v-model="dataDetails.driverName">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">性别</view>
 					<u-radio-group v-model="dataDetails.driverSex" placement="row">
 						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-							:label="item.name" :name="item.name" @change="radioChange" style="margin: 0 20rpx;">
+							:label="item.name" :name="item.name" @change="radioChange" style="margin: 0 0 0 20rpx;">
 						</u-radio>
 					</u-radio-group>
 				</view>
 
-				<view class="flex row row-ch">
+				<view class="flex row">
 					<view class="left-text">称呼</view>
-					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
+					<view class="flex">
+						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
 						v-model="dataDetails.driverCall" maxlength="1">
-					</u--input>
-					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
-					<view class="flex align-center" v-else>女士</view>
+						</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-else>女士</view>
+					</view>
+					
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone"
+					<u--input placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone"
 						maxlength="11">
 					</u--input>
 				</view>
@@ -210,22 +214,22 @@
 					</view>
 					<image class="" :src="item.payeeAddressUrl" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">银行卡卡号</view>
 					<view class="flex">
-						<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="item.bankCard">
+						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard">
 						</u--input>
 					</view>
 				</view>
 				<view class="flex row">
 					<view class="left-text">开户行</view>
-					<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="item.bankDeposit">
+					<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="item.bankDeposit">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text khzh-styel">开户支行</view>
 					<view class="flex" v-if="isShowManualInput">
-						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='left' border="none"
+						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='right' border="none"
 							v-model="item.bankDepositBranch">
 						</u--input>
 						<view @click="manualInput" class="type">选择支行</view>
@@ -237,12 +241,11 @@
 						</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">
-						<u--input disabled placeholder="输入收款人姓名" inputAlign='left' border="none" v-model="item.payeeName">
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName">
 						</u--input>
 					</view>
 				</view>
@@ -252,12 +255,12 @@
 				</u-picker>
 			</view>
 
-			<view @click="addBankNumber(dataDetails.hyDriverPayeeInfoList)" class="add-car">
+			<!-- <view @click="addBankNumber(dataDetails.hyDriverPayeeInfoList)" class="add-car">
 				<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="28"></u-icon>
 				<view class="car-text">
 					添加银行卡
 				</view>
-			</view>
+			</view> -->
 
 			<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 				:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
@@ -1321,6 +1324,7 @@
 			padding: 4rpx 10rpx;
 			font-size: 26rpx;
 			display: flex;
+			margin-left:4px;
 			justify-content: center;
 			align-items: center;
 		}
@@ -1371,4 +1375,14 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+	/deep/.u-radio-group--row {
+	    justify-content: flex-end;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/driverCertificationNext.vue

@@ -49,7 +49,7 @@
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">准驾车型</view>
 					<view class="" @click="driveType">
 						{{dataDetails.quasiDrivingVehicle?dataDetails.quasiDrivingVehicle:'选择准驾车型>'}}
@@ -57,7 +57,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">驾驶证发证机关</view>
-					<u--input placeholder="请输入驾驶证发证机关" inputAlign='left' border="none" v-model="dataDetails.lssuingAuthority" >
+					<u--input placeholder="请输入驾驶证发证机关" inputAlign='right' border="none" v-model="dataDetails.lssuingAuthority" >
 					</u--input>
 				</view>
 <!--
@@ -164,9 +164,9 @@
 						{{dataDetails.qualificationCertificateValidityDate?dataDetails.qualificationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row ">
 					<view class="left-text">从业资格证号</view>
-					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 <!--
@@ -225,9 +225,10 @@
 				</view>
 			
 				-->
-				<view class="flex row">
+				<view class="flex row noborder">
 					<view class="left-text">通讯地址</view>
-					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress"></u--input>
+					<u--textarea v-model="dataDetails.postalAddress" border="none"  placeholder="输入通讯地址" autoHeight  maxlength="30"></u--textarea>
+					<!-- <u--input placeholder="输入通讯地址" inputAlign='right' border="none" v-model="dataDetails.postalAddress"></u--input> -->
 				</view>
 			</view>
 			
@@ -997,4 +998,11 @@
 	.path{
 		color: #2772FB;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/editDriverCertification.vue

@@ -5,7 +5,7 @@
 			<view class="content1 content-other">
 				<view class="flex row">
 					<view class="left-text">姓名</view>
-					<u--input placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.driverName">
+					<u--input placeholder="输入姓名" inputAlign='right' border="none" v-model="dataDetails.driverName">
 					</u--input>
 				</view>
 				<view class="flex row">
@@ -17,17 +17,17 @@
 					</u-radio-group>
 				</view>
 
-				<view class="flex row row-ch">
+				<view class="flex row">
 					<view class="left-text">称呼</view>
-					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
+					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
 						v-model="dataDetails.driverCall" maxlength="1">
 					</u--input>
-					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
-					<view class="flex align-center" v-else>女士</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 class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone">
+					<u--input placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone">
 					</u--input>
 				</view>
 				<view class="flex row noborder" v-if="dataDetails.driverPhone!=userInfo.phone">
@@ -62,11 +62,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard" maxlength="18">
+					<u--input disabled placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard" maxlength="18">
 					</u--input>
 				</view>
 
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
@@ -74,8 +74,9 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">身份证地址</view>
-					<u--input placeholder="请输入身份证地址" inputAlign='left' 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--input placeholder="请输入身份证地址" inputAlign='right' border="none" > 
+					</u--input>-->
 				</view>
 			</view>
 			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
@@ -393,7 +394,7 @@
 													}).then(res => {
 													if(res.data){
 														_this.dataDetails.cardAddress=res.data.recPersonAddr
-														_this.dataDetails.numberCard = res.data.recPersonNo
+														// _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)
@@ -805,6 +806,19 @@
 		z-index: 9;
 	}
 	/deep/.u-radio{
-		margin-right:10px;
+		margin-left:10px;
+	}
+	/deep/.uni-input-input:disabled {
+		background: #fff;
+	}
+	/deep/.u-radio-group--row {
+	    justify-content: flex-end;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
 	}
 </style>

pages/mine/editDriverCertificationNext.vue

@@ -49,7 +49,7 @@
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">准驾车型</view>
 					<view class="" @click="driveType">
 						{{dataDetails.quasiDrivingVehicle?dataDetails.quasiDrivingVehicle:'选择准驾车型>'}}
@@ -57,7 +57,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">驾驶证发证机关</view>
-					<u--input placeholder="请输入驾驶证发证机关" inputAlign='left' border="none" v-model="dataDetails.lssuingAuthority" >
+					<u--input placeholder="请输入驾驶证发证机关" inputAlign='right' border="none" v-model="dataDetails.lssuingAuthority" >
 					</u--input>
 				</view>
 				<!--
@@ -158,16 +158,16 @@
 					</view>
 					<image class="" :src="dataDetails.qualificationCertificate" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">从业资格证有效期</view>
 					<view></view>
 					<view class="" @click="selectValidityPeriod(3)">
 						{{dataDetails.qualificationCertificateValidityDate?dataDetails.qualificationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row">
 					<view class="left-text">从业资格证号</view>
-					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 				<!--
@@ -228,15 +228,13 @@
 				</view>
 				
 				-->
-				<view class="flex row">
+				<view class="flex row noborder align-center">
 					<view class="left-text">通讯地址</view>
-					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress">
-					</u--input>
+					<u--textarea v-model="dataDetails.postalAddress" border="none"  placeholder="输入通讯地址" autoHeight  maxlength="30"></u--textarea>
 				</view>
 			</view>
 			<view class="flex service align-center">
-				<u--image @click='consent'
-					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
+				<u--image @click='consent' :src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
 					width="12px" height="12px"></u--image>
 				我已阅读并同意
 				<navigator
@@ -246,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">
@@ -257,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>
@@ -987,4 +986,14 @@
 	}
 
 	.btn-color {}
+	/deep/.uni-input-input:disabled {
+		background: #fff;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/manageVehicles/addVehicle.vue

@@ -15,7 +15,7 @@
 				<view class="text">上传道路运输证</view>
 			</view>
 			<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)" class="preview-card-img picture">
-				<view @click.stop="delCard(8)">
+				<view @click.stop="delCard(1)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -30,7 +30,10 @@
 			<view class="flex row flex-space-between">
 				<view class="left-text">道路运输证有效期</view>
 				<view class="" @click="selectValidityPeriod(4)">
-					{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
+					<view :style="{'color':dataDetails.operationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期'}}
+						<image v-if='!dataDetails.operationCertificateValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view v-if="sign == '挂车'">
@@ -41,7 +44,7 @@
 				</view>
 				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(9)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(9)">
+					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -58,7 +61,10 @@
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车道路运输证有效期</view>
 				<view class="" @click="selectValidityPeriod(5)">
-					{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
+					<view :style="{'color':dataDetails.trailerOperationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期'}}
+						<image v-if='!dataDetails.trailerOperationCertificateValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="title" v-if="sign == '挂车'">牵引车行驶证主页</view>
@@ -104,20 +110,29 @@
 			<view class="flex row flex-space-between">
 				<view class="left-text">注册日期</view>
 				<view class="" @click="selectValidityPeriod(6)">
-					{{dataDetails.drivingLicenseRegistrationDate?dataDetails.drivingLicenseRegistrationDate:'选择注册日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseRegistrationDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseRegistrationDate?dataDetails.drivingLicenseRegistrationDate:'选择注册日期'}}
+						<image v-if='!dataDetails.drivingLicenseRegistrationDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">发证日期</view>
 				<view class="" @click="selectValidityPeriod(7)">
-					{{dataDetails.drivingLicenseIssueDate?dataDetails.drivingLicenseIssueDate:'选择发证日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseIssueDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseIssueDate?dataDetails.drivingLicenseIssueDate:'选择发证日期'}}
+						<image v-if='!dataDetails.drivingLicenseIssueDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证有效期</view>
 				<view class="" @click="selectValidityPeriod(1)">
-					{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期'}}
+						<image v-if='!dataDetails.drivingLicenseValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="flex row flex-space-between">
@@ -134,7 +149,11 @@
 			<view class="flex row noborder">
 				<view class="left-text">车辆能源类型</view>
 				<view style='text-align:right;width:50%;' class="" @click="driveType">
-					{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}>
+					<view :style="{'color':dataDetails.energyType?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型'}}
+						<image v-if='!dataDetails.energyType' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+				<!-- 	{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}> -->
 				</view>
 			</view>
 
@@ -178,20 +197,32 @@
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">注册日期</view>
 				<view class="" @click="selectValidityPeriod(8)">
-					{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseRegistrationDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期'}}
+						<image v-if='!dataDetails.trailerLicenseRegistrationDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+<!-- 					{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期>'}} -->
 				</view>
 			</view> 
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">发证日期</view>
 				<view class="" @click="selectValidityPeriod(9)">
-					{{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseIssueDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期'}}
+						<image v-if='!dataDetails.trailerLicenseIssueDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+					<!-- {{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期>'}} -->
 				</view>
 			</view>
 
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证有效期</view>
 				<view class="" @click="selectValidityPeriod(2)">
-					{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期'}}
+						<image v-if='!dataDetails.trailerLicenseValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+					<!-- {{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}} -->
 				</view>
 			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
@@ -225,7 +256,8 @@
 				<view class="left-text">车牌颜色</view>
 				<view class='flex'>
 					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-					<view>></view>	
+					<view>
+						<image v-if='!dataDetails.carNumberColour' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image></view>	
 				</view>
 			</view>
 
@@ -758,7 +790,13 @@
 									_this.$forceUpdate()
 								}
 							)
-						}
+						},
+						fail: function(req){
+							console.log(req,11111)
+						},
+						complete: function(req1){
+							console.log(req1,22222)
+						},
 					});
 
 				// }
@@ -1385,8 +1423,13 @@
 						this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
 					}
 				}
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
 				this.$request.baseRequest('post', '/driverCarInfo/api/addInfo', this.dataDetails).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							this.$refs.uToast.show({
 								type: 'success',
 								message: "提交成功！",
@@ -1429,7 +1472,7 @@
 
 		.left-text {
 			// background: red;
-			width: 290rpx;
+			width: 176px;
 			color: #333333;
 			display: flex;
 			align-items: center;

pages/mine/manageVehicles/editVehicle.vue

@@ -219,7 +219,9 @@
 				<view class="left-text">车牌颜色</view>
 				<view class='flex'>
 					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-					<view>></view>
+					<view>
+						<image v-if='!dataDetails.carNumberColour' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 				
 				
@@ -1374,7 +1376,7 @@
 
 		.left-text {
 			// background: red;
-			width: 290rpx;
+			width: 176px;
 			color: #333333;
 			display: flex;
 			align-items: center;

pages/mine/manageVehicles/index.vue

@@ -34,7 +34,7 @@
 					<view class="text">车辆状态：</view>
 					<u-tag v-if="item.status=='已通过'" :text="item.status" type="success" plain plainFill size="mini">
 					</u-tag>
-					<u-tag v-if="item.status=='未通过'" :text="item.status" type="error" plain plainFill size="mini">
+					<u-tag v-if="item.status=='未通过' || item.status=='已驳回'" :text="item.status" type="error" plain plainFill size="mini">
 					</u-tag>
 					<u-tag v-if="item.status=='审核中'" :text="item.status" type="warning" plain plainFill size="mini">
 					</u-tag>

pages/mine/settings/editPassword.vue

@@ -94,6 +94,7 @@
 				}
 			},
 			getcode(e){
+				console.log(this.phone)
 				if(this.phone.length!=11){
 					uni.showToast({
 						title: '请输入正确的手机号',
@@ -104,23 +105,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}}

pages/news/newsSee.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="center">
 		<view class="news_info">
+
 			<view class="">{{dataInfo.newsTitle}}</view>
-			<view class="">{{dataInfo.newsContent}}</view>
+			<view style='white-space: pre-wrap;' class="">{{dataInfo.newsContent}}</view>
 		</view>
 	</view>
 </template>
@@ -12,7 +13,6 @@
 		data(){
 			return{
 				dataInfo:{},
-				
 			}
 		},
 		onLoad(options) {

pages/order/confirmLoading.vue

@@ -63,7 +63,14 @@
 			</view>
 			<view class='row-between'>
 				<view class="">预计运费（元）</view>
-				{{detailData.freight ? detailData.freight:"来自合同"}}
+				<view class="">{{detailData.driverContract == 1 ? detailData.freight:"来自合同"}}</view>
+				<!-- {{detailData.freight ? detailData.freight:"来自合同"}} -->
+				<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
+						placeholder="请输入运费"></view> -->
+			</view>
+			<view class='row-between'>
+				<view class="">预付款（元）</view>
+				{{detailData.advanceCharge ? detailData.advanceCharge:"来自合同"}}
 				<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
 						placeholder="请输入运费"></view> -->
 			</view>

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

@@ -15,7 +15,7 @@
 									fontWeight: 'bold',
 									transform: 'scale(1.05)'
 								}"></u-tabs>
-					<view class="right-btn flex align-center" @click="showMenu=true">
+					<view class="right-btn flex align-center" @click="showMenu=!showMenu">
 						<view class="">
 							全部类型
 						</view>

pages/order/orderDetails.vue

@@ -17,11 +17,11 @@
 			</view>
 			<!-- flex flex-space-between -->
 			<view class="item2">
-				<u-button class="btn" text="查看合同" @click="lookContract" v-if="dataObj.driverContract=='1'"></u-button>
+				<u-button class="btn" @click="lookContract" v-if="dataObj.driverContract=='1'">查看合同</u-button>
 			     <!-- <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" v-if="dataObj.orderStatus=='未装车'"></u-button>
+				<u-button 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>
@@ -148,9 +148,13 @@
 				<view class=" gray">运费</view>
 				<view class="">{{carrierInfo.estimatedFreight}}元</view>
 			</view>
+			<view class='row-between'>
+				<view class="gray">预付款（元）</view>
+				{{dataObj.advanceCharge}}元
+			</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>
@@ -198,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"
@@ -334,7 +339,7 @@
 			checkfreight(num){
 				this.tips = num
 				if(num == 1){
-					this.freightContent = "合计应付运费 "+ this.dataObj.hyCarrierInfo.totalFreight + " 元，确定无误？"
+					this.freightContent = "合计应付运费 "+ this.dataObj.hyCarrierInfo.totalFreight + " 元，确认无误？"
 				}else{
 					this.freightContent = "确认驳回运费信息？"
 				}
@@ -494,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,23 +38,22 @@
 				<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>
+			
 			<view class='row-between'>
 				<view class="gray">运费(元/车)</view>
 				<!-- <view class="">{{dataDetails.freight}}{{dataDetails.illingMethod==0?'元/吨':'元/车'}}</view> -->
 				<!-- 				<view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
 						class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
 				<view class="flex">
-					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight"
+					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight1"
 						inputAlign='right' clearable @input="preMoney"></u--input>
 					<!-- <span> 元/车</span> -->
 				</view>
@@ -285,9 +284,12 @@
 
 			this.carList = []
 			that = this
-			// this.dataDetails = JSON.parse(options.obj)
-
 			this.dataDetails = JSON.parse(options.obj)
+			if(this.dataDetails.billingMethod==1){
+				this.dataDetails.freight1=this.dataDetails.freight
+			}else{
+				this.dataDetails.freight1=''
+			}
 			// console.log(this.dataDetails.carNo,this.dataDetails.carrierInfo)
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
@@ -340,7 +342,7 @@
 		methods: {
 			preMoney() {
 				if (this.dataDetails.freightAdvance == 1) {
-					this.dataDetails.advanceCharge = this.dataDetails.freight * this.proportion
+					this.dataDetails.advanceCharge = this.dataDetails.freight1 * this.proportion?this.proportion:0
 				}
 			},
 			collection() {
@@ -403,6 +405,7 @@
 				this.endShow = false
 			},
 			submit(num) {
+				this.dataDetails.freight=this.dataDetails.freight1
 				let _obj = {}
 				if (num == 1) { //预览合同
 					_obj.submitFlag = 1

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

@@ -1,5 +1,5 @@
 <template>
-	<view class="center">
+	<view @touchend="end" @touchmove="move" :class="{popupShow:tipsShow}" class="center">
 		<view class="flex row1">
 			<view class="flex center_top">
 				<view class="center_top_btn" :class="indexbtn == 1? '':'center_top_btn1'" @click="changebtn(1)">司机
@@ -183,7 +183,8 @@
 				},
 				status: 'loadmore',
 				nomoreText: '实在没有了',
-				mescroll:{}
+				mescroll:{},
+				popupShow:false
 			}
 		},
 		created() {},
@@ -885,4 +886,10 @@
 		// margin-top: 10rpx;
 
 	}
+	.popupShow {
+		overflow: hidden;
+		position: fixed;
+		height: 100vh;
+		width: 100%;
+	}
 </style>

util/request.js

@@ -6,6 +6,8 @@ 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,
 		// 请求接口地址
@@ -14,12 +16,13 @@ const baseRequest = (method, url, data, header) => {
 		method: method,
 		// 配置请求类型
 		header: {
-			'content-type': contentheader //'application/x-www-form-urlencoded; charset=UTF-8',
+			'content-type': contentheader ,//'application/x-www-form-urlencoded; charset=UTF-8',
+			'accessToken':userInfo.accessToken
 		}
 	}
 	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',
@@ -27,8 +30,25 @@ 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) => {
+						if (res.cookies) {
+							console.log(res.cookies)
+							if (res.cookies.length != 0) {
+								uni.setStorageSync('cookie', res.cookies[0]);
+							}
+						}
 						// console.log(JSON.stringify(res[1].data))
 						// if(res[1].data.code == '200' || res[1].data.code == 200){
 						// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
@@ -53,7 +73,7 @@ const baseRequest = (method, url, data, header) => {
 								// 	}); 
 							}
 						} else {
-							reject(response)
+							reject(res)
 							// uni.showToast({
 							// 	icon: 'none',
 							// 	title: '网络异常，请检查网络状况',