Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into gyq_test

component/carPlan/carPlan.css

@@ -66,11 +66,10 @@
 	justify-content: center;
 	background: #F3F8FF;
 	border-radius: 16rpx;
-	min-width: 158rpx;
-	padding: 0 20rpx;
 	border: 4rpx solid transparent;
 	margin-right: 18rpx;
 	box-sizing: border-box;
+	min-width: 158rpx;
 }
 .car-plan-list-i{
 	height: 158rpx;
@@ -78,11 +77,10 @@
 	justify-content: center;
 	background: #FFF;
 	border-radius: 16rpx;
-	min-width: 158rpx;
-	padding: 0 20rpx;
 	border: 4rpx solid #0A59F7;
 	margin-right: 18rpx;
 	box-sizing: border-box;
+	min-width: 158rpx;
 }
 .car-plan-unit{
 	font-weight: 400;
@@ -93,11 +91,13 @@
 	font-weight: 600;
 	font-size: 32rpx;
 	color: #060809;
+
 }
 .car-plan-unit-i{
 	font-weight: 400;
 	font-size: 32rpx;
 	color: #0A59F7;
+
 }
 .car-plan-price-i{
 	font-weight: 600;

component/carPlan/carPlan.vue

@@ -46,7 +46,7 @@
 						<view :class="(type == item.hire_duration_unit ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{item.hire_price/100}}</text></view>
 					</view>
 					
-					<view v-if="params.sell_price != 0"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" >
+					<view v-if="params.sell_price != 0"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" style="padding:  0rpx 20rpx; min-width: auto; "  >
 						<view :class="(type == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">购买</view>
 						<view :class="(type == 100 ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{params.sell_price/100}}</text></view>
 					</view>

component/comPopup/Notice.vue

@@ -5,8 +5,8 @@
             <view class="title">{{ title }}</view>
             <view class="tips">
                 <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>
+                <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>
@@ -55,7 +55,9 @@ export default {
     },
     methods: {
         close() {
-            this.$emit('input', false)
+            uni.navigateTo({
+            	url: '/pages/loginRegister/login',
+            })
         }
     }
 }

pages/batteryPackage/batteryPackage.css

@@ -37,8 +37,9 @@
 	
 }
 .package-num{
-	font-size: 46rpx;
+	font-size: 40rpx;
 	margin-right: 2rpx;
+	margin-left: 6rpx;
 }
 .align-center{
 	align-items: center;

pages/batteryPackage/batteryPackage.vue

@@ -8,13 +8,13 @@
 		</view>
 		<view v-for="(item,index) of list" @click="selectItem(item)" :key="index" class="package-list-view" :class="{'active' : item.package_code == form.package_code }">
 			<view class="package-num-view flex-row"><text class="package-num">{{item.total_day || 0}}</text> 天 <text
-					class="package-num">{{item.total_num || 0}}</text> 次</view>
+					class="package-num">{{(item.total_num || 0)=== 0 ? '不限次数' : item.total_num + '次'}}</text></view>
 			<view class="flex-row flex-between align-baseline">
 				<view v-if="item.tag.child_tag_name" class="apply-battery">适用电池：<text class="apply-battery-num">{{ !!Number(item.tag.main_tag_name) ? item.tag.main_tag_name + "V" : item.tag.main_tag_name}}{{!!Number(item.tag.child_tag_name) ? item.tag.child_tag_name + "Ah" : item.tag.child_tag_name }}</text></view>
 				
 				<view v-else class="apply-battery">适用电池：<text class="apply-battery-num">{{ item.tag.main_tag_name }}</text></view>
 				<view class="flex-row align-baseline">
-					<text class="package-price">${{item.viewShowMoney || '0.00'}}</text>
+					<!-- <text class="package-price">${{item.viewShowMoney || '0.00'}}</text> -->
 					<text class="symbol-style">
 						<text>$</text>
 						<text style="font-size: 48rpx;">{{item.viewMoney || '0.00'}}</text>
@@ -101,8 +101,9 @@ import { fenToYuan, msg } from '../../utils/util.js';
 						url:`/pages/order/order`
 					})
 				}else{
-					msg(res.data.msg)
+					msg(data.msg)
 				}
+				this.isShowToBuy = false
 			},
 			selectItem(item){
 				this.form.package_code = item.package_code

pages/carFunctionSet/more.vue

@@ -31,14 +31,14 @@
 			</view>
 		</view>
 		<view class="tips">{{ $t('长按拖动可调整顺序，可增减固定导航栏内容') }}</view>
-		<view class="un-bind-btn" @tap="toUnbind">{{ $t('解除绑定') }}</view>
+		<view v-if="showUnBind" 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)==$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('more')">{{$t("确定")}}</view>
+					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
 				</view>
 			</view>
 		</view>
@@ -77,6 +77,8 @@
 				isActiveEdit: false,
 				activeTabs: [],
 				toBeSelectTabs: [],
+				car_info :{},
+				showUnBind:true
 			}
 		},
 		computed: {
@@ -87,6 +89,10 @@
 				return this.isActiveEdit && this.realActiveTabs.length < this.MAX_TAB_LEN
 			}
 		},
+		onLoad(){
+			this.car_info =  uni.getStorageSync('car_info') || {};
+			this.showUnBind = !!this.car_info.sold_time
+		},
 		created() {
 			this.initializeTabs()
 		},

pages/dashboard/dashboard.vue

@@ -15,11 +15,18 @@
 		</view>
 
 		<view class="battery_life_progress">
-			<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}" class="is_progress"></view>
-			<view class="text ">
-				<text>续航</text>
-				<text> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text>
+			<view>
+				<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}"
+					class="is_progress"></view>
+				<view class="text">
+					<text>续航</text>
+					<text style="margin-left: 20rpx;"> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text>
+				</view>
+			</view>
+			<view style="font-weight: 600;font-size: 36rpx;">
+				{{ ((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%' }}
 			</view>
+
 		</view>
 
 		<view class="info-container">
@@ -51,10 +58,10 @@
 		},
 		created() {
 			let car_sn = uni.getStorageSync('car_info').car_sn
-			if(car_sn){
+			if (car_sn) {
 				this._initInfoList()
 			}
-			
+
 		},
 		methods: {
 			async _initInfoList() {
@@ -177,13 +184,20 @@
 		}
 
 		.battery_life_progress {
+
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
 			width: 100%;
 			margin-bottom: 40rpx;
+			padding-right: 40rpx;
 			background: #FFFFFF;
 			border-radius: 40rpx;
 			overflow: hidden;
 			position: relative;
 			height: 92rpx;
+
 			.is_progress {
 				min-width: 30%;
 				height: 100%;
@@ -194,7 +208,8 @@
 				left: 0;
 				top: 0;
 			}
-			.text{
+
+			.text {
 				position: relative;
 				z-index: 1;
 				font-size: 32rpx;
@@ -203,7 +218,8 @@
 				align-items: center;
 				height: 92rpx;
 				padding-left: 10rpx;
-				text{
+
+				text {
 					line-height: 1;
 				}
 			}
@@ -213,6 +229,7 @@
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
+
 			.info-wrap {
 				width: 336rpx;
 				margin-bottom: 14rpx;

pages/index/index.vue

@@ -19,9 +19,9 @@
 							<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
 								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 @click="routerLink('/pages/message/index?isSys=0')" class="news">
+							<view v-if="newsList.device_count > 0" class="num">
+								{{ newsList.device_count}}
 							</view>
 							<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
 								style="width: 48rpx;height: 48rpx;" mode=""></image>
@@ -564,6 +564,7 @@
 			line-height: 1;
 			background-color: #FA2918;
 			border-radius: 50%;
+			z-index: 99;
 		}
 	}
 </style>

pages/loginRegister/changePassword.vue

@@ -62,10 +62,10 @@ export default {
 			if(res[1].confirm){
 				let {data} = await http.postApi(config.API_FLK_ACCOUNT_IMODIFY_PASSWD,this.form)
 				if(data.code == 200){
-					common.simpleToast(this.$t('修改成功'))
+					common.simpleToast(this.$t('修改成功,请重新登录'))
 					storage.removeUserToken()
 					uni.removeStorageSync('USER_INFO_DATA')
-					uni.redirectTo({
+					uni.reLaunch({
 						url:'/pages/loginRegister/login'
 					})
 				}else{

pages/loginRegister/forgetPassword.vue

@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         noticeText({ email }) {
-            return `我们向 <span style="color: #0A59F7;">${email}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。`
+            return `我们已向 <span style="color: #0A59F7;">${email}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。`
         }
     },
     methods: {

pages/message/index.vue

@@ -1,25 +1,31 @@
 <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">
-                    <view>{{ $t('设备消息') }}</view>
-                    <view v-if="item.unread > 0" class="bage">{{ item.unread }}</view>
-                </view>
-                <view class="time">{{item.message_date}}</view>
-            </view>
-            <view class="device-info">
-                <image class="img" :src="item.image" />
-                <view class="info">
-                    <view class="name">{{ item.car_name }}</view>
-                    <view class="status">{{item.message_overview}}</view>
-                </view>
-            </view>
-        </view>
+		<navBar :name=" options.isSys === '0' ? '设备信息' : '我的消息'"></navBar>
+        <view v-if="isSys==='0' && deviceList.length>0">
+			<view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"  @tap="toDeviceMsgPage(item)">
+			    <view class="row">
+			        <view class="title">
+			            <view>{{ $t('设备消息') }}</view>
+			            <view v-if="item.unread > 0" class="bage">{{ item.unread }}</view>
+			        </view>
+			        <view class="time">{{item.message_date}}</view>
+			    </view>
+			    <view class="device-info">
+			        <image class="img" :src="item.image" />
+			        <view class="info">
+			            <view class="name">{{ item.car_name }}</view>
+			            <view v-if="item.message_overview!==''" class="status">{{item.message_overview}}</view>
+			        </view>
+			    </view>
+			</view>
+		</view>
+		<view v-if="isSys==='0' && deviceList.length === 0" style="display: flex;align-items: center;justify-content: center;height: 80vh;">
+			您还没有设备消息
+		</view>
         
-        <view style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
+        <view v-if="isSys==='1' && sysMsgList.length > 0 " style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
             <view class="title">{{ $t('系统消息') }}</view>
+			
             <view class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
                 <view class="msg">
                     {{ item.title }}
@@ -29,6 +35,10 @@
                 <view class="dtl">{{ item.overview }}</view>
             </view>
         </view>
+		
+		<view v-if="isSys==='1' && sysMsgList.length === 0 " style="display: flex;align-items: center;justify-content: center;height: 80vh;">
+			您还没有系统消息
+		</view>
     </view>
 </template>
 
@@ -43,9 +53,13 @@ export default {
             value: 10,
             sysMsgList: [],
             deviceList: [],
-            deviceInfo: {}
+            deviceInfo: {},
+			isSys:'1'
         }
     },
+	onLoad(options){
+		this.isSys = options.isSys
+	},
     created() {
         this.querySysMsgList()
         this.queryDeviceMsg()

pages/my/my.vue

@@ -7,8 +7,8 @@
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
 		<view  class="user-switch-row">
-			<view  @click="routerLink({ url: '/pages/message/index',isLogin:1 })" class="news">
-				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
+			<view  @click="routerLink({ url: '/pages/message/index?isSys=1',isLogin:1 })" class="news">
+				<view v-if="newsList.plate_count> 0" class="num">{{newsList.plate_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
 					 />
 			</view>