Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

# Conflicts:
#	pages/order/confirmLoading.vue

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://api.changyuntong56.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.110.67:8999',
 	h5Appid: 'wxb66b599f7f61b46f',
@@ -11,7 +11,7 @@ const dev = {
 	androidAppSecurity: "24c593b7037347e08857a6ab05fd231b0509f5bb7cb741078f524f506ad32db8", //安卓网络货运企业在省平台申请的接入安全码
 	iosAppSecurity: "b01e4805276646eeb25f0fad91de97a4f32e8c2c0e0d42e5b24cc4737e9f040f", //ios网络货运企业在省平台申请的接入安全码
 	enterpriseSenderCode: "23106960", //网络货运企业在省平台申请的企业发送代码
-	environment: "debug", //环境:“debug”接入测试环境,“release”接入正式环境。
+	environment: "release", //环境:“debug”接入测试环境,“release”接入正式环境。
 }
 
 export function def() {

manifest.json

@@ -1,185 +1,182 @@
 {
-	"name": "畅运通",
-	"appid": "__UNI__9C76CB6",
-	"description": "",
-	"versionName": "1.2.2",
-	"versionCode": 122,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"compatible": {
-			"ignoreVersion": true
-		},
-		"usingComponents": true,
-		"nvueStyleCompiler": "智运",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Geolocation": {},
-			"Maps": {},
-			"iBeacon": {},
-			"Camera": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_PACKAGE_SIZE\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a"]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {},
-				"maps": {
-					"amap": {
-						"appkey_ios": "450806e9eef29de257faad3a06ec7e9a",
-						"appkey_android": "dc40c1be0513c1c8e01eb560318dbc68"
-					}
-				},
-				"geolocation": {
-					"amap": {
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "450806e9eef29de257faad3a06ec7e9a",
-						"appkey_android": "dc40c1be0513c1c8e01eb560318dbc68"
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		},
-		"nativePlugins": {
-			"FUN-AmapLocation": {
-				"__plugin_info__": {
-					"name": "持续定位、后台定位、高德定位",
-					"description": "持续定位、后台定位、高德定位, 后台保活，购前先测是否符合需求[反馈819589789@qq.com] ",
-					"platforms": "Android",
-					"url": "https://ext.dcloud.net.cn/plugin?id=2018",
-					"android_package_name": "uni.UNI9C76CB6",
-					"ios_bundle_id": "uni.UNI9C76CB6",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "2018",
-					"parameters": {}
-				}
-			},
-			"AJ-Alert": {
-				"__plugin_info__": {
-					"name": "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
-					"description": "uni的showModel样式单一，直接写vue弹窗又遮盖不了原生的组件，这是一个优化原生弹窗api",
-					"platforms": "Android,iOS",
-					"url": "https://ext.dcloud.net.cn/plugin?id=1664",
-					"android_package_name": "uni.UNI9C76CB6",
-					"ios_bundle_id": "uni.UNI9C76CB6",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "1664",
-					"parameters": {}
-				}
-			},
-			"Hdgq-LocSdkWX": {
-				"__plugin_info__": {
-					"name": "部网络货运信息交互系统位置信息SDK插件V2高德版(Android和iOS)",
-					"description": "部网络货运信息交互系统位置信息插件2.1.1，高德定位版本，支持Android和iOS，有问题联系qq：568647409，qq群：1042037517",
-					"platforms": "Android,iOS",
-					"url": "https://ext.dcloud.net.cn/plugin?id=2648",
-					"android_package_name": "uni.UNI9C76CB6",
-					"ios_bundle_id": "uni.UNI9C76CB6",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "2648",
-					"parameters": {}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
+    "name" : "畅运通",
+    "appid" : "__UNI__9C76CB6",
+    "description" : "",
+    "versionName" : "1.2.2",
+    "versionCode" : 122,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "智运",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Geolocation" : {},
+            "Maps" : {},
+            "Camera" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_PACKAGE_SIZE\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "450806e9eef29de257faad3a06ec7e9a",
+                        "appkey_android" : "dc40c1be0513c1c8e01eb560318dbc68"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "450806e9eef29de257faad3a06ec7e9a",
+                        "appkey_android" : "dc40c1be0513c1c8e01eb560318dbc68"
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "FUN-AmapLocation" : {
+                "__plugin_info__" : {
+                    "name" : "持续定位、后台定位、高德定位",
+                    "description" : "持续定位、后台定位、高德定位, 后台保活，购前先测是否符合需求[反馈819589789@qq.com] ",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2018",
+                    "android_package_name" : "uni.UNI9C76CB6",
+                    "ios_bundle_id" : "uni.UNI9C76CB6",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2018",
+                    "parameters" : {}
+                }
+            },
+            "AJ-Alert" : {
+                "__plugin_info__" : {
+                    "name" : "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
+                    "description" : "uni的showModel样式单一，直接写vue弹窗又遮盖不了原生的组件，这是一个优化原生弹窗api",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1664",
+                    "android_package_name" : "uni.UNI9C76CB6",
+                    "ios_bundle_id" : "uni.UNI9C76CB6",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1664",
+                    "parameters" : {}
+                }
+            },
+            "Hdgq-LocSdkWX" : {
+                "__plugin_info__" : {
+                    "name" : "部网络货运信息交互系统位置信息SDK插件V2高德版(Android和iOS)",
+                    "description" : "部网络货运信息交互系统位置信息插件2.1.1，高德定位版本，支持Android和iOS，有问题联系qq：568647409，qq群：1042037517",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2648",
+                    "android_package_name" : "uni.UNI9C76CB6",
+                    "ios_bundle_id" : "uni.UNI9C76CB6",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2648",
+                    "parameters" : {}
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
 }
+/* 5+App特有相关 */
+

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'>
@@ -199,14 +199,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()
@@ -256,16 +256,26 @@
 				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].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
@@ -368,7 +378,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
@@ -392,7 +402,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]
 								}
@@ -666,7 +676,7 @@
 						})
 						return
 					}
-					
+
 					this.alertTitle = '确定提交装车信息？'
 				}
 
@@ -726,7 +736,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: "运输时长输入错误！",
@@ -777,7 +787,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)
@@ -787,6 +797,7 @@
 							let _title = ''
 							if (that.detailData.statusFlag == 1) {
 								_title = '暂存成功！'
+								return
 							} else {
 								that.start() //开始授权并开始定位
 								_title = '提交成功！'
@@ -796,16 +807,6 @@
 									intervalTime: 60000,
 									// 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('====确认装车开启连续定位====');
@@ -838,7 +839,7 @@
 												orderId: that.id,
 												longitudeLatitude: JSON.stringify(uni.getStorageSync('mapGJ'))
 											}).then(res => {
-												console.log("已发送定位----------------",res)
+												console.log("已发送定位----------------", res)
 												uni.removeStorageSync('mapGJ');
 												that.$helper.gjList = []
 											})
@@ -849,7 +850,7 @@
 									//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
 								}
 							);
-							
+
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,
@@ -859,6 +860,8 @@
 									})
 								}
 							})
+						} else {
+							uni.$u.toast(res.message);
 						}
 					})
 					.catch(res => {