Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

.gitignore

@@ -0,0 +1,68 @@
+HELP.md
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+config/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+#/build/
+
+### VS Code ###
+.vscode/
+
+### maven ###
+.mvn
+mvnw
+mvnw.cmd
+
+###properties###
+/unimall-launcher/src/main/resources/application-dev.properties
+/unimall-launcher/src/main/resources/application-prd.properties
+
+### target ###
+/target/
+/unpackage/cache/
+/unpackage/debug/
+/unpackage/dist/
+
+
+###node_modules###
+/node_modules/
+
+
+###logs###
+unimall.log
+unimall.log.*.gz
+unimall.log.*.tmp
+
+###templates###
+/templates/
+
+
+### plugins ###
+/plugins/
+/pages/plugins/
+/unimall-admin/src/views/plugins/

.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

App.vue

@@ -32,7 +32,48 @@
 			// },
 		},
 		onLaunch: function() {
+			
 			// #ifdef APP-PLUS
+			
+			var that = this
+			//判断该用户是否需要开启持续定位
+			this.$helper.fUN_AmapLocation.stop({}, result => {
+				console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+				this.$helper.fUN_AmapLocation.start(
+					{
+						intervalTime: 1000*60,
+						isReport: true,
+						reportInterval: 5,
+						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('====确认装车开启连续定位====', JSON.stringify(res));
+						//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
+					}
+				); 
+			});
+			
+			// fUN_AmapLocation.permission({}, result => {
+			//     console.log('====fUN_AmapLocation定位====');
+			// });
+			// fUN_AmapLocation.hasLocationPermissions(function(result) {
+			//     console.log('====fUN_AmapLocation定位权限===='+ result)
+			// });
+			// startLocation与start均可
+			// this.$helper.fUN_AmapLocation.start(
+			// 	{
+			// 		intervalTime: 1000*10,
+			// 		isReport: false,
+			// 	},
+			// 	result => {
+			// 		//见下方定位返回示例
+			// 		console.log('====fUN_AmapLocation定位====', JSON.stringify(result));
+			// 	}
+			// ); 
+			
        // let  isOpenLocation= permision.checkSystemEnableLocation() 
 	   // console.log("isOpenLocation",isOpenLocation)
 	   // this.requestAndroidPermission('android.permission.ACCESS_FINE_LOCATION')
@@ -41,7 +82,6 @@
 			if (type == "android") {
 				appUpdate()
 			}
-			var that = this
 			// plus.push.getClientInfoAsync((info) => {
 			// 	var name = 'clientId'
 			// 	var value = info.clientid
@@ -132,6 +172,7 @@
 		},
 		onShow: function() {
 			console.log('App Show')
+			
 		},
 		onHide: function() {
 			console.log('App Hide')

common/helper.js

@@ -38,6 +38,7 @@ const makeValidityPeriod = function(type) {
 	_list.push(_list1, _list2, _list3)
 	return _list
 }
+const fUN_AmapLocation = uni.requireNativePlugin('FUN-AmapLocation');
 
 const getListByUserId = function() {
 	let baseUrlNew = config.def().baseUrlNew
@@ -202,5 +203,6 @@ export default {
 	makeValidityPeriod,
 	getProvinceAbbreviation,
 	filterUrban,
-	filterArea
+	filterArea,
+	fUN_AmapLocation
 }

main.js

@@ -46,3 +46,17 @@ const app = new Vue({
 // require('./util/request/index')(app)
 
 app.$mount()
+// #ifdef APP-PLUS
+let main = plus.android.runtimeMainActivity(); 
+plus.runtime.quit = function() {
+    main.moveTaskToBack(false);
+};
+
+plus.nativeUI.toast = (function(str) {
+    if (str == '再按一次退出应用') {
+
+        main.moveTaskToBack(false);
+        return false;
+    }
+});
+// #endif

manifest.json

@@ -19,28 +19,34 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Maps" : {}
+            "Maps" : {},
+            "Geolocation" : {},
+            "iBeacon" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<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.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_ACCOUNTS\"/>",
+                    "<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.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ]
             },
             /* ios打包配置 */
@@ -50,8 +56,15 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "64541bb9b52fe4d41d8ac5c1959cf4b9",
-                        "appkey_android" : "8a601d5716a812aaf65291da18dae719"
+                        "appkey_ios" : "450806e9eef29de257faad3a06ec7e9a",
+                        "appkey_android" : "dc40c1be0513c1c8e01eb560318dbc68"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "450806e9eef29de257faad3a06ec7e9a",
+                        "appkey_android" : "dc40c1be0513c1c8e01eb560318dbc68"
                     }
                 }
             },
@@ -87,6 +100,22 @@
                     }
                 }
             }
+        },
+        "nativePlugins" : {
+            "FUN-AmapLocation" : {
+                "__plugin_info__" : {
+                    "name" : "持续定位、后台定位、高德定位 - [试用版，仅用于自定义调试基座]",
+                    "description" : "持续定位、后台定位、高德定位, 后台保活，购前先测是否符合需求[反馈819589789@qq.com] ",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2018",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "2018",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages/mine/driverCertification.vue

@@ -74,12 +74,12 @@
 					</view>
 					<view class="flex row">
 						<view class="left-text">总质量（千克）</view>
-						<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="item.carTotalWeight">
+						<u--input placeholder="输入总质量" inputAlign='left' type="number" border="none" v-model="item.carTotalWeight">
 						</u--input>
 					</view>
 					<view class="flex row">
 						<view class="left-text">核定载质量（千克）</view>
-						<u--input placeholder="输入核定载质量" inputAlign='left' border="none"
+						<u--input placeholder="输入核定载质量" inputAlign='left' type="number" border="none"
 							v-model="item.carApprovedWeight">
 						</u--input>
 					</view>
@@ -88,7 +88,7 @@
 					</view>
 					<view class="flex row noborder input-ckg">
 						<view class="input-positon">
-							<u--input class="input" placeholder="长" inputAlign='left' border="none"
+							<u--input class="input" placeholder="长" type="number" inputAlign='left' border="none"
 								v-model="item.carLong">
 							</u--input>
 							<view class="position-right">
@@ -97,7 +97,7 @@
 						</view>
 						<view class="star">*</view>
 						<view class="input-positon">
-							<u--input placeholder="宽" inputAlign='left' border="none" v-model="item.carWidth">
+							<u--input placeholder="宽" type="number" inputAlign='left' border="none" v-model="item.carWidth">
 							</u--input>
 							<view class="position-right">
 								mm
@@ -105,7 +105,7 @@
 						</view>
 						<view class="star">*</view>
 						<view class="input-positon">
-							<u--input placeholder="高" inputAlign='left' border="none" v-model="item.carHeight">
+							<u--input placeholder="高" inputAlign='left' type="number" border="none" v-model="item.carHeight">
 							</u--input>
 							<view class="position-right">
 								mm
@@ -856,8 +856,7 @@
 				}
 			},
 			next(val) {
-				console.log(111111111111)
-				// if (this.validate()) return
+				if (this.validate()) return
 				uni.$u.route('/pages/mine/driverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
 				});
@@ -1145,7 +1144,7 @@
 		.picture {
 			width: 100%;
 			height: 440rpx;
-			background: red;
+			// background: red;
 			position: relative;
 
 			.text {
@@ -1216,11 +1215,11 @@
 		padding: 40rpx 20rpx 50rpx 20rpx;
 
 		.next-btn {
-			background: #F1F3F6;
+			background: #22C572;
 			width: 90%;
 			padding: 20rpx 20rpx;
 			text-align: center;
-			color: #C5CAD4;
+			color: #FFFFFF;
 			border-radius: 50rpx;
 		}
 	}

pages/mine/driverCertificationNext.vue

@@ -68,6 +68,11 @@
 					</view>
 					<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 				</view>
+				<view class="flex row">
+					<view class="left-text">行驶证档案编号</view>
+					<u--input placeholder="输入行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.drivingLicenseNumber">
+					</u--input>
+				</view>
 
 				<view class="flex row">
 					<view class="left-text">行驶证有效期</view>
@@ -107,6 +112,11 @@
 						<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 					</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">挂车行驶证档案编号</view>
+					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.trailerLicenseNumber">
+					</u--input>
+				</view>
 
 				<view class="flex row" v-if="isGCar">
 					<view class="left-text">挂车行驶证有效期</view>
@@ -136,10 +146,10 @@
 					</view>
 				</view>
 
-				<view class="title">运营证</view>
+				<view class="title">道路运输证</view>
 				<view @click="uploadImg(8)" class="picture picture8" v-if="!dataDetails.operationCertificate">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
-					<view class="text">上传运营证</view>
+					<view class="text">上传道路运输证</view>
 				</view>
 				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
@@ -150,18 +160,23 @@
 					<image class="" :src="dataDetails.operationCertificate" mode="aspectFit"></image>
 				</view>
 				<view class="flex row">
-					<view class="left-text">运营证有效期</view>
+					<view class="left-text">道路运输证号</view>
+					<u--input placeholder="输入道路运输证号" inputAlign='left' border="none" v-model="dataDetails.operationCertificateNumber">
+					</u--input>
+				</view>
+				<view class="flex row">
+					<view class="left-text">道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(4)">
 						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
 
 				<view v-if="isGCar">
-					<view class="title row flex">挂车运营证</view>
+					<view class="title row flex">挂车道路运输证</view>
 					<view @click="uploadImg(9)" class="picture picture9"
 						v-if="!dataDetails.trailerOperationCertificate">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
-						<view class="text">上传挂车运营证</view>
+						<view class="text">上传挂车道路运输证</view>
 					</view>
 					<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
 						class="preview-card-img picture">
@@ -172,9 +187,14 @@
 						<image class="" :src="dataDetails.trailerOperationCertificate" mode="aspectFit"></image>
 					</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">挂车道路运输证号</view>
+					<u--input placeholder="输入挂车道路运输证号" inputAlign='left' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
+					</u--input>
+				</view>
 
 				<view class="flex row" v-if="isGCar">
-					<view class="left-text">挂车运营证有效期</view>
+					<view class="left-text">挂车道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(5)">
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
 					</view>
@@ -410,7 +430,14 @@
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "行驶证副页不能为空！",
+						message: "行驶证有效期不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证档案编号不能为空！",
 					})
 					return true
 				}
@@ -421,7 +448,7 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseBackPage)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "挂车行驶证副页不能为空！",
@@ -435,6 +462,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "挂车行驶证档案编号不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -459,44 +493,65 @@
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "运营证不能为空！",
+						message: "道路运输证不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "道路运输证号不能为空！",
 					})
 					return true
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "运营证有效期不能为空！",
+						message: "道路运输证有效期不能为空！",
 					})
 					return true
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "挂车运营证不能为空！",
+						message: "挂车道路运输证不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "挂车道路运输证号不能为空！",
 					})
 					return true
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "挂车运营证有效期不能为空！",
+						message: "挂车道路运输证有效期不能为空！",
 					})
 					return true
 				}
 				return false
 			},
 			submit() {
-				uni.switchTab({
-					url:'/pages/mine/index'
-				})
+				
+			
 				// 校验
 				if (this.validate()) return
+				debugger
 				if(this.dataDetails.driverSex=='男'){
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
 				}else{
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'女士'
 				}
+				if(!this.consentStatus){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请勾选协议！",
+					})
+					return
+				}
 
 
 

pages/mine/index.vue

@@ -173,9 +173,9 @@
 						if (this.firstAuthentication) {
 							this.isFirstSH = false
 							if (this.firstAuthentication.driverSex == '女') {
-								this.userName = this.firstAuthentication.driverCall + '女士'
+								this.userName = this.firstAuthentication.driverCall
 							} else {
-								this.userName = this.firstAuthentication.driverCall + '先生'
+								this.userName = this.firstAuthentication.driverCall
 							}
 
 							if (this.firstAuthentication.authenticationStatus == '审核中') {

pages/order/confirmLoading.vue

@@ -140,57 +140,89 @@
 					title: '获取定位中',
 					mask: true
 				})
-				uni.getLocation({
-					type: 'gcj02',
-					geocode: true,
-					success: res => {
-						console.log('定位地址')
-						console.log(res)
+				this.$helper.fUN_AmapLocation.start(
+					{
+						intervalTime: 1000*3,
+						isReport: false,
+					},
+					res => {
+						//见下方定位返回示例
+						console.log('====fUN_AmapLocation定位====', JSON.stringify(res));
 						if (res.latitude) {
 							this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
 							this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
-							this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.address.city)
-							this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.address
+							this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.city)
+							this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res
 								.district);
 							console.log(this.detailData.carrierInfo.sendCity)
 							console.log(this.detailData.carrierInfo.sendArea)
 							this.$forceUpdate()
-							uni.hideLoading()
-						} else {
-							if (uni.getSystemInfoSync().platform == 'android') {
-								var context = plus.android.importClass("android.content.Context");
-								var locationManager = plus.android.importClass(
-									"android.location.LocationManager");
-								var main = plus.android.runtimeMainActivity();
-								var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-								this.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
-							}
-							if (this.bool === false) {
-								uni.showModal({
-									title: '提示',
-									content: '请打开定位服务',
-									success: ({
-										confirm,
-										cancel
-									}) => {
-										if (confirm) {
-											if (uni.getSystemInfoSync().platform == 'android') {
-												var Intent = plus.android.importClass(
-													'android.content.Intent');
-												var Settings = plus.android.importClass(
-													'android.provider.Settings');
-												var intent = new Intent(Settings
-													.ACTION_LOCATION_SOURCE_SETTINGS);
-												var main = plus.android.runtimeMainActivity();
-												main.startActivity(intent); // 打开系统设置GPS服务页面
-											}
-										}
-									}
-								});
-							}
+							
 						}
+						uni.hideLoading()
+						
+						this.$helper.fUN_AmapLocation.stop({}, result => {
+							console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+						});
 					}
-				});
+				); 
+			// 	uni.getLocation({
+			// 		type: 'gcj02',
+			// 		geocode: true,
+			// 		success: res => {
+			// 			console.log('定位地址')
+			// 			console.log(res)
+			// 			if (res.latitude) {
+			// 				this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
+			// 				this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
+			// 				this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.address.city)
+			// 				this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.address
+			// 					.district);
+			// 				console.log(this.detailData.carrierInfo.sendCity)
+			// 				console.log(this.detailData.carrierInfo.sendArea)
+			// 				this.$forceUpdate()
+			// 				uni.hideLoading()
+			// 			} else {
+			// 				if (uni.getSystemInfoSync().platform == 'android') {
+			// 					var context = plus.android.importClass("android.content.Context");
+			// 					var locationManager = plus.android.importClass(
+			// 						"android.location.LocationManager");
+			// 					var main = plus.android.runtimeMainActivity();
+			// 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+			// 					this.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
+			// 				}
+			// 				if (this.bool === false) {
+			// 					uni.showModal({
+			// 						title: '提示',
+			// 						content: '请打开定位服务',
+			// 						success: ({
+			// 							confirm,
+			// 							cancel
+			// 						}) => {
+			// 							if (confirm) {
+			// 								if (uni.getSystemInfoSync().platform == 'android') {
+			// 									var Intent = plus.android.importClass(
+			// 										'android.content.Intent');
+			// 									var Settings = plus.android.importClass(
+			// 										'android.provider.Settings');
+			// 									var intent = new Intent(Settings
+			// 										.ACTION_LOCATION_SOURCE_SETTINGS);
+			// 									var main = plus.android.runtimeMainActivity();
+			// 									main.startActivity(intent); // 打开系统设置GPS服务页面
+			// 								}
+			// 							}
+			// 						}
+			// 					});
+			// 				}
+			// 			}
+			// 		},
+			// 		fail: res => {
+			// 			console.log('定位失败')
+			// 			console.log(res)
+						
+			// 		}
+			// 	});
+			
 			},
 			alertBtn() {
 				// uni.navigateTo({
@@ -276,6 +308,21 @@
 							} else {
 								_title = '提交成功！'
 							}
+							this.$helper.fUN_AmapLocation.start(
+								{
+									intervalTime: 1000*60,
+									isReport: true,
+									reportInterval: 5,
+									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('====确认装车开启连续定位====', JSON.stringify(res));
+									//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
+								}
+							); 
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,