zhengkaixin 1 år sedan
förälder
incheckning
db321629ff

+ 13 - 13
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -39,7 +39,9 @@
 
 			<scroll-view class="scroll-view_H" scroll-x="true" :scrollWithAnimation="true" @scroll="scroll"
 				:scrollLeft="scrollLeftSet" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
-				<view class="scroll-view-item_H" v-if="!ispay" v-for="(item,i) in cardList" :key="i">
+				<view class="scroll-view-item_H" :style="cardList.length==1?'    width: 100%;':''"
+				 
+				 v-if="!ispay" v-for="(item,i) in cardList" :key="i">
 					<view :style="'background-image: url('+item.monthlyRentCard.image+') ;'"
 						:class="'cardtab card-'+i ">
 						<view class="tag" v-if="item.monthlyRentCard.isVip">{{item.monthlyRentCard.platformText}}车主
@@ -317,8 +319,6 @@
 			<button class="btn " v-else-if="userInfo.userType=='1'">游客无法购买月卡
 			</button>
 			
-		
-			
 			<button class="btn " v-else-if="!isReady">加载中
 			</button>
 			<button class="btn " v-else-if="ispay"> {{userCard&&ispay?userCard.endTime:''}}到期
@@ -415,7 +415,7 @@
 				show3: false,
 				show2: true,
 				show1: false,
-				infoSet: false,
+				infoSet: true,
 				infoSet1: false,
 				userCard: null,
 				isReady: false,
@@ -732,18 +732,18 @@
 						if (res.data.regUser) {
 							var userInfo = res.data.regUser
 							this.userInfo = userInfo;
-							if (userInfo.userType == "1") {
+							// if (userInfo.userType == "1") {
 
-							} else if (userInfo.carId && userInfo.realName) {
-								this.infoSet = true;
+							// } else if (userInfo.carId && userInfo.realName) {
+							// 	this.infoSet = true;
 
-							} else {
-								this.infoSet = false;
-								if (this.endCardBool) {
-									this.infoSet1 = true;
-								}
+							// } else {
+							// 	this.infoSet = false;
+							// 	if (this.endCardBool) {
+							// 		this.infoSet1 = true;
+							// 	}
 
-							}
+							// }
 
 							var userCard = res.data.userCard;
 							this.userCard = userCard

+ 1 - 1
pages/searchPile/searchPile.vue

@@ -298,7 +298,7 @@
 
 					</view>
 
-					<u-divider margin-top="20" style="margin-bottom: 20px;" bg-color="#F2F4F4"
+					<u-divider margin-top="20"  v-if="stationslist.length!=0" style="margin-bottom: 20px;" bg-color="#F2F4F4"
 						 >已经到底了</u-divider>
 
 				</view>

+ 23 - 5
pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -287,10 +287,25 @@
 						</view>
 					</view>
 					</view>
-			<!-- 	<view>
-					<img @click="gotoUrl('')" src="@/assets/img/9-4/6show.png">
-				</view> -->
-			</view>
+			
+			</view>
+			
+			<view class="carImg3" v-else-if="carImg4Bl&&!userCardBool">
+				<view class="carImg2" >
+					
+			
+					<view>
+						<view class="carImg-1">每月只需12.9元</view>
+						<view  class="carImg-2">前338度电可省约<span>67.6</span>元</view>
+						<view  class="carImg-3" @click="gotoUrl('pages/discountCard/productDetails')">
+							<span>点击购买</span>
+						</view>
+					</view>
+					</view>
+			
+			</view>
+			
+			
 			<!-- <u-modal v-model="showVin"  class="showOss" 
 		    confirm-text="注册会员"   cancel-text="先不注册"
 			width="560"
@@ -565,7 +580,8 @@
 		},
 		data() {
 			return {
-				carImg3Bl:false,
+				carImg3Bl:false,
+				carImg4Bl:false,
 				carImg3span1:0,
 				carImg3span2:0,
 				
@@ -966,6 +982,8 @@
 						this.carImg3span1=parseInt(num1/10000);
 						this.carImg3span2=parseInt(num2*0.4) ;
 						this.carImg3Bl=true;
+					}else{
+						this.carImg4Bl=true;
 					}
 					
 				}).catch(error => {

+ 31 - 17
pages/user/index.vue

@@ -35,19 +35,18 @@
 					<img src="@/assets/img/9-4/黄金会员.svg" v-if="personInfo.memberLevel==2" >
 					<img src="@/assets/img/9-4/铂金会员.svg" v-if="personInfo.memberLevel==3" >
 					
-					<view class="rightText rightTextA"  v-if="personInfo.memberLevel==1||personInfo.memberLevel==null">
+					<view class="rightText " 
+					 :class="{
+						 rightTextA:personInfo.memberLevel==1||personInfo.memberLevel==null,
+						  rightTextB:personInfo.memberLevel==2,
+						    rightTextC:personInfo.memberLevel==3,
+							  rightTextD:personInfo.memberLevel==4
+					 }" >
 						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
-						<view class="rightText2">可购买6折卡</view>
+						<view class="rightText2"  v-if="false">查看详情</view>
 						
 					</view>
-					<view class="rightText rightTextB"  v-if="personInfo.memberLevel==2">
-						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
-						<view class="rightText2">可购买月卡</view>
-					</view>
-					<view class="rightText rightTextC"  v-if="personInfo.memberLevel==3">
-						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
-						<view class="rightText2">可购买月卡</view>
-					</view>
+					
 				</view>
 				
 			</view>
@@ -188,23 +187,25 @@
 		</view>
 		<!-- 菜单 -->
 		<view class="menu">
-			<view class="item" @click="chargingRecord">
+			<view class="item" @click="toRecharge">
 				<view class="item-icon">
-					<img src="@/assets/img/gologin/img3.svg">
+					
+					<img src="@/assets/img/gologin/img4.svg">
 				</view>
 				<view class="item-name " oldstyle="font-size: 16px;">
-					充电记录
+					快速充值
 				</view>
 			</view>
-			<view class="item" @click="myAppointment">
+			
+			<view class="item" @click="chargingRecord">
 				<view class="item-icon">
-					
-					<img src="@/assets/img/gologin/img4.svg">
+					<img src="@/assets/img/gologin/img3.svg">
 				</view>
 				<view class="item-name " oldstyle="font-size: 16px;">
-					我的预约
+					充电记录
 				</view>
 			</view>
+		
 			
 			
 			<view class="item" @click="toInvoice">
@@ -227,6 +228,8 @@
 		<!-- 菜单 -->
 		<view class="menu" style="margin-bottom:60px ;">
 			
+			
+			
 			<view class="item" @click="gotoUrl('pages/service/service')">
 				<view class="item-icon">
 					<i class="ri-customer-service-2-line"></i>
@@ -259,6 +262,17 @@
 					关于我们
 				</view>
 			</view>
+			
+			<view class="item"  @click="myAppointment">
+					<view class="item-icon" style="line-height: 52rpx;">
+						
+						<u-icon name="hourglass" size="24px" ></u-icon>
+			
+					</view>
+					<view class="item-name " oldstyle="font-size: 16px;">
+						我的预约
+					</view>
+			</view>
 			<!-- <view class="item">
 				<view class="item-icon">
 					<i class="ri-tools-line"></i>