gjy 3 年之前
父節點
當前提交
f46fc4eba0
共有 3 個文件被更改,包括 33 次插入30 次删除
  1. 3 0
      pages/order/confirmLoading.vue
  2. 30 30
      pages/order/orderDetails.vue
  3. 0 0
      unpackage/dist/dev/app-plus/app-service.js

+ 3 - 0
pages/order/confirmLoading.vue

@@ -405,6 +405,9 @@
 							uni.navigateBack({
 								delta:1
 							})
+						}else{
+							uni.hideLoading()
+							uni.$u.toast(res.message);
 						}
 					})
 					.catch(res => {

+ 30 - 30
pages/order/orderDetails.vue

@@ -590,36 +590,36 @@
 					if (res.code == 200) {
 						this.dataObj = res.data
 						// 承运信息显示
-						// if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
-						// 	.cargoOwnerStatus != "已终止") {
-						// 	this.status1 = true
-						// }
-						// // 运费信息
-						// if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
-						// 	.cargoOwnerStatus != "待确认装车" && res.data.cargoOwnerStatus != "已驳回装车信息" && res.data
-						// 	.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息"  && res.data.cargoOwnerStatus != "待结算" && res.data
-						// 	.cargoOwnerStatus != "已终止") {
-						// 	this.status2 = true
-						// }
-						// //还款信息
-						// if (res.data.cargoOwnerStatus == "待还款" && res.data.cargoOwnerStatus == "已还款" && res.data
-						// 	.cargoOwnerStatus == "已完结") {
-						// 	this.status3 = true
-						// }
-						// if (res.data.hyCarrierInfo) {
-						// 	if (res.data.hyCarrierInfo.loadingImg) {
-						// 		let _zcList = res.data.hyCarrierInfo.loadingImg.split(',')
-						// 		for (let i = 0; i < _zcList.length; i++) {
-						// 			if (_zcList[i]) this.zcImgList.push(_zcList[i])
-						// 		}
-						// 	}
-						// 	if (res.data.hyCarrierInfo.unloadingImg) {
-						// 		let _xcList = res.data.hyCarrierInfo.unloadingImg.split(',')
-						// 		for (let i = 0; i < _xcList.length; i++) {
-						// 			if (_xcList[i]) this.xcImgList.push(_xcList[i])
-						// 		}
-						// 	}
-						// }
+						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
+							.cargoOwnerStatus != "已终止") {
+							this.status1 = true
+						}
+						// 运费信息
+						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
+							.cargoOwnerStatus != "待确认装车" && res.data.cargoOwnerStatus != "已驳回装车信息" && res.data
+							.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息"  && res.data.cargoOwnerStatus != "待结算" && res.data
+							.cargoOwnerStatus != "已终止") {
+							this.status2 = true
+						}
+						//还款信息
+						if (res.data.cargoOwnerStatus == "待还款" && res.data.cargoOwnerStatus == "已还款" && res.data
+							.cargoOwnerStatus == "已完结") {
+							this.status3 = true
+						}
+						if (res.data.hyCarrierInfo) {
+							if (res.data.hyCarrierInfo.loadingImg) {
+								let _zcList = res.data.hyCarrierInfo.loadingImg.split(',')
+								for (let i = 0; i < _zcList.length; i++) {
+									if (_zcList[i]) this.zcImgList.push(_zcList[i])
+								}
+							}
+							if (res.data.hyCarrierInfo.unloadingImg) {
+								let _xcList = res.data.hyCarrierInfo.unloadingImg.split(',')
+								for (let i = 0; i < _xcList.length; i++) {
+									if (_xcList[i]) this.xcImgList.push(_xcList[i])
+								}
+							}
+						}
 					}
 
 				})

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Some files were not shown because too many files changed in this diff