zhengkaixin 1 jaar geleden
bovenliggende
commit
20c677bd2a

+ 2 - 1
.env.dev.js

@@ -14,7 +14,8 @@ const UNI_APP = {
 	defaultStation:["e012f9fe-90a8-4a47-bb64-26ea139c3c05"],
 	//defaultStation:[],
 	openId:"zkxtest23",//zkx
-
+	gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
+	wechatUrl:"/youdian",
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//

+ 4 - 3
.env.js

@@ -10,14 +10,15 @@
     if (process.env.NODE_ENV === "development") {  
 
          ENV_VAR = require('.env.dev.js');
+		ENV_VAR = require(`@/config/.env.test.js`);
 		
     } else if (process.env.NODE_ENV === "production") {  
 		if(NODE_NAME=="test"){
-			ENV_VAR = require(`config/.env.test${envjs}.js`); 
+			ENV_VAR = require(`@/config/.env.test${envjs}.js`); 
 		}else if(NODE_NAME=="production"){
-			ENV_VAR = require(`config/.env.prod${envjs}.js`);
+			ENV_VAR = require(`@/config/.env.prod${envjs}.js`);
 		} else  {  
-			ENV_VAR = require('.env.prod.js');  
+			ENV_VAR = require('@/config/.env.prod.js');  
 		} 
     }  
 

+ 0 - 1
App.vue

@@ -10,7 +10,6 @@
 			}
 		},
 		onLoad() {
-			this.projectName = process.car.ProjectName;
 		},
 		onLaunch: function() {
 			

+ 3 - 3
apis/weixin.js

@@ -34,7 +34,7 @@ export function alpay(data) {
 //根据code换取openid
 export function getDataByCode(code) {
 	return request({
-		url: '/wechat/findUserInfo/' + code,
+		url: process.car.wechatUrl+'/findUserInfo/' + code,
 		params: {},
 		method: 'get',
 	})
@@ -52,7 +52,7 @@ export function getDataByCodeALI(code) {
 //获得配置
 export function getConfig() {
 	return requestWhite({
-		url: '/wechat/getConfig',
+		url: process.car.wechatUrl+'/getConfig',
 		data: {
 			url: window.location.href.split('#')[0]
 		},
@@ -62,7 +62,7 @@ export function getConfig() {
 
 export function checkSubscribe(data) {
 	return requestWhite({
-		url: '/wechat/checkSubscribe',
+		url: process.car.wechatUrl+'/checkSubscribe',
 		data: data,
 		method: 'post',
 	})

+ 1 - 1
components/u-navbar/u-navbar.vue

@@ -324,7 +324,7 @@
 			gotoGz() {
 				this.carhelp.setGzDate()
 				this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				var url = process.car.gzUrl;
 				window.location.href = url
 			
 			},

+ 3 - 1
config/.env.prod-youdian.js

@@ -6,11 +6,13 @@ const UNI_APP = {
 		
 	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
 	branchParameter:"youdian",//team51,youdian
+	gzUrl:"https://mp.weixin.qq.com/s/syLTJR69MWZY-D4ewa_1og",
 	NODE_ENV :"prod",
+	 wechatUrl:"/youdian",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	VUE_APP_ALIAPPID:"2021003131641247",
 }  
 

+ 2 - 0
config/.env.prod.js

@@ -6,6 +6,8 @@ const UNI_APP = {
 		
 	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
 	branchParameter:"team51",//team51,youdian
+	gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
+	 wechatUrl:"/wechat",
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId

+ 4 - 1
config/.env.test-youdian.js

@@ -6,14 +6,17 @@ const UNI_APP = {
 	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
     //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
    defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
+   gzUrl:"https://mp.weixin.qq.com/s/syLTJR69MWZY-D4ewa_1og",
    
 	branchParameter:"youdian",//team51,youdian
 	NODE_ENV :"test",
+	wechatUrl:"/youdian",
 	SIMPLE_RUN:false,
 	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",D
 	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	//VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	VUE_APP_ALIAPPID:"2021003131641247",
 	//zkx的测试openId
 	// openId:"oHjCawsJ5blME36lHaSpSVfEhleU",

+ 2 - 1
config/.env.test.js

@@ -6,7 +6,8 @@ const UNI_APP = {
 	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
     //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
    defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
-   
+   gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
+   wechatUrl:"/wechat",
 	branchParameter:"team51",//team51,youdian
 	NODE_ENV :"test",
 	SIMPLE_RUN:false,

+ 5 - 3
main.js

@@ -176,10 +176,12 @@ Vue.mixin({
 	onLoad(option) {
 		if (option.test == 'test') {
 			let vConsole = new Vconsole()
-		}
-
-	},
+		}
+		this.projectName = process.car.ProjectName;
+	},
+	
 	methods: {
+		
 		setValidity(periodOfValidity){
 			if(periodOfValidity<=365){
 				return periodOfValidity+'天';

+ 10 - 10
package.json

@@ -62,32 +62,32 @@
 					"NODE_NAME_T": "production-TEAM51"
 				}
 			},
-			"test-platform-yuodian": {
-				"title": "test-yuodian",
+			"test-platform-youdian": {
+				"title": "test-youdian",
 				"BROWSER": "Chrome",
 				"env": {
 					"UNI_PLATFORM": "h5",
 					"NODE_NAME": "test",
-					"branchParameter":"yuodian",
-					"envjs":"-yuodian"
+					"branchParameter":"youdian",
+					"envjs":"-youdian"
 				},
 				"define": {
 					"CUSTOM-CONST": true,
-					"NODE_NAME_T": "test-yuodian"
+					"NODE_NAME_T": "test-youdian"
 				}
 			},
-			"production-platform-yuodian": {
-				"title": "production-yuodian",
+			"production-platform-youdian": {
+				"title": "production-youdian",
 				"BROWSER": "Chrome",
 				"env": {
 					"UNI_PLATFORM": "h5",
 					"NODE_NAME": "production",
-					"branchParameter":"yuodian",
-					"envjs":"-yuodian"
+					"branchParameter":"youdian",
+					"envjs":"-youdian"
 				},
 				"define": {
 					"CUSTOM-CONST": true,
-					"NODE_NAME_T": "production-yuodian"
+					"NODE_NAME_T": "production-youdian"
 				}
 			}
 		}

+ 1 - 1
pages/discountCard/productDetails.vue

@@ -765,7 +765,7 @@
 			},
 			gotoGz() {
 				//this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				var url = process.car.gzUrl;
 				window.location.href = url
 			
 			},

+ 1 - 1
pages/login/login.vue

@@ -270,7 +270,7 @@
 			},
 			gotoGz() {
 				this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+			var url = process.car.gzUrl;
 				window.location.href = url
 
 			},

+ 1 - 1
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -599,7 +599,7 @@
 			},
 			gotoGz() {
 				this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href = url
 
 			},

+ 1 - 1
pages/searchPile/chargeProcess/dcCharging.vue

@@ -998,7 +998,7 @@
 			},
 			gotoGz() {
 				this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href = url
 
 			},

+ 1 - 2
pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -776,8 +776,7 @@
 			},
 			gotoGz() {
 				this.carhelp.setGzDate()
-			//	this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				var url = process.car.gzUrl;
 				window.location.href = url
 			
 			},

+ 1 - 1
pages/user/InviteFriends.vue

@@ -196,7 +196,7 @@
 		methods: {
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href=url
 				
 			},

+ 1 - 1
pages/user/finance/recharge.vue

@@ -201,7 +201,7 @@
 			},
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href=url
 				
 			},

+ 1 - 1
pages/user/index.vue

@@ -551,7 +551,7 @@
 			},
 			gotoGz() {
 				this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href = url
 
 			},

+ 1 - 1
pages/user/newYear2024.vue

@@ -301,7 +301,7 @@
 			gotoGz() {
 				this.carhelp.setGzDate()
 				//	this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				var url = process.car.gzUrl;
 				window.location.href = url
 
 			},

+ 1 - 1
pages/user/sharePicc.vue

@@ -334,7 +334,7 @@
 			gotoGz() {
 				this.carhelp.setGzDate()
 			//	this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+					var url = process.car.gzUrl;
 				window.location.href = url
 			
 			},