杂项修改

androidPrivacy.json

@@ -5,7 +5,7 @@
     "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。你可阅读<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，了解详细信息，如果你同意，请点击下面按钮开始接受我们的服务。。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
-    "hrefLoader" : "system|default",
+    "hrefLoader" : "system",
     "second" : {
         "title" : "确认提示",
         "message" : "进入应用前，你需先同意<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，否则将退出应用。",
@@ -16,7 +16,7 @@
         "backgroundColor" : "#ffffff",
         "borderRadius" : "5px",
         "title" : {
-            "color" : "#4e6ef2"
+            "color" : "#000"
         },
         "buttonAccept" : {
             "color" : "#333333"

common/config_gyq.js

@@ -80,6 +80,8 @@ var config = {
 	//	行驶轨迹
 	API_CAR_TRACK_INFO: api_web_url +'?r=flk/car/track-info',
 	
+	//修改密码
+	API_FLK_ACCOUNT_IMODIFY_PASSWD: api_web_url +'?r=flk/account/modify-passwd',
 	
 };
 module.exports = config;

common/request.js

@@ -56,6 +56,9 @@ async function getRequest(url, data) {
 	});
 	uni.hideLoading();
 	 res = res[1]
+	 if(!res.data.code){
+	 	throw Error(res.data);
+	 }
 	if (_checkTokenValid(res)) {
 		return res
 	}
@@ -84,7 +87,11 @@ async function postRequest(url, data ) {
 		method: 'POST',
 	});
 	res = res[1]
+	
 	wx.hideLoading();
+	if(!res.data.code){
+		throw Error(res.data);
+	}
 	if (res.data.code == 200) {
 		res.succeed = true
 		res.body = res.data

components/navBar/navBar.vue

@@ -1,25 +1,27 @@
 <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`}"  @tap="bindReturnView">
-					<img v-if="type!='active'" class="return-view"  :src="'https://qiniu.bms16.com/'+((type=='select'||type=='login')?'FjhcWGFGsI56rLZRu7_OnhGtpoUs':(type=='carDetail'?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_'))" />
-					
+		<view>
+			<view class="top-view flex-row" :style="'padding-top:'+statusBarHeight+'px;background:'+bgColor+';'">
+				<view class="navHei" :style="{'height':`calc(${navabarHeight}rpx)`,'width':'100%',}">
+					<view  :class="[type=='carDetail'?'car-detail-style':'','left']" @tap="bindReturnView">
+						<img v-if="type!='active'" class="return-view"
+							:src="'https://qiniu.bms16.com/'+((type=='select'||type=='login')?'FjhcWGFGsI56rLZRu7_OnhGtpoUs':(type=='carDetail'?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_'))" />
 					</view>
-				<text class="top-text">{{name}}</text>
+					<text class="top-text">{{name}}</text>
+				</view>
 			</view>
+			<view :class="(bgColor!='#FFF'||type==('active'||'noBottom'))?'':'view-height'"
+				:style="{'height':`calc(${statusBarHeight}px + ${navabarHeight}rpx)`}"></view>
 		</view>
-		<view  :class="(bgColor!='#FFF'||type==('active'||'noBottom'))?'':'view-height'" :style="'height:'+( navabarHeight + statusBarHeight )+'rpx;'"></view>
-		</view>
-		
+
 	</view>
 </template>
 
@@ -28,22 +30,22 @@
 		props: {
 			name: {
 				type: String,
-				default:''
+				default: ''
 			},
-			type:{
-				type:String,
-				default:'my'
+			type: {
+				type: String,
+				default: 'my'
 			},
-			bgColor:{
-				type:String,
-				default:'#FFF'
+			bgColor: {
+				type: String,
+				default: 'rgba(255,255,255,0)'
 			},
-			left:{
-				type:String,
-				default:'32'
+			left: {
+				type: String,
+				default: '32'
 			}
 		},
-		data () {
+		data() {
 			return {
 				statusBarHeight: 0,
 				navabarHeight: 0,
@@ -55,21 +57,23 @@
 		methods: {
 			_getCustomBar() {
 				const sysinfo = uni.getSystemInfoSync()
-				let GAP = 8
-				// #ifdef MP-ALIPAY
-				GAP = 0
-				// #endif
-				// #ifdef APP-PLUS
+				// let GAP = 8
+				// // #ifdef MP-ALIPAY
+				// GAP = 0
+				// // #endif
+				// // #ifdef APP-PLUS
+
+				// // #endif
+				// // #ifdef MP-WEIXIN
+				// const clientRect = uni.getMenuButtonBoundingClientRect()
+				// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+				// this.navabarHeight = navabarHeight
+				// // #endif
+
 				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,
@@ -80,25 +84,39 @@
 </script>
 
 <style scoped>
+	.navHei{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+	}
+	.left{
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		left: 0;
+	}
 	.top-view {
 		background: #ffffff;
 		width: 100%;
-		/* height: 170rpx; */
 		position: fixed;
 		z-index: 10;
-		align-items: baseline;
+		left: 0;
+		top: 0;
+		align-items: center;
+		padding: 0 26rpx;
+		text-align: center;
 	}
-	
+
 	.return-view {
 		width: 40rpx;
 		height: 40rpx;
 		/* margin-top: 24rpx; */
-/* 		margin-left: 32rpx; */
+		/* 		margin-left: 32rpx; */
 	}
-	
+
 	.top-text {
 		color: #060809;
-		margin-left: 230rpx;
 		font-size: 36rpx;
 		font-weight: 600;
 		line-height: 36rpx;
@@ -106,14 +124,16 @@
 		font-style: normal;
 		font-family: PingFangSC, PingFang SC;
 	}
-	.view-height{
+
+	.view-height {
 		/* border-bottom:2rpx solid #060809 ; */
-		margin-bottom: 32rpx;
+		/* margin-bottom: 32rpx; */
 	}
-	.car-detail-style{
+
+	.car-detail-style {
 		width: 56rpx;
 		height: 56rpx;
-		background: rgba(0,0,0,0.4);
+		background: rgba(0, 0, 0, 0.4);
 		border-radius: 16rpx 0rpx 16rpx 0rpx;
 		padding-left: 6rpx;
 	}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "弗兰克",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.4",
-    "versionCode" : 134,
+    "versionName" : "1.3.5",
+    "versionCode" : 135,
     "transformPx" : false,
     "loadnativePlugins" : false,
     "sassImplementationName" : "node-sass",
@@ -25,7 +25,8 @@
             "Geolocation" : {},
             "Maps" : {},
             "Barcode" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "OAuth" : {}
         },
         "distribute" : {
             "android" : {
@@ -71,8 +72,21 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
-                "maps" : {},
-                "oauth" : {},
+                "maps" : {
+                    "google" : {
+                        "APIKey_ios" : "AIzaSyAyfZx9Stm7rx5KbOGH5e1mgT-84EWvb7Q",
+                        "APIKey_android" : "AIzaSyAyfZx9Stm7rx5KbOGH5e1mgT-84EWvb7Q"
+                    }
+                },
+                "oauth" : {
+                    "google" : {
+                        "clientid" : "1"
+                    },
+                    "facebook" : {
+                        "appid" : "",
+                        "client_token" : ""
+                    }
+                },
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
@@ -132,7 +146,8 @@
         // "appid" : "wx56681a7f2fe324ed",//名师傅出行
         "setting" : {
             "urlCheck" : false,
-            "minified" : true
+            "minified" : true,
+            "es6" : true
         },
         "usingComponents" : true,
         "plugins" : {},

pages/activation/activation.vue

@@ -1,55 +1,60 @@
 <template>
-	<view class="container-view">
-		<view class="return-info">
-			<view class="h5">车辆信息</view>
-
-			<view v-if="overdueMoney" class="return-top  flex-row flex-between">
-				<view style="align-items: baseline;" class="flex-row">逾期费用：
-					<allPrice :amount="(overdueMoney/100)" />
+	<view class="">
+		<navBar name="我的订单" left="0"></navBar>
+		<view class="container-view">
+			<view class="return-info">
+				<view class="h5">车辆信息</view>
+		
+				<view v-if="overdueMoney" class="return-top  flex-row flex-between">
+					<view style="align-items: baseline;" class="flex-row">逾期费用：
+						<allPrice :amount="(overdueMoney/100)" />
+					</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>车辆编号：{{car_sn}}</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>车辆名称：{{carInfoData.car_name}}</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>车型：{{carInfoData.model_name}}</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>续航：{{carInfoData.endurance}}m</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>重量：{{carInfoData.weight}}kg</view>
+				</view>
+				<view class="return-top  flex-row ">
+					<view>照片：</view>
+					<image class="img" :src="carInfoData.model_images" mode="aspectFill"></image>
 				</view>
 			</view>
-
-			<view class="return-top  flex-row flex-between">
-				<view>车辆编号：{{car_sn}}</view>
-			</view>
-			<view class="return-top  flex-row flex-between">
-				<view>车辆名称：{{carInfoData.car_name}}</view>
-			</view>
-			<view class="return-top  flex-row flex-between">
-				<view>车型：{{carInfoData.model_name}}</view>
-			</view>
-			<view class="return-top  flex-row flex-between">
-				<view>续航：{{carInfoData.endurance}}m</view>
-			</view>
-			<view class="return-top  flex-row flex-between">
-				<view>重量：{{carInfoData.weight}}kg</view>
-			</view>
-			<view class="return-top  flex-row ">
-				<view>照片：</view>
-				<image class="img" :src="carInfoData.model_images" mode="aspectFill"></image>
-			</view>
-		</view>
-		<view v-if="shopInfo.shop_name" class="return-info">
-			<view class="h5">门店信息</view>
-			<view class="return-top  flex-row flex-between">
-				<view>门店名称：{{shopInfo.shop_name}}</view>
+			<view v-if="shopInfo.shop_name" class="return-info">
+				<view class="h5">门店信息</view>
+				<view class="return-top  flex-row flex-between">
+					<view>门店名称：{{shopInfo.shop_name}}</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>门店地址：{{shopInfo.address}}</view>
+				</view>
 			</view>
-			<view class="return-top  flex-row flex-between">
-				<view>门店地址：{{shopInfo.address}}</view>
+			<view class="pictures-info">
+				<view>车辆照片</view>
+				<!-- <view>这里是关于激活车辆照片的文案描述，这里是关于激活车辆照片的文案描述</view> -->
+				<uploaders :max="Number(shopList.flk_hire_car_img_num)" :car_info="car_imgs"
+					@update-car-images="handleCarImagesUpdate"></uploaders>
+				<view v-if="isReturnCar" @tap="submitReturn" class="pictures-btn">归还车辆</view>
+				<view v-else @tap="submitEnabled" class="pictures-btn">激活车辆</view>
 			</view>
+		
+			<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
+				:isShowToBuy="isShowToBuy" />
 		</view>
-		<view class="pictures-info">
-			<view>车辆照片</view>
-			<!-- <view>这里是关于激活车辆照片的文案描述，这里是关于激活车辆照片的文案描述</view> -->
-			<uploaders :max="shopList.flk_hire_car_img_num" :car_info="car_imgs"
-				@update-car-images="handleCarImagesUpdate"></uploaders>
-			<view v-if="isReturnCar" @tap="submitReturn" class="pictures-btn">归还车辆</view>
-			<view v-else @tap="submitEnabled" class="pictures-btn">激活车辆</view>
-		</view>
-
-		<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
-			:isShowToBuy="isShowToBuy" />
+		
 	</view>
+	
+
 </template>
 
 <script>
@@ -233,7 +238,8 @@
 
 			submitEnabled() {
 				const me = this
-				const _image_list = this.car_imgs.map(item => item.img_url)
+				console.log(this.car_imgs)
+				const _image_list = this.car_imgs.map(item => item.url)
 				if (_image_list.length < 1) return common.simpleToast('请上传车辆照片')
 				const pData = {
 					car_sn: this.car_sn,

pages/batteryRecord/batteryRecord.vue

@@ -1,6 +1,7 @@
 <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"
@@ -89,6 +90,12 @@
 </script>
 
 <style scoped lang="scss">
+	.car-model-text{
+		width: 260rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 	.batteryList {
 		width: 698rpx;
 		background: #FFFFFF;

pages/cabinetDetail/cabinetDetail.vue

@@ -321,14 +321,13 @@ import progressView from '@/component/progressView/progressView';
 					})
 				} else {
 					common.simpleToast(resp.data.msg)
-					setTimeout(() => {
-						uni.switchTab({
-							url: '/pages/index/index'
-						});
-					}, 1500)
+					// setTimeout(() => {
+					// 	uni.switchTab({
+					// 		url: '/pages/index/index'
+					// 	});
+					// }, 1500)
 				}
 			},
-
 			refreshCabinet() {
 				this.loadCabinetDetail()
 			},

pages/carList/carList.vue

@@ -1,6 +1,7 @@
 <template>
+	<view>
+	<navBar name="请选择设备" type="select"/>
 	<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>
@@ -24,6 +25,7 @@
         @confirm="unbindSubmit"
       />
 	</view>
+</view>
 </template>
 
 <script>
@@ -174,6 +176,10 @@
     font-weight: 600;
     font-size: 48rpx;
     color: #828DA2;
+	width: 500rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .car-name-i{
     color: #060809;

pages/index/components/unleasedPages/unleasedPages.vue

@@ -80,8 +80,10 @@
 		  watch: {
 		    model_list(newVal) {
 		      console.log("子组件 props 更新:", newVal);
-			  this.moder_info=newVal[0]
-			  this.model_id=newVal[0].model_id
+			  if(newVal[0]){
+				  this.moder_info=newVal[0]
+				  this.model_id=newVal[0].model_id
+			  }
 		    }
 		  },
 		methods: {

pages/index/index.css

@@ -24,6 +24,16 @@
 	font-weight: 600;
 	font-size: 40rpx;
 	color: #060809;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.car-name-view .text{
+	width: 200rpx;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: block;
 }
 .quantity{
 	font-family: DIN, DIN;

pages/index/index.vue

@@ -2,10 +2,16 @@
 	<view>
 		<block v-if="isLogin && car_info.car_sn">
 			<view class="container-view"> 
-			<navBar type="index" />
+			<!-- #ifdef MP-WEIXIN -->
+			<view :style="{height: `${statusBarHeight + 30}px`}"></view>
+			<!-- #endif -->
+			<!-- #ifdef APP -->
+			<view :style="{height: `${statusBarHeight}px`}"></view>
+			<!-- #endif -->
+			<!-- <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>
+						<text class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
 						<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
 							style="width: 14rpx;height: 14rpx;" alt="">
 					</view>
@@ -161,6 +167,7 @@
 	export default {
 		data() {
 			return {
+				statusBarHeight:0,
 				newsList: {},
 				img_list: [],
 				isLogin: false,
@@ -200,7 +207,7 @@
 			this.loadModelList()
 			const user_token = storage.getUserToken()
 			if (!user_token) {
-				this.loadIsLogin()
+				// this.loadIsLogin()
 				return
 			}
 		},
@@ -358,7 +365,6 @@
 				http.postApi(config.API_RECOMMEND_CAR_MODEL_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
 						const list = resp.data.data
-						console.log('哈哈哈啊哈')
 						console.log(resp.data.data)
 						const img_list = resp.data.data.map(item => item.image)
 						me.setData({

pages/loginRegister/changePassword.vue

@@ -1,26 +1,31 @@
 <template>
-    <view class="changePassword-page">
+	<view class="">
 		<navBar name="修改密码"></navBar>
-        <ZxInput
-            v-model="form.old_passwd"
-            :placeholder="$t('请输入旧密码')"
-            isPassword
-        />
-        <ZxInput
-            v-model="form.new_passwd"
-            :placeholder="$t('请输入新密码')"
-            isPassword
-        />
-        <ZxInput
-            v-model="form.second_passwd"
-            :placeholder="$t('请再次输入新密码')"
-            isPassword
-        />
-   
-        <view :class="['zx-form-btn', isSubmit && 'is-submit']" style="margin-top: 64rpx;" @tap="changePassword">
-            {{ $t('确认修改') }}
-        </view>
-    </view>
+		<view class="changePassword-page">
+			
+		    <ZxInput
+		        v-model="form.old_passwd"
+		        :placeholder="$t('请输入旧密码')"
+		        isPassword
+		    />
+		    <ZxInput
+		        v-model="form.new_passwd"
+		        :placeholder="$t('请输入新密码')"
+		        isPassword
+		    />
+		    <ZxInput
+		        v-model="form.second_passwd"
+		        :placeholder="$t('请再次输入新密码')"
+		        isPassword
+		    />
+		   
+		    <view :class="['zx-form-btn', isSubmit && 'is-submit']" style="margin-top: 64rpx;" @tap="changePassword">
+		        {{ $t('确认修改') }}
+		    </view>
+		</view>
+		
+	</view>
+
 </template>
 
 
@@ -54,7 +59,7 @@ export default {
 				title:this.$t('是否确认修改密码？')
 			})
 			if(res[1].confirm){
-				let {data} = await http.postApi(config.API_FLK_CABINET_RESET_PASSWORD,this.form)
+				let {data} = await http.postApi(config.API_FLK_ACCOUNT_IMODIFY_PASSWD,this.form)
 				if(data.code == 200){
 					common.simpleToast(this.$t('修改成功'))
 					setTimeout(()=>{
@@ -81,5 +86,6 @@ export default {
     min-height: 100vh;
     width: 100%;
     background: #F1F3F4;
+	margin-top: 20rpx;
 }
 </style>

pages/loginRegister/forgetPassword.vue

@@ -10,8 +10,9 @@
         </view>
         <NoticeDialog
             :title="$t('重置密码邮件已发送')"
-            :btnText="$t('我知道了')"
+            :btnText="$t('去登录')"
             type="forgetPassword"
+			@close='close'
             :text="noticeText"
             :email="email"
             v-model="isSendSucceed"
@@ -43,6 +44,11 @@ export default {
         }
     },
     methods: {
+		close(){
+			uni.navigateBack({
+				delta:1
+			})
+		},
         resetHandle() {
             if (!emailRegex.test(this.email)) {
                 uni.showToast({ title: this.$t('请输入有效的邮箱地址'), icon: 'none' })

pages/loginRegister/login.vue

@@ -50,7 +50,6 @@
       </view>
     </view>
   </template>
-  
   <script>
   import { QINIU_URL, emailRegex } from '@/common/constant'
   import ZxInput from './components/ZxInput.vue'
@@ -214,7 +213,6 @@
             .forget {
                 display: flex;
                 align-items: center;
-  
                 &::after {
                     content: "";
                     width: 28rpx;

pages/loginRegister/register.vue

@@ -29,8 +29,9 @@
         </view>
         <NoticeDialog
             :title="$t('注册邮件已发送')"
-            :btnText="$t('我知道了')"
+            :btnText="$t('去登录')"
             type="register"
+			@close='close'
             :email="form.email"
             :text="$t(`我们向 ${this.form.email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`)"
             v-model="isSendSucceed"
@@ -67,6 +68,11 @@ export default {
         }
     },
     methods: {
+		close(){
+			uni.navigateBack({
+				delta:1
+			})
+		},
         handleAgreementLink(id) {
             uni.navigateTo({
                 url: `/pages/contract/contract?contract_id=${id}`

pages/my/my.vue

@@ -6,7 +6,6 @@
 		<!-- #ifdef APP -->
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
-		
 		<view  class="user-switch-row">
 			<view  @click="routerLink({ url: '/pages/message/index' })" class="news">
 				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>

pages/my/set.vue

@@ -11,7 +11,7 @@
         >
           <view class="title">{{ item.title }}</view>
           <view :class="['text-right', item.hideArrow && 'hide-arrow']">
-            <view v-if="item.textProp == 'registrationTime'"> {{ formatTimestamp(userInfo.ctime) }}</view>
+            <view v-if="item.textProp == 'registrationTime' && userInfo.ctime"> {{ formatTimestamp(userInfo.ctime) }}</view>
             <input class="inp" @blur="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
             <!-- <view v-if="item.textProp == 'registrationTime'"" class="title">{{ userInfo[item.textProp] }}1</view> -->
             <block v-else>

pages/order/order.css

@@ -15,6 +15,12 @@
 	font-size: 40rpx;
 	color: #060809;
 }
+.car-model-text{
+	width: 260rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
 .package-type-list{
 	font-family: PingFangSC, PingFang SC;
 	font-weight: 500;
@@ -57,6 +63,10 @@
 	color: #2A3A5A;
 	font-size: 36rpx;
 	font-weight: bold;
+	width: 460rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 
 .card-border {

pages/order/order.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container-view">
-		<navBar name="我的订单" left="0"></navBar>>
+		<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.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="container-view">
-		
 		<view class="time-info">
 			<navBar bgColor="transparent" left="0"></navBar>
 			<view>
@@ -358,7 +357,7 @@
 				this.bindOrderInfo()
 			}
 		},
-
+		
 		onUnload: function() {},
 
 		computed: {},

pages/service/components/cabinetList/cabinetList.vue

@@ -6,9 +6,9 @@
 				<view class="cabinet-distance">{{item.distance}}m</view>
 			</view>
 			<view class="battery-list-view">
-				<view class="battery-view" v-for="(items, index) in item.tag_info" :key="index">
+				<view class="battery-view" v-for="(items, index) in item.tag_code" :key="index">
 					<text class="battery-voltage">{{items.main_tag_name}}</text>
-					<text class="battery-num">{{'*'+num}}</text>
+					<text class="battery-num">{{'*'+items.num}}</text>
 				</view>
 			</view>
 			<view  class="flex-row flex-end">

pages/service/service.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="service-main">
-		<navBar type="index"></navBar>
+		<!-- <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
@@ -132,6 +132,10 @@
 		 */
 		onLoad: function(options) {
 			this.loadModelType();
+			
+		},
+		
+		onShow() {
 			this.locationFn()
 		},