Merge branch 'lw_test' into gyq_test

component/comPopup/Notice.vue

@@ -4,7 +4,9 @@
             <image :src="QINIU_URL + 'Fqb-i2uJWlZOg8EvUXHr_1qhlndf'" class="icon"/>
             <view class="title">{{ title }}</view>
             <view class="tips">
-                <rich-text :nodes="text"></rich-text>
+                <text v-if="type=='bluetoothPail'">{{text}}</text>
+                <text v-else-if="type=='register'">我们向 <span style="color: #0A59F7;">{{email}}</span> 注册邮件，请您登录邮箱点击链接完成注册。</text>
+                <text v-else-if="type=='forgetPassword'">我们向 <span style="color: #0A59F7;">{{email}}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。</text>
             </view>
             <view class="btn" @tap="close">{{ btnText }}</view>
         </view>
@@ -23,6 +25,14 @@ export default {
             type: String,
             default: ''
         },
+        type: {
+            type: String,
+            default: ''
+        },
+        email: {
+            type: String,
+            default: ''
+        },
         text: {
             type: String,
             default: ''

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)">

component/smartCalendar/index.css

@@ -120,7 +120,7 @@
 	color: #FFFFFF;
 	font-size: 32rpx;
 	text-align: center;
-	background-color: #0074FF;
+	background-color: #060809;
 	border-radius: 40rpx;
 	height: 80rpx;
 	line-height: 80rpx;

components/navBar/navBar.vue

@@ -10,8 +10,8 @@
 		<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 :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>
 				<text class="top-text">{{name}}</text>

locale/zh.json

@@ -85,5 +85,6 @@
 	"电池优化":"电池优化",
 	"位置权限":"位置权限",
 	"修改成功":"修改成功",
-	"请先链接蓝牙":"请先链接蓝牙"
+	"请先链接蓝牙":"请先链接蓝牙",
+	"注册邮件发送成功":"注册邮件发送成功"
 }

pages/bluetoothUnlock/bluetoothPair.vue

@@ -25,7 +25,7 @@
 		<view class="pair-btn" style="bottom: 140rpx;" @tap="otaUpgrade">OTA升级</view>
 		<view class="pair-btn" @tap="initiateBluetoothPairing">开始配对</view>
 		<CenterDialog confirmText="配对" ref="centerDialog" />
-		<Notice v-model="showNotice" title="感应解锁已开启" btnText="关闭" text='注意：请勿在手机蓝牙中忽略“电动车蓝牙02"设备，否则感应解锁功能将无法使用' />
+		<Notice v-model="showNotice" title="感应解锁已开启" btnText="关闭" type="bluetoothPail" text='注意：请勿在手机蓝牙中忽略“电动车蓝牙02"设备，否则感应解锁功能将无法使用' />
 	</view>
 </template>
 

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

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>

pages/loginRegister/components/ZxInput.vue

@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     showIcon() {
-      return this.isFocus && this.inputValue
+      return (this.isFocus && this.inputValue)||this.isPassword
     }
   },
   watch: {

pages/loginRegister/forgetPassword.vue

@@ -11,7 +11,9 @@
         <NoticeDialog
             :title="$t('重置密码邮件已发送')"
             :btnText="$t('我知道了')"
+            type="forgetPassword"
             :text="noticeText"
+            :email="email"
             v-model="isSendSucceed"
         />
     </view>

pages/loginRegister/login.vue

@@ -14,7 +14,7 @@
         <ZxInput
             v-model="form.passwd"
             :placeholder="$t('请输入密码')"
-            isPassword
+            :isPassword="form.passwd"
         />
         <view 
           :class="['agreement-row', checkShakeObj.agreemen && 'shake']" 
@@ -136,7 +136,7 @@
     .title-wrap {
         .title {
             font-family: PingFangSC, PingFang SC;
-            font-weight: 600;
+            font-weight: 800;
             font-size: 56rpx;
             color: #060809;
             line-height: 56rpx;

pages/loginRegister/register.vue

@@ -30,7 +30,9 @@
         <NoticeDialog
             :title="$t('注册邮件已发送')"
             :btnText="$t('我知道了')"
-            :text="noticeText"
+            type="register"
+            :email="form.email"
+            :text="$t(`我们向 ${this.form.email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`)"
             v-model="isSendSucceed"
         />
     </view>
@@ -59,9 +61,7 @@ export default {
         }
     },
     computed: {
-        noticeText({ form }) {
-            return `我们向 <span style="color: #0A59F7;">${form.email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`
-        },
+        
         isSubmt({ form }) {
             return form.email && form.passwd && form.second_passwd
         }
@@ -97,13 +97,14 @@ export default {
             }, res => {
                 const { msg: title } = res.body
                 if (res.succeed) {
-                    uni.showToast({ title, icon: 'none' })
+                    uni.showToast({ title:this.$t('注册邮件发送成功'), icon: 'none' })
                     this.isSendSucceed = true
                 } else {
                     uni.showToast({ title, icon: 'none' })
                 }
             })
-        }
+        },
+
     }
 }
 </script>