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

.env.test.js

@@ -12,11 +12,11 @@ const UNI_APP = {
 	//小鹏管家appid
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 	//zkx的测试openId
-	openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
+	// openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
 	// openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	// openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
 	//zq的测试openId
-	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",
+	openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU"
 }  
 
 module.exports = UNI_APP;

pages/article/articleDetails.vue

@@ -31,12 +31,10 @@
 			}
 		},
 		onLoad(op) {
-			if (this.carhelp.getPersonInfo()) {
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
 			}
 			
 			this.id =op.id;

pages/article/newsNotice.vue

@@ -58,13 +58,12 @@
 			}
 		},
 		onReady() {
-			if (this.carhelp.getPersonInfo()) {
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
 			}
+				
 			this.getNewsList();
 			this.getBannerInfo("NEWS")
 		},

pages/index/index.vue

@@ -85,7 +85,7 @@
 
 
 
-		<view style="height:50px"></view>
+		<view style="height:100px"></view>
 		<!-- 站点 -->
 		<view class="station" v-if="message == 'getLocation:ok' && chargeList.length == 0"
 			@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
@@ -662,7 +662,7 @@
 		text-align: center;
 		background-color: #fff;
 		position: absolute;
-		top: 160px;
+		top: 210px;
 		left: 0;
 		right: 0;
 		margin: auto;

pages/login/welcome.vue

@@ -14,7 +14,7 @@
 				<view slot="error"></view>
 			</u-image>
 			
-			<u-image   v-if="!imgmode"  :height="imgH"  ref="imgw2"  mode="aspectFill">
+			<u-image   v-if="!imgmode"  :height="imgH"  ref="imgw"  mode="aspectFill">
 				<view slot="loading"></view>
 				<view slot="error"></view>
 			</u-image>

pages/record/details.vue

@@ -64,12 +64,11 @@
 				this.id = op.id;
 				this.getchargingDetail();
 			}
-			if (this.carhelp.getPersonInfo()) {
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
 			}
 		},
 		methods: {

pages/record/index.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="carNone" v-if="chargeList.length == 0">
 				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp" oldstyle="font-size: 20px;">暂无充电订单</p>
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充电订单</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)">
@@ -75,12 +75,10 @@
 					
 			this.getChargeList();
 			
-			if (this.carhelp.getPersonInfo()) {
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
 			}
 		},
 		onReachBottom() {

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -223,7 +223,7 @@
 						content: "请登录后使用扫码充电",
 						showCancel: false,
 						success: () => {
-							this.onShowRole = true
+			 				this.onShowRole = true
 							uni.navigateTo({
 								url: "/pages/login/login?jpcode=jp_team51_charge_id:A_" + id
 							})
@@ -298,15 +298,19 @@
 			display: flex;
 			justify-content: space-between;
 			padding: 14px 16px 0 0;
-			height: 48px;
-			line-height: 48px;
+			@include themeify{
+ 				height: themed('font-size18');
+				line-height: themed('font-size18');
+			}
+/*			height: 48px;
+			line-height: 48px;*/
 			background-color: #fff;
 			border-bottom: 1px solid rgba(242, 242, 242, 100);
 
 			.detail-name {
 				margin-left: 16px;
 				@include themeify{
-					line-height:themed('font-size2'); 
+					font-size:themed('font-size2'); 
 					height: themed('font-size5');
 					line-height: themed('font-size6');
 				}
@@ -322,7 +326,7 @@
 				line-height: 23px;*/
 				color: rgba(51, 51, 51, 100);
 				@include themeify{
-					line-height:themed('font-size2'); 
+					font-size:themed('font-size2'); 
 					height: themed('font-size6');
 					line-height: themed('font-size6');
 				}
@@ -342,7 +346,7 @@
 				justify-content: space-between;
 				@include themeify{
  					height: themed('font-size19');
-					line-height: themed('font-size199');
+					line-height: themed('font-size19');
 				}
 /*				height: 48px;
 				line-height: 48px;*/

pages/user/about.vue

@@ -29,7 +29,15 @@
 				},
 				titleStyle:{
 					"font-size":'28rpx'
-				}
+				},
+				elderStatus: false,
+			}
+		},
+		onReady() {
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
 			}
 		},
 		methods: {

pages/user/car/carAdd.vue

@@ -2,18 +2,25 @@
 	<view>
 		<u-navbar title="车辆管理">
 			<view class="slot-wrap">
-				<span class="navBtn" @click="showDelete">删除车辆</span>
+				<span class="navBtn oldTextjp2" oldstyle="font-size: 16px;" @click="showDelete">删除车辆</span>
 			</view>
 		</u-navbar>
 		<view>
-			<u-modal v-model="show" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="content"></u-modal>
+			<u-modal v-model="show" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" 
+				:content="content" :confirm-text="confirmText"></u-modal>
 		</view>
 		<view class="carDet">
 			<u-form :model="form" ref="uForm">
 				<ucarkeyboard ref="uKeyboard" mode="car" @confirm="confirm" @cancel="cancel" v-show="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
-				<u-form-item label="车牌号码" label-width="150rpx"><u-input input-align="right" placeholder="请输入车牌号" v-model="form.carNum" @click="keyClick" /></u-form-item>
-				<u-form-item label="车辆类型" label-width="150rpx"><u-input input-align="right" v-model="carName" placeholder="请输入正确车牌号" disabled /></u-form-item>
-				<u-form-item label="设为默认车辆" label-width="180rpx"><u-switch slot="right" v-model="form.defaultFlag"></u-switch></u-form-item>
+				<u-form-item label="车牌号码" label-width="200rpx" :label-style="elderStatus ? {fontSize: '18px'} : {}">
+					<u-input input-align="right" placeholder="请输入车牌号" v-model="form.carNum" :custom-style="elderStatus ? {fontSize: '18px'} : {}" @click="keyClick" />
+				</u-form-item>
+				<u-form-item label="车辆类型" label-width="200rpx" :label-style="elderStatus ? {fontSize: '18px'} : {}">
+					<u-input input-align="right" v-model="carName" :custom-style="elderStatus ? {fontSize: '18px'} : {}" placeholder="请输入正确车牌号" disabled />
+				</u-form-item>
+				<u-form-item label="设为默认车辆" label-width="230rpx" :label-style="elderStatus ? {fontSize: '18px'} : {}">
+					<u-switch slot="right" v-model="form.defaultFlag"></u-switch>
+				</u-form-item>
 			</u-form>
 		</view>
 		<u-button class="login-btn" type="success" shape="circle" @click="keepCar">保存</u-button>
@@ -35,12 +42,14 @@
 				show: false,
 				title: '删除车辆',
 				content: '是否删除此车牌号?',
+				confirmText: '删除',
 				form: {
 					id: '',
 					carNum: '',
 					defaultFlag: true,
 				},
 				carList: [],
+				elderStatus: false,
 			}
 		},
 		onLoad(op) {
@@ -51,6 +60,12 @@
 		},
 		onReady() {
 			this.$refs.uKeyboard.changeCarInputMode();
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
 		},
 		methods: {
 			cancel() {

pages/user/car/index.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="车辆管理"></u-navbar>
 		<view class="carNone" v-if="carList.length == 0">
 			<img src="static/img/none2.svg" alt="">
-			<p>暂无绑定车辆</p>
+			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无绑定车辆</p>
 			<view class="carNone-btn" @click="addCar">
 				添加车牌
 			</view>
@@ -13,7 +13,7 @@
 				<span v-if="item.defaultFlag">默认</span>
 				<font>{{item.carNum}}</font>
 			</view>
-			<view class="car-btn" @click="addCar">添加车牌</view>
+			<view class="car-btn oldTextjp2" oldstyle="font-size: 18px;" @click="addCar">添加车牌</view>
 		</view>
 	</view>
 </template>

pages/user/coupon/myCoupon.vue

@@ -31,17 +31,11 @@
 				</view>
 				
 				<view class="limit">
-					<view class="limit-text" v-if="more==index&&readMoreStatus">
-							<view class="limit-text2">
+					<view class="limit-text">
+							<view :class="more==index&&readMoreStatus ? 'limit-text2' : 'limit-text1'">
 								<span>{{item.useScope}}</span>		
 							</view>
-							<text class="iconfont arrows" @click="readMore(index)">&#xe62c;</text>
-					</view>
-					<view class="limit-text" v-else>
-							<view class="limit-text1">
-								<span>{{item.useScope}}</span>
-							</view>
-							<text class="iconfont arrows" @click="readMore(index)">&#xe607;</text>
+							<text class="iconfont arrows" @click="readMore(index)">{{more==index&&readMoreStatus ? '&#xe607;' : '&#xe62c;'}}</text>
 					</view>
 					<view class="use-button" v-if="current == '0'" @click="toIndex">去使用</view>
 					<view class="have-used" v-if="current == '1'"><img src="../../../static/img/haveused.png" alt=""></view>
@@ -71,7 +65,8 @@
 				pageIndex: 1,
 				recordsTotal: 0,
 				readMoreStatus: false,
-				more: '',
+				more: -1,
+				moreShow: '',
 			}
 		},
 		onShow() {
@@ -94,8 +89,13 @@
 				})
 			},
 			readMore(index) {
-				this.more = index;
-				this.readMoreStatus = !this.readMoreStatus;
+				if(this.more != index && this.readMoreStatus) {
+					this.more = index;
+					this.readMoreStatus = true;
+				} else {
+					this.more = index;
+					this.readMoreStatus = !this.readMoreStatus;
+				}
 			},
 			getCouponList(bl) {
 				uni.showLoading({

pages/user/data.vue

@@ -10,10 +10,10 @@
 			</view>
 			<view class="data-input">
 				<u-form :model="form" ref="uForm" >
-					<u-form-item label-position="top" label="昵称"><u-input v-model="form.nickName" /></u-form-item>
+					<u-form-item label-position="top" label="昵称" :label-style="elderStatus ? {fontSize: '16px'} : {}"><u-input v-model="form.nickName" /></u-form-item>
 				</u-form>
 			</view>
-			<u-button class="login-btn" type="success" shape="circle" @click="submit">提交</u-button>
+			<u-button class="login-btn" type="success" shape="circle" @click="submit">保存</u-button>
 		</view>
 	</view>
 </template>
@@ -30,10 +30,17 @@
 					nickName: '',
 					headImg: '',
 				},
+				elderStatus: false,
 			}
 		},
 		onReady() {
 			this.getUserInfo();
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
 		},
 		methods: {
 			getUserInfo() {

pages/user/finance/balance.vue

@@ -42,16 +42,16 @@
 				<view class="balanceMain-list" v-if="accountList.length > 0">
 					<view class="balanceMain-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
 						<view class="title">
-							<font>{{item.payNameStr}}</font>
-							<p>{{item.createTime}}</p>
+							<font class="oldTextjp2" oldstyle="font-size: 18px;">{{item.payNameStr}}</font>
+							<p  class="oldTextjp2" oldstyle="font-size: 14px;">{{item.createTime}}</p>
 						</view>
-						<h4>{{item.amount}}元</h4>
+						<h4 class="oldTextjp2" oldstyle="font-size: 24px;">{{item.amount}}元</h4>
 					</view>
 				</view>
 			</view>
 			<view class="carNone" v-if="accountList.length == 0">
 				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp" oldstyle="font-size: 20px;">本月暂无充值记录</p>
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">本月暂无充值记录</p>
 			</view>
 		</view>	
 	</view>

pages/user/finance/rechargeDet.vue

@@ -6,14 +6,14 @@
 			<view class="payPrice">
 				<font>{{detail.payFee}}</font><span>元</span>
 			</view>
-			<p>充值金额(元)</p>
+			<p class="oldTextjp2" oldstyle="font-size: 16px;">充值金额(元)</p>
 		</view>
-		<view class="rechargeDet-main">
+		<view class="rechargeDet-main oldTextjp2" oldstyle="font-size: 18px;">
 			<view class="rechargeDet-list">
 				<p>充值订单</p><span>{{detail.outOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>交易单号</p><span>{{detail.transactionId}}</span>
+				<p>交易单号</p><span class="transactionClass">{{detail.transactionId}}</span>
 			</view>
 			<view class="rechargeDet-list">
 				<p>充值时间</p><span>{{detail.payTime}}</span>
@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<view class="rechargeDet-main">
-			<view class="rechargeDet-list">
+			<view class="rechargeDet-list oldTextjp2" oldstyle="font-size: 18px;">
 				<p>状态</p><span>{{detail.payStatusStr}}</span>
 			</view>
 		</view>
@@ -43,6 +43,7 @@
 			return {
 				id: '',
 				detail: {},
+				elderStatus: false,
 			}
 		},
 		onLoad(op) {
@@ -50,6 +51,12 @@
 				this.id = op.id
 				this.getAccountDetail();
 			}
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
 		},
 		methods: {
 			getAccountDetail() {
@@ -106,6 +113,13 @@
 			&:last-child{
 				border-bottom: none;
 			}
+			.transactionClass {
+				width: 70%;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				text-align: right;
+			}
 		}
 	}
 </style>

pages/user/finance/rechargeList.vue

@@ -8,12 +8,18 @@
 		</view>
 		<view class="carNone" v-if="accountList.length == 0">
 			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p class="oldTextjp" oldstyle="font-size: 20px;">暂无充值记录</p>
+			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充值记录</p>
 		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
-				<view class="rechargeList-row"><span>{{item.payName == "give" ? '赠送金额' : '充值金额'}}</span><h4>{{item.amount}}元</h4></view>
-				<view class="rechargeList-row"><p>{{item.payNameStr}}</p><p>{{item.createTime}}</p></view>
+				<view class="rechargeList-row">
+					<span class="oldTextjp" oldstyle="font-size: 18px;">{{item.payName == "give" ? '赠送金额' : '充值金额'}}</span>
+					<h4 class="oldTextjp2" oldstyle="font-size: 20px;">{{item.amount}}元</h4>
+				</view>
+				<view class="rechargeList-row">
+					<p class="oldTextjp2" oldstyle="font-size: 14px;">{{item.payNameStr}}</p>
+					<p class="oldTextjp2" oldstyle="font-size: 14px;">{{item.createTime}}</p>
+				</view>
 			</view>
 		</view>
 	</view>

pages/user/freeInstallment.vue

@@ -1,5 +1,5 @@
 <template>
-	<view >
+	<view class="all">
 		<u-navbar title="免费安桩"></u-navbar>
 	    <view class="main">
 			<view class="text">
@@ -80,6 +80,7 @@
 	export default{
 		data() {
 				return {
+					elderMode:false,
 					typeList: [
 									{
 										name: '停车场',
@@ -115,6 +116,35 @@
 				};
 				
 			},
+			methods:{
+				theme(type) {
+					
+				  if(type == 'elder')	
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'32rpx',
+						"font-weight":'bold!important'
+					 	};
+					 this.titleStyle = data;
+				  }
+				  else
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'28rpx'
+					 	};
+					 this.titleStyle = data;
+				  } 
+				}
+			},
+			onReady(){
+				this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+				if(this.elderMode)
+					this.theme('elder')
+				else
+					this.theme('standard')
+			}
 	}
 </script>
 
@@ -125,11 +155,21 @@
 </style>
 
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
 	.main{
+		
 	   padding: 36px 28px 85px;
 	   .text{
 		   color: rgba(255, 255, 255, 100);
-		   font-size: 18px;
+		   @include themeify{
+		   	font-size: themed('font-size4');
+		   }
+/*		   font-size: 18px;*/
 		   text-align: justify;
 
 	   }
@@ -139,16 +179,23 @@
 		   padding: 24px;
 		   border-radius: 16px;
 		   .title{
-			   height: 18px;
+			   /*height: 18px;*/
 			   color: rgba(16, 16, 16, 100);
-			   font-size: 18px;
+			   @include themeify{
+			   	font-size: themed('font-size4');
+			   	height: themed('font-size4');			   
+				}
+/*			   font-size: 18px;*/
 			   font-weight: 600;
 		   }
 		   .content{
 			   margin-top: 12px;
 			   p{
 				   font-weight: 550;
-				   font-size: 14px
+				   @include themeify{
+				   	font-size: themed('font-size2');
+    				}
+/*				   font-size: 14px*/
 			   }
 			   .suited-text{
 				   margin-top: 10px;
@@ -173,10 +220,15 @@
 			  margin-left: 10px;
 		  }
 		  p{
-		  				  height: 18px;
-						  line-height: 18px;
+			  @include themeify{
+			  	font-size: themed('font-size4');
+			  	line-height: themed('font-size4');
+			  	height: themed('font-size4');
+  				}
+/*		  				  height: 18px;
+						  line-height: 18px;*/
 		  				  color: rgba(16, 16, 16, 100);
-		  				  font-size: 18px;
+/*		  				  font-size: 18px;*/
 		  }
 		  
 		  .tel,.place,.type,.want{
@@ -190,6 +242,10 @@
 			   margin-top: 12px;
 			 .uni-textarea-placeholder{
 				 padding: 12px;
+				 @include themeify{
+				 	font-size: themed('font-size2');
+				 	line-height: themed('font-size2'); 
+   				}
 			 }
 			 /deep/.uni-textarea-textarea{
 				 margin: 10px;
@@ -213,9 +269,14 @@
 	}
 	.hint{
 		margin-top: 12px;
-		
+		@include themeify{
+			font-size: themed('font-size2');
+			line-height: themed('font-size5'); 
+		}
+		/*
 		font-size: 14px;
 		line-height: 20px;
+		*/
 		text-align: justify;
 		.tel-num{
 			color: #9FC7FF;

pages/user/index.vue

@@ -101,7 +101,7 @@
 			</view>
 			<view>
 				<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266" :show-cancel-button="true" ref="uModal" 
-					:asyncClose="true" :title="title" :content="content"></u-modal>
+					:asyncClose="true" :title="title" :content="content" :content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
 			</view>
 			<view class="userCell-item" @click="setUp">
 				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
@@ -154,16 +154,16 @@
 				this.getCarPersonAccount();
 				this.getUserInfo();
 				this.getCouponList();
-				
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
 			}
 			if(this.$refs.tabbarMain){
 				this.$refs.tabbarMain.setcount(2);
 			}
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
 		},
 		onReady() {
 			WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {

pages/user/phone.vue

@@ -1,15 +1,15 @@
 <template>
-	<view>
+	<view class="all">
 		<u-navbar title="修改手机号"></u-navbar>
 		<view class="login-form">
 			<view class="login-form-item">
 				<view class="input">
-					<u-input v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :placeholderStyle="placeholderStyle" v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
 				</view>
 			</view>
 			<view class="login-form-item">
 				<view class="input">
-					<u-input v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 					<view class="code" @click="getCode">{{codeTips}}</view>
 				</view>
 			</view>
@@ -32,6 +32,10 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
+				placeholderStyle:{
+					'font-size':'28rpx'
+				},
 				form: {
 					telephone: '',
 					verifyCode: '',
@@ -133,7 +137,33 @@
 						icon: "none"
 					})
 				})
+			},
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'32rpx', 
+				 	};
+				 this.placeholderStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'28rpx'
+				 	};
+				 this.placeholderStyle = data;
+			  } 
 			}
+		}, 
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
 		}
 	}
 </script>
@@ -143,6 +173,13 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	
 	.login-form{
 		background-color: #fff;
 		padding: 12px 28px;
@@ -167,7 +204,10 @@
 		.tips {
 			color: $u-type-info;
 			margin-top: 12px;
-			font-size: 12px;
+			@include themeify{
+				font-size: themed('font-size1');
+			}
+/*			font-size: 12px;*/
 			span{
 				color:#3fbd70;
 			}

pages/user/toJoin.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="all">
 		<u-navbar title="我要加盟"></u-navbar>
 	
 		<view class="main">
@@ -79,6 +79,7 @@
 	export default{
 		data() {
 				return {
+					elderMode:false,
 					typeList: [
 									{
 										name: '电动汽车充电桩（快充）',
@@ -117,6 +118,35 @@
 				};
 				
 			},
+			methods:{
+				theme(type) {
+					
+				  if(type == 'elder')	
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'32rpx',
+						"font-weight":'bold!important'
+					 	};
+					 this.titleStyle = data;
+				  }
+				  else
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'28rpx'
+					 	};
+					 this.titleStyle = data;
+				  } 
+				}
+			},
+			onReady(){
+				this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+				if(this.elderMode)
+					this.theme('elder')
+				else
+					this.theme('standard')
+			}
 	}
 </script>
 
@@ -130,11 +160,19 @@
 </style>
 
 <style lang="scss" scoped>
-	
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size1');
+		}
+	}
 	.main {
 		width: 100%;
 	    margin-top: 131px;
-		line-height: 20px;
+		@include themeify{
+ 			line-height: themed('font-size5');
+		}
+/*		line-height: 20px;*/
 		border-radius: 16px;
 	
 		padding: 0 28px 85px;
@@ -144,9 +182,13 @@
 			background-color: #fff;
             border-radius: 16px;
 			.title{
-				height: 18px;
+/*				height: 18px;*/
 				color: rgba(16, 16, 16, 100);
-				font-size: 18px;
+				@include themeify{
+					font-size: themed('font-size4');
+					height: themed('font-size4');
+				}
+/*				font-size: 18px;*/
 				font-weight: 600;
 				
 			}
@@ -158,7 +200,10 @@
 				margin-top: 12px;
 				p{
 					margin-top: 10px;
-					line-height: 24px;
+					@include themeify{
+						line-height: themed('font-size7');
+					}
+/*					line-height: 24px;*/
 					text-align: justify;
 				}
 			}
@@ -178,10 +223,15 @@
 				  margin-left: 10px;
 			  }
 			  p{
-			  				  height: 18px;
-							  line-height: 18px;
+				  @include themeify{
+				  	font-size: themed('font-size4');
+				  	line-height: themed('font-size4');
+				  	height: themed('font-size4');
+				  }
+/*			  				  height: 18px;
+							  line-height: 18px;*/
 			  				  color: rgba(16, 16, 16, 100);
-			  				  font-size: 18px;
+/*			  				  font-size: 18px;*/
 			  }
 			  
 			  .tel,.place,.type,.want{
@@ -222,9 +272,12 @@
 			  }
 			  .hint{
 			  	margin-top: 12px;
-			  	
-			  	font-size: 14px;
-			  	line-height: 20px;
+			  	@include themeify{
+			  		font-size: themed('font-size2');
+			  		line-height: themed('font-size5'); 
+			  	}
+/*			  	font-size: 14px;
+			  	line-height: 20px;*/
 			  	text-align: justify;
 			  	.tel-num{
 			  		color: #9FC7FF;