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

# Conflicts:
#	pages/user/coupon/couponDetails.vue
#	pages/user/coupon/myCoupon.vue

main.js

@@ -63,21 +63,21 @@ Vue.mixin({
 					
 				}
 				
-				for (var i = 0; i < list2.length; i++) {
-						var edit = list2[i].getAttribute("oldstyle-edit");
+				for (var j = 0; j < list2.length; j++) {
+						var edit = list2[j].getAttribute("oldstyle-edit");
 						if(!edit){
-											list2[i].setAttribute("oldstyle-edit",list2[i].style.cssText);			
+											list2[j].setAttribute("oldstyle-edit",list2[j].style.cssText);			
 						}else{
 							edit=""
 						}
 						if (g) {
-							var str = list2[i].getAttribute("oldstyle");
+							var str = list2[j].getAttribute("oldstyle");
 							if(str){
-								list2[i].style = str+";"
+								list2[j].style = str+";"
 							}
 						}else{
 							if(edit){
-								list2[i].style=edit
+								list2[j].style=edit
 							}
 								
 						}

pages/record/details.vue

@@ -4,40 +4,45 @@
 		<view class="details">
 			<view class="details-head">
 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
-				<h4>{{chargeDetail.stationName}}</h4>
+				<h4 class="oldTextjp" oldstyle="font-size: 20px;">{{chargeDetail.stationName}}</h4>
 			</view>
 			<view class="details-main">
 				<view class="details-price">
 					<h3>{{chargeDetail.actualFee != null ? chargeDetail.actualFee : '0.00'}}</h3><span>元</span>
 				</view>
-				<p>订单总额</p>
+				<p :style="elderStatus ? 'font-size: 18px;' : ''">订单总额</p>
+			</view>
+			<view class="oldTextjp2" oldstyle="font-size: 18px;">
+				<view class="details-row"><p>电费</p><span>{{chargeDetail.totalElecMoney != null ? chargeDetail.totalElecMoney : '0.00'}}元</span></view>
+				<view class="details-row"><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney : '0.00'}}元</span></view>
+				<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.text+'元' : '未使用'}}</span></view>
 			</view>
-			<view class="details-row"><p>电费</p><span>{{chargeDetail.totalElecMoney != null ? chargeDetail.totalElecMoney : '0.00'}}元</span></view>
-			<view class="details-row"><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney : '0.00'}}元</span></view>
-		<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.text+'元' : '未使用'}}</span></view>
-		
 		</view>
 		<view class="details">
 			<view class="details-title">
-				<h4>充电详情</h4>
+				<h4 class="oldTextjp" oldstyle="font-size: 20px;">充电详情</h4>
+			</view>
+			<view class="oldTextjp2" oldstyle="font-size: 18px;">
+				<view class="details-row"><p>消费电量(度)</p><span>{{chargeDetail.electricQuantity != null ? chargeDetail.electricQuantity/10000 : '0.000'}}</span></view>
+				<view class="details-row"><p>开始时间</p><span>{{chargeDetail.startTime}}</span></view>
+				<view class="details-row"><p>结束时间</p><span>{{chargeDetail.endTime}}</span></view>
+				<view class="details-row"><p>充电时长</p><span>{{chargeDetail.chargingMinute != null ? chargeDetail.chargingMinute+'分' : '00分00秒'}}</span></view>
 			</view>
-			<view class="details-row"><p>消费电量(度)</p><span>{{chargeDetail.electricQuantity != null ? chargeDetail.electricQuantity/10000 : '0.000'}}</span></view>
-			<view class="details-row"><p>开始时间</p><span>{{chargeDetail.startTime}}</span></view>
-			<view class="details-row"><p>结束时间</p><span>{{chargeDetail.endTime}}</span></view>
-			<view class="details-row"><p>充电时长</p><span>{{chargeDetail.chargingMinute != null ? chargeDetail.chargingMinute+'分' : '00分00秒'}}</span></view>
 		</view>
 		<view class="details">
 			<view class="details-title">
-				<h4>更多信息</h4>
+				<h4 class="oldTextjp" oldstyle="font-size: 20px;">更多信息</h4>
+			</view>
+			<view class="oldTextjp2" oldstyle="font-size: 18px;">
+				<view class="details-row"><p>结束原因</p><span>{{chargeDetail.remark}}</span></view>
+				<view class="details-row"><p>订单状态</p><span>{{chargeDetail.statusText}}</span></view>
+				<view class="details-row"><p>充电桩编号</p><span>{{chargeDetail.deviceNo}}</span></view>
+				<view class="details-row"><p>更新时间</p><span>{{chargeDetail.updateTime}}</span></view>
+				<view class="details-row"><p>充电车辆</p><span>{{chargeDetail.carNumber}}</span></view>
 			</view>
-			<view class="details-row"><p>结束原因</p><span>{{chargeDetail.remark}}</span></view>
-			<view class="details-row"><p>订单状态</p><span>{{chargeDetail.statusText}}</span></view>
-			<view class="details-row"><p>充电桩编号</p><span>{{chargeDetail.deviceNo}}</span></view>
-			<view class="details-row"><p>更新时间</p><span>{{chargeDetail.updateTime}}</span></view>
-			<view class="details-row"><p>充电车辆</p><span>{{chargeDetail.carNumber}}</span></view>
 		</view>
 		<view class="detailsBtn">
-			<u-button class="detailsBtn-btn" type="primary" shape="circle" plain @click="toHome">返回主页</u-button>
+			<u-button class="detailsBtn-btn oldTextjp2" oldstyle="font-size: 16px;" type="primary" shape="circle" plain @click="toHome">返回主页</u-button>
 		</view>
 	</view>
 </template>

pages/record/index.vue

@@ -18,14 +18,14 @@
 						<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 oldTextjp2" oldstyle="font-size: 14px;">
-						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
+					<view class="recordList-row">
+						<p :style="elderStatus ? 'font-size: 14px' : ''">开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
 					</view>
-					<view class="recordList-row oldTextjp2" oldstyle="font-size: 14px;">
-						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
+					<view class="recordList-row">
+						<p :style="elderStatus ? 'font-size: 14px' : ''">充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
 					</view>
 					<view class="recordList-row">
-						<p class="oldTextjp2" oldstyle="font-size: 14px;">充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分钟' : '00分00秒'}}</p>
+						<p :style="elderStatus ? 'font-size: 14px' : ''">充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分钟' : '00分00秒'}}</p>
 						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
 					</view>
 				</view>
@@ -221,6 +221,7 @@
 			align-items: center;
 			margin-top: 8px;
 			p{
+				font-size: 12px;
 				color:#888;
 			}
 			h4{

pages/searchPile/chargeProcess/charge.vue

@@ -65,7 +65,7 @@
 					{{selectObj.threshold == 0 ? '无门槛' : '满'+selectObj.threshold+'元可用'}},
 					
 					<span class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</span>
-					<span class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value*10}}折</span>
+					<span class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</span>
 					
 					<view class="iconfont">&#xe600;</view>
 				</view>

pages/user/coupon/chooseCoupons.vue

@@ -43,7 +43,7 @@
 					<view class="price2"
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					 
-					 v-if="item.classify == '2'">服务费{{item.value*10}}折</view>
+					 v-if="item.classify == '2'">服务费{{item.value}}折</view>
 				 
 				  <view class="contidion">
 				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}
@@ -64,7 +64,7 @@
 			<view class="num">
 				 
 				<view class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</view>
-				<view class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value*10}}折</view>
+				<view class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</view>
 								 
 			</view>
 		</view>

pages/user/coupon/couponDetails.vue

@@ -14,7 +14,9 @@
 					</view>
 					<view class="content-right">
 						 <view class="price" v-if="userCoupon.classify == '1'">{{userCoupon.value}}元</view>
-						 <view class="price2" v-if="userCoupon.classify == '2'">服务费{{userCoupon.value*10}}折</view>
+
+						 <view class="price2" v-if="userCoupon.classify == '2'">服务费{{userCoupon.value}}折</view>
+
 						 <view class="price-condition">
 							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold+'元可用'}}
 						 </view>

pages/user/coupon/myCoupon.vue

@@ -21,9 +21,11 @@
 					</view>
 					<view class="content-right">
 						<view class="price" v-if="item.classify == '1'">{{item.value}}元</view>
-						<view class="price2" v-if="item.classify == '2'">服务费{{item.value*10}}折</view>
+
+						<view class="price2" v-if="item.classify == '2'">服务费{{item.value}}折</view>
+
 						<view class="price-condition">
-							{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}
+							{{item.threshold > 0 ? '满'+item.threshold+'元可用' : '无门槛'}}
 						</view>
 					</view>
 				</view>

pages/user/index.vue

@@ -4,21 +4,21 @@
 			<view class="userHead-img">
 				<u-avatar :src="userId ? headImg : '../../assets/img/head.png'" size="96"></u-avatar>
 			</view>
-			<view class="userHead-text oldTextjp2" oldstyle="font-size: 28px;">
-				<h3 class="oldTextjp2" oldstyle="font-size: 28px;">{{userId ? userPhone : '点击登录/注册'}}</h3>
+			<view class="userHead-text">
+				<h3 :style="elderStatus ? 'font-size: 28px;' : ''">{{userId ? userPhone : '点击登录/注册'}}</h3>
 			</view>
 		</view>
 		<view class="userData">
 			<view class="userData-num" @click="toBalance">
-				<view class="userData-data oldTextjp2" oldstyle="font-size: 28px;">{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}元</view>
-				<view class="userData-foot oldTextjp2" oldstyle="font-size: 16px;">可用余额</view>
+				<view class="userData-data oldTextjp" oldstyle="font-size: 28px;">{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}元</view>
+				<view class="userData-foot" :style="elderStatus ? 'font-size: 16px;' : ''">可用余额</view>
 			</view>
 			<view class="line">
 				
 			</view>
 			<view class="userData-num" @click="toMyCoupon">
-				<view class="userData-data oldTextjp2" oldstyle="font-size: 28px;">{{recordsTotal}}张</view>
-				<view class="userData-foot oldTextjp2" oldstyle="font-size: 16px;">优惠券</view>
+				<view class="userData-data oldTextjp" oldstyle="font-size: 28px;">{{recordsTotal}}张</view>
+				<view class="userData-foot" :style="elderStatus ? 'font-size: 16px;' : ''">优惠券</view>
 			</view>
 		</view>
 		<view class="userBanner">
@@ -30,33 +30,33 @@
 		
 		</view>
 		<view class="userIcon">
-			<view class="userIcon-tit oldTextjp2" oldstyle="font-size: 20px;">
+			<view class="userIcon-tit" :style="elderStatus ? 'font-size: 20px;' : ''">
 				<h3>常用功能</h3>
 			</view>
-			<view class="userIcon-main oldTextjp2" oldstyle="font-size: 18px;">
+			<view class="userIcon-main">
 				<view class="userIcon-item" @click="getScanCode">
 					<view class="userIcon-icon userIcon-icon1">
 						<u-icon name="qr-scan-2-line" custom-prefix="custom-icon" color="#fff" size="36"></u-icon>
 					</view>
-					<p>扫码充电</p>
+					<p :style="elderStatus ? 'font-size: 18px;' : ''">扫码充电</p>
 				</view>
 				<view class="userIcon-item" @click="fastRecharge">
 					<view class="userIcon-icon userIcon-icon2">
 						<u-icon name="wallet-3-line" custom-prefix="custom-icon" color="#fff" size="36"></u-icon>
 					</view>
-					<p>快速充值</p>
+					<p :style="elderStatus ? 'font-size: 18px;' : ''">快速充值</p>
 				</view>
 				<view class="userIcon-item" @click="chargingRecord">
 					<view class="userIcon-icon userIcon-icon3">
 						<u-icon name="todo-line" custom-prefix="custom-icon" color="#fff" size="36"></u-icon>
 					</view>
-					<p>充电记录</p>
+					<p :style="elderStatus ? 'font-size: 18px;' : ''">充电记录</p>
 				</view>
 				<view class="userIcon-item" @click="toSearchPile">
 					<view class="userIcon-icon userIcon-icon4">
 						<u-icon name="road-map-line" custom-prefix="custom-icon" color="#fff" size="36"></u-icon>
 					</view>
-					<p>附近站点</p>
+					<p :style="elderStatus ? 'font-size: 18px;' : ''">附近站点</p>
 				</view>
 			</view>
 		</view>
@@ -67,7 +67,7 @@
 					<p>车辆管理</p>
 				</view>
 				<view>
-					<text class="add oldTextjp2" oldstyle="font-size: 16px;">添加车牌号</text>
+					<text class="add" :style="elderStatus ? 'font-size: 16px;' : ''">添加车牌号</text>
 					<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 				</view>
 			</view>
@@ -97,7 +97,7 @@
 					<u-icon name="customer-service-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>联系客服</p>
 				</view>
-				<span class="oldTextjp2" oldstyle="font-size: 16px;">{{content}}</span>
+				<span :style="elderStatus ? 'font-size: 16px;' : ''">{{content}}</span>
 			</view>
 			<view>
 				<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266" :show-cancel-button="true" ref="uModal"