隐藏权限

common/common.js

@@ -914,5 +914,5 @@ module.exports = {
 	countToDay: countToDay,
 	getFormattedTime: getFormattedTime,
 	callPhone: callPhone,
-	timestampToDays: timestampToDays,
+	timestampToDays: timestampToDays
 };

locale/zh.json

@@ -88,5 +88,6 @@
 	"请先连接蓝牙":"请先连接蓝牙",
 	"注册邮件发送成功":"注册邮件发送成功",
 	"蓝牙配对成功":"蓝牙配对成功",
-	"请输入8-18位密码，包含字母数字":"请输入8-18位密码，包含字母数字"
+	"请输入8-18位密码，包含字母数字":"请输入8-18位密码，包含字母数字",
+	"车辆已开机":"车辆已开机"
 }

pages/bluetoothUnlock/bluetoothPair.vue

@@ -139,8 +139,8 @@
 					},
 					() => {}
 				);
-				bluetooth.offCharacteristicStateChange(this.car_sn, 'home');
-				bluetooth.offConnectionStateChange(this.car_sn, 'home');	 
+				bluetooth.offCharacteristicStateChange(this.car_sn, 'index');
+				bluetooth.offConnectionStateChange(this.car_sn, 'index');	 
 			},
 			switchNormal(){
 				const me=this

pages/carList/carList.vue

@@ -4,7 +4,7 @@
 	<view class="car-list">
 		<view v-for="(item,index) of carList" :key="index" @click="clickItem(item)"  :class="['car-list-card',  car_info.car_sn == item.car_sn?'car-list-card-i' :'']">
 		    <view class="car-name" :class="{ 'car-name-i' : car_info.car_sn == item.car_sn}">{{item.car_name}}</view>
-			<image v-if="car_info.car_sn == item.car_sn" class="icon" src="/static/resource/images/gyq_ly.png" mode=""></image>
+			<image v-if="car_info.car_sn == item.car_sn && isNearLockCheck" class="icon" src="/static/resource/images/gyq_ly.png" mode=""></image>
 			<!-- https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX -->
 			<image class="img" :src="item.model_images" mode="aspectFit"></image>
 			<view v-if="car_info.car_sn == item.car_sn" class="select">
@@ -46,7 +46,8 @@
 				carList:[],
 				car_sn:"",
 				car_info:{},
-				clickItemData:{}
+				clickItemData:{},
+				isNearLockCheck:false
 			};
 		}
 		/**
@@ -54,6 +55,7 @@
 		 */
 		,
 		onLoad: function(options) {
+			this.isNearLockCheck=app.globalData.nearLockCheck
 			this.loadUserCarList()
 		},
 		methods: {
@@ -82,6 +84,13 @@
 						resp.data.data.car_sn = car_sn
 						uni.setStorageSync('car_info', resp.data.data);
 						me.car_info = resp.data.data
+						//清空当前设备蓝牙相关
+						app.globalData.nearLockCheck=false
+						app.globalData.nearLockInfo={}
+						app.globalData.sensitivityType=0
+						app.globalData.connectionState={}
+						
+						me.bluetoothClose()
 						common.simpleToast('切换成功！')
 						setTimeout(()=> {
 							uni.navigateBack({
@@ -110,6 +119,21 @@
 					}
 				})
 			},
+			bluetoothClose: function() {
+				bluetooth.closeBluetoothAdapter();
+				bluetooth.closeDevice(
+					this.car_info.car_sn,
+					() => {
+						console.log('关闭蓝牙连接');
+						// this.setData({
+						// 	bt_loading: false
+						// });
+					},
+					() => {}
+				);
+				bluetooth.offCharacteristicStateChange(this.car_info.car_sn, 'index');
+				bluetooth.offConnectionStateChange(this.car_info.car_sn, 'index');	 
+			},
 		}
 	};
 </script>

pages/carLocation/carLocation.vue

@@ -13,12 +13,12 @@
 		<!-- 气泡内容 -->
 		<view v-if="is_show_nav" class="block-view">
 			<view class="custom-bubble-name">{{address}}</view>
-			<view class="flex-row flex-between">
-				<view class="flex-row block-car-time align-center">
+			<view class="flex-row" style="justify-content: flex-end;">
+				<!-- <view class="flex-row block-car-time align-center">
 					<img style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt="">
 					<text class="car-time-text">已驻车 <text class="car-time-text-b">9</text>分钟</text>
-				</view>
-				<img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
+				</view> -->
+				<view class="" @tap="navAddress"><img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt=""></view>
 			</view>
 			<view v-if="car_info.heart_time" class="updata-time">更新于 {{car_info.heart_time}} </view>
 			<view @tap="findCar"  class="car-config-btn">闪灯鸣笛</view>
@@ -59,7 +59,7 @@ import googleMap from "@/component/googleMap/googleMap";
 		onLoad: function(options) {
 			
 			this.car_info = uni.getStorageSync('car_info') || {}
-			this.car_info.heart_time = this.car_info.heart_time ?  dayjs(this.car_info.heart_time).format('YYYY-MM-DD hh:mm:ss') : '未知时间'
+			this.car_info.heart_time = this.car_info.heart_time ?  dayjs(this.car_info.heart_time*1000).format('YYYY-MM-DD hh:mm:ss') : '未知时间'
 			this.init()
 			// this.longitude = {
 			// 	longitude:car_info.longitude,
@@ -200,12 +200,29 @@ import googleMap from "@/component/googleMap/googleMap";
 								popText:'闪灯鸣笛',
 								cmdType:'findCar',
 							})
-							me.tapBlueToothCmd(_,true)
+							me.tapBlueToothCmd('',true)
 						}
 					},
 					fail: function(res) {},
 					complete: function(res) {},
 				})
+			},
+			navAddress(){
+				const {
+					latitude,
+					longitude,
+					cityname,
+					address,
+					model_name
+				} = this.car_info
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name:model_name,
+					address: address,
+					success: function(res) {}
+				});
 			}
 		}
 	};

pages/common/wxs/tools.sjs

@@ -34,7 +34,7 @@ var minuteToHour = function(minute) {
  */
 var formatTime = function(datetime) {
 
-	if (datetime == 0) {
+	if (datetime == 0 ||!datetime) {
 		return ""
 	}
 

pages/common/wxs/tools.wxs

@@ -34,7 +34,7 @@ var minuteToHour = function(minute) {
  */
 var formatTime = function(datetime) {
 
-	if (datetime == 0) {
+	if (datetime == 0|| !datetime) {
 		return ""
 	}
 

pages/index/components/mapCard/mapCard.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="container-view-car" @tap="navCarLocation">
 		<!-- #ifdef APP -->
-		<view style="width:100%;height: 258rpx;" class="map">
+		<view :style="{width:'100%',height: height?'258rpx':'140rpx'}" class="map">
 			<cover-view  class="top-car-location">
 				<cover-image class='img' style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" ></cover-image>
 				<cover-view class="text">车辆位置</cover-view>
 			</cover-view>
-			<googleMap keyId="1" width='100%' height='258rpx' v-if="car_info.latitude"  :mapData="{type:3}" :myLocation='{
+			<googleMap keyId="1" width='100%' :height="height?'258rpx':'140rpx'" v-if="car_info.latitude"  :mapData="{type:3}" :myLocation='{
 				longitude:car_info.longitude,
 				latitude:car_info.latitude
 			}'></googleMap>
@@ -15,14 +15,14 @@
 		<!-- #endif -->
 		<!-- #ifndef APP -->
 		<map class="map"  :longitude="car_info.longitude"
-			:latitude="car_info.latitude" scale="16" show-location style="width:300rpx;height: 258rpx;" :markers="carLocation">
+			:latitude="car_info.latitude" scale="16" show-location :style="{width:'300rpx',height: height?'258rpx':'140rpx'}" :markers="carLocation">
 			<view class="top-car-location flex-row">
 				<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" alt="">
 				<text>车辆位置</text>
 			</view>
 		</map>
 		<!-- #endif -->
-		<view style="width:100%;" class="car-address">{{carAddress}}</view>
+		<view  class="car-address">{{carAddress}}</view>
 	</view>
 </template>
 
@@ -49,6 +49,10 @@
 				type: Object,
 				default: {}
 			},
+			height: {
+				type: Boolean,
+				default: true
+			},
 		},
 		
 		mounted() {
@@ -87,8 +91,8 @@
 				var _pi = "APP"
 				//#endif
 				const location = {
-					lat: that.latitude,
-					lng: that.longitude,
+					lat: that.car_info.latitude,
+					lng: that.car_info.longitude,
 					pi: _pi
 				}
 				let {data} = await http.postApi(config.API_MAP_REGEO, location)
@@ -148,5 +152,6 @@
 	border-bottom-left-radius: 40rpx;
 	border-bottom-right-radius: 40rpx;
 	margin-top: 8rpx;
+	padding-left: 8rpx;
 }
 </style>

pages/index/index.css

@@ -64,7 +64,8 @@
 	width: 336rpx;
 	background-color: #FFF;
 	border-radius: 40rpx;
-	height: 48%;
+	/* height: 48%; */
+	height: 100%;
 	margin-bottom: 14rpx;
 	padding:28rpx 28rpx 32rpx 24rpx;
 }
@@ -113,9 +114,14 @@
 	margin-right: 20rpx;
 }
 .map-card-view{
-	height: 362rpx;
 	margin:0 32rpx 20rpx;
 }
+.height_362{
+	height: 362rpx;
+}
+.height_260{
+	height: 230rpx;
+}
 .icon_style_64{
 	width: 64rpx;
 	height: 64rpx;

pages/index/index.vue

@@ -56,8 +56,8 @@
 						<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
 							style="width: 100%;height: 526rpx;" alt="">
 						<view class="flex-row align-center update-time-view">
-							<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-							<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}</text>
+							<text  style="margin-right: 10rpx;">{{car_info.acc_state==1?$t("车辆已开机"): $t("车辆已关机")}} </text>
+							<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{tools.formatTime( car_info.heart_time|| '')}}</text>
 							<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
 								:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
 						</view>
@@ -65,9 +65,8 @@
 					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle"/>
 			
 			
-					<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"
-						class="flex-row flex-between map-card-view">
-						<MapCard :car_info="car_info" />
+					<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']">
+						<MapCard :car_info="car_info" :height="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"/>
 			
 						<view class="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
@@ -83,13 +82,13 @@
 								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
 							</view>
 			
-							<view class="card-bg">
+							<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="card-bg">
 								<view class="flex-row card-top-title">
 									<img style="width: 36rpx;height: 36rpx;"
 										src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
 									<text class="margin_l_8">{{$t("换电套餐")}}</text>
 								</view>
-								<view v-if="car_info.package_type == 1" class=" card-top-text">
+								<view v-if="car_info.package_type == 1" class="card-top-text">
 									{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text
 										class="font_24">{{$t("天")}}</text>
 								</view>
@@ -276,14 +275,14 @@
 				this.loadUserCarList()
 				
 				//蓝牙配对所需权限  运行小程序需要隐藏
-				const permissionArr=permision.requestAndroidPermissions(this.platform)
-				console.log(permissionArr,'permissionArr');
-				this.setData({
-					authStepList:permissionArr
-				})
-				permissionArr.map(item=>{
-					if(!item.state) this.isOpenAllPermission=true
-				})
+				// const permissionArr=permision.requestAndroidPermissions(this.platform)
+				// console.log(permissionArr,'permissionArr');
+				// this.setData({
+				// 	authStepList:permissionArr
+				// })
+				// permissionArr.map(item=>{
+				// 	if(!item.state) this.isOpenAllPermission=true
+				// })
 				
 				// if (!this.car_info.car_sn) {
 					
@@ -341,19 +340,20 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				console.log(!this.isOpenAllPermission,this.isBluethConnect,'this.isBluethConnect');
-				if(this.isBluethConnect){
-					uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
-				}else{
-					if(!this.isOpenAllPermission){
-						common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
-						uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-					}else{
-						this.setData({
-							isShowPermission:true,
-						})	
-					}
-				}
+				uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				// console.log(!this.isOpenAllPermission,this.isBluethConnect,'this.isBluethConnect');
+				// if(this.isBluethConnect){
+				// 	uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
+				// }else{
+				// 	if(!this.isOpenAllPermission){
+				// 		common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
+				// 		uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				// 	}else{
+				// 		this.setData({
+				// 			isShowPermission:true,
+				// 		})	
+				// 	}
+				// }
 
 			},
 			closePermission(){
@@ -528,6 +528,7 @@
 
 	.news {
 		position: relative;
+		margin-right: 20rpx;
 
 		.num {
 			position: absolute;

pages/loginRegister/register.vue

@@ -1,6 +1,7 @@
 <template>
     <view class="register-page">
-		<navBar  left="0" bgColor="transparent"></navBar>
+		<navBar name="账号注册" left="0" bgColor="transparent"></navBar>
+		<view style="height: 20rpx;"></view>
         <ZxInput
             v-model="form.email"
             :placeholder="$t('请输入邮箱账号')"

pages/my/my.vue

@@ -168,7 +168,7 @@ var request = require('@/common/request.js');
 			},
 			checkHandle_combo() {
 				if(!this.car_info.sold_time){
-					this.$msg('您还未购买车辆，购买车辆才可享受次套餐')
+					this.$msg('您还未购买车辆，购买车辆才可享受换电套餐')
 					return
 				}
 				if(!this.car_info.car_sn){

pages/storeDetails/storeDetails.css

@@ -6,6 +6,9 @@
 	height: 420rpx;
 	/* background-size: contain; */
 }
+.swiper{
+	height: 500rpx;
+}
 .store-img-view .swiper-item-img {
 	width: 100%;
 	height: 100%;
@@ -14,10 +17,11 @@
 .store-img-view{
 	height: 500rpx;
 	width: 100%;
+	position: relative;
 }
 .p-bg{
 	position: relative;
-	top: -152rpx;
+	top: -110rpx;
 	z-index: 99;
 	width: 100vw;
 	padding: 0 24rpx;
@@ -325,4 +329,20 @@
 		width: 20rpx;
 		height: 24rpx;
 		margin-right: 4rpx;
+	}
+	
+	.car-detail-style {
+		width: 56rpx;
+		height: 56rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 16rpx 0rpx 16rpx 0rpx;
+		padding-left: 6rpx;
+		position: relative;
+		left: 20rpx;
+		top: 100rpx;
+		z-index: 1000;
+	}
+	.return-view {
+		width: 40rpx;
+		height: 40rpx;
 	}

pages/storeDetails/storeDetails.vue

@@ -1,10 +1,13 @@
 <template>
 	<view class="container-view">
-		<navBar></navBar>
+		<!-- <navBar></navBar> -->
 		<!-- <view class="store-img-view" style="background-image: url('https://qiniu.bms16.com/FhG-xwyMdxPVjYNrxXnq5enGFT-2');background-repeat: no-repeat;background-size: 100% 500rpx;">
 			
 		</view> -->
 		<view class="store-img-view">
+			<view  :class="['car-detail-style']" @tap="bindReturnView">
+				<img  class="return-view" :src="'https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG'" />
+			</view>
 			<swiper v-if="shop_image && shop_image.length!=0" class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000"
 				indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000" circular>
 				<swiper-item class="swiper-item" v-for="(item,index) in shop_image" :key="index">
@@ -13,6 +16,7 @@
 			</swiper>
 			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFill">
 			</image>
+			
 		</view>
 
 		<view class="p-bg">
@@ -328,6 +332,11 @@
 					success: function(res) {},
 				})
 			},
+			bindReturnView() {
+				uni.navigateBack({
+					delta: 1,
+				}) // 返回上一页
+			},
 		}
 
 	};