调整

pages/index/index.vue

@@ -493,8 +493,9 @@
 			if(	!this.pointTimeOut ){
 				this.pointTimeOut=true
 				this.getPointTimeOut();
-				this.getUserInfo();
+				
 			}
+			this.getUserInfo();
 				
 		},
 		onReady() {
@@ -514,7 +515,7 @@
 			// 	})
 			// }
 			
-			this.getUserInfo();
+			//this.getUserInfo();
 		
 
 			WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -548,7 +548,7 @@
 			.price {
 				position: absolute;
 				top: 24rpx !important;
-				right: 8rpx !important;
+				right: 32rpx !important;
 			}
 
 			.current-price {

pages/searchPile/chargeProcess/charge.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<ujp-navbar title="充电"  :is-back="isback" ></ujp-navbar>
+		<ujp-navbar title="开始充电"  :is-back="isback" ></ujp-navbar>
 		<!-- 优惠 -->
 		<view class="discounts" style="padding:0 18px;" v-if="bannerList.length">
 			<u-swiper bg-color="#fff" :img-mode="'scaleToFill'" height="160" :list="bannerList" @click="clickBanner"
@@ -10,75 +10,41 @@
 		<view class="recharge" >
 			
 			
-			<view class="title">请选择充电金额
-				<view class="to-recharge" @click="gotoUrl('pages/user/finance/recharge')">
+			<view class="title">
+				<view class="left lefttitle">
+					请选择充电金额
+				</view>
+				<view class="to-recharge" @click="show=true,recordId=''">
 					去充值
 				</view>
 			</view>
 			<p>当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</p>
-			<view class="rechargeMain">
+			<view class="rechargeMain">
+				<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''" class=" recharge-item  ">
+					充满自停
+				</view>
 				<view class="recharge-item" @click="moneyClick(item.id)"
 					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
 					:key="item.id">
 					{{item.name}}元
 				</view>
 				<view class="recharge-item" :class="otherNum ? 'active' : ''" style="
-					padding: 8px 0px;">
-					<u-input v-model="otherNum" @input="ckInput" type="digit" placeholder="其他充值金额" />
+					padding: 1px 0px;">
+					<u-input v-model="otherNum" @input="ckInput"  @focus="focus" type="digit" placeholder="其他充电金额" />
 
 				</view>
-				<view style="color: rgba(153, 153, 153, 100);
-				font-size: 14px;
-				text-align: left;
-				font-family: AlibabaPuHui-regular;"><span style="color:red">*</span>充电金额输入范围为1元-500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱），最终结算金额将以实际充入电量为准。</view>
-
+				
 			</view>
-			<view class="title">其他充电模式</view>
+			
 			
-			<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''" class="self-stop ">
-				充满自停
-			</view>
+			
 			
-			<view  v-if="false"  style="color: rgba(153, 153, 153, 100); 
-			font-size: 14px;
-			text-align: left;
-			font-family: AlibabaPuHui-regular;">充满自停将<span style="color:#53b56b">预扣费10元</span>,充电结束后按实际金额结算,多退少补<br/>
-					
-			</view>
+			
 			
-			<!-- 优惠券 -->
-			<view class="discounts" v-if="false" >
-				<view class="title">
-					<span class="title-1">
-						优惠券
-					</span>
-					<span class="title-2">
-						每次只能使用1张
-					</span>
-					<span class="title-3">
-						-6.00
-					</span>
-				</view>
-				<view class="select">
-					<u-radio-group v-model="value" :wrap="true">
-						<template v-for="(item, index) in list" >
-							<u-radio @change="radioChange" :key="index" :name="item.id"
-								:style="item.chooseStatus==0?'	background-color: #e3e3e3 !important;':''"
-								:disabled="item.chooseStatus==0">
-								满{{item.threshold.toFixed(2)}}元减{{item.value.toFixed(2)}}元
-								<view class="explain" @click="gotoUrl('pages/user/coupon/couponDetails?id='+item.id)" :key="index" >使用说明</view>
-
-							</u-radio>
-							 
-						</template>
-					</u-radio-group>
-
-				</view>
-			</view>
 
     <!-- 优惠券2 -->
 			 <view class="discounts2">
-			 	<view class="left">
+			 	<view class="left lefttitle">
 			 		优惠券
 			 	</view>
 				<view class="right" @click="chooseCoupons"  v-if="selectObj.id">
@@ -99,12 +65,11 @@
 				</view>
 				
 			 </view>
-			 <view class="couponsuse" v-if="couponsuse" ><span style="color:red">*</span>{{couponsuse}}</view>
-			 
+			
 			 
 			 <!-- 会员活动 -->
 			 <view class="member" v-if="userCardBool" >
-			 	<view class="actively">
+			 	<view class="actively ">
 			 		会员活动
 			 	</view>
 				<view class="type"  v-if="!vin" style="color: red;" >
@@ -124,7 +89,18 @@
 		<view class="bottom">
 			<view class="botton"
 			 @click="submit"
-			 >开始充电</view>
+			 >开始充电</view>
+			
+		</view>
+		
+		<view class="textinfo">
+			<p>充电说明：</p>
+			<view>
+				1.最终结算金额将以实际充入电量为准；<br/>
+				2.充满自停模式需要您的余额不低于10元才可充电；<br/>
+				3.充电金额请输入1元~500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱)；<br/>
+				4.完成充电后，在满足条件的情况下，优惠券自动抵扣；提前结束充电则不使用优惠券并返还至您的卡包。<br/>
+			</view>
 		</view>
 		
 		<!-- <view class="but-box" style="margin-bottom: 20px;">
@@ -141,32 +117,27 @@
 		<!-- 弹窗 -->
 		<template >
 			<view >
-				<u-popup v-model="show" mode="bottom">
+				<u-popup v-model="show" mode="bottom"  >
 					<view class="recharge" style="padding-bottom: 0;">
-						<view class="title oldTextjp" oldstyle="font-size:20px">选择充值金额</view>
+						<view class="title lefttitle " >选择充值金额</view>
 						<p>当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</p>
-						<view class="rechargeMain">
-							
-								<view class="recharge-item">50元</view>
-								<view class="recharge-item">100元</view>
-								<view class="recharge-item">200元</view>
-								<view class="recharge-item">300元</view>
-								<view class="recharge-item">500元</view>
-								<view class="recharge-item">1000元</view>
-								<view class="recharge-item" style="position: relative;">100元
-								<view class="amount" >充100送10</view>
-								</view>
-							
+						<view class="rechargeMain">
+							<view class="recharge-item" :class="!otherNum_f&&moneyActiveClass_f == item.id ? 'active' : ''"
+								v-for="(item,index) in moneyList_f" :key="item.id" @click="moneyClick_f(item.id,item)">
+								{{item.amountDesc?item.amountDesc:item.rechargeAmount+'元'}}
+								<view class="amount" v-if="item.amountRemark">{{item.amountRemark}}</view>
+								</view>
+							
 						</view>
 						<p class="oldTextjp2" oldstyle="font-size:16px">其他充值金额</p>
 					<view  style="margin-bottom: 32px;">
 						
 						<view 
 						
-						:class="otherNum? 'active' : ''"
+						:class="otherNum_f? 'active' : ''"
 						class="recharge-input self-stop" style="height: 100%;width: 100%;margin-bottom: 8px;">
-							<u-input type="digit" :border="true" />
-						
+							<u-input v-model="otherNum_f" @input="ckInput" @focus="focus" type="digit" :border="true" />
+										
 						
 						</view>
 						<view style="color: rgba(153, 153, 153, 100);
@@ -176,7 +147,7 @@
 						
 					</view>
 					
-						<view class="recharge-btn transactionClass" v-if="!show2" style="margin-top: 60px;">
+						<view class="recharge-btn transactionClass"  style="margin-top: 60px;">
 							<view >
 								<u-checkbox-group>
 									<u-checkbox active-color="green" v-model="checked" shape="circle" @change="checkboxChange()"></u-checkbox>
@@ -187,7 +158,7 @@
 							
 							<u-button
 							 class="success-btn"
-								shape="circle" type="success" @click="gotoGz" style="margin-top: 12px;margin-bottom: 16px;">
+								shape="circle" type="success" @click="rechargeNow" style="margin-top: 12px;margin-bottom: 16px;">
 								<span>微信充值</span>
 							</u-button>
 						</view>
@@ -203,16 +174,26 @@
 	import * as API from '@/apis/chargeProcess.js'
 	import * as userApi from '@/apis/user.js'
 	import * as newsApi from '@/apis/news.js'
+	import * as API_finance from '@/apis/finance.js'
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	import * as Pay from '@/apis/weixin.js'
+	
+	
 
 	export default {
 		data() {
-			return {
+			return {
+				fee:0,
+				recordId:"",
 				show2:false,
 				stationId:"",
 				elderMode:false,
 				isback:true,
-				show: true,
-				moneyActiveClass: "-1",
+				show: false,
+				moneyActiveClass: "-1",
+				moneyActiveClass_f: "-1",
 				detail: {},
 				couponsuse:'',
 				//提交信息
@@ -225,8 +206,10 @@
 					//paytype:'YE',
 				},
 				uuid:0,
-				user: {},
-				otherNum: '',
+				user: {},
+				otherNum_f: '',
+				otherNum: '',
+				moneyList_f:[],
 				moneyList: [
 					{
 						id: '5',
@@ -259,7 +242,8 @@
 				listlength:0,
 				vin:true,
 				bannerList:[],
-            checked:true,
+            checked:true,
+			selectItem:{},
 			}
 		},
 		computed:{
@@ -304,7 +288,8 @@
 						// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
 			if(couponsuse){
 							this.couponsuse=couponsuse
-				}
+				}
+				this.init()
 		},
 		onReady(){
 			this.getBannerInfo("charge-start")
@@ -326,6 +311,74 @@
 			this.getHomePage()
 		},
 		methods: {
+			moneyClick_f(index,item) {
+				this.otherNum_f='';
+				this.moneyActiveClass_f = index;
+				if(item){
+					this.selectItem=item;
+					// if(item.imgUrl){
+					// 	this.selectImg=item
+					// }
+				}
+			},
+			rechargeNow() {
+				if(!this.checked){
+					uni.showToast({
+						title:"请同意《充值协议》后进行充值"
+					})
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				this.submitForm={};
+				if(!this.otherNum){
+					this.submitForm.chargingMarketingId=this.selectItem.id;
+				}else{
+					this.submitForm.amount=this.otherNum
+				}
+				//(this.submitForm)
+				if(this.value2=="0"){
+					this.wxpy()
+				}else{
+					this.alpy()
+				}
+				
+			},
+			focus(){
+				console.log(0)
+				uni.pageScrollTo({
+					scrollTop:999999,
+					duration:0
+				})
+			},
+			init() {
+			
+			
+			
+				
+				var data = {
+						type:2	,
+						};
+			
+			
+				API_finance.marketingData(data).then((res) => {
+			
+					this.moneyList_f = res.data.chargingMarketingList
+					if (this.moneyList_f.length > 0) {
+						this.selectItem = this.moneyList_f[0];
+						this.moneyActiveClass_f = this.moneyList_f[0].id
+						//(this.moneyActiveClass)
+					}
+					
+				}).catch(error => {
+					uni.showToast({
+			
+						title: error
+					})
+				})
+			},
 			clickBanner(index){
 				var mod= this.bannerList[index]
 				
@@ -456,26 +509,38 @@
 
 				//this.submitForm.deviceNo = this.detail.deviceNo;
 				API.startCarCharging(this.submitForm).then((res) => {
-					//(JSON.stringify(this.res))
-					this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
-
+					//(JSON.stringify(this.res))
+					
+					if(res.data.status=="1"){
+						this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
+					
+					}else if(res.data.status=="5"){
+						uni.hideLoading()
+						uni.showModal({
+							title: '提示',
+							confirmText:"充值并开始充电",
+							content: '账户余额不足，是否充值？',
+							success: showModal => {
+								if (showModal.confirm) {
+									//付钱  改为组件
+									this.recordId=res.data.recordId;
+									this.otherNum_f=res.data.fee;
+									
+									this.show=true;
+									uni.hideLoading()
+								} else if (showModal.cancel) {
+									//('用户点击取消');
+								}
+							}
+						});
+					}
+					
+					
 
 				}).catch(error => {
 					uni.hideLoading()
 					if (error == '用户账户余额不足!') {
-						uni.showModal({
-							title: '支付',
-							content: '用户账户余额不足，是否充值？',
-							success: res => {
-								if (res.confirm) {
-									//付钱  改为组件
-									this.gotoUrl("pages/user/finance/recharge");
-
-								} else if (res.cancel) {
-									//('用户点击取消');
-								}
-							}
-						});
+						
 					} else {
 						uni.showToast({
 							title: error
@@ -566,25 +631,8 @@
 					return
 				}
 
-
-				if (this.submitForm.chargeStrategy == 0 && this.user.balance < 1) {
-					uni.showModal({
-						title: '支付',
-						content: '余额不足1元无法开启充满自停，是否充值？',
-						success: res => {
-							if (res.confirm) {
-								//付钱  改为组件
-								this.gotoUrl("pages/user/finance/recharge");
-
-							} else if (res.cancel) {
-								//('用户点击取消');
-							}
-						}
-					});
-				} else {
-
-					this.confirm()
-				}
+				this.confirm()
+			 
 
 
 			},
@@ -598,12 +646,30 @@
 	}
 </style>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	.textinfo{
+		padding: 40rpx;
+		font-size: 14px !important;
+		color: #999999;
+	
+		p{
+			font-size: 16px !important;
+			color:#101010;
+			    font-weight: bold;
+		}
+	}
+	.lefttitle{
+		font-weight: bold;
+		font-size: 16px
+	}
 	@import "@/_theme.scss";
 	.listlength{
 		    float: right;
 		    padding-right: 10px;
 	}
+	/deep/.u-drawer-content{
+		border-radius: 10px 10px 0 0
+	}
 	
 	/deep/.u-radio-group {
 		width: 100%;
@@ -630,7 +696,7 @@
 
 	.recharge {
 		padding: 16px;
-		padding-bottom: 80px;
+		// padding-bottom: 80px;
 		.title {
 			@include themeify{
 				font-size: themed('font-size3');
@@ -657,7 +723,7 @@ position: relative;
 			flex-wrap: wrap;
 			// justify-content: space-between;
 			margin-top: 12px;
-			margin-bottom: 20px;
+			margin-bottom: 5px;
 
 			.recharge-item {
 				.u-input {
@@ -665,7 +731,7 @@ position: relative;
 				}
 				width: 31%;
 				border: 1px solid #e3e3e3;
-				padding: 15px 0;
+				padding: 10px 0;
 				border-radius: 4px;
 				text-align: center;
 				margin-bottom: 10px;
@@ -735,7 +801,7 @@ position: relative;
 
 	//优惠券
 	.discounts {
-		margin-top: 20px;
+		margin-top: 10px;
 		width: 100%;
 
 		.title {
@@ -827,7 +893,7 @@ position: relative;
 	
 	// 优惠券2
 	.discounts2{
-		margin-top: 20px;
+		margin-top: 10px;
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
@@ -890,29 +956,31 @@ position: relative;
 	
 	
 	// 尾部
-	.bottom {
+	.bottom {
+		background: #fff;
 		width: 100%;
-		height: 64px;
-		line-height: 64px;
-		position: fixed;
-		bottom: 0;
-		left: 0;
+		// height: 64px;
+		// line-height: 64px;
+		// position: fixed;
+		// bottom: 0;
+		// left: 0;
 		z-index: 999;
-		padding: 12px 16px;
+		padding: 0px 16px 16px;
 	
 		.botton {
 			//width: 343px;
-/*			height: 40px;
-			line-height: 40px;*/
+			height: 40px;
+			line-height: 40px;
+			font-size:16px;
 			border-radius: 50px;
 			background-color: rgba(0, 185, 98, 100);
 			color: rgba(255, 255, 255, 100);
 /*			font-size: 16px;*/
-			@include themeify{
-				font-size: themed('font-size3');  
-				line-height: themed('font-size15');
-				height: themed('font-size15');			
-			}
+			// @include themeify{
+			// 	font-size: themed('font-size3');  
+			// 	line-height: themed('font-size15');
+			// 	height: themed('font-size15');			
+			// }
 			text-align: center;
 			margin: 0 auto;
 		}
@@ -922,10 +990,8 @@ position: relative;
 	.couponsuse{
 		color: rgba(153, 153, 153, 100);
 		margin-top: 10px;
-		@include themeify{
-			font-size: themed('font-size1'); 
-		}
-/*		font-size: 12px;*/
+	
+		font-size: 14px;
 		text-align: left;
 		font-family: AlibabaPuHui-regular;
 	}

pages/searchPile/stationAndPile/stationDetails.vue

@@ -50,7 +50,7 @@
 				<view class="date"><text><img src="../../../assets/img/riLine-map-pin-time-line.svg" alt=""></text>
 				{{stationDetail.station.describe}}</view>
 			</view>
-			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;" @click="parkingTips=true">
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;" @click="parkingTips=true" v-if="stationDetail.station.parkingDescription">
 				<view class="park"><text><img src="../../../assets/img/riLine-parking-box-line.svg" alt=""></text>
 				{{stationDetail.station.parkingDescription}}</view>
 				<view class="iconfont park-font">

pages/user/finance/recharge.vue

@@ -294,6 +294,7 @@
 				})
 			},
 			moneyClick(index,item) {
+				this.otherNum='';
 				this.moneyActiveClass = index;
 				if(item){
 					this.selectItem=item;