bug修改

common/storage.js

@@ -198,7 +198,10 @@ function setUserCurrentLocation(
 }
 
 function getUserCurrentLocation() {
-	return uni.getStorageSync(USER_CURRENT_LOCATION);
+	return uni.getStorageSync(USER_CURRENT_LOCATION) || {
+		longitude: 115.853024,
+		latitude: 28.686280
+	};
 }
 
 

main.js

@@ -7,6 +7,7 @@ Polyfill.init();
 
 // 全局mixins，用于实现setData等功能，请勿删除！';
 import Mixin from './polyfill/mixins';
+import mixins from './mixin/index.js';
 import i18n from './locale/index'
 import uView from "uview-ui";
 Vue.use(uView)
@@ -20,11 +21,9 @@ uni.addInterceptor('request', {
 		return false; // 阻止默认弹窗
 	}
 });
-
-// #ifndef VUE3
 import Vue from 'vue';
-
 Vue.mixin(Mixin);
+Vue.mixin(mixins);
 Vue.config.productionTip = false;
 App.mpType = 'app';
 const app = new Vue({
@@ -32,7 +31,6 @@ const app = new Vue({
 	...App
 });
 app.$mount();
-// #endif
 
 // // #ifdef VUE3
 // import { createSSRApp } from 'vue';

mixin/index.js

@@ -1,115 +1,153 @@
 // mixins/countdownMixin.js
 var bluetooth = require('@/common/bluetooth.js');
-import {getFunctionTag,setFunctionTag} from '@/common/storage.js';
+import {
+	getFunctionTag,
+	setFunctionTag,
+	getUserCurrentLocation
+} from '@/common/storage.js';
 var app = getApp();
 var config = require('@/common/config.js');
 var common = require('@/common/common.js');
 var http = require('@/common/http.js');
 import i18n from '@/locale/index.js'
 export default {
-  data() {
-    return {
-      carOnline: false, 
-	  statusBarHeight:0,
-	  popText:'',
-	  cmdType:'',
-	  popupControlShow:false
-    };
-  },
-   mounted(){
-  	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
-  },
-  methods: {
-		tapOpenControl(e){
-			console.log(111);
-			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线
+	data() {
+		return {
+			myLocation:{},
+			carOnline: false,
+			statusBarHeight: 0,
+			popText: '',
+			cmdType: '',
+			popupControlShow: false
+		};
+	},
+	onLoad(){
+		this.myLocation = getUserCurrentLocation()
+		this.locationMixin()
+		this.checkLocationPermission()
+	},
+	mounted() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+	},
+	methods: {
+		async locationMixin(){
+			let data = await this.$location()
+			this.myLocation = {
+				longitude: data.longitude,
+				latitude: data.latitude
+			}
+		},
+		async checkLocationPermission() {
+			let data = await this.$checkLocationPermission()
+			console.log('权限获取')
+			console.log(data)
+		},
+		tapOpenControl(e) {
+			const _carOnline = uni.getStorageSync('car_info').online != 0 //在线
 			console.log(this.popupControlShow);
-			const {name,type}=e
+			const {
+				name,
+				type
+			} = e
 			this.setData({
-				carOnline:_carOnline,
-				popText:name,
-				cmdType:type,
-				popupControlShow:true
+				carOnline: _carOnline,
+				popText: name,
+				cmdType: type,
+				popupControlShow: true
 			})
 			console.log(this.popupControlShow);
 		},
-		changClick(tab){
-			const typeArr=['tirePressure','batteryInfo','navigation']
-			const isOther=typeArr.findIndex(t => t === tab.type)!==-1
-			console.log('isOther',isOther);
-			if(isOther){
-				const {name,type}=tab
+		changClick(tab) {
+			const typeArr = ['tirePressure', 'batteryInfo', 'navigation']
+			const isOther = typeArr.findIndex(t => t === tab.type) !== -1
+			console.log('isOther', isOther);
+			if (isOther) {
+				const {
+					name,
+					type
+				} = tab
 				this.setData({
-					popText:name,
-					cmdType:type,
+					popText: name,
+					cmdType: type,
 				})
 				this.tapBlueToothCmd()
-			}else{
+			} else {
 				this.tapOpenControl(tab)
 			}
 		},
-		closePopup(){
-			this.popupControlShow=false
+		closePopup() {
+			this.popupControlShow = false
 		},
-		tapBlueToothCmd(isCarLocation=false){
-			const car_info= uni.getStorageSync('car_info');
-			if(this.cmdType=='batteryInfo'){
+		tapBlueToothCmd(isCarLocation = false) {
+			const car_info = uni.getStorageSync('car_info');
+			if (this.cmdType == 'batteryInfo') {
 				uni.navigateTo({
-					url:`/pages/batteryDetail/batteryDetail`
+					url: `/pages/batteryDetail/batteryDetail`
 				})
-			}else if(this.cmdType=='navigation'){
+			} else if (this.cmdType == 'navigation') {
 				const {
 					address,
 					latitude,
 					longitude,
 					car_name
-				} =car_info
+				} = car_info
 				uni.openLocation({
 					latitude: latitude - 0,
 					longitude: longitude - 0,
 					scale: 15,
 					name: car_name,
 					address: address,
-					success: function (res) {},
+					success: function(res) {},
 				})
 				//获取胎压
-			}else if(this.cmdType=='tirePressure'){
+			} else if (this.cmdType == 'tirePressure') {
 				this.bluetoothCmd()
-			}else{
+			} else {
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
-					if(this.cmdType=='turnOnOrOff'){
-						const switchType=this.contrilList.find(item => item.isTurnOn)
-						const pData={
-							car_sn:car_info.car_sn,
-							switch:switchType
+					if (this.cmdType == 'turnOnOrOff') {
+						const switchType = this.contrilList.find(item => item.isTurnOn)
+						const pData = {
+							car_sn: car_info.car_sn,
+							switch: switchType
 						}
-						const me=this
+						const me = this
 						common.loading();
 						http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
 								common.simpleToast(me.popText + '成功');
-								const activeTag=me.contrilList.map(item=>{
-									item.isTurnOn=(item.isTurnOn==1)?0:1
-									item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+								const activeTag = me.contrilList.map(item => {
+									item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+									item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
 									return item
 								})
-								const tag=getFunctionTag().tag
-								setFunctionTag({activeTag,tag})
-								
+								const tag = getFunctionTag().tag
+								setFunctionTag({
+									activeTag,
+									tag
+								})
+
 							} else {
 								common.simpleToast(resp.data.msg);
 							}
 						});
-					}else{
-						const testArr=[
-							{type:'findCar',opt_type:1},
-							{type:'openSeatBag',opt_type:0},
-							{type:'openTailBox',opt_type:2},
-							]
-						const pData = testArr.find(i=>i.type===this.cmdType)
-						const me=this
+					} else {
+						const testArr = [{
+								type: 'findCar',
+								opt_type: 1
+							},
+							{
+								type: 'openSeatBag',
+								opt_type: 0
+							},
+							{
+								type: 'openTailBox',
+								opt_type: 2
+							},
+						]
+						const pData = testArr.find(i => i.type === this.cmdType)
+						const me = this
 						common.loading();
 						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
 							uni.hideLoading();
@@ -124,18 +162,18 @@ export default {
 					this.bluetoothCmd(isCarLocation)
 				}
 			}
-			this.popupControlShow=false
+			this.popupControlShow = false
 		},
-		bluetoothCmd(isCarLocation){
-			const me=this
-			const car_info= uni.getStorageSync('car_info');
+		bluetoothCmd(isCarLocation) {
+			const me = this
+			const car_info = uni.getStorageSync('car_info');
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
 			const isBluetoothConnect = app.globalData.connectionStateChangeFunc[car_info.car_sn]
-			if(isBluetoothConnect){
-				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
-				console.log(isTurnOn,this.cmdType,this.contrilList);
+			if (isBluetoothConnect) {
+				const isTurnOn = this.contrilList.find(item => item.isTurnOn).isTurnOn == 1
+				console.log(isTurnOn, this.cmdType, this.contrilList);
 				const bluetoothCommands = {
-					'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
+					'turnOnOrOff': isTurnOn ? bluetooth.turnOnCar : bluetooth.turnOffCar,
 					'findCar': bluetooth.findCarCmd,
 					'openSeatBag': bluetooth.openCarSeat,
 					'openTailBox': bluetooth.openCarTrunk,
@@ -147,13 +185,13 @@ export default {
 				if (command) {
 					command(car_sn, () => {
 						uni.hideLoading();
-						if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
+						if (this.cmdType == 'openSeatBag' || this.cmdType == 'openTailBox') {
 							common.simpleToast('操作成功');
 						}
 						console.log(`发送${this.popText}指令结束`);
 					});
 				}
-			}else{
+			} else {
 				uni.showModal({
 					title: '提示',
 					content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
@@ -162,14 +200,14 @@ export default {
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							if(isCarLocation){
+							if (isCarLocation) {
 								uni.switchTab({
-									url:'/pages/index/index'
+									url: '/pages/index/index'
 								})
-							}else{
+							} else {
 								me.$emit('toBluetooth')
 							}
-							
+
 						}
 					},
 					fail: function(res) {},
@@ -178,8 +216,5 @@ export default {
 			}
 		}
 	},
-
- 
-  beforeDestroy() {
-  },
-};
+	beforeDestroy() {},
+};

pages/carDetail/carDetail.vue

@@ -119,10 +119,6 @@
 				car_detail: {},
 				showCarPlan: false,
 				selectType: 1,
-				myLocation: {
-					latitude: 23.099994,
-					longitude: 113.324004,
-				},
 				destance: 0,
 				price: 0,
 				params: {}
@@ -143,12 +139,7 @@
 		},
 		methods: {
 			locationFn() {
-				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.loadCarInfo(res.longitude, res.latitude)
-					}
-				})
+				this.loadCarInfo(this.myLocation.longitude, this.myLocation.latitude)
 			},
 			loadCarInfo(latitude, longitude) {
 				const me = this

pages/feedback/index.vue

@@ -166,10 +166,9 @@
 				const imgList = this.imgList.map(item=>{
 					return item.url
 				})
-				const imgs = this.imgList.join(',')
 				const pData = {
 					content: this.content,
-					imgs: imgs,
+					image_list: imgList,
 					type_id: this.typeId
 				}
 				const that = this

pages/index/index.vue

@@ -453,12 +453,17 @@
 							}
 						}
 						if(!isCar){
+							
 							if (list.length > 0) {
+								uni.removeStorageSync('car_info')
 								me.setData({
 									car_list: list,
 									car_sn: list[0].car_sn || '',
 								})
 								me.loadCarDetail(list[0].car_sn)
+							}else{
+								uni.removeStorageSync('car_info')
+								this.car_info = {}
 							}
 						}else{
 							me.loadCarDetail(itemCar.car_sn)

pages/service/components/carRentalList/carRentalList.vue

@@ -40,7 +40,7 @@
 				
 				<scroll-view v-if="item.model_list.length>1" :scroll-into-view="'into'+into" scroll-x="true" enable-flex class="scrollview-box"
 					scroll-with-animation @scroll="onScroll">
-					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)" v-for="(items,index) in item.model_list" :key="index"
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}`)" v-for="(items,index) in item.model_list" :key="index"
 						:style="{ marginLeft: index > 0 ? '32rpx' : '0' }" class="form-item" :data-item="items"
 						>
 						<view class="second-view flex-row">

pages/service/service.vue

@@ -101,10 +101,6 @@
 		data() {
 			return {
 				activeMarkersId: 0,
-				myLocation: {
-					latitude: 0,
-					longitude: 0,
-				},
 				selectType: "store",
 				type: 1,
 				nearStoreList: [],
@@ -188,17 +184,9 @@
 			},
 
 
-			locationFn() {
+			async locationFn() {
 				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.myLocation = {
-							latitude: res.latitude,
-							longitude: res.longitude,
-						}
-						_this.loadCarRentalList();
-					}
-				})
+				_this.loadCarRentalList();
 			},
 
 			tapSelectType(e) {

utils/gyq_utils.js

@@ -1,8 +1,9 @@
 var storage = require('../common/storage.js');
-function srcFn(url,isLogin){
-	if(isLogin && !storage.getUserToken()){
+
+function srcFn(url, isLogin) {
+	if (isLogin && !storage.getUserToken()) {
 		uni.navigateTo({
-			url:'/pages/loginRegister/login'
+			url: '/pages/loginRegister/login'
 		})
 		return
 	}
@@ -10,16 +11,100 @@ function srcFn(url,isLogin){
 		url,
 	})
 }
+async function location() {
+	const storedLocation = storage.getUserCurrentLocation()
+	try {
+		let data = await locationAsync()
+		storage.setUserCurrentLocation({
+			longitude: data.longitude,
+			latitude: data.latitude
+		})
+		return data
+	} catch (error) {
+		return storedLocation
+	}
+}
+
+function locationAsync() {
+	return new Promise((resolve, reject) => {
+		uni.getLocation({
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
 
-function msg(str){
+function msg(str) {
 	uni.showToast({
-		title:str,
-		icon:'none'
+		title: str,
+		icon: 'none'
 	})
 }
+function checkLocationPermissionH5() {
+  return new Promise((resolve) => {
+    if (navigator.permissions) {
+      navigator.permissions.query({ name: 'geolocation' }).then((result) => {
+        resolve(result.state === 'granted'); // granted 表示已授权
+      });
+    } else {
+      // 兼容旧版本浏览器：直接尝试获取位置，通过错误判断
+      navigator.geolocation.getCurrentPosition(
+        () => resolve(true),
+        (error) => resolve(error.code === error.PERMISSION_DENIED ? false : true)
+      );
+    }
+  });
+}
+
+function checkLocationPermissionMP() {
+  return new Promise((resolve) => {
+    uni.getSetting({
+      success: (res) => {
+        // 微信小程序的权限字段为 'scope.userLocation'
+        const hasPermission = res.authSetting['scope.userLocation'] === true;
+        resolve(hasPermission);
+      },
+      fail: () => resolve(false)
+    });
+  });
+}
+function checkLocationPermissionApp() {
+  return new Promise((resolve) => {
+    uni.getSetting({
+      success: (res) => {
+        // Android/iOS 的权限字段可能不同，需实测确认
+        const hasPermission = res.authSetting['scope.userLocation'] === true;
+        resolve(hasPermission);
+      },
+      fail: () => resolve(false)
+    });
+  });
+}
+
+function checkLocationPermission() {
+	return new Promise((resolve) => {
+		// #ifdef H5
+		checkLocationPermissionH5().then(resolve);
+		// #endif
+
+		// #ifdef MP-WEIXIN
+		checkLocationPermissionMP().then(resolve);
+		// #endif
+
+		// #ifdef APP-PLUS
+		checkLocationPermissionApp().then(resolve);
+		// #endif
+	});
+}
 export default {
-  install: function (vm) {
-    vm.prototype.$srcFn = srcFn;
-    vm.prototype.$msg = msg;
-  },
+	install: function(vm) {
+		vm.prototype.$srcFn = srcFn;
+		vm.prototype.$msg = msg;
+		vm.prototype.$location = location;
+		vm.prototype.$checkLocationPermission = checkLocationPermission;
+	},
 };