zhongtianhaoyuan 2 éve
szülő
commit
cd591edf92
3 módosított fájl, 15 hozzáadás és 7 törlés
  1. 2 2
      config/index.js
  2. 1 1
      pages/goodSource/index.vue
  3. 12 4
      pages/order/signContract.vue

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 1 - 1
pages/goodSource/index.vue

@@ -495,7 +495,7 @@
 					driverCommonId: that.driverCommonId,
 					commonId: item.commonId,
 					compId: item.compId,
-					cargoOwnerName: item.cargoOwnerName,
+					cargoOwnerName: item.cargoOwnerReallyName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,
 					sendCity: item.sendCity,

+ 12 - 4
pages/order/signContract.vue

@@ -523,6 +523,7 @@
 						return
 					}
 				}
+				
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.tranStartDate = that.dataDetails.tranStartDate
 				_obj.tranEndDate = that.dataDetails.tranEndDate
@@ -534,14 +535,21 @@
 				_obj.weight = that.dataDetails.weight
 				_obj.grossWeight = that.dataDetails.grossWeight
 				_obj.advanceCharge = that.dataDetails.advanceCharge
-				_obj.bankCard = that.dataDetails.bankCard
-				_obj.bankDeposit = that.dataDetails.bankDeposit
-				_obj.bankDepositBranch = that.dataDetails.bankDepositBranch
-				_obj.payeeName = that.dataDetails.payeeName
+				// _obj.bankCard = that.dataDetails.bankCard
+				// _obj.bankDeposit = that.dataDetails.bankDeposit
+				// _obj.bankDepositBranch = that.dataDetails.bankDepositBranch
+				// _obj.payeeName = that.dataDetails.payeeName
 				_obj.id = that.dataDetails.id
 				_obj.typeFlag = 2
 				_obj.carCaptainAccountNumber = that.dataDetails.carCaptainAccountNumber
 				_obj.payeeIdCard = that.dataDetails.payeeIdCard
+				
+				if(!this.dataDetails.carCaptainCommonId){  //carCaptainCommonId没有值  证明他没有车队  (有车队长不传收款账户信息)
+					_obj.bankCard = that.dataDetails.bankCard
+					_obj.bankDeposit = that.dataDetails.bankDeposit
+					_obj.bankDepositBranch = that.dataDetails.bankDepositBranch
+					_obj.payeeName = that.dataDetails.payeeName
+				}
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
 					fileType: 'png',