Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

main.js

@@ -76,7 +76,10 @@ Vue.mixin({
 								list2[i].style = str+";"
 							}
 						}else{
+							if(edit){
 								list2[i].style=edit
+							}
+								
 						}
 					
 				}

pages/article/articleDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar title="文章详情" :title-size="elderStatus ? 40 : 35"></u-navbar>
+		<u-navbar title="文章详情"></u-navbar>
 		<view class="main">
 			<view class="new-title oldTextjp" oldstyle="font-size: 22px;">
 				{{newsDetail.title}}

pages/article/newsNotice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;height:1135px;" >
-		<u-navbar title="新闻公告" :title-size="elderStatus ? 40 : 35"></u-navbar>
+		<u-navbar title="新闻公告"></u-navbar>
 		
 		<view class="options">
 			<view class="options-item">

pages/index/index.vue

@@ -94,9 +94,9 @@
 			</view>
 			<view class="text">
 				<view class="station-title">
-					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
-					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
-					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;" v-if="stationData.type == '1,2'" style="background-color: #00BAC8;">快/慢</text>
+					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #9D9FFF;" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
+					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00B962;" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
+					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00BAC8;" v-if="stationData.type == '1,2'" style="background-color: #00BAC8;">快/慢</text>
 					<text class="title-right oldTextjp" oldstyle="font-size: 20px;">{{stationData.name}}</text>
 				</view>
 

pages/record/index.vue

@@ -3,20 +3,20 @@
 		<u-navbar title="充电订单"></u-navbar>
 		
 		<view class="record">
-			<view class="recordTime" @click="show = true">
+			<view class="recordTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
 				<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
 				<p>{{month}}月</p>
 				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="carNone" v-if="chargeList.length == 0">
 				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p>暂无充电订单</p>
+				<p class="oldTextjp" oldstyle="font-size: 20px;">暂无充电订单</p>
 			</view>
 			<view class="recordList" v-if="chargeList.length > 0">
 				<view class="recordList-item" v-for="(item,index) in chargeList" :key="item.id" @click="gotoUrl('pages/record/details?id=' + item.id)">
 					<view class="recordList-name">
-						<h4>{{item.stationName}}/{{item.deviceNo}}</h4>
-						<span class="state1" :style="{color : textColor(item)}">{{item.statusText}}</span>
+						<h4 class="oldTextjp" oldstyle="font-size: 20px;">{{item.stationName}}/{{item.deviceNo}}</h4>
+						<span class="state1" :style="{color : textColor(item),fontSize: textFontSize()}">{{item.statusText}}</span>
 					</view>
 					<view class="recordList-row">
 						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
@@ -26,7 +26,7 @@
 					</view>
 					<view class="recordList-row">
 						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
-						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
+						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
 					</view>
 				</view>
 			</view>
@@ -56,6 +56,7 @@
 				chargeList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
+				elderStatus: false,
 			}
 		},
 		onReady() {
@@ -73,6 +74,14 @@
 			this.endDate = year + '-' + monthN + '-' + day;
 					
 			this.getChargeList();
+			
+			if (this.carhelp.getPersonInfo()) {
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
 		},
 		onReachBottom() {
 			if (this.chargeList.length < this.recordsTotal) {			
@@ -97,6 +106,11 @@
 						break;
 				}
 			},
+			textFontSize() {
+				if(this.elderStatus) {
+						return '20px'
+				}
+			},
 			confirmTime(params) {
 				if(params.month.slice(0,1) == '0') {
 					this.month = params.month.slice(1);

pages/user/setting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="设置" :title-size="checked ? 40 : 35"></u-navbar>
+		<u-navbar title="设置"></u-navbar>
 		<u-cell-group>
 			<u-cell-item title="修改手机号" :title-style="checked ? titleStyle : {}" v-model="userPhone" @click="gotoUrl('pages/user/phone')"
 				:value-style="checked ? {fontSize:'16px'} : {}">