zhengkaixin 1 år sedan
förälder
incheckning
093ce0c6f3
5 ändrade filer med 50 tillägg och 7 borttagningar
  1. 6 3
      .env.dev.js
  2. 39 0
      .env.dev.youdian.js
  3. 1 1
      .env.js
  4. 3 1
      apis/weixin.js
  5. 1 2
      utils/request.js

+ 6 - 3
.env.dev.js

@@ -15,7 +15,9 @@ const UNI_APP = {
 	//defaultStation:[],
 	openId:"zkxtest23",//zkx
 	gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
-	wechatUrl:"/youdian",
+	gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
+	
+	wechatUrl:"/wechat",
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
@@ -28,8 +30,9 @@ const UNI_APP = {
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//sz
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-	branchParameter:"youdian",//team51,youdian
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	branchParameter:"team51",//team51,youdian
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",//51
+	//VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
 	VUE_APP_ALIAPPID:"2021003131641247",
 }  
 

+ 39 - 0
.env.dev.youdian.js

@@ -0,0 +1,39 @@
+const UNI_APP = {  
+	ProjectName :"优电联盟",
+	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/' ,
+	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,
+	PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
+	XPGJ_URL: 'https://xpgjapi.xiaoxinda.com/' ,
+	NODE_ENV :"dev",
+	SIMPLE_RUN:true,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
+	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2","da6e714d-c5a8-4f76-8132-5f4a56677130"],
+	defaultStation:["e012f9fe-90a8-4a47-bb64-26ea139c3c05"],
+	//defaultStation:[],
+	openId:"zkxtest23",//zkx
+	gzUrl:"https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ",
+	gzUrl:"https://mp.weixin.qq.com/s/syLTJR69MWZY-D4ewa_1og",
+	
+	wechatUrl:"/youdian",
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
+	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
+	//openId:"oK9Wr5-ViXQMUP2cjiW3bGIABj1Q",
+	//openId:"oK9Wr5wkU3OwWhQ7mRrLZ5MDZNHo",
+	//openId:"oK9Wr53qHzp7kOSiue_PYjwEqivM",
+	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
+	//openId:"oK9Wr50iQUjEAam1s_RpHpXJS5xg",//月卡用户
+	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//sz
+	//小鹏管家appid
+	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
+	branchParameter:"youdian",//team51,youdian
+	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",//51
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",//youdian
+	VUE_APP_ALIAPPID:"2021003131641247",
+}  
+
+module.exports = UNI_APP;

+ 1 - 1
.env.js

@@ -9,7 +9,7 @@
 	console.log(NODE_NAME,branchParameter,envjs)
     if (process.env.NODE_ENV === "development") {  
 		 
-         ENV_VAR = require('.env.dev.js');
+         ENV_VAR = require('.env.dev.youdian.js');
 		 
 		
 		

+ 3 - 1
apis/weixin.js

@@ -33,8 +33,10 @@ export function alpay(data) {
 
 //根据code换取openid
 export function getDataByCode(code) {
+	var url = process.car.wechatUrl+'/findUserInfo/' + code
+	
 	return request({
-		url: process.car.wechatUrl+'/findUserInfo/' + code,
+		url: url,
 		params: {},
 		method: 'get',
 	})

+ 1 - 2
utils/request.js

@@ -6,14 +6,13 @@ const request = (options) => {
 	//记录请求次数和响应次数
 	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
 	var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
-	
 	var token=carhelp.getToken(options);
 	
 	 if(token_tdate&&token_tdate==tdate){
 	 	return requestSon(options);
 	 }
 	 var openId=carhelp.getOpenId()
-	var  urlindex="/wechat/findUserInfo"
+	var  urlindex=process.car.wechatUrl+"/findUserInfo"
 	var k=options.url.indexOf(urlindex)==-1;
 	
 	 if(!openId&&k){