调整

pages/login/login.vue

@@ -4,7 +4,7 @@
 			
 				<view slot="right" 
 				 v-if="!personInfo"
-				 @click="touristBl=true" style=" margin-right: 10px;color:#00B962"> 游客模式</view>
+				 @click="show3=true" style=" margin-right: 10px;color:#00B962"> 游客模式</view>
 		</ujp-navbar>
 		
 		<view class="login">
@@ -49,9 +49,9 @@
 		<u-modal v-model="show1" @confirm="gotoGz"
 		cancel-text="暂不关注"  
 		confirm-text="前往关注"
-		
+		:show-cancel-button="false"
 		 confirm-color="#53b56b"
-			:show-cancel-button="true" 
+			
 			ref="uModal2" :asyncClose="true" 
 			 >
 			<view style="padding: 15px;"
@@ -59,19 +59,32 @@
 			>请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行会员注册</view>
 		</u-modal>
 		
-		<u-modal v-model="touristBl" 
-		:show-cancel-button="true"
-		   @confirm="touristConfirm"
-		cancel-text="取消"  	confirm-text="游客登录" title="提示">
-			<view style="
-								text-align: center;
-							">
+		<u-modal v-model="show3" v-show="!show1"  class="showOss"
+		    confirm-text="注册会员"   cancel-text="先不注册"
+			width="600"
+			title="提示"
+		  :show-cancel-button="false" :show-confirm-button="false" >
+			<view class="slot-content">
+				<!-- :show-title="false" -->
 				
+					<view style="padding:0 20rpx;font-size: 32rpx;margin: 10px 0">
+						<b>【游客模式】</b>免注册可快速充电与退款<br/>
+						<b>【会员模式】</b>注册后可享服务费85折等
+						多重会员优惠
+					</view>
+					<view  style="    margin: auto  60rpx; ">
+					<u-button shape="circle" @click="touristConfirm"
+					 style="    width: 200rpx;    background-color: #fff !important; margin: 20rpx;float: left;margin-bottom: 20px; "
+					 szie="mini" type="success" plain >游客模式</u-button>
+					<u-button shape="circle"
+					   style=" float: left;   width: 200rpx; margin: 20rpx;margin-bottom: 20px; "
+					  szie="mini" type="success"  @click="show3=false" >会员模式</u-button>
+					</view>
 			</view>
-			<view style="text-align: center;    padding: 10px;">游客身份充电将无法享受平台服务费8.5折及各类优惠券活动哦~</view>
-		
 		</u-modal>
 		
+	
+		
 	</view>
 </template>
 
@@ -107,6 +120,7 @@
 				projectName:'',
 				show1:false,
 				show2:false,
+				show3:false,
 				touristBl:false,
 				personInfo:null,
 				
@@ -162,6 +176,8 @@
 						url: '/pages/index/index'
 					})
 				}
+			}else{
+				this.show3=true
 			}
 			
 			
@@ -215,7 +231,10 @@
 						
 					}else{
 						//this.init();
+						this.show1=false;
 						this.show2=true;
+						
+						
 						//this.carhelp.setGzDate() 
 						
 					}

pages/searchPile/chargeProcess/charge.vue

@@ -454,7 +454,13 @@
 				this.payValue=0;
 			}else{
 				this.payValueTemp=1;
+				
+				var payValueDefault=this.carhelp.get("payValueDefault");
+				
 				this.payValue=1;
+				if(payValueDefault=="1"||payValueDefault=="0"){
+					this.payValue=payValueDefault;
+				}
 			}
 			this.payName=this.payList[this.payValue].name;
 			
@@ -803,6 +809,7 @@
 				//this.submitForm.deviceNo = this.detail.deviceNo;
 				API.startCarCharging(this.submitForm).then((res) => {
 					//(JSON.stringify(this.res))
+					this.carhelp.set("payValueDefault",this.payValue);
 					
 					if(res.data.status=="5"){