123

pages/mine/driverCertification.vue

@@ -694,7 +694,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)

pages/order/confirmUnloading.vue

@@ -33,7 +33,7 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">运费</view>
-				<view class="row-right-text">{{detailData.freight}}{{detailData.illingMethod==0?'元/吨':'元/车'}}</view>
+				<view class="row-right-text">{{detailData.freightInfo.freight}}{{detailData.billingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
 
 		</view>
@@ -55,8 +55,11 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">合计应付运费（元）</view>
-				<input class="totalFreight-input" placeholder="输入合计应付运费" v-model="detailData.carrierInfo.totalFreight"
-					type="number" />
+				
+				<input class="totalFreight-input" placeholder="输入合计应付运费" v-model="detailData.freightInfo.freight"
+					type="number" v-if="detailData.billingMethod==1"/>
+					<input class="totalFreight-input" placeholder="输入合计应付运费" v-model="detailData.carrierInfo.totalFreight"
+						type="number" v-if="detailData.billingMethod==0"/>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
@@ -111,17 +114,17 @@
 		onLoad(options) {
 			console.log('------------')
 			console.log(options)
-			this.detailData = options;
+			this.detailData = JSON.parse(options.obj)
 			this.detailData.carrierInfo = {
-				carNo: '123',
+				carNo: '',
 				unloadingDate: '',
 				estimatedFreight: '',
 				unloadingAreaLongitude: '',
 				unloadingAreaLatitude: '',
-				unloadCity: '沈阳',
-				unloadArea: '大东',
+				unloadCity: '',
+				unloadArea: '',
 				unloadingImg: '',
-				totalFreight: '100',
+				totalFreight: '',
 				id: this.detailData.carrierId,
 
 			}
@@ -334,6 +337,7 @@
 							} else {
 								_title = '提交成功！'
 							}
+							uni.hideLoading()
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,

pages/order/index.vue

@@ -91,30 +91,31 @@
 						</view>
 						<view class="row4 flex flex-end align-center">
 							<view class="time">{{good.updateDate}}</view>
+							<!-- {{good.freight}} -->
 							<!-- 货主装车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
-								{{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.billingMethod==0?(good.freightInfo.freight?good.freightInfo.freight:good.freight):good.freightCar}}{{good.billingMethod==0?'元/吨':'元/车'}}
 								<!-- {{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认装车'||good.orderStatus=='平台驳回装车信息'||good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='货主驳回卸车信息'">
 								<!-- {{good.estimatedFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
-								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车卸车确认后 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认卸车'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='待结算'||good.orderStatus=='已完结'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<!-- {{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
-								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
-							<view class='pay flex'
+							<!-- <view class='pay flex'
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='待平台确认卸车'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<div>已付</div>
 								<div class='number'>¥{{good.totalRepayable}}</div>
 								<div class='number'>11</div>
-							</view>
+							</view> -->
 						</view>
 						<view class="row5 flex flex-end">
 							<view class="stop active" @click.stop="stop(good)"
@@ -387,7 +388,7 @@
 				uni.$u.route('/pages/order/confirmLoading', item);
 			},
 			confirmUnLoading(item) {
-				uni.$u.route('/pages/order/confirmUnloading', item);
+				uni.$u.route('/pages/order/confirmUnloading', {obj:JSON.stringify(item)});
 			},
 			back() {
 				uni.navigateBack(-1)

pages/order/signContract.vue

@@ -76,8 +76,8 @@
 				<view class="">
 					<view @click="dateShow">{{dataDetails.startDates?dataDetails.startDates:'请选择运输开始日期'}}
 					</view>
-					<u-datetime-picker :show="startShow" mode="date" @cancel="removeStart" @confirm="startDate"
-						@close="removeStart"></u-datetime-picker>
+					
+						<u-calendar :show="startShow" mode="single" @confirm="startDate" @close="startShow= false"></u-calendar>
 				</view>
 			</view>
 			<view class='row-between'>
@@ -87,8 +87,7 @@
 						clearable></u--input> -->
 					<view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}
 					</view>
-					<u-datetime-picker :show="endShow" mode="date" @cancel="removeEnd" @confirm="endDate"
-						@close="removeEnd"></u-datetime-picker>
+					<u-calendar :show="endShow" mode="single" @confirm="endDate" @close="endShow= false"></u-calendar>
 				</view>
 			</view>
 			<view class='row-between'>
@@ -287,13 +286,11 @@
 				this.endShow = false
 			},
 			startDate(e) {
-				let timeFormat = uni.$u.timeFormat
-				this.dataDetails.startDates = timeFormat(e.value, "yyyy-mm-dd")
 				this.startShow = false
+				this.dataDetails.startDates = e[0]
 			},
 			endDate(e) {
-				let timeFormat = uni.$u.timeFormat
-				this.dataDetails.endDates = timeFormat(e.value, "yyyy-mm-dd")
+				this.dataDetails.endDates = e[0]
 				this.endShow = false
 			},
 			submit() {