zhengkaixin 9 months ago
parent
commit
bbc6475707
2 changed files with 2 additions and 2 deletions
  1. 1 1
      config/.env.dev.ud.js
  2. 1 1
      main.js

+ 1 - 1
config/.env.dev.ud.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"优电联盟",
 	BASE_URL: 'https://youdian.hbjp.com.cn/charging-station-server/',
 	//
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,

+ 1 - 1
main.js

@@ -204,7 +204,7 @@ Vue.mixin({
 		
 		quickChargeReduceMethod1(station){
 			//普通满减活动
-			if(station.quickChargeReduceResult&& station.quickChargeJoinActivity==0){
+			if(station.quickChargeReduceResult&&(!station.quickChargeJoinActivity|| station.quickChargeJoinActivity==0)){
 				
 				return true 
 			}