改造分支

.env.dev.js

@@ -14,7 +14,7 @@ const UNI_APP = {
 	defaultStation:["e012f9fe-90a8-4a47-bb64-26ea139c3c05"],
 	//defaultStation:[],
 	openId:"zkxtest23",//zkx
-	
+
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
@@ -27,6 +27,7 @@ const UNI_APP = {
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//sz
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
+	branchParameter:"TEAM51",//team51,youdian
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 	VUE_APP_ALIAPPID:"2021003131641247",
 }  

.env.js

@@ -3,33 +3,31 @@
     let ENV_VAR = null;  
 	 
 	var NODE_NAME=  process.env['NODE_NAME']
-	console.log(NODE_NAME)
+	var branchParameter=  process.env['branchParameter']
+	var envjs=  process.env['envjs']
+	
+	console.log(NODE_NAME,branchParameter,envjs)
     if (process.env.NODE_ENV === "development") {  
 
-        if (NODE_ENV === 'dev') {  
-            ENV_VAR = require('.env.dev.js');  
-        } else if (NODE_ENV === 'test') {  
-			ENV_VAR = require('.env.test.js'); 
-        } else{
-			 ENV_VAR = require('.env.dev.js');  
-		}
+         ENV_VAR = require('.env.dev.js');
 		
     } else if (process.env.NODE_ENV === "production") {  
-		
 		if(NODE_NAME=="test"){
-			ENV_VAR = require('.env.test.js'); 
+			ENV_VAR = require(`config/.env.test${envjs}.js`); 
 		}else if(NODE_NAME=="production"){
-			ENV_VAR = require('.env.prod.js');
+			ENV_VAR = require(`config/.env.prod${envjs}.js`);
 		} else  {  
 			ENV_VAR = require('.env.prod.js');  
 		} 
-      
     }  
 
     if (ENV_VAR) {  
 		process.car = {};  
+		process.car.envjs=envjs;
+		process.car.branchParameter=branchParameter;
         for (let key in ENV_VAR) {  
 			process.car[key] = ENV_VAR[key];			
         }  
+	
     }  
 })();

config/.env.prod-youdian.js

@@ -0,0 +1,17 @@
+const UNI_APP = {  	
+		ProjectName :"51充电联盟",
+    BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
+	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
+		
+	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
+	branchParameter:"TEAM51",//team51,youdian
+	NODE_ENV :"prod",
+	SIMPLE_RUN:false,
+	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
+	//小鹏管家appid
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_ALIAPPID:"2021003131641247",
+}  
+
+module.exports = UNI_APP;

.env.prod.js → config/.env.prod.js

@@ -2,10 +2,10 @@ const UNI_APP = {
 		ProjectName :"51充电联盟",
     BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
-		XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
+	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
 		
 	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
-	
+	branchParameter:"TEAM51",//team51,youdian
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId

config/.env.test-youdian.js

@@ -0,0 +1,29 @@
+const UNI_APP = {  
+	ProjectName :"51充电联盟",
+    //BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
+	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
+	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
+    //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
+   defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
+   
+	branchParameter:"TEAM51",//team51,youdian
+	NODE_ENV :"test",
+	SIMPLE_RUN:false,
+	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
+	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",D
+	//小鹏管家appid
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_ALIAPPID:"2021003131641247",
+	//zkx的测试openId
+	// openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
+	// openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
+	// openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
+	//zq的测试openId
+	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU"
+	//openId:"test004",
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
+	
+}  
+
+module.exports = UNI_APP;

.env.test.js → config/.env.test.js

@@ -7,7 +7,7 @@ const UNI_APP = {
     //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
    defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2"],
    
-
+	branchParameter:"TEAM51",//team51,youdian
 	NODE_ENV :"test",
 	SIMPLE_RUN:false,
 	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId

package.json

@@ -1,63 +1,95 @@
-{
- "scripts": {
-  "test:h5": "cross-env UNI_PLATFORM=h5 jest -i",
-  "serve": "vue-cli-service serve",
-  "build": "vue-cli-service build",
-  "test": "vue-cli-service build --mode test"
- },
- "dependencies": {
-  "compression-webpack-plugin": "^8.0.1",
-  
-   "echarts": "^5.3.2",
-  "qrcodejs2": "^0.0.2",
-  "remixicon": "^2.5.0",
-  "sass-mixins-variables": "^1.1.0",
-  "uni-crazy-router": "0.0.31",
-  "uni-simple-router": "^2.0.1",
-  "uview-ui": "^1.8.4",
-  "vconsole": "^3.4.0",
-  "vue-cli": "^2.9.6",
-  "vue-cropper": "^0.5.6",
-  "vuex": "^3.6.2",
-  "weixin-js-sdk": "^1.6.0"
- },
- "devDependencies": {
-  "@vue/cli-plugin-babel": "^4.0.0",
-  "@vue/cli-plugin-eslint": "^4.0.0",
-  "@vue/cli-service": "^4.0.0",
-  "babel-eslint": "^10.0.3",
-  "eslint": "^5.16.0",
-  "eslint-plugin-vue": "^5.0.0",
-  "node-sass": "^5.0.0",
-  "sass-loader": "^11.0.1",
-  "vue-template-compiler": "^2.6.10"
- },
- "uni-app": {
-  "scripts": {
-   "test-platform": {
-    "title": "test",
-    "BROWSER": "Chrome",
-    "env": {
-     "UNI_PLATFORM": "h5",
-     "NODE_NAME": "test"
-    },
-    "define": {
-     "CUSTOM-CONST": true,
-	   "NODE_NAME_T": "test"
-    }
-   },
-   "production-platform": {
-    "title": "production",
-    "BROWSER": "Chrome",
-    "env": {
-     "UNI_PLATFORM": "h5",
-     "NODE_NAME": "production"
-    },
-    "define": {
-     "CUSTOM-CONST": true,
-	  "NODE_NAME_T": "production"
-    }
-   }
-  }
- }
-}
+{
+	"scripts": {
+		"test:h5": "cross-env UNI_PLATFORM=h5 jest -i",
+		"serve": "vue-cli-service serve",
+		"build": "vue-cli-service build",
+		"test": "vue-cli-service build --mode test"
+	},
+	"dependencies": {
+		"compression-webpack-plugin": "^8.0.1",
+
+		"echarts": "^5.3.2",
+		"qrcodejs2": "^0.0.2",
+		"remixicon": "^2.5.0",
+		"sass-mixins-variables": "^1.1.0",
+		"uni-crazy-router": "0.0.31",
+		"uni-simple-router": "^2.0.1",
+		"uview-ui": "^1.8.4",
+		"vconsole": "^3.4.0",
+		"vue-cli": "^2.9.6",
+		"vue-cropper": "^0.5.6",
+		"vuex": "^3.6.2",
+		"weixin-js-sdk": "^1.6.0"
+	},
+	"devDependencies": {
+		"@vue/cli-plugin-babel": "^4.0.0",
+		"@vue/cli-plugin-eslint": "^4.0.0",
+		"@vue/cli-service": "^4.0.0",
+		"babel-eslint": "^10.0.3",
+		"eslint": "^5.16.0",
+		"eslint-plugin-vue": "^5.0.0",
+		"node-sass": "^5.0.0",
+		"sass-loader": "^11.0.1",
+		"vue-template-compiler": "^2.6.10"
+	},
+	"uni-app": {
+		"scripts": {
+			"test-platform": {
+				"title": "test",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "test",
+					"branchParameter":"TEAM51",
+					"envjs":""
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "test-TEAM51"
+				}
+			},
+			"production-platform": {
+				"title": "production",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "production",
+					"branchParameter":"TEAM51",
+					"envjs":""
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "production-TEAM51"
+				}
+			},
+			"test-platform-yuodian": {
+				"title": "test-yuodian",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "test",
+					"branchParameter":"yuodian",
+					"envjs":"-yuodian"
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "test-yuodian"
+				}
+			},
+			"production-platform-yuodian": {
+				"title": "production-yuodian",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "production",
+					"branchParameter":"yuodian",
+					"envjs":"-yuodian"
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "production-yuodian"
+				}
+			}
+		}
+	}
+}

pages.json

@@ -874,7 +874,7 @@
             "path" : "pages/store/51store",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+               
                 "enablePullDownRefresh": false
             }
             
@@ -883,7 +883,7 @@
             "path" : "pages/store/commodityDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+               
                 "enablePullDownRefresh": false
             }
             
@@ -892,7 +892,7 @@
             "path" : "pages/store/orderDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+               
                 "enablePullDownRefresh": false
             }
             
@@ -901,7 +901,7 @@
             "path" : "pages/store/orderConfirm",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+               
                 "enablePullDownRefresh": false
             }
             
@@ -910,7 +910,7 @@
         	"path" : "pages/store/myOrder",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "",
+        		
         		"enablePullDownRefresh" : false
         	}
         },
@@ -918,7 +918,7 @@
         	"path" : "pages/store/paymentSuccess",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "",
+        		
         		"enablePullDownRefresh" : false
         	}
         },
@@ -926,7 +926,7 @@
         	"path" : "pages/user/newYear2024",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "",
+        		
         		"enablePullDownRefresh" : false
         	}
         }

utils/init.js

@@ -49,6 +49,7 @@ var app = {
 		 	url: process.car.BASE_URL + loginurl,
 		 	data: {
 		 		openId:thisopenId,
+				branchParameter:process.car.branchParameter
 		 	},
 		 	header: {
 		 		'Content-Type': 'application/x-www-form-urlencoded',

utils/mixin.js

@@ -1,4 +1,4 @@
-var prefix = 'jp_charging_' + process.car.NODE_ENV + '_';
+var prefix = 'jp_charging_' + process.car.NODE_ENV+process.car.envjs + '_';
 
 var app = {
 	getGzDate : (key) => {

utils/request.js

@@ -1,6 +1,5 @@
 import  carhelp from '@/utils/mixin.js'
 import requestSon from './requestSon.js';
-import requestNum from './requestNum.js';
 
 
 const request = (options) => {
@@ -37,7 +36,7 @@ const request = (options) => {
 			url: process.car.BASE_URL + loginurl,
 			data: {
 				openId:openId,
-			
+				branchParameter:process.car.branchParameter
 			},
 			
 			header: {
@@ -60,7 +59,7 @@ const request = (options) => {
 				options.token=token
 				
 				var isson= requestSon(options)
-				//requestNum(options);
+				
 				resolve(isson);
 				 
 			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){

utils/requestNum.js

@@ -1,59 +0,0 @@
-import  carhelp from '@/utils/mixin.js'
-
-//记录请求次数和响应次数
-let reqCount = 0,
-	resCount = 0;
-var baseUrl=process.car.BASE_URL;
-const request = (options) => {
-	var token=carhelp.getToken(options);
-	
-	reqCount++;
-	 
-	return new Promise((resolve, reject) => {
-		//如果特殊链接需要传入token
-		if(options&&options.token){
-			token=options.token;
-		}
-		uni.request({
-			method: 'post',
-			url: baseUrl + '/mobile/messageApi/readMessageNum',
-			//data: options.data?options.data:{},
-			
-			header: {
-				'Content-Type': 'application/x-www-form-urlencoded',
-				'X-Requested-With': 'XMLHttpRequest',
-				'Authorization':token
-			}
-		}).then((response) => {
-			//for(var t = Date.now(); Date.now() - t <= 2000;);
-			
-			resCount++
-			//防止连续请求多个接口时loading闪现
-			let [error, res] = response;
-			
-			
-			if (res.data.code != 200) {
-				reject(res.data.message)
-			} else {
-				if(!res.data.result){
-					uni.showToast({
-						title: res.data.message,
-						position:'bottom'
-					})
-					reject(res.data.message);
-				}else{
-					
-					carhelp.set("tabbar_show_num",res.data.data);
-					resolve(res.data);
-				}
-			
-			}
-		}).catch(error => {
-			resCount++
-		
-			let [err, res] = error;
-			reject(err)
-		})
-	});
-}
-export default request

utils/requestParking.js

@@ -13,7 +13,12 @@ const request = (options) => {
 		uni.request({
 			method: options.method ? options.method : 'get',
 			url: baseUrl + options.url,
-			data: options.data ? options.data : {},
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			timeout:options.timeout?options.timeout:60*1000,
 			header: options.header ? {
 				...options.header,

utils/requestSon.js

@@ -21,8 +21,13 @@ const request = (options) => {
 		uni.request({
 			method: options.method?options.method:'get',
 			url: baseUrl + options.url,
-			data: options.data?options.data:{},
-			
+			 
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			header: options.header?{
 				...options.header,
 				'Authorization':token

utils/requestWhite.js

@@ -22,7 +22,12 @@ const request = (options) => {
 		uni.request({
 			method: options.method?options.method:'get',
 			url: baseUrl + options.url,
-			data: options.data?options.data:{},
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			timeout:1000*600,
 			header: options.header?{
 				...options.header,

utils/requestXpgj.js

@@ -13,7 +13,12 @@ const request = (options) => {
 		uni.request({
 			method: options.method ? options.method : 'get',
 			url: baseUrl + options.url,
-			data: options.data ? options.data : {},
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			timeout:options.timeout?options.timeout:60*1000,
 			header: options.header ? {
 				...options.header,