合并

config/index.js

@@ -1,12 +1,8 @@
 
-<<<<<<< HEAD
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
-=======
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
->>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
 

utils/index.js

@@ -92,11 +92,7 @@ export function parseQuery() {
 
 	// #ifdef H5
 
-<<<<<<< HEAD
-	const res = {};
-=======
 	let res = {};
->>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
 
 	const query = (location.href.split("?")[1] || "")
 		.trim()
@@ -120,20 +116,8 @@ export function parseQuery() {
 		}
 	});
 	// #endif
-<<<<<<< HEAD
-
-=======
->>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
-	// #ifdef MP-WEIXIN
-
-	var pages = getCurrentPages() //获取加载的页面
-	var currentPage = pages[pages.length - 1] //获取当前页面的对象
 	var url = currentPage.route //当前页面url
-<<<<<<< HEAD
-	var res = currentPage.options //如果要获取url中所带的参数可以查看options
-=======
 	res = currentPage.options //如果要获取url中所带的参数可以查看options
->>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
 	// #endif
 
 	return res