zhengkaixin 2 years ago
parent
commit
9b4c3f40bb

+ 4 - 4
.env.dev.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
 const UNI_APP = {  
 	ProjectName :"51充电联盟",
 	ProjectName :"51充电联盟",
-	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,
 	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,
 	//PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
 	//PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
@@ -11,8 +11,8 @@ const UNI_APP = {
 	
 	
 	openId:"zkxtest",//zkx
 	openId:"zkxtest",//zkx
 	
 	
-	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
-	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	
 	

+ 1 - 1
pages/index/index.vue

@@ -399,7 +399,7 @@
 							会员服务费{{discountRatio10(stationData.discountRatio)}}折</view>
 							会员服务费{{discountRatio10(stationData.discountRatio)}}折</view>
 						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
 						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
 						<view class="sign-4"
 						<view class="sign-4"
-							v-if="stationData.id=='3c554cea-f522-4281-b582-d761510ed91e'||stationData.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'">
+							v-if="stationData.id=='3c554cea-f522-4281-b582-d761510ed91e'||stationData.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'||stationData.nightLowPriceEnabled">
 							夜间超低价</view>
 							夜间超低价</view>
 
 
 						<view class="sign-2" v-if="stationData.tagList.length != 0"
 						<view class="sign-2" v-if="stationData.tagList.length != 0"

+ 1 - 1
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -226,7 +226,7 @@
 							会员服务费{{discountRatio10(stationData.discountRatio)}}折</view>
 							会员服务费{{discountRatio10(stationData.discountRatio)}}折</view>
 						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
 						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
 						<view class="sign-4"
 						<view class="sign-4"
-							v-if="stationData.id=='3c554cea-f522-4281-b582-d761510ed91e'||stationData.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'">
+							v-if="stationData.id=='3c554cea-f522-4281-b582-d761510ed91e'||stationData.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'||stationData.nightLowPriceEnabled">
 							夜间超低价</view>
 							夜间超低价</view>
 
 
 						<view class="sign-2" v-if="stationData.tagList.length != 0"
 						<view class="sign-2" v-if="stationData.tagList.length != 0"

+ 1 - 1
pages/search/search.vue

@@ -34,7 +34,7 @@
 			<view class="sign" v-if="item.stationType!=50&&personInfo&&personInfo.userType!=1">
 			<view class="sign" v-if="item.stationType!=50&&personInfo&&personInfo.userType!=1">
 				<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员服务费{{discountRatio10(item.discountRatio)}}折</view>
 				<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员服务费{{discountRatio10(item.discountRatio)}}折</view>
 				<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
 				<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
-				<view class="sign-4" v-if="item.id=='3c554cea-f522-4281-b582-d761510ed91e'||item.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'">夜间超低价</view>
+				<view class="sign-4" v-if="item.id=='3c554cea-f522-4281-b582-d761510ed91e'||item.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'||item.nightLowPriceEnabled">夜间超低价</view>
 				
 				
 				<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 				<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 			
 			

+ 15 - 1
pages/searchPile/searchPile.vue

@@ -160,7 +160,9 @@
 							<template v-if="personInfo&&personInfo.userType!=1">
 							<template v-if="personInfo&&personInfo.userType!=1">
 								<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员服务费{{discountRatio10(item.discountRatio)}}折</view>
 								<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员服务费{{discountRatio10(item.discountRatio)}}折</view>
 								<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
 								<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
-								
+								<view class="sign-4"
+									v-if="item.id=='3c554cea-f522-4281-b582-d761510ed91e'||item.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'||item.nightLowPriceEnabled">
+									夜间超低价</view>
 								<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 								<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
 								
 								
 							</template>
 							</template>
@@ -1903,6 +1905,18 @@ font-weight: 600;
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 			margin-bottom: 8rpx;
 			margin-bottom: 8rpx;
 		}
 		}
+		.sign-4 {
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #00B962;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid #00B962;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
 	}
 	}
 	
 	
 		.park-text2 {
 		.park-text2 {

+ 15 - 2
pages/searchPile/stationAndPile/stationDetails.vue

@@ -55,7 +55,9 @@
 					会员服务费{{discountRatio10(station.discountRatio)}}折</view>
 					会员服务费{{discountRatio10(station.discountRatio)}}折</view>
 
 
 				<view class="sign-3" v-if="station.category=='超充'">160kW超充站</view>
 				<view class="sign-3" v-if="station.category=='超充'">160kW超充站</view>
-
+				<view class="sign-4"
+					v-if="stationDetail.station.id=='3c554cea-f522-4281-b582-d761510ed91e'||stationDetail.station.id=='3865b3a3-13fd-461a-8145-ee9711df35a2'||stationDetail.station.nightLowPriceEnabled">
+					夜间超低价</view>
 
 
 				<view class="sign-2" v-if="stationDetail.station.tagList.length != 0"
 				<view class="sign-2" v-if="stationDetail.station.tagList.length != 0"
 					v-for="(tagName,tagIndex) in stationDetail.station.tagList" :key="tagIndex">{{tagName}}</view>
 					v-for="(tagName,tagIndex) in stationDetail.station.tagList" :key="tagIndex">{{tagName}}</view>
@@ -2421,7 +2423,18 @@
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 			margin-bottom: 8rpx;
 			margin-bottom: 8rpx;
 		}
 		}
-
+		.sign-4 {
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #00B962;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid #00B962;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
 		.sign-2 {
 		.sign-2 {
 			height: 20px;
 			height: 20px;
 			line-height: 20px;
 			line-height: 20px;