游客

pages/index/index.vue

@@ -246,8 +246,10 @@
 					{{stationData.address}}
 				</view>
 				<view class="sign" v-else>
-					<view class="sign-1" v-if="stationData.giveDiscount&&stationData.discountRatio">服务费{{stationData.discountRatio/10}}折</view>
-					<view class="sign-2" v-if="stationData.tagList.length != 0" v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
+					<template v-if="personInfo.userType!=1">
+						<view class="sign-1" v-if="stationData.giveDiscount&&stationData.discountRatio">会员服务费{{stationData.discountRatio/10}}折</view>
+						<view class="sign-2" v-if="stationData.tagList.length != 0" v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
+					</template>
 				</view>
 				<view class="price-free oldTextClass">
 					<view class="price">
@@ -459,6 +461,7 @@
 				activityDate: '',
 				activityDateList: {},
 				activityListShow: false,
+				personInfo:{},
 			}
 		},
 		onLoad(op) {
@@ -596,7 +599,7 @@
 					uni.hideLoading();
 					
 					if (res.code == 200&&res.result) {
-						
+						this.personInfo=res.data.regUser;
 						var token = res ? res.data.token : '';					
 						this.carhelp.setPersonInfo(res.data.regUser );
 						this.carhelp.setToken(token);

pages/search/search.vue

@@ -31,8 +31,8 @@
 			<view class="sign" >
 				{{item.address}}
 			</view>
-			<view class="sign" v-if="item.stationType!=50">
-				<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
+			<view class="sign" v-if="item.stationType!=50&&personInfo.userType!=1">
+				<view class="sign-1" v-if="item.giveDiscount">会员服务费{{item.discountRatio/10}}折</view>
 				<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 			</view>
 			<view class="price-free price-freeList">
@@ -97,6 +97,7 @@
 				pageIndex:1,
 				recordsTotal: 0,
 				nav_height:54,
+				personInfo:{},
 				userId:'',
 				keyword:'',
 			  stationslist:[],
@@ -138,7 +139,7 @@
 				
 			 if (this.carhelp.getPersonInfo()) {
 			 	this.userId = this.carhelp.getPersonInfo().id;
-			 			
+			 	this.personInfo=this.carhelp.getPersonInfo();
 			 } 
 			 WxJsApi.getWxConfig(['getLocation','openLocation', 'addEventListener']).then((res)=>{
 			 

pages/searchPile/chargeProcess/charge.vue

@@ -162,6 +162,8 @@
 				2.充满自停模式需要您的余额不低于10元才可充电；<br/>
 				3.充电金额请输入1元~500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱)；<br/>
 				4.完成充电后，在满足条件的情况下，优惠券自动抵扣；提前结束充电则不使用优惠券并返还至您的卡包。<br/>
+			
+				5.先付后退模式，无法享受平台会员的服务费折扣、优惠券等优惠活动。<br/>
 			</view>
 		</view>
 		
@@ -1340,7 +1342,7 @@ position: relative;
 	
 	}
 	.card {
-	
+		overflow: hidden;
 		padding: 10px;
 		margin-top: 10px;
 		.title{
@@ -1363,8 +1365,8 @@ position: relative;
 					width: 64rpx;
 					height: 64rpx;
 					position: absolute;
-					    top: -10px;
-					    right: -10px;
+					    top: -12px;
+					    right: -12px;
 						    border-radius: 0 0 0 8px;
 							img{
 								width: 64rpx;

pages/searchPile/searchPile.vue

@@ -155,8 +155,11 @@
 							{{item.address}}
 						</view>
 						<view class="sign" v-else>
-							<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
-							<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
+							<template v-if="personInfo.userType!=1">
+								<view class="sign-1" v-if="item.giveDiscount">会员服务费{{item.discountRatio/10}}折</view>
+								<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
+								
+							</template>
 						</view>
 						<view class="price-free price-freeList">
 						<view class="price">
@@ -230,9 +233,13 @@
 									</view> -->
 								</view>
 								<view class="sign min-h">
-									<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
+									<template v-if="personInfo.userType!=1">
+										
+								
+									<view class="sign-1" v-if="item.giveDiscount">会员服务费{{item.discountRatio/10}}折</view>
 									<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" 
 										:key="tagIndex">{{tagName}}</view>
+									</template>
 								</view>
 								<view class="price-free  price-freeOne">
 									<view class="price">
@@ -390,6 +397,7 @@ export default {
 				]
 			},
 			userId:'',
+			personInfo:{},
 		};
 	},
 	onLoad(op) {
@@ -433,7 +441,7 @@ export default {
 			
 		 if (this.carhelp.getPersonInfo()) {
 		 	this.userId = this.carhelp.getPersonInfo().id;
-			
+			this.personInfo=this.carhelp.getPersonInfo();
 		 }
 		 
 		 let preference = this.carhelp.get('preference',this.preference)  

pages/searchPile/stationAndPile/stationDetails.vue

@@ -37,16 +37,16 @@
 			</view>
 			
 			<view class="sign" 
-					v-if="stationDetail.station.stationType!=50"
+					v-if="stationDetail.station.stationType!=50&&personInfo.userType!=1"
 			:class="{
 				noImg:!(stationDetail.station != null && stationDetail.station.image != null)
 			}">
 				<view class="sign-1" v-if="station.giveDiscount">
-					服务费{{station.discountRatio/10}}折</view>
+					会员服务费{{station.discountRatio/10}}折</view>
 				<view class="sign-2" v-if="stationDetail.station.tagList.length != 0" 
 					v-for="(tagName,tagIndex) in stationDetail.station.tagList" :key="tagIndex">{{tagName}}</view>
 			</view>
-			<view  v-else  style="height: 30px;" >
+			<view  v-else  style="height: 50px;" >
 				&nbsp;
 			</view>
 			
@@ -489,7 +489,7 @@
 					setIntervalBool:true,
 					priceList: [],
 					platform:'',
-					
+					personInfo:{},
 					devices: {
 						idleNum: 1,
 						total: 6,
@@ -558,7 +558,8 @@
 				this.theme('standard')
 
 			if (this.carhelp.getPersonInfo()) {
-				this.userId = this.carhelp.getPersonInfo().id;
+				this.userId = this.carhelp.getPersonInfo().id;
+				this.personInfo= this.carhelp.getPersonInfo()
 
 			}
 			WxJsApi.getWxConfig(['getLocation','openLocation', 'addEventListener', 'scanQRCode']).then((res) => {

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -23,8 +23,8 @@
 							暂无定位
 						</view> -->
 					</view>
-					<view class="sign">
-						<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
+					<view class="sign" v-if="personInfo.userType!=1">
+						<view class="sign-1" v-if="item.giveDiscount">会员服务费{{item.discountRatio/10}}折</view>
 						<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" 
 							:key="tagIndex">{{tagName}}</view>
 					</view>
@@ -143,6 +143,7 @@
 			return {
 				elderMode:false,
 				userId:'',
+				personInfo:{},
 				id: '',
 				longitude: 112.28468,
 				latitude: 30.307094,
@@ -406,6 +407,8 @@
 				//		//('latitude2  '+this.latitude) 
 				if (this.carhelp.getPersonInfo()) {
 					this.userId = this.carhelp.getPersonInfo().id;
+					this.personInfo=this.carhelp.getPersonInfo();
+					
 							
 				}
 				WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {