调整

.env.js

@@ -1,35 +0,0 @@
-(function() {  
-    const NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
-    let ENV_VAR = null;  
-	 
-	var NODE_NAME=  process.env['NODE_NAME']
-	console.log(NODE_NAME)
-    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');  
-		}
-		
-    } else if (process.env.NODE_ENV === "production") {  
-		
-		if(NODE_NAME=="test"){
-			ENV_VAR = require('.env.test.js'); 
-		}else if(NODE_NAME=="production"){
-			ENV_VAR = require('.env.prod.js');
-		} else  {  
-			ENV_VAR = require('.env.prod.js');  
-		} 
-      
-    }  
-
-    if (ENV_VAR) {  
-		process.car = {};  
-        for (let key in ENV_VAR) {  
-			process.car[key] = ENV_VAR[key];			
-        }  
-    }  
-})();

App.vue

@@ -1,6 +1,6 @@
 <script>
-	import '.env.js'
-	import 'font.js'
+	import './config/font.js'
+	import "./config/.env.js"
 	export default {
 		onLaunch: function() {
 			

apis/weixin.js

@@ -30,7 +30,7 @@ export function wxpay2(data) {
 //根据code换取openid
 export function getDataByCode(code) {
 	return request({
-		url: '/wechat/findUserInfo/' + code,
+		url:process.car.wechatUrl+ '/findUserInfo/' + code,
 		params: {},
 		method: 'get',
 	})
@@ -42,7 +42,7 @@ export function getDataByCode(code) {
 export function getConfig() {
 	
 	return request({
-		url: '/wechat/getConfig',
+		url:process.car.wechatUrl+ '/getConfig',
 		data: {
 			url: window.location.href.split('#')[0]
 		},

.env.dev.js → config/.env.dev.js

@@ -1,8 +1,11 @@
 const UNI_APP = {  
+	ProjectName :"51充电联盟",
 	 BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	// BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
-	
+	branchParameter:"51team",//team51,youdian
+	wechatUrl:"/wechat",
+	envjs:"",
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  

config/.env.dev.ud.js

@@ -0,0 +1,25 @@
+const UNI_APP = {  
+	ProjectName :"优电联盟",
+	 BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	// BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
+	branchParameter:"youdian",//team51,youdian
+	envjs:".ud",
+	wechatUrl:"/youdian",
+	NODE_ENV :"dev",
+	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
+	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  
+	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
+	openId:"1000",
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
+	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",//zkx
+	
+	//小鹏管家appid
+	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
+	 
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
+	
+}  
+
+module.exports = UNI_APP;

config/.env.js

@@ -0,0 +1,51 @@
+(function() {  
+    const NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
+    let ENV_VAR = null;  
+	 
+	var NODE_NAME=  process.env['NODE_NAME']
+	var branchParameter=  process.env['branchParameter']
+	var envjs=  process.env['envjs']
+	
+	console.log(NODE_NAME,branchParameter,envjs)
+    if (process.env.NODE_ENV === "development") {  
+		 
+         ENV_VAR = require('@/config/.env.dev.ud.js');
+		 
+		
+    } else if (process.env.NODE_ENV === "production") {  
+		if(NODE_NAME=="test"){
+			if("youdian"==branchParameter){
+				ENV_VAR = require('@/config/.env.test.ud.js'); 
+			}else if("51team"==branchParameter){
+				ENV_VAR = require('@/config/.env.test.js'); 
+			}else{
+				ENV_VAR = require('@/config/.env.test.js'); 
+			}
+			
+		}else if(NODE_NAME=="production"){
+			
+			if("youdian"==branchParameter){
+				ENV_VAR = require('@/config/.env.prod.ud.js'); 
+			}else if("51team"==branchParameter){
+				ENV_VAR = require('@/config/.env.prod.js'); 
+			}else{
+				ENV_VAR = require('@/config/.env.prod.js'); 
+			}
+			
+		} else  {  
+			ENV_VAR = require('@/config/.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.js

@@ -0,0 +1,16 @@
+const UNI_APP = {
+	ProjectName :"51充电联盟",
+  branchParameter:"51team",//team51,youdian
+  wechatUrl:"/wechat",
+    BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	NODE_ENV :"prod",
+	SIMPLE_RUN:false,
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//测试用openId
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	//VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
+	
+	//小鹏管家appid
+	//VUE_APP_WXAPPID:"wx7e70eb62a8459869"
+}  
+
+module.exports = UNI_APP;

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

@@ -4,7 +4,9 @@ const UNI_APP = {
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//测试用openId
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	branchParameter:"youdian",//team51,youdian
+	wechatUrl:"/youdian",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
 	
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869"

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

@@ -1,10 +1,12 @@
 const UNI_APP = {  
    // BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	ProjectName :"51充电联盟",
 
    //  BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
 	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
    // BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
-   
+   branchParameter:"51team",//team51,youdian
+   wechatUrl:"/wechat",
 
 	NODE_ENV :"test",
 	SIMPLE_RUN:false,
@@ -13,6 +15,7 @@ const UNI_APP = {
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	
 	//zkx的测试openId
 	//openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
 		//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",

config/.env.test.ud.js

@@ -0,0 +1,29 @@
+const UNI_APP = {  
+   // BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+ProjectName :"优电联盟",
+   //  BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
+	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+   // BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
+   
+	branchParameter:"youdian",//team51,youdian
+wechatUrl:"/youdian",
+	NODE_ENV :"test",
+	SIMPLE_RUN:false,
+	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
+	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",
+	//小鹏管家appid
+	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
+	
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
+	
+	//zkx的测试openId
+	//openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
+		//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
+	 //	   oK9Wr54VbEh3xvWYmD_zT5NbH4AY
+	 openId:"10000",
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
+	//zq的测试openId
+	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",
+}  
+
+module.exports = UNI_APP;

jpsoft.vue

@@ -1,75 +0,0 @@
-<template>
-	<view>
-		openId:<u-input v-model="openId" :border="true"></u-input>
-		<u-button @click="submit" >提交</u-button>
-	</view>
-</template>
-
-<script>
-
-	
-	export default {
-		data() {
-			return {
-				openId:"",
-				form: {
-					phone: '',
-					code: '',
-				},
-				
-			}
-		},
-		onLoad(op) {
-		
-		},
-		methods: {
-			submit(){
-				var NODE_NAME=  process.env['NODE_NAME']
-				if(NODE_NAME=="production"){
-					
-					alert("该功能只支持测试环境")
-				}else{
-					this.carhelp.setOpenId(this.openId);
-					this.carhelp.setToken("");
-					this.carhelp.set("token_tdate","")
-					uni.showToast({
-						title:"修改成功"
-					})
-				}
-				
-				
-			}
-		},
-		onReady() {
-			this.openId=this.carhelp.getOpenId();
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login-title {
-		display: flex;
-		align-items: center;
-		margin: 25px 30px;
-
-		h3 {
-			font-size: 20px;
-			margin-left: 10rpx;
-			color: #1677ff;
-			font-weight: normal;
-		}
-	}
-
-	.login-main {
-		margin: 0 30px;
-	}
-
-	.login-btn {
-		margin: 30px;
-	}
-
-	.login-code {
-		color: #1677ff;
-	}
-</style>

main.js

@@ -33,9 +33,13 @@ const app = new Vue({
 //Vue.use(mixin)
 Vue.mixin({ 
     onLoad( option){  
-        if (option.test == 'test') {
-        	let vConsole = new Vconsole()
-        }
+       
+		if (option.test == 'test') {
+			let vConsole = new Vconsole()
+		}
+		this.projectName = process.car.ProjectName;
+		this.branchParameter=process.car.branchParameter;
+		
 		
     } ,methods:{
 	

package.json

@@ -30,30 +30,64 @@
   "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
-    }
-   },
-   "production-platform": {
-    "title": "production",
-    "BROWSER": "Chrome",
-    "env": {
-     "UNI_PLATFORM": "h5",
-     "NODE_NAME": "production"
-    },
-    "define": {
-     "CUSTOM-CONST": true
-    }
-   }
-  }
- }
+"uni-app": {
+		"scripts": {
+			"test-platform": {
+				"title": "test",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "test",
+					"branchParameter":"51team",
+					"envjs":""
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "test-TEAM51"
+				}
+			},
+			"production-platform": {
+				"title": "production",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "production",
+					"branchParameter":"51team",
+					"envjs":""
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "production-TEAM51"
+				}
+			},
+			"test-platform-youdian": {
+				"title": "test-youdian",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "test",
+					"branchParameter":"youdian",
+					"envjs":".ud"
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "test-youdian"
+				}
+			},
+			"production-platform-youdian": {
+				"title": "production-youdian",
+				"BROWSER": "Chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"NODE_NAME": "production",
+					"branchParameter":"youdian",
+					"envjs":".ud"
+				},
+				"define": {
+					"CUSTOM-CONST": true,
+					"NODE_NAME_T": "production-youdian"
+				}
+			}
+		}
+	}
 }

pages.json

@@ -13,14 +13,7 @@
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
-		{
-			"name": "充电中",
-			"path": "jpsoft",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
+		
 		{
 			"name": "充电",
 			"path": "pages/charge/index",

pages/login/index.vue

@@ -4,17 +4,24 @@
 		<div class="vongi-login-logo" style="
 			text-align: center;
 			margin-top: 40px;">
-			<img src="@/assets/img/logo.png" style="
+			<img  v-if="branchParameter=='51team'"
+			 src="@/assets/img/logo.png" style="
 			   width: 72px;
 			   height: 72px;
 			   border-radius: 15px;
+			" />
+			<img  v-if="branchParameter=='youdian'"
+			 src="@/assets/img/logoUd.jpg" style="
+			   width: 72px;
+			   height: 72px;
+			   border-radius: 15px;
 			" />
 			<div style="
 				color: rgba(16, 16, 16, 100);
 				font-size: 18px;
 				text-align: center;
 				font-family: PingFangSC-regular;
-			">51充电联盟</div>
+			">{{projectName}}</div>
 			<!-- 51充电联盟 -->
 		</div>
 		<view class="login-title">

utils/mixin.js

@@ -1,4 +1,5 @@
-var prefix = 'jp_charging2_' + process.car.NODE_ENV + '_';
+var prefix = 'jp_charging2_' + process.car.NODE_ENV+process.car.envjs + '_';
+
 
 var app = {
 	

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) => {
@@ -20,7 +19,9 @@ const request = (options) => {
 	 	return requestSon(options);
 	 }
 	 var openId=carhelp.getOpenId()
-	var  urlindex="/wechat/findUserInfo"
+	//var  urlindex="/wechat/findUserInfo"
+	var  urlindex=process.car.wechatUrl+"/findUserInfo"
+	
 	var k=options.url.indexOf(urlindex)==-1;
 	
 	 if(!openId&&k){
@@ -42,7 +43,7 @@ const request = (options) => {
 			url: process.car.BASE_URL + loginurl,
 			data: {
 				openId:openId,
-			
+				branchParameter:process.car.branchParameter
 			},
 			
 			header: {
@@ -67,7 +68,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||userType==1){

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/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:{},
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			header: options.header?{
 				...options.header,
 				'Authorization':token

utils/requestWhite.js

@@ -22,8 +22,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:{},
+			data: options.data ?{
+				... options.data ,
+				branchParameter:process.car.branchParameter
+			}: {
+				branchParameter:process.car.branchParameter
+			},
 			header: options.header?{
 				...options.header,
 				'Authorization':token

vue.config.js

@@ -1,4 +1,5 @@
 if(process.env.NODE_ENV === "production"){
+	const Templates = process.UNI_SCRIPT_DEFINE;
 
 const path = require('path');
 const webpack = require('webpack')
@@ -56,9 +57,18 @@ module.exports = {
 			})
 		); */
 
-			config.plugins.push(new webpack.ProgressPlugin(percentage => {
-				percentage === 1 ? console.log('编译完成：100.00%') : console.log(`编译进度：${(percentage * 100).toFixed(2)}%`)
+			
+			
+			config.plugins.push(new webpack.ProgressPlugin(percentage => {
+			
+			
+				var NODE_NAME_T="";
+				if(Templates){
+					NODE_NAME_T=Templates['NODE_NAME_T']
+				}
+					percentage === 1 ? console.log('编译完成：100.00%') : console.log(`编译${NODE_NAME_T}进度：${(percentage * 100).toFixed(2)}%,提示！构建请点击‘发行’-‘自定义发行’`)
 			}));
+			
 		config.output.filename = `./static/js/[name].${Timestamp}.js`
 		config.output.chunkFilename = `./static/js/[name].${Timestamp}.js`