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

pages/index/index.vue

@@ -462,27 +462,33 @@
 				}
 			},
 			rechargeActivity(index) {
-				var mod = this.activityList[index]
-
-				if (mod.clickUrl == null) {
-
-				} else if (mod.clickUrl.indexOf('http') == 0) {
-					window.location = mod.clickUrl;
-
-				} else if (mod.clickUrl.indexOf('#/') == 0) {
-					if (mod.clickUrl.indexOf("?") == -1) {
-						mod.clickUrl += '?';
+				if (this.userId) {
+					var mod = this.activityList[index]
+					
+					if (mod.clickUrl == null) {
+					
+					} else if (mod.clickUrl.indexOf('http') == 0) {
+						window.location = mod.clickUrl;
+					
+					} else if (mod.clickUrl.indexOf('#/') == 0) {
+						if (mod.clickUrl.indexOf("?") == -1) {
+							mod.clickUrl += '?';
+						}
+						var url=mod.clickUrl.split("#")[1]
+						//window.location = mod.clickUrl;
+						uni.navigateTo({
+							url: url
+						})
+					} else if (mod.clickUrl == '#' || mod.clickUrl == '') {
+					
+					} else {
+						uni.navigateTo({
+							url: mod.clickUrl
+						})
 					}
-					var url=mod.clickUrl.split("#")[1]
-					//window.location = mod.clickUrl;
-					uni.navigateTo({
-						url: url
-					})
-				} else if (mod.clickUrl == '#' || mod.clickUrl == '') {
-
 				} else {
 					uni.navigateTo({
-						url: mod.clickUrl
+						url: '/pages/login/login'
 					})
 				}
 			},

pages/user/coupon/myCoupon.vue

@@ -33,10 +33,7 @@
 				<view class="limit">
 					<view class="limit-text">
 							<view class="limit-text1">
-								<u-read-more ref="uReadMore" :shadow-style="shadowStyle" :show-height="50" text-indent="0" color="#999999" :close-text="closeContent" 
-									:open-text="openContent" :toggle="true">
-									<rich-text :nodes="item.useScope"></rich-text>
-								</u-read-more>
+								<span>{{item.useScope}}</span>
 							</view>
 					</view>
 					<view class="use-button" v-if="current == '0'" @click="toIndex">去使用</view>
@@ -66,15 +63,6 @@
 				myCouponList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
-				shadowStyle: {
-					width: "110%",
-					backgroundImage: "none",
-					paddingTop: "0",
-					marginTop: "-10%",
-					justifyContent: "right",
-				},
-				closeContent: '',
-				openContent: '',
 			}
 		},
 		onShow() {
@@ -251,6 +239,7 @@
 					max-width: 51vw;
 					line-height: 20px;
 					position: relative;
+					font-size: 11px;
 					.arrows{
 										   display: inline-block;
 									   width: 20px;

pages/user/finance/balance.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar title="我的余额">
 			<view class="slot-wrap">
-				<span class="navBtn" @click="toRefundList">退余额</span>
+				<span class="navBtn oldTextjp2" oldstyle="font-size: 16px;" @click="toRefundList">退余额</span>
 			</view>
 		</u-navbar>
 		<view class="balance">
@@ -18,11 +18,11 @@
 							</view>
 						</u-modal>
 					</view>
-					<view class="balanceCard-main">
+					<view class="balanceCard-main oldTextjp2" oldstyle="font-size: 16px;">
 						<h2 v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}元</h2>
 						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
 					</view>
-					<view class="balanceCard-foot">
+					<view class="balanceCard-foot oldTextjp2" oldstyle="font-size: 16px;">
 						<view class="balanceCard-item" v-if="personAccount.totalAmount != null">可用余额{{personAccount.totalAmount.toFixed(2)}}元</view>
 						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}元</view>
 					</view>
@@ -32,9 +32,9 @@
 				<view class="balanceMain-title">
 					<view class="title">
 						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
-						<span>充值明细</span>
+						<span class="oldTextjp" oldstyle="font-size: 20px;">充值明细</span>
 					</view>
-					<view class="more" @click="seeAll">
+					<view class="more oldTextjp2" oldstyle="font-size: 16px;" @click="seeAll">
 						<span>查看全部</span>
 						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 					</view>
@@ -51,7 +51,7 @@
 			</view>
 			<view class="carNone" v-if="accountList.length == 0">
 				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p>本月暂无充值记录</p>
+				<p class="oldTextjp" oldstyle="font-size: 20px;">本月暂无充值记录</p>
 			</view>
 		</view>	
 	</view>
@@ -71,6 +71,7 @@
 				content: `总金额=可用余额+冻结金额。使用预付费充电时，在充电过程中会冻结部分金额，充电完成后将剩余金额返还至余额账户，每笔预充金额的冻结时间不超过96小时。`,
 				personAccount: {},
 				accountList: [],
+				elderStatus: false,
 			}
 		},
 		onReady() {
@@ -84,6 +85,12 @@
 			
 			this.getCarPersonAccount();
 			this.getAccountRecordData();
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
 		},
 		methods: {
 			toRefundList() {

pages/user/finance/rechargeList.vue

@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<u-navbar title="充值记录"></u-navbar>
-		<view class="rechargeTime" @click="show = true">
+		<view class="rechargeTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
 			<span>{{month}}月</span>
 			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 		</view>
 		<view class="carNone" v-if="accountList.length == 0">
 			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p>暂无充值记录</p>
+			<p class="oldTextjp" oldstyle="font-size: 20px;">暂无充值记录</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)">
@@ -41,11 +41,18 @@
 				accountList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
+				elderStatus: false,
 			}
 		},
 		onReady() {			
 			if(this.carhelp.getPersonInfo()) {
 				this.userId = this.carhelp.getPersonInfo().id;
+				
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
 			}
 			
 			var date = new Date();