0403_bug

common/common.js

@@ -841,7 +841,7 @@ function countToDay(count, unit) {
 }
 
 async function callPhone(phone) {
-	const text = i18n.t('您是否要拨打电话' + phone + '?')
+	const text = i18n.t('您是否要拨打电话') + phone + '?'
 	// const text=that.$t()+phone+'?'
 	let res = await uni.showModal({
 		content: text,

common/http.js

@@ -93,7 +93,7 @@ function getRequest(url, data, successCallBack, failCallBack) {
 	});
 }
 
-function postRequest(url, data, successCallBack, failCallBack) {
+function postRequest(url, data, successCallBack=()=>{}, failCallBack=()=>{}) {
 	const datetime = Math.floor(Date.now() / 1000)
 	data.time = datetime.toString()
 	let jsonStr = JSON.stringify(selfSort(data))

mixin/index.js

@@ -15,7 +15,8 @@ export default {
 	  popText:'',
 	  cmdType:'',
 	  myLocation:{},
-	  popupControlShow:false
+	  popupControlShow:false,
+	  car_detail:{}
     };
   },
   onLoad(){
@@ -23,6 +24,8 @@ export default {
 	 this.locationMiXin()
   },
    mounted(){
+	   console.log(this.isConnectBlueth,'isConnectBlueth');
+	   this.car_detail=uni.getStorageSync('car_info')
   	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
   },
   methods: {
@@ -34,7 +37,7 @@ export default {
 		   }
 	  },
 		tapOpenControl(e){
-			const _carOnline= uni.getStorageSync('car_info').online == 1 //在线
+			const _carOnline= this.car_detail.online == 1 //在线
 			console.log('_carOnline',this._carOnline);
 			const {name,type}=e
 			this.setData({
@@ -65,27 +68,14 @@ export default {
 		},
 		tapBlueToothCmd(cmd,type){
 			console.log(cmd,type,'cmd,type');
-			const car_info= uni.getStorageSync('car_info');
+			const car_info= this.car_detail;
 			const isCarLocation = (cmd=='more')?true:type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
 					url:`/pages/batteryDetail/batteryDetail`
 				})
 			}else if(this.cmdType=='navigation'){
-				const {
-					address,
-					latitude,
-					longitude,
-					car_name
-				} =car_info
-				uni.openLocation({
-					latitude: latitude - 0,
-					longitude: longitude - 0,
-					scale: 15,
-					name: car_name,
-					address: address,
-					success: function (res) {},
-				})
+				this.getCarAddressName()
 				//获取胎压
 			}else if(this.cmdType=='tirePressure'){
 				this.bluetoothCmd()
@@ -148,10 +138,10 @@ export default {
 		},
 		bluetoothCmd(isCarLocation){
 			const me=this
-			const car_info= uni.getStorageSync('car_info');
+			const car_info= this.car_detail;
 			const app = getApp();
-			console.log('test',app.globalData.connectionState[car_info.car_sn]);
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
+			if(Object.keys(app.globalData.connectionState).length === 0) return
 			const isBluetoothConnect = app.globalData.connectionState[car_info.car_sn].device
 			if(isBluetoothConnect){
 				//改成判断开关锁
@@ -165,7 +155,7 @@ export default {
 				};
 				common.loading();
 				const command = bluetoothCommands[this.cmdType];
-				const car_sn = uni.getStorageSync('car_info').car_sn
+				const car_sn = this.car_detail.car_sn
 				if (command) {
 					command(car_sn, () => {
 						uni.hideLoading();
@@ -176,35 +166,64 @@ export default {
 					});
 				}
 			}else{
-				uni.showModal({
-					title: '提示',
-					content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							if(isCarLocation){
-								uni.switchTab({
-									url:'/pages/index/index'
-								})
-							}else{
-								me.$emit('toBluetooth')
-							}
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
+				// 	showCancel: true,
+				// 	cancelText: '取消',
+				// 	confirmText: '确定',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			if(isCarLocation){
+				// 				uni.switchTab({
+				// 					url:'/pages/index/index'
+				// 				})
+				// 			}else{
+				// 				me.$emit('toBluetooth')
+				// 			}
 							
-						}
-					},
-					fail: function(res) {},
-					complete: function(res) {},
+				// 		}
+				// 	},
+				// 	fail: function(res) {},
+				// 	complete: function(res) {},
+				// })
+			}
+		},
+		async getCarAddressName() {
+			const that = this
+			//#ifdef MP-ALIPAY
+			var _pi = "ali_index"
+			//#endif
+			//#ifdef MP-WEIXIN
+			var _pi = "wx_index"
+			//#endif
+			//#ifdef APP
+			var _pi = "APP"
+			//#endif
+			const location = {
+				lat: this.car_detail.latitude,
+				lng: this.car_detail.longitude,
+				pi: _pi
+			}
+			let {data} = await http.postApi(config.API_MAP_REGEO, location)
+			if(data.code == 200){
+				console.log(data,'data.data.data');
+				const address = data.data.data.address
+				const {
+					latitude,
+					longitude,
+					car_name
+				} =this.car_detail
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: car_name,
+					address: address,
+					success: function (res) {},
 				})
 			}
 		},
-		// async loadData() {
-		// 				return new Promise((resolve) => {
-		// 					// setTimeout(resolve, 1000); // 模拟 5 秒请求时间
-		// 					// this.trunOn(resolve)
-		// 				});
-		// 			},
 
 	},
 

pages/index/components/control/control.css

@@ -16,6 +16,11 @@
 	/* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
 	margin: 20rpx;
 }
+.contril-item-e,
+.more-item-e{
+	margin: 20rpx 10rpx;
+}
+
 .contril-item-img{
 	width: 112rpx;
 	height: 112rpx;

pages/index/components/control/control.vue

@@ -84,7 +84,7 @@
 	import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
 	
 	import controlMixin from '@/mixin/index';
-	import i18n from '@/locale/index.js'
+	import {Language} from '@/utils/util.js'
 	import {
 			getFunctionTag,
 			setFunctionTag
@@ -104,6 +104,10 @@ export default {
 		isOverdueShow: {
 			type: Boolean,
 			default: false
+		},
+		isConnectBlueth: {
+			type: Boolean,
+			default: false
 		}
 	},
 
@@ -115,7 +119,8 @@ export default {
 			switchValue: {state:false,time:0},
 			isShowMore:false,
 			car_line:false,
-			authority_list:[]
+			authority_list:[],
+			Language,
 			// startX: 0, // 滑块开始滑动的初始位置
 			// moveX: 0, // 滑块滑动的距离
 			// unlocked: false, // 是否解锁成功的标志

pages/index/index.vue

@@ -56,7 +56,7 @@
 							<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10"
 								:show-percent="false" :percent="car_info.soc"></u-line-progress>
 							<view class="quantity-text flex-row">
-								<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
+								<view style="font-weight:400;font-size: 22rpx;">{{$t("续航")}}</view>
 								<view style="font-size: 36rpx;">{{formatDistance(car_info.remain_mail) }}<text style="font-size: 30rpx;">{{car_info.remain_mail ? car_info.remain_mail>1000?'km':'m' :'km'}}</text></view>
 							</view>
 						</view>
@@ -78,7 +78,7 @@
 								:style="{width: '24rpx',height: '32rpx'}" alt="">
 						</view>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
+					<Control :contrilList="contrilList" :isConnectBlueth="isConnectBlueth" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
 					
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
@@ -321,6 +321,12 @@
 				this.newsNumFn()
 				this.isLogin = true
 				this.loadUserCarList()
+				//蓝牙是否连接
+				if('car_sn' in this.car_info && Object.keys(app.globalData.connectionState).length != 0){
+					
+					this.isConnectBlueth=app.globalData.connectionState[this.car_info.car_sn].connect
+					
+				}
 				// #ifdef APP
 					//蓝牙配对所需权限  运行小程序需要隐藏
 					// const permissionArr = permision.requestAndroidPermissions(this.platform)
@@ -379,7 +385,9 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				
+				// uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				
 				// console.log(!this.isOpenAllPermission,this.isBluethConnect,'this.isBluethConnect');
 				// if(this.isBluethConnect){
 				// 	uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
@@ -488,15 +496,13 @@
 						uni.setStorageSync('car_info', this.car_info);
 						const app=getApp()
 						//车辆离线连接蓝牙
-						console.log('me.car_info.online',me.car_info.online);
 						if(me.car_info.online==1){
 							me.loadBluetooth()
 						}
-						// this.isConnectBlueth=app.globalData.connectionState[this.car_info.car_sn]
+						
 						//判断逾期
 						if (resp.data.data.sold_time) return
 						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
-						console.log(time,resp.data.data.hire_end_time,Math.floor(new Date()) / 1000);
 						if (time <= 0) {
 							this.isOverdueShow = true
 							app.globalData.isOverdueShow=true
@@ -505,9 +511,7 @@
 							this.isOverdueShow = false
 							app.globalData.isOverdueShow=false
 						}
-						console.log('this.time',this.isOverdueShow,app.globalData.isOverdueShow,this.time);
 						if(!this.time){
-							console.log(1111);
 							// this.time = setInterval(()=>{
 							// 	this.loadCarDetail(car_sn)
 							// },5000)