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

pages.json

@@ -396,6 +396,11 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},{ "name":"我要加盟",
+			"path": "pages/user/toJoin",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
         
     ],

pages/record/details.vue

@@ -8,13 +8,13 @@
 			</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>
 			</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 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">
@@ -51,6 +51,7 @@
 				id: '',
 				chargeDetail: {},
 				userCouponObj:{},
+				elderStatus: false,
 			}
 		},
 		onLoad(op) {
@@ -58,6 +59,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

@@ -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">
+					<view class="recordList-row oldTextjp2" oldstyle="font-size: 14px;">
 						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
 					</view>
-					<view class="recordList-row">
+					<view class="recordList-row oldTextjp2" oldstyle="font-size: 14px;">
 						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
+						<p class="oldTextjp2" oldstyle="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>

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/index.vue

@@ -62,50 +62,49 @@
 		</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>
-				<view class="">
-					<text class="add">添加车牌号</text>
+				<view>
+					<text class="add oldTextjp2" oldstyle="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 class="oldTextjp2" oldstyle="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>
@@ -155,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) => {
@@ -210,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;"
@@ -479,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

@@ -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>