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

pages/article/articleDetails.vue

@@ -1,8 +1,8 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar title="文章详情"></u-navbar>
+		<u-navbar title="文章详情" :title-size="elderStatus ? 40 : 35"></u-navbar>
 		<view class="main">
-			<view class="new-title">
+			<view class="new-title oldTextjp" oldstyle="font-size: 22px;">
 				{{newsDetail.title}}
 			</view>
 			<view class="time">
@@ -26,11 +26,20 @@
 			return {
 				id: '',
 				newsDetail: '',
+				elderStatus: false,
+				myFontSize: 0,
 			}
 		},
 		onLoad(op) {
-			this.id =op.id;
+			if (this.carhelp.getPersonInfo()) {
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
 			
+			this.id =op.id;
 			this.getNewsInfoDetail();
 		},
 		methods: {
@@ -43,11 +52,19 @@
 				newsApi.newsInfoDetail(this.id).then((res) => {
 					uni.hideLoading()					
 					this.newsDetail = res.data;
+					
+					if(this.elderStatus) {
+						this.myFontSize=16;
+						this.newsDetail.content=this.newsDetail.content.replaceAll("font-size","font-size:"+this.myFontSize+"px;");
+					}
+					
+					
 					this.$nextTick(()=>{
 					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");
 					    for(var i=0;i<list.length;i++){
 					        list[i].style='width: 100%;height: 100%;'
 					    }
+							 
 					})
 				}).catch(error => {
 					uni.showToast({

pages/article/newsNotice.vue

@@ -1,10 +1,10 @@
 <template>
 	<view style="background-color: #fff;height:1135px;" >
-		<u-navbar title="新闻公告"></u-navbar>
+		<u-navbar title="新闻公告" :title-size="elderStatus ? 40 : 35"></u-navbar>
 		
 		<view class="options">
 			<view class="options-item">
-				<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
+				<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
 			</view>
 		</view>
 		
@@ -18,7 +18,7 @@
 		<view class="news" >
 			<view class="news-content" v-for="(item,index) in newsList" :key="item.id" @click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
 				<view class="content-text">
-					<view class="content-title">{{item.title}}</view>
+					<view class="content-title oldTextjp2" oldstyle="font-size: 18px;">{{item.title}}</view>
 					<view class="news-time">{{item.createTime ? item.createTime.slice(5,16) : ''}}</view>
 				</view>
 				<view class="content-img">
@@ -49,6 +49,7 @@
 				list: [ 
 					
 				],
+				elderStatus: false,
 			}
 		},
 		onReachBottom() {
@@ -57,6 +58,13 @@
 			}
 		},
 		onReady() {
+			if (this.carhelp.getPersonInfo()) {
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
 			this.getNewsList();
 			this.getBannerInfo("NEWS")
 		},

pages/index/index.vue

@@ -14,7 +14,7 @@
 				<view class="icon iconfont" style="background-color:#59d96e;">
 					&#xe61a;
 				</view>
-				<view class="text">
+				<view class="text oldTextjp2" oldstyle="font-size: 18px;">
 					扫码充电
 				</view>
 
@@ -23,7 +23,7 @@
 				<view class="icon iconfont" style="background-color:#4BD2C0;">
 					&#xe629;
 				</view>
-				<view class="text">
+				<view class="text oldTextjp2" oldstyle="font-size: 18px;">
 					快速充值
 				</view>
 
@@ -32,7 +32,7 @@
 				<view class="icon iconfont" style="background-color: #6FA5FF;">
 					&#xe625;
 				</view>
-				<view class="text">
+				<view class="text oldTextjp2" oldstyle="font-size: 18px;">
 					充电记录
 				</view>
 
@@ -41,7 +41,7 @@
 				<view class="icon iconfont" style="background-color: #9D9FFF;">
 					&#xe622;
 				</view>
-				<view class="text">
+				<view class="text oldTextjp2" oldstyle="font-size: 18px;">
 					附近站点
 				</view>
 
@@ -87,17 +87,16 @@
 			</view>
 			<view class="text">
 				<view class="station-title">
-					<text class="title-left" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
-					<text class="title-left" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
-					<text class="title-left" v-if="stationData.type == '1,2'"
-						style="background-color: #00BAC8;">快/慢</text>
-					<text class="title-right">{{stationData.name}}</text>
+					<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-right oldTextjp" oldstyle="font-size: 20px;">{{stationData.name}}</text>
 				</view>
 
 				<view class="station-price">
 					<view class="price-left">{{stationData.costPrice}}</view>
 					<view class="price-right">
-						起 元/度
+						元/度 起 
 					</view>
 				</view>
 
@@ -163,38 +162,6 @@
 				<img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
 			</view>
 		</view>
-		<!-- <view class="state2 state">
-	 		 <view class="state-text">
-	 		 	<view class="text-1" style="color: green">
-	 		 		充电中
-	 		 	</view>
-	 			<view class="text-2">
-	 				前方等待两位
-	 			</view>
-	 			<view class="text-3">
-	 				荆鹏软件园充电站/1号有序充电桩
-	 			</view>
-	 		 </view>
-	 	<view class="img-box">
-	 		<img src="static/img/充电中-缺省页.png">
-	 	</view>
-	 </view> -->
-		<!-- <view class="state3 state">
-	 		 <view class="state-text">
-	 		 	<view class="text-1" style="color: red;">
-	 		 		已充满
-	 		 	</view>
-	 			<view class="text-2" style="color: red;">
-	 				超出时间将收取占位费
-	 			</view>
-	 			<view class="text-3">
-	 				荆鹏软件园充电站/1号有序充电桩
-	 			</view>
-	 		 </view>
-	 	<view class="img-box">
-	 		<img src="static/img/已充满-缺省页.png">
-	 	</view>
-	 </view> -->
 
 		<!-- 充值活动 -->
 		<view class=" top-up" v-if="activityList.length > 0">
@@ -222,7 +189,7 @@
 			<view class="news-content" v-for="(item,index) in newsList" :key="item.id"
 				@click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
 				<view class="content-text">
-					<view class="content-title">{{item.title}}</view>
+					<view class="content-title oldTextjp2" oldstyle="font-size: 18px;">{{item.title}}</view>
 					<view class="news-time">{{item.createTime?item.createTime.slice(5,10):''}}</view>
 				</view>
 				<view class="content-img">
@@ -233,7 +200,7 @@
 		<view class="bottom" v-if="newsList.length == recordsTotal && newsList.length != 0">
 			<view class="bot">
 				<view class="bot-line"></view>
-				<view class="bot-text">已经到底了</view>
+				<view class="bot-text oldTextjp2" oldstyle="font-size: 14px;">已经到底了</view>
 				<view class="bot-line"></view>
 			</view>
 		</view>

pages/user/coupon/couponDetails.vue

@@ -7,7 +7,7 @@
 				<view class="voucher" v-if="userCoupon.classify == '2'">折扣卷</view>
 				<view class="content">
 					<view class="content-left">
-						<view class="text">{{userCoupon.accessChannel}}</view>
+						<view class="text">{{chargingCoupon.couponName}}</view>
 						<view class="useful-life">
 							有效期至{{userCoupon.endDate ? userCoupon.endDate.slice(0,10) : ''}}
 						</view>		

pages/user/setting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="设置" :title-bold="checked" :title-size="checked ? 38 : 30"></u-navbar>
+		<u-navbar title="设置" :title-size="checked ? 40 : 35"></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'} : {}">