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

App.vue

@@ -393,7 +393,7 @@
 										}
 										this.$helper.gjList.push(_data)
 										uni.setStorageSync('mapGJ', this.$helper.gjList);
-										if (uni.getStorageSync('mapGJ').length > 100) {
+										if (uni.getStorageSync('mapGJ').length > 10) {
 											this.$request.baseRequest('post',
 													'/hyOrderTravelPath/api/addInfo', {
 														orderId: that.id,

pages/mine/index.vue

@@ -22,7 +22,6 @@
 					<u-image @click="goDetailPage('/pages/mine/set')" style='margin-top: -6px;' class='image'
 						:showLoading="true" src="@/static/images/mine/set.png" width="25px" height="25px"></u-image>
 				</view>
-				
 			</view>
 		</view>
 		<view class="content1">

pages/order/confirmLoading.vue

@@ -122,7 +122,7 @@
 <script>
 	let that;
 	//插件对象
-	var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
+	// var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import * as config from '@/config/index.js'
 	import {
@@ -209,7 +209,7 @@
 			sdkwx.checkLocationPermission(function(res) {
 				console.log(res);
 			});
-			this.auth()
+			// this.auth()
 		},
 		onHide() {
 			uni.removeStorageSync(
@@ -888,7 +888,7 @@
 					console.log("暂存")
 					this.affirm(data)
 				} else { //提交
-					this.start(data) //先调用管局start
+					this.affirm(data) //先调用管局start
 				}
 			}
 		},

pages/order/confirmUnloading.vue

@@ -744,11 +744,11 @@
 						" " + h + ":" + f + ":" + m
 				}
 				this.detailData.carrierInfo.carNo = this.detailData.carNumber
-				if (this.detailData.statusFlag != 1 && this.detailData.orderStatus == "运输中") {
-					let _data = await this.stopMap()
-					console.log(3)
-					if (!_data) return
-				}
+				// if (this.detailData.statusFlag != 1 && this.detailData.orderStatus == "运输中") {
+				// 	let _data = await this.stopMap()
+				// 	console.log(3)
+				// 	if (!_data) return
+				// }
 				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData.carrierInfo).then(
 						res => {
 							console.log(4)

pages/public/login.vue

@@ -386,7 +386,7 @@
 											console.log("查看参数", that.shippingNoteInfos)
 											that.auth()
 											that.$helper.fUN_AmapLocation.start({
-													intervalTime: 5000,
+													intervalTime: 60000,
 													isReport: false
 												},
 												res => {
@@ -406,7 +406,7 @@
 													// console.log('this.$helper.gjList')
 													// console.log(this.$helper.gjList)
 													// console.log("条数", uni.getStorageSync('mapGJ').length)
-													if (uni.getStorageSync('mapGJ').length > 100) {
+													if (uni.getStorageSync('mapGJ').length > 10) {
 														// console.log(JSON.stringify(uni
 														// 	.getStorageSync('mapGJ')))
 														that.$request.baseRequest('post',