Browse Source

长辈模式

wkyy 3 years ago
parent
commit
220a7f2808

+ 4 - 6
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;

+ 5 - 6
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")
 		},

+ 5 - 6
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: {

+ 5 - 7
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() {

+ 9 - 1
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: {

+ 20 - 5
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() {

+ 2 - 2
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>

+ 9 - 2
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() {

+ 4 - 4
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>

+ 18 - 4
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>

+ 9 - 3
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>

+ 7 - 7
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) => {