更新

pages/mine/driverCertification.vue

@@ -252,12 +252,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>

pages/mine/manageVehicles/addVehicle.vue

@@ -1385,8 +1385,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: "提交成功！",

pages/order/confirmLoading.vue

@@ -63,7 +63,8 @@
 			</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>

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" 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>

pages/order/signContract.vue

@@ -54,7 +54,7 @@
 				<!-- 				<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>
@@ -286,8 +286,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 +344,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 +407,7 @@
 				this.endShow = false
 			},
 			submit(num) {
+				this.dataDetails.freight=this.dataDetails.freight1
 				let _obj = {}
 				if (num == 1) { //预览合同
 					_obj.submitFlag = 1