liuwei 1 week ago
parent
commit
dad004331b

+ 2 - 2
component/customTabbar/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="" style="border: 2rpx solid red;">
-		<view style="height: 148rpx;border: 2rpx solid red;"></view>
+	<view class="" >
+		<view style="height: 148rpx;"></view>
 		<view class="tabbar-wrap"  >
 			<view class="tabbar">
 				<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">

+ 1 - 1
components/navBar/navBar.vue

@@ -10,7 +10,7 @@
 		<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">
+				<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'?'FjhcWGFGsI56rLZRu7_OnhGtpoUs':(type=='carDetail'||type=='login'?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_'))" />
 					
 					</view>

+ 6 - 4
pages/carFunctionSet/more.vue

@@ -24,7 +24,7 @@
 			<view class="tab-item-container is-to-be-select">
 				<view v-for="tab in toBeSelectTabs" :key="tab.name" class="tab-item" @longpress="toggleEdit"
 					@tap="addItemTab(tab)">
-					<image v-if="showAddIcon" :src="icons.add" class="right-icon" />
+					<image @tap.stop="addIcon(tab)" v-if="showAddIcon" :src="icons.add" class="right-icon" />
 					<image :src="tab.iconUrl" class="icon" />
 					<view class="name">{{ $t(tab.name) }}</view>
 				</view>
@@ -34,8 +34,8 @@
 		<view class="un-bind-btn" @tap="toUnbind">{{ $t('解除绑定') }}</view>
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
-				<view class="popup-title">{{$t(popText)}}</view>
-				<view class="popup-content">{{$t("您确认")+$t(popText)}}</view>
+				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
+				<view class="popup-content">{{$t("您确认")+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
 					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
@@ -129,11 +129,13 @@
 				// 	this.tapOpenControl(tab)
 				// }
 				this.changClick(tab)
+				
+			},
+			addIcon(tab){
 				if(!this.isActiveEdit) return
 				const index = this.toBeSelectTabs.findIndex(t => t.name === tab.name)
 				if (index !== -1) {
 					const removedTab = this.toBeSelectTabs.splice(index, 1)[0]
-					console.log(removedTab,index,this.realActiveTabs.length);
 					this.activeTabs.push(removedTab)
 					if (this.realActiveTabs.length == this.MAX_TAB_LEN) {
 						this.isActiveEdit = false

+ 2 - 2
pages/index/components/control/control.vue

@@ -12,8 +12,8 @@
 		</scroll-view>
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
-				<view class="popup-title">{{$t(popText)}}</view>
-				<view class="popup-content">{{$t("您确认")+$t(popText)}}</view>
+				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
+				<view class="popup-content">{{$t("您确认")+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
 					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>