前端

pages/goodSource/shippingDetails.vue

@@ -66,7 +66,7 @@
 					<view class="flex">
 						<view>{{detailData.goodsName}}</view>
 						<view style='margin: 0 10rpx;'>|</view>
-						<view>{{detailData.weight}}吨</view>
+						<view v-if='detailData.weight'>{{detailData.weight}}吨</view>
 					</view>
 
 				</view>
@@ -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>
@@ -257,8 +257,12 @@
 			},
 			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,
@@ -275,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() {
@@ -299,6 +303,9 @@
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
+					}).catch(res => {
+						uni.$u.toast(res.message);
+					});
 				this.isShowAlert = false
 			},
 			cancelClick() {

pages/mine/manageVehicles/addVehicle.vue

@@ -790,7 +790,13 @@
 									_this.$forceUpdate()
 								}
 							)
-						}
+						},
+						fail: function(req){
+							console.log(req,11111)
+						},
+						complete: function(req1){
+							console.log(req1,22222)
+						},
 					});
 
 				// }

pages/order/orderDetails.vue

@@ -202,7 +202,8 @@
 				<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'

pages/order/signContract.vue

@@ -40,7 +40,8 @@
 			</view>
 			<view class='row-between'>
 				<!-- 后加 -->
-				<view class="gray">服务费（元）</view>
+				<!-- <view class="gray">服务费（元）</view> -->
+				<view class="gray">工本费（元）</view>
 				<view class="">{{dataDetails.serviceCharge}}</view>
 			</view>