cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gao xiaosong
2020-09-13 11:21:00 +08:00
parent a0473dc2f2 2723cab736
commit a6cf6d8824
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

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