bug修改

common/constant.js

@@ -18,8 +18,8 @@ export const LEASE_TYPE_ARR = [
 	{ label: '日租', value: LEASE_TYPE.day, type: 'day', unit: '天' ,sort:3},
 	{ label: '月租', value: LEASE_TYPE.month, type: 'month', unit: '月' ,sort:5},
 	{ label: '年租', value: LEASE_TYPE.year, type: 'year', unit: '年' ,sort:7},
-	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '时',sort:2 },
-	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分',sort:1 },
+	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '小时',sort:2 },
+	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分钟',sort:1 },
 	{ label: '周租', value: LEASE_TYPE.week, type: 'week', unit: '周' ,sort:4},
 	{ label: '季租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季',sort:6 },
 	{ label: '购买', value: LEASE_TYPE.buy, type: 'buy', unit: '买' ,sort:8}

component/carPlan/carPlan.vue

@@ -2,7 +2,9 @@
 	<view  class="show-more">
 		<view class="more-info">
 			<view class="flex-row model-title">
-				<view style="margin-right: 24rpx;"><img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="params.image" alt=""></view>
+				<view style="margin-right: 24rpx;">
+					<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="image" mode="aspectFill"></image>
+					</view>
 				<view class="car-model-detail flex-row">
 					<!-- <priceTool :price="58" :font_size="40"/> -->
 					<allPrice :amount="((priceAll || 0)/100)"/>
@@ -15,17 +17,11 @@
 						<text>已选择</text>
 						<text>{{leaseUnitsResult}}</text>
 						<text style="margin-left: 12rpx;">时长 {{count}} 
-							<text v-if="type==1">日</text>
-							<text v-if="type==2">月</text>
-							<text v-if="type==3">年</text>
-							<text v-if="type==4">时</text>
-							<text v-if="type==5">分</text>
-							<text v-if="type==6">周</text>
-							<text v-if="type==7">季</text>
+							<text>{{leaseUnits}}</text>
 						</text>
 						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
 					</view>
-					<view class="car-model-tip">现车 随时可到店提车</view>
+					<view style="margin-top: 10rpx;" class="car-model-tip">现车 随时可到店提车</view>
 				</view>
 				<view class="close-img">
 					<image style="width: 24rpx;height: 24rpx;" @tap="closeShowMore"
@@ -74,7 +70,7 @@
 							 共 
 							<view style="font-weight: 600;margin: 0 10rpx;">{{count}}</view>
 							<!-- <view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,isSelectStatus)}}</view> -->
-							<text>{{leaseUnitsResult}}</text>
+							<text>{{leaseUnits}}</text>
 						</view>
 						<!-- <view class="count-btn fbtn" @tap.stop.prevent="bindMinus">-</view> -->
 						<view @tap.stop.prevent="bindMinus"><img class="count-btn fbtn"
@@ -118,6 +114,7 @@
 	export default {
 		data() {
 			return {
+				image:'',
 				orderInfo:{},
 				isShowToBuy:false,
 				priceAll:0,
@@ -131,6 +128,10 @@
 			leaseUnitsResult() {
 				const result = LEASE_TYPE_ARR.find(v => v.value == this.type);
       			return result ? result.label : '';
+			},
+			leaseUnits(){
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.type);
+				return result ? result.unit : '';
 			}
 		},
 		/**
@@ -151,6 +152,8 @@
 			PayTypeModel,
 		},
 		mounted() {
+			this.params.image =  this.params.model_images[0]
+			this.image = this.params.image ? this.params.image : this.params?.model_images[0] ? this.params.model_images[0] : "" 
 			this.type = this.selectType
 			this.tapSelectType({hire_duration_unit:this.selectType,hire_price:this.params.price*100})
 		},

component/scanCabBtn/scanBtn.css

@@ -451,15 +451,15 @@
 }
 
 .refund-btn{
-	width: 334rpx;
+	width:680rpx;
 	height: 80rpx;
-	background: #E5F1FF;
+	margin: auto;
+	background: #060809;
 	text-align: center;
 	border-radius: 40rpx;
 	font-weight: 500;
 	font-size: 32rpx;
-	color: #0074FF;
+	color: #fff;
 	text-align: center;
 	line-height: 80rpx;
-	margin-right: 18rpx;
 }

component/scanCabBtn/scanBtn.vue

@@ -264,7 +264,7 @@
 					this.scan_dev_id = cabinet_dev_id
 					this.loadNowCabinetDetail(cabinet_dev_id)
 				} else {
-					//common.simpleToast("未找到相应的机柜")
+					common.simpleToast("未找到相应的机柜")
 				}
 				
 			},

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "FRANCO MORINI",
-    "appid" : "__UNI__E67DD80",
+    "appid" : "__UNI__111A022",
     "description" : "",
     "versionName" : "1.3.7",
     "versionCode" : 137,

pages/cabinetDetail/cabinetDetail.vue

@@ -94,8 +94,8 @@
 										:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
 										{{item.box_sn}}
 									</view>
-									<view v-if="item.tag_info != 'undefined' && item.tag_info && item.tag_info.length !== 0" class="tag_type_n">
-										{{item.tag_info[0].main_tag_name ? (item.tag_info[0].main_tag_name) : ''}}{{item.tag_info[0].child_tag_name ? '/' + item.tag_info[0].child_tag_name : ''}}
+									<view v-if="item.tag_info" class="tag_type_n">
+										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
 									</view>
 								</view>
 	
@@ -118,8 +118,8 @@
 								<view class="namber-view flex-row flex-between">
 									<view :class="(item.is_full_soc==1)?'namber namber-b':'namber namber-o'">{{item.box_sn}}
 									</view>
-									<view v-if="item.tag_info && item.tag_info.length !== 0" class="tag_type">
-										{{item.tag_info[0].main_tag_name ? (item.tag_info[0].main_tag_name) : ''}}{{item.tag_info[0].child_tag_name ? '/' + item.tag_info[0].child_tag_name : ''}}
+									<view v-if="item.tag_info" class="tag_type">
+										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
 									</view>
 								</view>
 								<view class="status-img-view flex-row">
@@ -137,9 +137,10 @@
 						<!-- </block> -->
 					</view>
 				</view>
+				<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
+					@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
 			</view>
-			<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
-				@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
+		
 		</view>
 </template>
 

pages/index/components/unleasedPages/unleasedPages.vue

@@ -46,15 +46,14 @@
 		</view>
 		<view v-else>
 			<view style="margin: 0 50rpx 0rpx;height: 420rpx;">
-				<u-swiper  :list="['https://qiniu.bms16.com/FszIhdxNKutDOxBcfcWP_GWmjyFV']" :autoplay="false" mode="none"
+				<u-swiper  :list="['https://qiniu.bms16.com/Fqf6jeV9PQGeHXkXMHOi_jlPsTme']" :autoplay="false" mode="none"
 					:height="420" bgColor="transparent" class="custom-swiper">
 				</u-swiper>
 			</view>
-		
 			<view class="car-model-step">
 				<view style="padding-top: 80rpx;margin-bottom: 60rpx;">
-					<!-- <view class="recommend-car-name w_100 text-center">{{moder_info.model_name}}</view>
-					<view class="recommend-car-tip w_100 text-center line2">{{moder_info.title||'续航开新路 路遥见实力'}}</view> -->
+					<view class="recommend-car-name w_100 text-center">全新车型，即将发布！</view>
+					<view class="recommend-car-tip w_100 text-center line2">更智能、更高效，全新车型即将亮相，敬请期待！</view>
 					<!-- <view class="car-speed-view">
 						<view class="car-speed">72 <text class="company">km</text></view>
 						<text>全速续航</text>
@@ -64,12 +63,12 @@
 						<text>极速可达</text>
 					</view> -->
 				</view>
-				<!-- <view class="flex-row" @tap="navCarDetail" style="justify-content: center;">
+				<view class="flex-row" @tap="navCarDetail" style="justify-content: center;">
 					<view class="more-btn flex-row">
 						<view class="more-btn-text">了解更多</view>
 						<img class="more-btn-img" src="https://qiniu.bms16.com/Fi2Lg800Mc1MhCnvHT1DkvOEdJB1" alt="">
 					</view>
-				</view> -->
+				</view>
 				<view class="flex-row flex-around">
 					<view @tap="navCarDetail" class="lease-btn">租赁设备</view>
 					<view class="binding-btn">绑定设备</view>

pages/index/index.vue

@@ -1,18 +1,18 @@
 <template>
 	<view>
 		<!-- #ifdef APP -->
-		<u-no-network  zIndex='9999' @retry='retry'></u-no-network>
+		<u-no-network zIndex='9999' @retry='retry'></u-no-network>
 		<!-- #endif -->
 		<view v-if="isConnected">
 			<block v-if="isLogin && car_info.car_sn">
-				<view class="container-view"> 
-				<!-- #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="container-view">
+					<!-- #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 class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
@@ -20,7 +20,9 @@
 								style="width: 14rpx;height: 14rpx;" alt="">
 						</view>
 						<view @click="routerLink('/pages/message/index')" class="news">
-							<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
+							<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">
+								{{newsList.plate_count + newsList.device_count}}
+							</view>
 							<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
 								style="width: 48rpx;height: 48rpx;" mode=""></image>
 						</view>
@@ -45,11 +47,12 @@
 						<view class="quantity-view flex-row">
 							<text class="quantity flex-row">{{car_info.soc}} <text
 									style="font-size: 28rpx;font-weight: 500;">%</text></text>
-							<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false"
-								:percent="car_info.soc"></u-line-progress>
+							<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-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view> 
+								<view style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text
+										style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view>
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
@@ -57,18 +60,19 @@
 							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 v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}}
+								{{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>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle"/>
-			
-			
+					<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="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
 								<view class="flex-row flex-between card-top-title">
@@ -77,12 +81,14 @@
 											src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
 										<text class="margin_l_8">{{isTrackOrAll?'最近骑行':'总里程'}}</text>
 									</view>
-									<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img style="width: 24rpx;height: 20rpx;"
+									<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img
+											style="width: 24rpx;height: 20rpx;"
 											src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
 								</view>
-								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
+								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text>
+								</view>
 							</view>
-			
+
 							<view class="card-bg">
 								<view class="flex-row card-top-title">
 									<img style="width: 36rpx;height: 36rpx;"
@@ -96,7 +102,8 @@
 								<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text
 										class="font_24">{{$t("次")}}</text></view>
 								<view v-if="car_info.package_type == 3" class=" card-top-text">
-									{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text>
+									{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text
+										class="font_24">{{$t("次")}}</text>
 								</view>
 							</view>
 						</view>
@@ -107,9 +114,11 @@
 									src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
 							<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
 								<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
-								<view class="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}</view>
+								<view class="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}
+								</view>
 							</view>
-							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
+								alt="">
 						</view>
 						<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
 							class="flex-row config-car-view">
@@ -119,7 +128,8 @@
 								<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
 								<view class="flex-row tip-text-config">{{car_info.share_num + $t("个家庭账号")}}</view>
 							</view>
-							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
+								alt="">
 						</view>
 						<view @click="srcFn(`/pages/deviceInfo/deviceInfo`)" class="flex-row config-car-view">
 							<view class="margin_r_20"><img class="icon_style_64"
@@ -128,7 +138,8 @@
 								<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
 								<view class="flex-row tip-text-config">{{$t("软件版本") + (car_info.firmware||'')}}</view>
 							</view>
-							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
+								alt="">
 						</view>
 					</view>
 					<view style="height: 264rpx;"></view>
@@ -138,9 +149,11 @@
 				<UnleasedPages :model_list="model_list" :img_list="img_list" />
 			</block>
 			<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
-			<CustomTabbar @changCar='changCar' curt-tab="home"/>
-			<AndroidUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
-			<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
+			<CustomTabbar @changCar='changCar' curt-tab="home" />
+			<AndroidUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission"
+				v-if="isShowPermission && (platform === 'android')" />
+			<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission"
+				v-else-if="isShowPermission && (platform === 'ios')" />
 		</view>
 	</view>
 </template>
@@ -170,9 +183,9 @@
 	export default {
 		data() {
 			return {
-				isModel:false,
-				isConnected:false,
-				statusBarHeight:0,
+				isModel: false,
+				isConnected: false,
+				statusBarHeight: 0,
 				newsList: {},
 				img_list: [],
 				isLogin: false,
@@ -188,11 +201,11 @@
 						activity_time: 0
 					}
 				},
-				platform:'android',//手机型号
-				isShowPermission:false,//是否打开权限弹窗
-				statusBarHeight:0,
-				isBluethConnect:false, //当前是否蓝牙连接或者配对
-				isOpenAllPermission:false,//所有蓝牙配对所需权限是否已开启
+				platform: 'android', //手机型号
+				isShowPermission: false, //是否打开权限弹窗
+				statusBarHeight: 0,
+				isBluethConnect: false, //当前是否蓝牙连接或者配对
+				isOpenAllPermission: false, //所有蓝牙配对所需权限是否已开启
 			};
 		},
 		computed: {},
@@ -205,7 +218,7 @@
 			AndroidUnlockAuth,
 			IosUnlockAuth
 		},
-		
+
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
@@ -225,17 +238,17 @@
 			});
 			uni.onNetworkStatusChange((res) => {
 				_this.isConnected = res.isConnected
-				if(res.isConnected){
+				if (res.isConnected) {
 					_this.init()
 				}
 			});
 			// #endif
-			
+
 			// #ifndef APP
 			this.isConnected = true
-				_this.init()
+			_this.init()
 			// #endif
-			
+
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -245,7 +258,7 @@
 			uni.getNetworkType({
 				success: (res) => {
 					if (res.networkType != 'none') {
-						// this.init()
+						this.init()
 					}
 				}
 			});
@@ -253,9 +266,9 @@
 			// #ifndef APP
 			this.init()
 			// #endif
-		
+
 		},
-		
+
 		// 分享给好友
 		onShareAppMessage: function(res) { //发送给朋友
 			return {
@@ -264,34 +277,36 @@
 			}
 		},
 		methods: {
-			init(){
+			init() {
 				this.loadModelList()
 				this.contrilList = getFunctionTag().activeTag
 				const user_token = storage.getUserToken()
 				this.car_info = uni.getStorageSync('car_info') || {};
-				this.isBluethConnect=app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this.car_sn].connected && app.globalData.nearLockCheck
-				if(!user_token) return
+				this.isBluethConnect = app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this
+					.car_sn].connected && app.globalData.nearLockCheck
+				if (!user_token) return
 				this.newsNumFn()
 				this.isLogin = true
 				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
-				})
-				
+				// #ifdef APP
+					//蓝牙配对所需权限  运行小程序需要隐藏
+					const permissionArr = permision.requestAndroidPermissions(this.platform)
+					console.log(permissionArr, 'permissionArr');
+					this.setData({
+						authStepList: permissionArr
+					})
+					permissionArr.map(item => {
+						if (!item.state) this.isOpenAllPermission = true
+					})
+				// #endif
+
 				// if (!this.car_info.car_sn) {
-					
+
 				// } else {
 				// 	this.loadCarDetail(this.car_info.car_sn)
 				// }
 			},
-			retry(){
+			retry() {
 				console.log('115555')
 			},
 			async newsNumFn() {
@@ -341,32 +356,36 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				console.log(!this.isOpenAllPermission,this.isBluethConnect,'this.isBluethConnect');
-				if(this.isBluethConnect){
-					uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
-				}else{
-					if(!this.isOpenAllPermission){
+				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{
+						uni.navigateTo({
+							url: '/pages/bluetoothUnlock/bluetoothPair'
+						})
+					} else {
 						this.setData({
-							isShowPermission:true,
-						})	
+							isShowPermission: true,
+						})
 					}
 				}
 
 			},
-			closePermission(){
+			closePermission() {
 				this.setData({
-					isShowPermission:false
+					isShowPermission: false
 				})
 			},
 			showInduction() {
 				this.isHideInduction = true
 			},
 			loadModelList() {
-				if(this.isModel){
-					 return
+				if (this.isModel) {
+					return
 				}
 				this.isModel = true
 				const me = this
@@ -450,13 +469,13 @@
 						let itemCar = {}
 						for (let i = 0; i < list.length; i++) {
 							let item = list[i];
-							if(item.car_sn == this.car_info.car_sn){
+							if (item.car_sn == this.car_info.car_sn) {
 								isCar = true
 								itemCar = item
 							}
 						}
-						if(!isCar){
-							
+						if (!isCar) {
+
 							if (list.length > 0) {
 								uni.removeStorageSync('car_info')
 								me.setData({
@@ -464,11 +483,11 @@
 									car_sn: list[0].car_sn || '',
 								})
 								me.loadCarDetail(list[0].car_sn)
-							}else{
+							} else {
 								uni.removeStorageSync('car_info')
 								this.car_info = {}
 							}
-						}else{
+						} else {
 							me.loadCarDetail(itemCar.car_sn)
 						}
 					} else {
@@ -488,9 +507,9 @@
 							car_info: resp.data.data,
 						})
 						uni.setStorageSync('car_info', this.car_info);
-						console.log(this.car_info,'this.car_info------------------');
+						console.log(this.car_info, 'this.car_info------------------');
 						//判断逾期
-						if(!resp.data.data.sold_time) return 
+						if (!resp.data.data.sold_time) return
 						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
 						if (time > 0) {
 							this.isOverdueShow = true

pages/orderStatus/orderStatus.vue

@@ -208,9 +208,6 @@
 				<view>逾期后及时续租不收取逾期费，逾期时长将从续租订单的用车时间中抵扣</view>
 			</view>
 		</view>
-		
-		
-		
 		<view class="inset-bottom"></view>
 		<view class="payment-info flex-row flex-between">
 			<view>

pages/service/components/cabinetList/cabinetList.vue

@@ -6,8 +6,8 @@
 				<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_code" :key="index">
-					<text class="battery-voltage">{{items.main_tag_name}}</text>
+				<view style="margin-bottom: 10rpx;" class="battery-view" v-for="(items, index) in item.tag_code" :key="index">
+					<text class="battery-voltage">{{items.main_tag_name ? items.main_tag_name : ''}}{{items.child_tag_name ? '/' + items.child_tag_name : ''}}</text>
 					<text class="battery-num">{{'*'+items.num}}</text>
 				</view>
 			</view>