123

pages/order/confirmLoading.vue

@@ -88,8 +88,8 @@
 			<view class='row-between'>
 				<view class="">运输时长（小时）</view>
 				<view class="flex align-center">
-					<u--input placeholder="请输入运输时长" border="none" type="digit" v-model="detailData.transportationDuration" inputAlign='right'
-						clearable></u--input>
+					<u--input placeholder="请输入运输时长" border="none" type="digit"
+						v-model="detailData.transportationDuration" inputAlign='right' clearable></u--input>
 				</view>
 			</view>
 			<view class='s-flex'>
@@ -198,14 +198,14 @@
 				this.getInfo()
 			}
 			console.log(options)
-			var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
-			var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
+			var isContains = true; //隐私权政策是否包含高德开平隐私权政策  true是包含
+			var isShow = true; //隐私权政策是否弹窗展示告知用户 true是展示 
 			sdkwx.updatePrivacyShow(isContains, isShow);
-			
-			var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
+
+			var isAgree = true; //隐私权政策是否取得用户同意  true是用户同意
 			sdkwx.updatePrivacyAgree(isAgree);
 			//检查定位权限
-			sdkwx.checkLocationPermission(function(res){
+			sdkwx.checkLocationPermission(function(res) {
 				console.log(res);
 			});
 			this.auth()
@@ -252,18 +252,28 @@
 			start() { //开启定位
 				//车牌号 //司机姓名 //备注 //运单信息列表
 				console.log(this.detailData, "行政区划分")
-				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo, //运单号
-				this.shippingNoteInfos[0].serialNumber = "0000", //分单号
-				this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData.publishTaskInfo.sendAdCode, //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-				this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData.publishTaskInfo.unsendAdCode, //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-				this.shippingNoteInfos[0].startLongitude = this.detailData.publishTaskInfo.sendLongitude, //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLatitude =  this.detailData.publishTaskInfo.sendLatitude, //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLongitude =  this.detailData.publishTaskInfo.unsendLongitude, //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLatitude =  this.detailData.publishTaskInfo.unsendLatitude, //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLocationText = this.detailData.sendCity, //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLocationText = this.detailData.unloadCity, //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].vehicleNumber = this.detailData.carNumber, //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
-				this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
+				this.shippingNoteInfos[0].shippingNoteNumber = this.detailData.orderNo //运单号
+				this.shippingNoteInfos[0].serialNumber = "0000" //分单号
+				this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData.publishTaskInfo
+					.sendAdCode //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+				this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData.publishTaskInfo
+					.unsendAdCode //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
+				this.shippingNoteInfos[0].startLongitude = this.detailData.publishTaskInfo
+					.sendLongitude //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLatitude = this.detailData.publishTaskInfo
+					.sendLatitude //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLongitude = this.detailData.publishTaskInfo
+					.unsendLongitude //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLatitude = this.detailData.publishTaskInfo
+					.unsendLatitude //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLocationText = this.detailData
+					.sendCity //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLocationText = this.detailData
+					.unloadCity //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].vehicleNumber = this.detailData
+					.carNumber //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
+				this.shippingNoteInfos[0].driverName = this.detailData
+					.driverName //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 				this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 
 				//}],//运单信息列表,一辆车运单数最大支持数为 10
@@ -365,7 +375,7 @@
 					if (res.code == 200) {
 
 						this.detailData = res.data
-						if(res.data.hyCarrierInfo && res.data.hyCarrierInfo.transportationDuration){
+						if (res.data.hyCarrierInfo && res.data.hyCarrierInfo.transportationDuration) {
 							this.detailData.transportationDuration = res.data.hyCarrierInfo.transportationDuration
 						}
 						// #ifdef APP-PLUS
@@ -389,7 +399,7 @@
 								console.log(this.fileList1)
 								this.detailData.carNo = res.data.carNo
 								this.detailData.loadingDate = res.data.loadingDate
-							
+
 								if (res.data.loadingDate) {
 									this.detailData.loadingDate1 = res.data.loadingDate.split(' ')[0]
 								}
@@ -663,7 +673,7 @@
 						})
 						return
 					}
-					
+
 					this.alertTitle = '确定提交装车信息？'
 				}
 
@@ -723,7 +733,7 @@
 					})
 					return true
 				}
-				if (this.detailData.transportationDuration < 0 || this.detailData.transportationDuration >1000) {
+				if (this.detailData.transportationDuration < 0 || this.detailData.transportationDuration > 1000) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "运输时长输入错误！",
@@ -774,7 +784,7 @@
 					loadingLongitude: this.detailData.loadingLongitude,
 					loadingLatitude: this.detailData.loadingLatitude,
 					id: this.detailData.hyCarrierInfo.id,
-					transportationDuration:this.detailData.transportationDuration
+					transportationDuration: this.detailData.transportationDuration
 				}
 
 				// console.log("查看id--------",this.detailData.hyCarrierInfo.id)
@@ -784,25 +794,14 @@
 							let _title = ''
 							if (that.detailData.statusFlag == 1) {
 								_title = '暂存成功！'
+								return
 							} else {
 								that.start() //开始授权并开始定位
 								_title = '提交成功！'
 							}
 							that.$helper.fUN_AmapLocation.start({
-									// intervalTime: 1000 * 60,
 									intervalTime: 5000,
-									// locationCacheEnable:true,
 									isReport: false
-									// url: 'http://192.168.0.66/fun/open/test_json.do',
-									// params: {
-									// 	a: 1,
-									// 	B: '测试',
-									// 	c: true
-									// },
-									// headers: {
-									// 	a: '123',
-									// 	B: 'abcd'
-									// }
 								},
 								res => {
 									// console.log('====确认装车开启连续定位====');
@@ -835,7 +834,7 @@
 												orderId: that.id,
 												longitudeLatitude: JSON.stringify(uni.getStorageSync('mapGJ'))
 											}).then(res => {
-												console.log("已发送定位----------------",res)
+												console.log("已发送定位----------------", res)
 												uni.removeStorageSync('mapGJ');
 												that.$helper.gjList = []
 											})
@@ -846,7 +845,7 @@
 									//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
 								}
 							);
-							
+
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,
@@ -856,6 +855,8 @@
 									})
 								}
 							})
+						} else {
+							uni.$u.toast(res.message);
 						}
 					})
 					.catch(res => {