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

main.js

@@ -63,20 +63,23 @@ 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{
-								list2[i].style=edit
+							if(edit){
+								list2[j].style=edit
+							}
+								
 						}
 					
 				}

pages.json

@@ -391,6 +391,16 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},{ "name":"免费安桩",
+			"path": "pages/user/freeInstallment",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},{ "name":"我要加盟",
+			"path": "pages/user/toJoin",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
         
     ],

pages/article/articleDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar title="文章详情" :title-size="elderStatus ? 40 : 35"></u-navbar>
+		<u-navbar title="文章详情"></u-navbar>
 		<view class="main">
 			<view class="new-title oldTextjp" oldstyle="font-size: 22px;">
 				{{newsDetail.title}}

pages/article/newsNotice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;height:1135px;" >
-		<u-navbar title="新闻公告" :title-size="elderStatus ? 40 : 35"></u-navbar>
+		<u-navbar title="新闻公告"></u-navbar>
 		
 		<view class="options">
 			<view class="options-item">
@@ -76,7 +76,7 @@
 				})
 				newsApi.getBannerInfo(code).then((res) => {
 					this.list =res.data;
-					
+					uni.hideLoading()
 					}).catch(error => {
 						uni.showToast({
 						
@@ -89,12 +89,17 @@
 				
 				if(mod.linkUrl.indexOf('http')==0){
 				    window.location=mod.linkUrl;
-				}
-				else if(mod.linkUrl.indexOf('#/')==0){
+				}else if(mod.linkUrl.indexOf('#/')==0){
 					if(mod.linkUrl.indexOf("?")==-1){
 						mod.linkUrl+='?';
 					}
-				    window.location=mod.linkUrl;
+					
+					var url=mod.clickUrl.split("#")[1]
+					//window.location = mod.clickUrl;
+					uni.navigateTo({
+						url: url
+					})
+				   // window.location=mod.linkUrl;
 				}
 				else if(mod.linkUrl=='#'||mod.linkUrl==''){
 				

pages/index/index.vue

@@ -4,7 +4,7 @@
 		<!-- 头部图片 -->
 		<view class="banner">
 			 <u-swiper  bg-color="#fff" 
-			 :img-mode="'scaleToFill'" height="600" 
+			 :img-mode="'scaleToFill'" height="400" 
 			 :list="bannerList" @click="clickBanner"  :name="'picUrl'" >
 			</u-swiper> 
 			
@@ -94,9 +94,9 @@
 			</view>
 			<view class="text">
 				<view class="station-title">
-					<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-left oldTextjp2" oldstyle="font-size: 14px;background-color: #9D9FFF;" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
+					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00B962;" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
+					<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00BAC8;" v-if="stationData.type == '1,2'" style="background-color: #00BAC8;">快/慢</text>
 					<text class="title-right oldTextjp" oldstyle="font-size: 20px;">{{stationData.name}}</text>
 				</view>
 
@@ -339,25 +339,7 @@
 		},
 		methods: {
 			clickBanner(index){
-				var mod= this.bannerList[index]
-				
-				if(mod.linkUrl.indexOf('http')==0){
-				    window.location=mod.linkUrl;
-				}
-				else if(mod.linkUrl.indexOf('#/')==0){
-					if(mod.linkUrl.indexOf("?")==-1){
-						mod.linkUrl+='?';
-					}
-				    window.location=mod.linkUrl;
-				}
-				else if(mod.linkUrl=='#'||mod.linkUrl==''){
-				
-				}
-				else{
-					uni.navigateTo({
-						url:mod.linkUrl
-					})
-				}
+				 
 				
 			},
 			getBannerInfo(code){
@@ -367,8 +349,8 @@
 				})
 				newsApi.getBannerInfo(code).then((res) => {
 					this.bannerList =res.data;
-					
-					 document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 300px;"
+					uni.hideLoading()
+					 document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 200px;"
 				 }).catch(error => {
 						uni.showToast({
 						
@@ -491,8 +473,11 @@
 					if (mod.clickUrl.indexOf("?") == -1) {
 						mod.clickUrl += '?';
 					}
-					window.location = mod.clickUrl;
-
+					var url=mod.clickUrl.split("#")[1]
+					//window.location = mod.clickUrl;
+					uni.navigateTo({
+						url: url
+					})
 				} else if (mod.clickUrl == '#' || mod.clickUrl == '') {
 
 				} else {
@@ -600,7 +585,7 @@
 
 	.banner {
 		width: 100%;
-		height: 300px;
+		height: 200px;
 
 
 	}
@@ -616,7 +601,7 @@
 		text-align: center;
 		background-color: #fff;
 		position: absolute;
-		top: 260px;
+		top: 160px;
 		left: 0;
 		right: 0;
 		margin: auto;

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">
-					<span>￥</span><h3>{{chargeDetail.actualFee != null ? chargeDetail.actualFee : '0.00'}}</h3><span>元</span>
+					<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>
@@ -51,6 +56,7 @@
 				id: '',
 				chargeDetail: {},
 				userCouponObj:{},
+				elderStatus: false,
 			}
 		},
 		onLoad(op) {
@@ -58,6 +64,13 @@
 				this.id = op.id;
 				this.getchargingDetail();
 			}
+			if (this.carhelp.getPersonInfo()) {
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
 		},
 		methods: {
 			toHome() {

pages/record/index.vue

@@ -3,30 +3,30 @@
 		<u-navbar title="充电订单"></u-navbar>
 		
 		<view class="record">
-			<view class="recordTime" @click="show = true">
+			<view class="recordTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
 				<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
 				<p>{{month}}月</p>
 				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="carNone" v-if="chargeList.length == 0">
 				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p>暂无充电订单</p>
+				<p class="oldTextjp" oldstyle="font-size: 20px;">暂无充电订单</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)">
 					<view class="recordList-name">
-						<h4>{{item.stationName}}/{{item.deviceNo}}</h4>
-						<span class="state1" :style="{color : textColor(item)}">{{item.statusText}}</span>
+						<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">
-						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
+						<p :style="elderStatus ? 'font-size: 14px' : ''">开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
+						<p :style="elderStatus ? 'font-size: 14px' : ''">充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
-						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
+						<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>
 			</view>
@@ -56,6 +56,7 @@
 				chargeList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
+				elderStatus: false,
 			}
 		},
 		onReady() {
@@ -73,6 +74,14 @@
 			this.endDate = year + '-' + monthN + '-' + day;
 					
 			this.getChargeList();
+			
+			if (this.carhelp.getPersonInfo()) {
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
 		},
 		onReachBottom() {
 			if (this.chargeList.length < this.recordsTotal) {			
@@ -97,6 +106,11 @@
 						break;
 				}
 			},
+			textFontSize() {
+				if(this.elderStatus) {
+						return '20px'
+				}
+			},
 			confirmTime(params) {
 				if(params.month.slice(0,1) == '0') {
 					this.month = params.month.slice(1);
@@ -207,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/InviteFriends.vue

@@ -14,7 +14,7 @@
 						<h2>5</h2><span>元</span>
 					</view>
 					<view class="coupons-line"></view>
-					<view class="coupons-btn">
+					<view class="coupons-btn" @click="inviteFriendsBtn">
 						<u-icon name="wechat-fill" custom-prefix="custom-icon" color="#fff" size="48"></u-icon>
 						<span>分享至微信</span>
 					</view>
@@ -100,14 +100,86 @@
 </template>
 
 <script>
+	import wx from 'weixin-js-sdk'
+	import * as API_WeiXin from '@/apis/weixin'
+	
 	export default {
 		data() {
 			return {
 				
 			}
 		},
+		onLoad() {
+				this.get_wx_config();
+		},
 		methods: {
+			inviteFriendsBtn(){
+				WeixinJSBridge.invoke('sendAppMessage',{
+				"appid": process.car.VUE_APP_WXAPPID,
+				"img_url": "",
+				"img_width": "200",
+				"img_height": "200",
+				"link": window.location.href,
+				"desc": "descContent",
+				"title": "shareTitle"
+				}, function(res) {
+				//_report('send_msg', res.err_msg);
+				})
+			},
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				this.isLoading = true;
+				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
+					this.isLoading = false;
 			
+					var wxconfig = response.wxConfig;
+					console.log(wxconfig.nonceStr)
+					this.wxConfig = wxconfig;
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+					});
+					//this.wxShare()
+				}).catch(error => {
+					// this.isLoading = false;
+					// this.mui.toast(error);
+				})
+			},
+			//微信分享自定义
+			wxShare() {
+				var img="";//window.location.href.split("#")[0]+"/"+require("@/assets/img/logo_qilian.jpg")
+				console.log(this.nowItem);
+				var title="[荆州市企业联合会]"+this.title
+			//	var desc=
+				let joinUrl = this.url;
+				var _this = this;
+				wx.ready(function() {
+					wx.onMenuShareAppMessage({
+						title: title,
+					//	desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						//desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+				});
+			}
 		}
 	}
 </script>

pages/user/coupon/chooseCoupons.vue

@@ -40,10 +40,10 @@
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					
 					v-if="item.classify == '1'">{{item.value}}元</view>
-					<view class="price"
+					<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>
@@ -244,6 +244,12 @@
 				font-size: 32px;
 				text-align: right;
 			}
+			.price2{
+				height: 38px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 20px;
+				text-align: right;
+			}
 			.contidion{
 				height: 22px;
 				color: rgba(51, 51, 51, 100);

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="price" 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>
@@ -162,6 +164,11 @@
 					   color: rgba(0, 185, 98, 100);
 					   font-size: 32px;
 				   }
+				   .price2{
+				   					   height: 38px;
+				   					   color: rgba(0, 185, 98, 100);
+				   					   font-size: 20px;
+				   }
 				   .price-condition{
 					   height: 17px;
 					   color: rgba(102, 102, 102, 100);

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="price" 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>
@@ -215,7 +217,12 @@
 				   .price{
 					   height: 38px;
 					   color: rgba(0, 185, 98, 100);
-					   font-size: 32px;
+					   font-size: 34px;
+				   }
+				   .price2{
+				   			 height: 38px;
+				   			   color: rgba(0, 185, 98, 100);
+				   			 font-size: 24px;
 				   }
 				   .price-condition{
 					   height: 17px;

pages/user/finance/balance.vue

@@ -9,7 +9,7 @@
 			<view class="balanceHead">
 				<view class="balanceCard">
 					<view class="balanceCard-head">
-						<font>总金额(元)</font><u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="32" @click="show=true"></u-icon>
+						<font>总金额</font><u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="32" @click="show=true"></u-icon>
 					</view>
 					<view>
 						<u-modal v-model="show" :confirm-text="confirmText" confirm-color="#00B962">
@@ -19,7 +19,7 @@
 						</u-modal>
 					</view>
 					<view class="balanceCard-main">
-						<h2 v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}</h2>
+						<h2 v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}元</h2>
 						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
 					</view>
 					<view class="balanceCard-foot">

pages/user/finance/recharge.vue

@@ -353,7 +353,7 @@
 		.rechargeMain {
 			display: flex;
 			flex-wrap: wrap;
-			justify-content: space-between;
+		//	justify-content: space-between;
 			margin-top: 12px;
 			margin-bottom: 20px;
 
@@ -366,7 +366,7 @@
 				margin-bottom: 10px;
 				font-size: 16px;
 				position: relative;
-
+				margin-left: 5px;
 			}
 		.amount {
 		// width: 41.9%;

pages/user/freeInstallment.vue

@@ -0,0 +1,230 @@
+<template>
+	<view >
+		<u-navbar title="免费安桩"></u-navbar>
+	    <view class="main">
+			<view class="text">
+				        为响应政府号召，积极推动充电桩普及，“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务，有意加盟“51充电联盟”的机构和个人，均可申请免费安装电动汽车/摩托车/自行车充电桩，在平台的运营支持下，共享风口红利。
+			</view>
+	    	<view class="suited">
+	    		<p class="title">适合对象 :</p>
+				<view class="content">
+					<p>1.停车场、停车棚</p>
+					<view class="suited-text">
+						商超、小区、园区、医院等停车场。通过经营充电业务开源增收。
+					</view>
+				</view>
+				<view class="content">
+					<p>2.私人车位所有者</p>
+					<view class="suited-text">
+						可通过共享车位空闲时段，为他人提供充电便利获取被动收入。
+					</view>
+				</view>
+	    	</view>
+			
+			<view class="application-form ">
+				<view class="name">
+					<p>申请人姓名</p>
+					<u-input placeholder=""></u-input>
+				</view>
+				<view class="tel">
+					<p>联系电话</p>
+					<u-input placeholder=""></u-input>
+				</view>
+				<view class="place">
+					<p>安装地点</p>
+					<textarea class="textarea" placeholder="填写详细位置"></textarea>
+				</view>
+				<view class="type">
+					<p>场地类型</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group @change="checkboxGroupChange" active-color="#00B962">
+										<u-checkbox 
+											@change="checkboxChange" 
+											v-model="item.checked" 
+											v-for="(item, index) in typeList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+				<view class="want">
+					<p>想要安装</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group @change="checkboxGroupChange" active-color="#00B962">
+										<u-checkbox 
+											@change="checkboxChange" 
+											v-model="item.checked" 
+											v-for="(item, index) in wantList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+			      <view class="hint">
+			      	*请保持手机畅通，我们将安排专人与您联系。您也可以拨打 
+					 <text class="tel-num">400-8899-619</text>查询申请审核进度！
+			      </view>
+				 <u-button type="warning">提交申请</u-button>
+			</view>
+	    </view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data() {
+				return {
+					typeList: [
+									{
+										name: '停车场',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '私家车位',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '停车棚',
+										checked: false,
+										disabled: false
+									}
+								],
+								wantList: [
+													{
+														name: '电动汽车充电桩',
+														checked: false,
+														disabled: false
+													},
+													{
+														name: '电动摩托/自行车充电桩',
+														checked: false,
+														disabled: false
+													},
+													
+												]
+							
+								
+				};
+				
+			},
+	}
+</script>
+
+<style>
+	page{
+		background-color: #00b962;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.main{
+	   padding: 36px 28px 85px;
+	   .text{
+		   color: rgba(255, 255, 255, 100);
+		   font-size: 18px;
+		   text-align: justify;
+
+	   }
+	   .suited{
+		   background-color: #fff;
+		   margin-top: 24px;
+		   padding: 24px;
+		   border-radius: 16px;
+		   .title{
+			   height: 18px;
+			   color: rgba(16, 16, 16, 100);
+			   font-size: 18px;
+			   font-weight: 600;
+		   }
+		   .content{
+			   margin-top: 12px;
+			   p{
+				   font-weight: 550;
+				   font-size: 14px
+			   }
+			   .suited-text{
+				   margin-top: 10px;
+				   line-height: 20px;
+			   }
+		   }
+	   }
+	
+	
+	.application-form{
+		background-color: #fff;
+		 border-radius: 16px;
+		 margin-top: 24px;
+		  padding: 24px;
+		  .u-input{
+			  border-radius: 50px;
+			  background-color: rgba(232, 236, 234, 100);
+			  margin-top: 12px;
+			
+		  }
+		  /deep/.uni-input-input{
+			  margin-left: 10px;
+		  }
+		  p{
+		  				  height: 18px;
+						  line-height: 18px;
+		  				  color: rgba(16, 16, 16, 100);
+		  				  font-size: 18px;
+		  }
+		  
+		  .tel,.place,.type,.want{
+			  margin-top: 24px;
+		  }
+		  .textarea{
+			  width: 72.2vw;
+			  height: 100px;
+			  border-radius: 22px;
+			  background-color: rgba(232, 236, 234, 100);
+			   margin-top: 12px;
+			 .uni-textarea-placeholder{
+				 padding: 12px;
+			 }
+			 /deep/.uni-textarea-textarea{
+				 margin: 10px;
+			 }
+		  }
+	}
+	.type{
+		.checkbox{
+			margin-top: 12px;
+			/deep/.u-checkbox{
+				width: 50% !important;
+				margin-top: 4px;
+			}
+		}
+		
+	}
+	.want{
+		/deep/.u-checkbox{
+			margin-top: 8px;
+		}
+	}
+	.hint{
+		margin-top: 12px;
+		
+		font-size: 14px;
+		line-height: 20px;
+		text-align: justify;
+		.tel-num{
+			color: #9FC7FF;
+		}
+	}
+	/deep/.u-btn{
+		border-radius: 50px ;
+		margin-top: 24px;
+	}
+	}
+	
+</style>

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,78 +30,81 @@
 		
 		</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>
 		<view class="userCell">
 			<view class="userCell-item" @click="carManage">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="menu_cwcl" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>车辆管理</p>
 				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
+				<view>
+					<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>
 			<view class="userCell-item" @click="gotoUrl('pages/user/help')">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="compass-3-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>操作指南</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="userCell-item" @click="feedback">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="feedback-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>意见反馈</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="userCell-item" @click="gotoUrl('pages/user/about')">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="information-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>关于我们</p>
 				</view>
 				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 			</view>
 			<view class="userCell-item" @click="openModal">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="customer-service-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>联系客服</p>
 				</view>
-				<span>{{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" 
 					:asyncClose="true" :title="title" :content="content"></u-modal>
 			</view>
 			<view class="userCell-item" @click="setUp">
-				<view class="userCell-title">
+				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
 					<u-icon name="settings-4-fill" custom-prefix="custom-icon" color="#6BC6A7" size="36"></u-icon>
 					<p>设置</p>
 				</view>
@@ -151,12 +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);
 			}
-				
-			this.elderStatus=this.carhelp.get("getElderModeClass");
 		},
 		onReady() {
 			WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {
@@ -183,7 +190,12 @@
 					if(mod.linkUrl.indexOf("?")==-1){
 						mod.linkUrl+='?';
 					}
-				    window.location=mod.linkUrl;
+				    //window.location=mod.linkUrl;
+					var url=mod.linkUrl.split("#")[1]
+					//window.location = mod.clickUrl;
+					uni.navigateTo({
+						url: url
+					})
 				}
 				else if(mod.linkUrl=='#'||mod.linkUrl==''){
 				
@@ -201,6 +213,7 @@
 					mask: true,
 				})
 				newsApi.getBannerInfo(code).then((res) => {
+					uni.hideLoading();
 					this.bannerList =res.data;
 					
 					// document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 300px;"
@@ -427,7 +440,9 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		
 	}
+
 	.userIcon-main{
 		margin-top: 16px;
 		display: flex;
@@ -468,6 +483,9 @@
 			span{
 				color:#999;
 			}
+			.add{
+				color:#999;
+			}
 		}
 	}
 	

pages/user/logout.vue

@@ -45,12 +45,10 @@
 				userApi.deleteUser().then((res) => {
 					uni.hideLoading();
 					
-					if(res.data == "0") {
-						this.carhelp.logoff();
-						uni.reLaunch({
-							url: '/pages/index/index?jpcode=' + this.jpcode
-						})
-					}
+					this.carhelp.logoff();
+					uni.reLaunch({
+						url: '/pages/index/index'
+					})
 				}).catch(error => {
 					uni.navigateTo({
 						url: '/pages/user/finance/refundList'

pages/user/setting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="设置" :title-size="checked ? 40 : 35"></u-navbar>
+		<u-navbar title="设置"></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'} : {}">
@@ -8,16 +8,11 @@
 			<u-cell-item title="注销账号" :title-style="checked ? titleStyle : {}" value="注销后无法恢复，请谨慎操作" 
 				:value-style="checked ? {color:'#ff3300',fontSize:'16px'} : valueStyle" @click="gotoUrl('pages/user/logout')">
 			</u-cell-item>
+			<u-cell-item title="长辈模式" :title-style="checked ? titleStyle : {}" value="字体更大更清晰" :arrow="false"
+				:value-style="checked ? {color:'#777777',fontSize:'16px',textAlign: 'left',marginLeft: '8px'} : valueStyle2">
+				<u-switch slot="right-icon" v-model="checked" active-color="#00E266" @change="checkedChange"></u-switch>
+			</u-cell-item>
 		</u-cell-group>
-		<view class="switcher-mode">
-			<view class="oldTextjp2" oldstyle="font-weight:bold;font-size:18px">
-				长辈模式
-				<text class="oldTextjp2" oldstyle="font-weight:normal;font-size:16px;">字体更大更清晰</text>
-			</view>
-			<view class="switch-box" >
-				<u-switch v-model="checked" class="switch" active-color="#00E266" @change="checkedChange"></u-switch>
-			</view>
-		</view>
 		
 		<view class="logout-btn oldTextjp" oldstyle="font-size:18px" @click="signOut">
 			退出帐号
@@ -44,6 +39,11 @@
 				valueStyle: {
 					color:'#ff3300',
 				},
+				valueStyle2: {
+					color: '#777777',
+					textAlign: 'left',
+					marginLeft: '8px'
+				},
 				titleStyle: {
 					fontWeight: 'bold',
 					fontSize: '18px',

pages/user/toJoin.vue

@@ -0,0 +1,245 @@
+<template>
+	<view>
+		<u-navbar title="我要加盟"></u-navbar>
+	<!-- 	<view class="head">
+
+			<img src="/static/img/earth_@2.png" alt="">
+
+		</view> -->
+		<view class="main">
+			<view class="main-content">
+				<p class="title">适合对象</p>
+				<view class="text">
+					已经在经营充电桩业务的商家，可以申请加入“<text style="color: #e14173;">51充电联盟</text>”。
+				</view>
+				<p class="title">平台能为您提供：</p>
+				<view class="text-box">
+					<p>1.便捷的找桩、充电服务，提升用户体验。</p>
+					<p>2.获得更多的用户资源和运营支持，提高市场竞争力。</p>
+					<p>3.良好的平台背书,提高公信力</p>
+				</view>
+			</view>
+			<view class="application-form ">
+				<view class="name">
+					<p>申请人姓名</p>
+					<u-input placeholder=""></u-input>
+				</view>
+				<view class="tel">
+					<p>联系电话</p>
+					<u-input placeholder=""></u-input>
+				</view>
+				<view class="place">
+					<p>自有电桩地点</p>
+					<textarea class="textarea" placeholder="填写详细位置"></textarea>
+				</view>
+				<view class="type">
+					<p>场地类型</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group @change="checkboxGroupChange" active-color="#00B962">
+										<u-checkbox 
+											@change="checkboxChange" 
+											v-model="item.checked" 
+											v-for="(item, index) in typeList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+				<view class="want">
+					<p>自由电桩数量</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group @change="checkboxGroupChange" active-color="#00B962">
+										<u-checkbox 
+											@change="checkboxChange" 
+											v-model="item.checked" 
+											v-for="(item, index) in numList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+			      <view class="hint">
+			      	*请保持手机畅通，我们将安排专人与您联系。您也可以拨打 
+					 <text class="tel-num">400-8899-619</text>查询申请审核进度！
+			      </view>
+				 <u-button type="warning">提交申请</u-button>
+			</view>
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default{
+		data() {
+				return {
+					typeList: [
+									{
+										name: '电动汽车充电桩（快充）',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '电动汽车充电桩（慢充）',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '电动摩托/自行车充电桩',
+										checked: false,
+										disabled: false
+									}
+								],
+								numList: [
+													{
+														name: '5台以内',
+														checked: false,
+														disabled: false
+													},
+													{
+														name: '5~10台',
+														checked: false,
+														disabled: false
+													},
+													{
+														name: '10台以上',
+														checked: false,
+														disabled: false
+													},
+												]
+							
+								
+				};
+				
+			},
+	}
+</script>
+
+<style>
+	page {
+		
+		background:url(../../static/img/earth_@2.png) no-repeat top center #00b962 ;
+		background-size: 100%;
+		background-position: 50% 4%
+	}
+</style>
+
+<style lang="scss" scoped>
+	.head {
+		img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.main {
+		width: 100%;
+	    margin-top: 131px;
+		line-height: 20px;
+		border-radius: 16px;
+	
+		padding: 0 28px 85px;
+
+		.main-content {
+			padding:24px 24px;
+			background-color: #fff;
+            border-radius: 16px;
+			.title{
+				height: 18px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 18px;
+				font-weight: 600;
+				
+			}
+			.text{
+				margin-top: 12px;
+				margin-bottom: 24px;
+			}
+			.text-box{
+				margin-top: 12px;
+				p{
+					margin-top: 10px;
+					line-height: 24px;
+					text-align: justify;
+				}
+			}
+		}
+		.application-form{
+			background-color: #fff;
+			 border-radius: 16px;
+			 margin-top: 24px;
+			  padding: 24px;
+			  .u-input{
+				  border-radius: 50px;
+				  background-color: rgba(232, 236, 234, 100);
+				  margin-top: 12px;
+				
+			  }
+			  /deep/.uni-input-input{
+				  margin-left: 10px;
+			  }
+			  p{
+			  				  height: 18px;
+							  line-height: 18px;
+			  				  color: rgba(16, 16, 16, 100);
+			  				  font-size: 18px;
+			  }
+			  
+			  .tel,.place,.type,.want{
+				  margin-top: 24px;
+			  }
+			  .textarea{
+				  width: 72.2vw;
+				  height: 100px;
+				  border-radius: 22px;
+				  background-color: rgba(232, 236, 234, 100);
+				   margin-top: 12px;
+				 .uni-textarea-placeholder{
+					 padding: 12px;
+				 }
+				 /deep/.uni-textarea-textarea{
+					 margin: 10px;
+				 }
+			  }
+			  .type{
+			  	.checkbox{
+			  		margin-top: 12px;
+			  		/deep/.u-checkbox{
+			  			
+			  			margin-top: 4px;
+			  		}
+			  	}
+			  	
+			  }
+			  .want{
+			  	/deep/.u-checkbox{
+					width: 50% !important;
+			  		margin-top: 8px;
+			  	}
+			  }
+			  .hint{
+			  	margin-top: 12px;
+			  	
+			  	font-size: 14px;
+			  	line-height: 20px;
+			  	text-align: justify;
+			  	.tel-num{
+			  		color: #9FC7FF;
+			  	}
+			  }
+			  /deep/.u-btn{
+			  	border-radius: 50px ;
+			  	margin-top: 24px;
+			  }
+		}
+
+	}
+</style>