Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy into master

.env.prod.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  	
-    BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
+	BASE_URL: 'https://charging.xiaoxinda.com/making-friends-server/',
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId

.env.test.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
     // 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/',
+	BASE_URL: 'https://charging.xiaoxinda.com/making-friends-server/',
    
 
 	NODE_ENV :"test",

pages/index/main-zkx.vue

@@ -23,7 +23,7 @@
 			gotoMain(k){
 				if(k){
 					uni.navigateTo({
-						url:"pagesA/pages/login/index"
+						url:"/pagesA/pages/login/index"
 					})
 				}else{
 					uni.switchTab({