Merge branch 'lw_test' into gyq_test

common/bluetooth/ZXCar.js

@@ -55,6 +55,7 @@ function isDevice(device, data) {
 	return false;
 }
 
+//连接蓝牙后 发送登录指令
 function alterConnect(device, deviceId) {
 	readRepeatTime=0
 	// console.log(device,app.globalData.connectionState[deviceId],'deviceliuwei');
@@ -136,7 +137,7 @@ function readData(device, value, data) {
 			break;
 			
 			case 0x7C:
-			//接近解锁指令
+			//接近解锁指令 
 			nearCarCmd(device.mac_id,normalArray)
 			break;
 			

component/customTabbar/index.vue

@@ -1,7 +1,7 @@
 <template>
-	<view class="">
-		<view style="height: 150rpx;"></view>
-		<view class="tabbar-wrap">
+	<view class="" style="border: 2rpx solid red;">
+		<view style="height: 148rpx;border: 2rpx solid red;"></view>
+		<view class="tabbar-wrap"  >
 			<view class="tabbar">
 				<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
 					<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
@@ -255,7 +255,7 @@
 <style scoped>
 	.tabbar-wrap {
 		position: fixed;
-		bottom: 0;
+		bottom:0rpx;
 		left: 0;
 		right: 0;
 		/* border-bottom: env(safe-area-inset-bottom) solid #fff; */

components/navBar/navBar.vue

@@ -0,0 +1,120 @@
+<template>
+	<view>
+		
+		<!-- #ifdef MP-WEIXIN -->
+		<view v-if="type=='index'" :style="{height: `${statusBarHeight + 20}px`}"></view>
+		<!-- #endif -->
+		<!-- #ifdef APP -->
+		<view v-if="type=='index'" :style="{height: `${statusBarHeight}px`}"></view>
+		<!-- #endif -->
+		<view v-else>
+			<view  class="top-view flex-row" :style="'padding-top:'+statusBarHeight+'rpx;background-color:'+bgColor+';'">
+			<view class="flex-row" :style="'height:'+navabarHeight+'rpx;'">
+				<view :class="['flex-row',type=='carDetail'?'car-detail-style':'']" :style="{'margin-left': `${left}rpx`,border:'2rpx solid yellow'}"  @tap="bindReturnView">
+					<img v-if="type!='active'" class="return-view"  :src="'https://qiniu.bms16.com/'+(type=='select'?'FjhcWGFGsI56rLZRu7_OnhGtpoUs':(type=='carDetail'||type=='login'?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_'))" />
+					
+					</view>
+				<text class="top-text">{{name}}</text>
+			</view>
+		</view>
+		<view  :class="(bgColor!='#FFF'||type==('active'||'noBottom'))?'':'view-height'" :style="'height:'+( navabarHeight + statusBarHeight )+'rpx;'"></view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			name: {
+				type: String,
+				default:''
+			},
+			type:{
+				type:String,
+				default:'my'
+			},
+			bgColor:{
+				type:String,
+				default:'#FFF'
+			},
+			left:{
+				type:String,
+				default:'32'
+			}
+		},
+		data () {
+			return {
+				statusBarHeight: 0,
+				navabarHeight: 0,
+			}
+		},
+		mounted() {
+			this._getCustomBar()
+		},
+		methods: {
+			_getCustomBar() {
+				const sysinfo = uni.getSystemInfoSync()
+				let GAP = 8
+				// #ifdef MP-ALIPAY
+				GAP = 0
+				// #endif
+				// #ifdef APP-PLUS
+				this.statusBarHeight = sysinfo.statusBarHeight
+				this.navabarHeight = 100
+				// #endif
+				// #ifdef MP-WEIXIN
+				const clientRect = uni.getMenuButtonBoundingClientRect()
+				const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+				this.navabarHeight = navabarHeight
+				// #endif
+			},
+			
+			bindReturnView() {
+				uni.navigateBack({
+					delta: 1,
+				}) // 返回上一页
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.top-view {
+		background: #ffffff;
+		width: 100%;
+		/* height: 170rpx; */
+		position: fixed;
+		z-index: 10;
+		align-items: baseline;
+	}
+	
+	.return-view {
+		width: 40rpx;
+		height: 40rpx;
+		/* margin-top: 24rpx; */
+/* 		margin-left: 32rpx; */
+	}
+	
+	.top-text {
+		color: #060809;
+		margin-left: 230rpx;
+		font-size: 36rpx;
+		font-weight: 600;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+		font-family: PingFangSC, PingFang SC;
+	}
+	.view-height{
+		/* border-bottom:2rpx solid #060809 ; */
+		margin-bottom: 32rpx;
+	}
+	.car-detail-style{
+		width: 56rpx;
+		height: 56rpx;
+		background: rgba(0,0,0,0.4);
+		border-radius: 16rpx 0rpx 16rpx 0rpx;
+		padding-left: 6rpx;
+	}
+</style>

locale/zh.json

@@ -84,5 +84,6 @@
 	"后台运行":"后台运行",
 	"电池优化":"电池优化",
 	"位置权限":"位置权限",
-	"修改成功":"修改成功"
+	"修改成功":"修改成功",
+	"请先链接蓝牙":"请先链接蓝牙"
 }

mixin/index.js

@@ -9,11 +9,15 @@ import i18n from '@/locale/index.js'
 export default {
   data() {
     return {
-      carOnline: false, // 倒计时初始值
+      carOnline: false, 
+	  statusBarHeight:0,
 	  popText:'',
 	  cmdType:'',
 	  popupControlShow:false
     };
+  },
+   mounted(){
+  	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
   },
   methods: {
 		tapOpenControl(e){
@@ -173,10 +177,8 @@ export default {
 			}
 		}
 	},
-  created(){
-  },
-  mounted() {
-  },
+
+ 
   beforeDestroy() {
   },
 };

pages.json

@@ -1,5 +1,6 @@
 {
 	"easycom": {
+		"autoscan": true,
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [{
@@ -363,5 +364,15 @@
 		"navigationBarTitleText": "",
 		"navigationBarTextStyle": "black"
 	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
+	},
 	"subPackages": []
 }

pages/aboutMy/aboutMy.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container">
+		<navBar name="关于我们"></navBar>
 		<view class="header_view flex-row flex-column">
 			<image class="header_img" :src="app_logo" />
 			<view class="header_title">这里是名称</view>

pages/activity/activity.vue

@@ -1,9 +1,13 @@
 <template>
-	<view class="container-view flex-row">
-		<img style="width: 352rpx;height: 352rpx;" src="https://qiniu.bms16.com/Fn0mFwx4EHDzQiCypHM7HgiL4uuP" alt="">
-		<view class="active-text">暂无可参与的活动</view>
-		<CustomTabbar curt-tab="active"/>
+	<view class="">
+		<navBar name="活动中心" type="active" ></navBar>
+		<view class="container-view flex-row">
+			<img style="width: 352rpx;height: 352rpx;" src="https://qiniu.bms16.com/Fn0mFwx4EHDzQiCypHM7HgiL4uuP" alt="">
+			<view class="active-text">暂无可参与的活动</view>
+			<CustomTabbar curt-tab="active"/>
+		</view>
 	</view>
+	
 </template>
 
 <script>

pages/addUser/addUser.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="add-user-view">
+		<navBar :name="'添加成员'" left="0"/>
 		<view class="flex-row email-input-view">
 			<input class="email-input-style" type="email" v-model="email" placeholder="请输入被邀人邮箱号"  placeholder-style="font-size: 32rpx; font-weight: 400; color: #BAC1D0;">
 			<img class="clear-btn" src="https://qiniu.bms16.com/Fjpf2YnHUK1_CFf20kKRvjX9YdC3" alt="">
@@ -53,6 +54,7 @@
 	background-color: #FFF;
 	height: 100vh;
 	padding: 32rpx;
+	/* margin-top: 32rpx; */
 }
 .email-input-style{
 	width: 100%;

pages/batteryDetail/batteryDetail.css

@@ -1,7 +1,6 @@
 .battery-detail-main{
 	height: 100vh;
 	background: #F1F3F4;
-	
 }
 .quantity-count{
 	font-weight: bold;

pages/batteryDetail/batteryDetail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="battery-detail-main">
+		<navBar name="电池信息"  bgColor="#CFD1DE"></navBar>
 		<view class=" quantity-count">65<text class="quantity-text">%</text></view>
 		<view class="battery-list-view">
 			<view class="battery-list flex-row flex-between">

pages/batteryPackage/batteryPackage.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="battery-package-main">
+		<navBar bgColor="transparent" name="换电套餐" />
 		<view class="package-icon-view flex-row">
 			<img src="https://qiniu.bms16.com/FqF7erLOB8OutmFnre7-mbTkwpZr" alt="">
 			<view class="package-icon-text flex-row">5秒换电，瞬间满电，畅享骑行新体验！</view>

pages/batteryRecord/batteryRecord.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container-view">
+		<navBar name="换电记录" type="noBottom"></navBar>
 		<view class="order-type-view flex-row flex-between">
 			<view @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
 				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"

pages/bluetoothUnlock/bluetoothPair.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="bluetoothPair-page">
+		<navBar name="开启感应解锁"></navBar>
 		<view class="car-wrap">
 			<view class="name">智能电动摩托车智驾 M7</view>
 			<image :src="QINIU_URL + 'Fi6CPKj4-raA86oizhL3PiXD4DkH'" class="car-img" />

pages/bluetoothUnlock/unlockSet.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="unlockSet-page">
+		<navBar name="开启感应解锁" left="0"></navBar>
 		<view class="lock-img"></view>
 		<view class="main">
 			<view class="primary-text">开启感应解锁后，携带手机靠近车辆并按Auto 键即可开机</view>
@@ -14,7 +15,7 @@
 				<view class="txt">{{ $t('灵敏度设置') }}</view>
 			</view>
 		</view>
-		<view class="switch-btn">{{ $t('关闭感应解锁') }}</view>
+		<view @tap="closeNeerUnlock" class="switch-btn">{{ $t('关闭感应解锁') }}</view>
 
 		<u-popup v-model="showSensitivityDialog" mode="bottom" border-radius="28" @close="close">
 			<view class="popup-content">
@@ -23,9 +24,10 @@
 				<!-- <slider v-model="sensitivityValue" @change="changeValue"   height="16" :step="1" :min="0" :max="4" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#060809" block-size="20"></slider> -->
 				<!-- <u-slider v-model="sensitivityValue"  height="16"  :step="1"  activeColor="#060809" backgroundColor="#F1F3F4" block-color="#060809"></u-slider> -->
 
-				<view  @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd" class="slider">
-					<view class="tag"></view>
-					<view class="len"></view>
+				<view  class="slider">
+					<view  @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd" :style="'left:' + sensitivityValue*25 + '%;'" class="tag"><image class="icon-step" src="https://qiniu.bms16.com/Fj9w9q_9esu7rWBIVJ1yk0OZdeF1"/></view>
+					<view :style="'width:'+ sensitivityValue*25 + '%;'" class="len"></view>
+					<view class="slider-bg"></view>
 				</view>
 				<view class="flex-row step-text">
 					<text>最近</text>
@@ -53,11 +55,10 @@
 			}
 		},
 		onLoad() {
-			this.sensitivityValue = app.globalData.nearLockInfo.level - 0
+			// this.sensitivityValue = app.globalData.nearLockInfo.level - 0
 		},
 		methods: {
 			onTouchStart(e) {
-				
 				let pageX = e.changedTouches[0].pageX
 				this.start = pageX
 			},
@@ -72,12 +73,15 @@
 				if(this.start > this.Move ){
 					if((this.start - this.Move) > 20){
 						console.log('左')
-						this.stepIndex --
+						if(this.sensitivityValue==0) return
+						this.sensitivityValue --
+						this.changeValue()
 					}
 				}else if(this.start < this.Move){
 					if((this.start - this.Move) < 20){
-						console.log('右')
-						this.stepIndex ++
+						if(this.sensitivityValue==4) return
+						this.sensitivityValue ++
+						this.changeValue()
 					}
 				}
 			},
@@ -88,15 +92,20 @@
 				this.showSensitivityDialog = true
 
 			},
-			changeValue(value) {
-				console.log(value, this.sensitivityValue);
+			changeValue() {
+				// console.log(value, this.sensitivityValue);
 				//value 0 1 2 3 4
+				const value = this.sensitivityValue
 				const car_sn = uni.getStorageSync('car_info').car_sn
-				// common.loading();
+				common.loading();
 				bluetooth.setSensitivity(car_sn, value, () => {
 					console.log('设置灵敏度指令成功');
 				})
-
+			},
+			closeNeerUnlock(){
+				nearCloseUnlock(car_sn,()=>{
+					console.log('关闭接近解锁成功');
+				})
 			}
 		}
 	}
@@ -105,28 +114,45 @@
 
 <style lang="scss" scoped>
 	.slider {
-		width: 600rpx;
+		width: 100%;
 		position: relative;
 		padding: 20rpx 0;
 
 		.tag {
 			width: 50rpx;
 			height: 50rpx;
-			background-color: #060809;
-			border-radius: 50%;
+			// background-color: #060809;
+			// border-radius: 50%;
 			position: absolute;
 			left: 0;
 			top: 10rpx;
-
+			z-index: 300;
 		}
 
 		.len {
 			width: 50%;
 			height: 20rpx;
 			background-color: #060809;
+			border-radius: 40rpx 0 0 40rpx;
 			position: absolute;
 			left: 0;
-			top: 20rpx;
+			top: 26rpx;
+			z-index: 200;
+		}
+		.slider-bg{
+			background: #F1F3F4;
+			display: flex;
+			flex-grow: 1;
+			height: 20rpx;
+			position: absolute;
+			top: 26rpx;
+			width: 100%;
+			border-radius: 0 40rpx 40rpx 0;
+			z-index: 100;
+		}
+		.icon-step{
+			width: 32rpx;
+			height: 48rpx;
 		}
 	}
 

pages/carDetail/carDetail.css

@@ -143,12 +143,12 @@
 	height: 64rpx;
 }
 .use-car-view{
-	padding: 24rpx 24rpx 40rpx 0;
+	padding: 24rpx 24rpx 40rpx ;
 	position:fixed;
 	bottom: 0;
 	background: #FFFFFF;
 	box-shadow: 0rpx -2rpx 0rpx 0rpx #F4F5F6;
-	width: 98%;
+	width: 100%;
 }
 .use-car-btn{
 	width: 100%;
@@ -169,4 +169,8 @@
 }
 .step-title-view{
 	padding-left:24rpx ;
+}
+.rich_text{
+  /* margin: 30rpx; */
+  margin-bottom: 150rpx;
 }

pages/carDetail/carDetail.vue

@@ -1,5 +1,7 @@
 <template>
+	<view>
 	<view class="car-detail-main">
+		<navBar type="carDetail"/>
 		<view v-if="car_detail.image" class="flex-row">
 			<img style="width: 600rpx;height: 406rpx; margin: auto; margin-bottom: 20rpx;" :src="car_detail.image"
 				alt="">
@@ -80,6 +82,7 @@
 		<carPlan v-if="showCarPlan" @changeSelectType="changeSelectType" @closeShowMore="closeShowMore" :params="params"
 			:selectType="selectType" />
 	</view>
+</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>

pages/carFunctionSet/more.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="zx-container car-function-set-more">
+		<navBar name="更多功能" left="0"></navBar>
 		<view class="fn-wrap">
 			<view class="title">
 				{{ $t('固定导航栏') }}
@@ -164,6 +165,9 @@
 	@import "@/libs/css/layout.scss";
 
 	.car-function-set-more {
+		width: 100%;
+		min-height: 100vh;
+		padding:  0 24rpx 32rpx ;
 		.fn-wrap {
 			width: 100%;
 			background: #FFFFFF;

pages/carFunctionSet/unbind.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="zx-container unbind-page">
+		<navBar name="解除绑定" bgColor="#F1F3F4"></navBar>
       <view class="zx-wrap car-info-wrap">
         <image :src="carInfo.model_images" class="car-img" />
         <view class="car-name">

pages/carList/carList.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="car-list">
+		<navBar name="请选择设备" type="select" left="0"/>
 		<view v-for="(item,index) of carList" :key="index" @click="clickItem(item)" class="car-list-card" :class="{ 'car-list-card-i' : car_info.car_sn == item.car_sn}">
 		    <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>

pages/carLocation/carLocation.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="">
+		<navBar name="车辆位置"></navBar>
 		<!-- #ifndef APP -->
 		<map @touchmove="hiddenNav" @markertap="showNav" style="width: 100%; height: calc(100vh - 506rpx);" :latitude="latitude"
 			:longitude="longitude" :markers="markers" show-location>

pages/dashboard/dashboard.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="dashboard-page zx-page-linear">
+		<navBar bgColor="transparent"></navBar>
 		<view class="dashboard">
 			<view class="shadow" :style="{ '--progress': progress + '%' }"></view>
 			<view class="spe-wrap">

pages/deviceInfo/deviceInfo.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="device-info-main">
+		<navBar left="0" bgColor="transparent"></navBar>
 		<view class="device-name">{{list.car_name}}</view>
 		<view class="block-card">
 			<view class="info-view">

pages/feedback/index.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="container">
+		<navBar name="意见反馈" left="0"></navBar>
         <text class="title">问题类型</text>
         <view class="title-wrapper">
             <view v-for="(item, index) in typeList" @tap="tapType(item)" :key="index"
@@ -154,7 +155,7 @@ export default {
 
 <style scoped lang="scss">
 .container {
-    padding: 48rpx 32rpx 0;
+    padding: 0 32rpx 0;
     background-color: white;
     height: 100vh;
 }

pages/index/components/unleasedPages/unleasedPages.vue

@@ -1,20 +1,22 @@
 <template>
 	<view class="unleased-pages-main">
-		
+		<navBar type="index"/>
 		<view class="recommend-car-name w_100 text-center">{{moder_info.model_name}}</view>
 		<view class="recommend-car-tip w_100 text-center">{{moder_info.title||'续航开新路 路遥见实力'}}</view>
-		<view class="">
-			<u-swiper
-				v-if="img_list.length!=0"
-			     :list="img_list"
-			     @change="tapSwiper"
-			     :autoplay="false"
-				 mode="none"
-				 :height="420"
-				 bgColor="transparent"
-				 class="custom-swiper"
-			   >
-			</u-swiper>
+		<view >
+			<view style="margin: 0 50rpx 0rpx;height: 420rpx;">
+				<u-swiper
+					v-if="img_list.length!=0"
+					 :list="img_list"
+					 @change="tapSwiper"
+					 :autoplay="false"
+					 mode="none"
+					 :height="420"
+					 bgColor="transparent"
+					 class="custom-swiper"
+				   >
+				</u-swiper>
+			</view>
 			
 			<view class="car-model-step">
 				<view class="flex-row flex-around" style="padding-top: 80rpx;margin-bottom: 60rpx;">
@@ -67,7 +69,8 @@
 			return {
 				current: 0,
 				model_id:'',//租赁设备编号
-				moder_info:{}
+				moder_info:{},
+				statusBarHeight:0
 			};
 		}
 		/**

pages/index/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<block v-if="isLogin && car_info.car_sn">
-			<view class="container-view">
+			<view class="container-view"> 
+			<navBar type="index" />
 				<view class="flex-row flex-between align-center padding_about_40">
 					<view class="car-name-view" @tap="navSwitchCar">
 						<text style="margin-right: 10rpx;">{{car_info.car_name}}</text>
@@ -177,6 +178,7 @@
 				},
 				platform:'android',//手机型号
 				isShowPermission:false,//是否打开权限弹窗
+				statusBarHeight:0,
 			};
 		},
 		computed: {},
@@ -193,6 +195,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
 			this.locationFn()
 			this.loadModelList()
 			const user_token = storage.getUserToken()

pages/loginRegister/changePassword.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="changePassword-page">
+		<navBar name="修改密码"></navBar>
         <ZxInput
             v-model="form.old_passwd"
             :placeholder="$t('请输入旧密码')"
@@ -76,7 +77,7 @@ export default {
  @import "@/libs/css/layout.scss";
 
 .changePassword-page {
-    padding: 58rpx 32rpx;
+    padding: 0 32rpx 58rpx ;
     min-height: 100vh;
     width: 100%;
     background: #F1F3F4;

pages/loginRegister/forgetPassword.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="forgetPassword-page">
+		<navBar name="忘记密码"  left="0" bgColor="transparent"></navBar>
         <zx-input
             v-model="email"
             :placeholder="$t('请输入要重置的邮箱账号')"
@@ -64,6 +65,6 @@ export default {
     width: 100%;
     background: #F1F3F4;
     min-height: 100vh;
-    padding: 32rpx;
+    padding: 0 32rpx;
 }
 </style>

pages/loginRegister/login.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="zx-page-linear login-page">
+		<navBar type="login" left="0" bgColor="transparent"></navBar>
       <view class="title-wrap">
         <view class="title">{{ $t('欢迎来到智寻出行') }}</view>
         <view class="sub-title">{{ $t('邮箱密码登录') }}</view>
@@ -129,7 +130,7 @@
   <style lang="scss" scoped>
   @import "@/libs/css/layout.scss";
   .login-page {
-    padding: 94rpx 40rpx 64rpx;
+    padding: 0 40rpx 64rpx;
     box-sizing: border-box;
   
     .title-wrap {

pages/loginRegister/register.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="register-page">
+		<navBar  left="0" bgColor="transparent"></navBar>
         <ZxInput
             v-model="form.email"
             :placeholder="$t('请输入邮箱账号')"
@@ -114,7 +115,7 @@ export default {
     width: 100%;
     background: #F1F3F4;
     min-height: 100vh;
-    padding: 32rpx;
+    padding: 0 32rpx;
     .agreement-row {
         margin: 2rpx 0 64rpx;
         display: flex;

pages/message/index.vue

@@ -1,5 +1,6 @@
 <template>
     <view class="message-page">
+		<navBar name="设备信息"></navBar>
         <view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"  @tap="toDeviceMsgPage(item)">
             <view class="row">
                 <view class="title">

pages/mileageStatistics/index.vue

@@ -132,7 +132,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "@/libs/css/layout.scss";
+// @import "@/libs/css/layout.scss";
 
 .mileage-statistics-page {
   padding: 24rpx 32rpx;

pages/moreInfo/moreInfo.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="container-view">
-		<view :style="'padding-top:'+sumHeight+'px;height:0'"></view>
+		<navBar bgColor="transparent" type="index"></navBar>
+		<view :style="'padding-top:176rpx;height:0'"></view>
 		<!-- <img src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" style="width: 100%;height: 526rpx;" alt=""> -->
 		<image src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" style="width: 100%;height: 526rpx;"
 			mode="aspectFit"></image>
@@ -39,23 +40,9 @@
 	export default {
 		data() {
 			return {
-				statusBarHeight: 0,
-				navabarHeight: 0,
-				sumHeight: 0
 			}
 		},
 		onLoad() {
-			const clientRect = uni.getMenuButtonBoundingClientRect()
-			const sysinfo = uni.getSystemInfoSync()
-			let GAP = 8
-			// #ifdef MP-ALIPAY
-			GAP = 0
-			// #endif
-			const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo
-				.statusBarHeight) + GAP
-			this.navabarHeight = navabarHeight
-			this.statusBarHeight = sysinfo.statusBarHeight
-			this.sumHeight = this.statusBarHeight + this.navabarHeight
 		},
 		methods: {
 			toDashboard() {

pages/my/set.vue

@@ -1,5 +1,6 @@
 <template>
-    <view class="set-page zx-container">
+    <view class="set-page">
+		<navBar name="设置" left="0"></navBar>
       <image @click="editAvatarFn" :src="userInfo.headimg || defaultHeadImg" class="head-img" />
       <view class="list-wrap">
         <view
@@ -111,7 +112,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 66rpx 32rpx 48rpx;
+    padding: 0 32rpx 48rpx;
   
     .head-img {
         width: 174rpx;

pages/order/order.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container-view">
+		<navBar name="我的订单" left="0"></navBar>>
 		<view class="order-type-view flex-row flex-between">
 			<view v-if="selectOrderType == 0" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
 				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"

pages/orderStatus/orderStatus.css

@@ -3,7 +3,7 @@
 }
 
 .time-info {
-	padding: 48rpx 32rpx 24rpx;
+	padding: 0 32rpx 24rpx;
 	background: linear-gradient( 180deg, #CFD1DE 0%, #F1F3F4 100%);
 }
 

pages/orderStatus/orderStatus.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="container-view">
+		
 		<view class="time-info">
+			<navBar bgColor="transparent" left="0"></navBar>
 			<view>
 				<view v-if="orderInfo.pay_status!=2">
 					<view v-if="orderInfo.pay_status == 0">待支付</view>

pages/package/package.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="container-view">
-		<view class="top-bg" :style="'padding-top:'+statusBarHeight+'px;'">
-			<view class="flex-row" :style="'height:'+navabarHeight+'px;'">
+		<view class="top-bg" >
+			<navBar name="我的套餐" bgColor="transparent"></navBar>
+			<!-- <view class="flex-row" :style="'height:'+navabarHeight+'px;'">
 				<view class="flex-row" @tap="bindReturnView"><img class="return-view" src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" /></view>
 				<text class="top-text">我的套餐</text>
-			</view>
+			</view> -->
 			
 			<view class="package-card flex-row flex-between">
 				<view class="flex-row flex-column" style="align-items: flex-start;">
@@ -102,8 +103,8 @@
 				page: 1,
 				limit: 10,
 				car_info:{},
-				statusBarHeight: 0,
-				navabarHeight: 0,
+				// statusBarHeight: 0,
+				// navabarHeight: 0,
 				packageList: [
 					{ctime: '2024-04-04 16:15',total_duration: 30,efficient_day: 24,change_rate: 6,total_times: 10,status:1},
 					{ctime: '2024-04-04 16:15',total_duration: 30,efficient_day: 24,change_rate: 6,total_times: 10,status:2},
@@ -115,15 +116,15 @@
 		 */
 		onLoad: function(options) {
 			this.car_info = uni.getStorageSync('car_info') || {};
-			const clientRect = uni.getMenuButtonBoundingClientRect()
-			const sysinfo = uni.getSystemInfoSync()
-			let GAP = 8
-			// #ifdef MP-ALIPAY
-			GAP = 0
-			// #endif
-			const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
-			this.navabarHeight = navabarHeight
-			this.statusBarHeight = sysinfo.statusBarHeight
+			// const clientRect = uni.getMenuButtonBoundingClientRect()
+			// const sysinfo = uni.getSystemInfoSync()
+			// let GAP = 8
+			// // #ifdef MP-ALIPAY
+			// GAP = 0
+			// // #endif
+			// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+			// this.navabarHeight = navabarHeight
+			// this.statusBarHeight = sysinfo.statusBarHeight
 			this.mapCtx = uni.createMapContext('myMap');
 			this.listFn()
 		},

pages/powerSetting/powerSetting.css

@@ -1,5 +1,7 @@
 .power-setting-main{
 	padding: 24rpx;
+	background: linear-gradient( 180deg, #CFD1DE 0%, #F1F3F4 100%);
+	height: 100vh;
 }
 .power-setting-head{
 	flex-direction: column;

pages/powerSetting/powerSetting.vue

@@ -1,52 +1,53 @@
 <template>
-	<view class="power-setting-main">
-		<view class="flex-row power-setting-head">
-			<img class="head-img" :src="headimg" alt="">
-			<view class="head-name">{{nickname}}</view>
-			<text class="head-email">{{form.email}}</text>
-		</view>
-		<view class="setting-card" style="margin-bottom: 20rpx;">
-			<view class="setting-card-name">权限设置</view>
-			<view @click="selctFn(4)" class="setting-card-list flex-row">
-				<img src="https://qiniu.bms16.com/FgFEr3CUA43kd7yVCDcK4F7v9_zx" alt="">
-				<view class="setting-list-text flex-row flex-between">
-					<text>查看实时位置</text>
-					<img v-if="form.authority_list.indexOf(4) == -1" class="setting-list-arrow"
-						src="https://qiniu.bms16.com/FrA97op1dwM9XWH1ocqnF5FFlqoY" alt="">
-					<img v-else class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk"
-						alt="">
-				</view>
+		<view class="power-setting-main">
+			<navBar name="权限设置" bgColor="transparent"></navBar>
+			<view class="flex-row power-setting-head">
+				<img class="head-img" :src="headimg" alt="">
+				<view class="head-name">{{nickname}}</view>
+				<text class="head-email">{{form.email}}</text>
 			</view>
-			<view @click="selctFn(5)" class="setting-card-list flex-row">
-				<img src="https://qiniu.bms16.com/FmcZqGTnt64_v2xpgNbqS9Fa-fwy" alt="">
-				<view class="setting-list-text flex-row flex-between">
-					<text>使用换电</text>
-					<!-- <img class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk" alt=""> -->
-					<img v-if="form.authority_list.indexOf(5) == -1" class="setting-list-arrow"
-						src="https://qiniu.bms16.com/FrA97op1dwM9XWH1ocqnF5FFlqoY" alt="">
-					<img v-else class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk"
-						alt="">
+			<view class="setting-card" style="margin-bottom: 20rpx;">
+				<view class="setting-card-name">权限设置</view>
+				<view @click="selctFn(4)" class="setting-card-list flex-row">
+					<img src="https://qiniu.bms16.com/FgFEr3CUA43kd7yVCDcK4F7v9_zx" alt="">
+					<view class="setting-list-text flex-row flex-between">
+						<text>查看实时位置</text>
+						<img v-if="form.authority_list.indexOf(4) == -1" class="setting-list-arrow"
+							src="https://qiniu.bms16.com/FrA97op1dwM9XWH1ocqnF5FFlqoY" alt="">
+						<img v-else class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk"
+							alt="">
+					</view>
+				</view>
+				<view @click="selctFn(5)" class="setting-card-list flex-row">
+					<img src="https://qiniu.bms16.com/FmcZqGTnt64_v2xpgNbqS9Fa-fwy" alt="">
+					<view class="setting-list-text flex-row flex-between">
+						<text>使用换电</text>
+						<!-- <img class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk" alt=""> -->
+						<img v-if="form.authority_list.indexOf(5) == -1" class="setting-list-arrow"
+							src="https://qiniu.bms16.com/FrA97op1dwM9XWH1ocqnF5FFlqoY" alt="">
+						<img v-else class="setting-list-arrow" src="https://qiniu.bms16.com/FuA5w59wrvsisg3bGhe3hQ2dR3Bk"
+							alt="">
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="setting-card" style="margin-bottom: 32rpx;">
-			<view class="setting-card-name">默认设置</view>
-			<view class="setting-card-list flex-row">
-				<img src="https://qiniu.bms16.com/FsUxQz3DwHIj_vt3fY25Twmjfpek" alt="">
-				<view class="setting-list-text flex-row">远程开关锁</view>
-			</view>
-			<view class="setting-card-list flex-row">
-				<img src="https://qiniu.bms16.com/FuCNZSqsoMxn2ha-njRW3zC2ORTz" alt="">
-				<view class="setting-list-text flex-row">座桶锁</view>
-			</view>
-			<view class="setting-card-list flex-row">
-				<img src="https://qiniu.bms16.com/Fs7i3i_LBM7Zpxyj7Ad7_Kc_8z-J" alt="">
-				<view class="setting-list-text flex-row">感应解锁</view>
+			<view class="setting-card" style="margin-bottom: 32rpx;">
+				<view class="setting-card-name">默认设置</view>
+				<view class="setting-card-list flex-row">
+					<img src="https://qiniu.bms16.com/FsUxQz3DwHIj_vt3fY25Twmjfpek" alt="">
+					<view class="setting-list-text flex-row">远程开关锁</view>
+				</view>
+				<view class="setting-card-list flex-row">
+					<img src="https://qiniu.bms16.com/FuCNZSqsoMxn2ha-njRW3zC2ORTz" alt="">
+					<view class="setting-list-text flex-row">座桶锁</view>
+				</view>
+				<view class="setting-card-list flex-row">
+					<img src="https://qiniu.bms16.com/Fs7i3i_LBM7Zpxyj7Ad7_Kc_8z-J" alt="">
+					<view class="setting-list-text flex-row">感应解锁</view>
+				</view>
 			</view>
+			<view v-if="isSet" @tap="submit" class="check-btn add-btn">确认添加</view>
+			<view v-else @tap="delSubmit" class="check-btn del-btn">删除成员</view>
 		</view>
-		<view v-if="isSet" @tap="submit" class="check-btn add-btn">确认添加</view>
-		<view v-else @tap="delUserBtn" class="check-btn del-btn">删除成员</view>
-	</view>
 </template>
 
 <script>

pages/purchaseOrder/purchaseOrder.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container-view">
+		<navBar name="确认订单" left="0"></navBar>
 		<view class="select-time-view">
 			<view class="flex-row">选择取车时间</view>
 			<view @tap="tapSelectTime" class="flex-row align-center" style="margin-bottom:20rpx ;">

pages/service/service.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="service-main">
+		<navBar type="index"></navBar>
 		<!-- #ifdef MP-WEIXIN -->
 		<map @markertap='markertapFn' class="my_app" id="myMap" :longitude="myLocation.longitude"
 			:latitude="myLocation.latitude" :scale="18" show-location enable-3D show-compass enable-overlooking

pages/storeDetails/aaaa.vue

@@ -1,26 +0,0 @@
-<template>
-	<view class="aa">
-		23213123123
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.aa {
-		width: 100px;
-		height: 200rpx;
-		background-color: red;
-	}
-</style>

pages/storeDetails/storeDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container-view">
+		<navBar type="index"></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> -->
@@ -154,7 +155,6 @@
 	export default {
 		components: {
 			priceTool,
-			aaaa
 			// UseGuidance
 		},
 		data() {

pages/travelingTrack/travelingTrack.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container">
+	<view class="container-view">
+		<navBar :name="'最近骑行'" />
 		<!-- #ifdef MP-WEIXIN -->
 		<map class="my_app" id="myMap" :longitude="myLocation.longitude" :latitude="myLocation.latitude" :scale="scale"
 			:markers="markers" :enable-satellite="mapParams.enableSatellite" :enable-traffic="mapParams.enableTraffic"
@@ -128,7 +129,7 @@
 			} else {
 				this.getLocationAndSave();
 			}
-			this.init()
+			// this.init()
 		},
 		/**
 		 * 生命周期函数--监听页面显示

pages/userManagement/userManagement.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="user-card">
+		<navBar :name="'最近骑行'" />
 		<view class="flex-row align-center user-card-heard">
 			<img style="width: 48rpx;height: 48rpx;" src="https://qiniu.bms16.com/FieeNq75ybyjIzQO6fmNcdTlRsp5" alt="">
 			<text style="margin-left: 16rpx;">共享用户</text>