diff --git a/config/index.js b/config/index.js index cb07c1d..948f1d5 100644 --- a/config/index.js +++ b/config/index.js @@ -1,11 +1,3 @@ - -// 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';