diff --git a/.gitignore b/.gitignore index f60e997..3a1e4f9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ yarn-error.log* unpackage/ assets/css/style.css assets/css/style.css.map +.hbuilderx diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 501e01c..9cba30d 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,10 +2,15 @@ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 "version": "0.0", "configurations": [{ - "type": "uniCloud", - "default": { - "launchtype": "remote" - } - } + "default" : + { + "launchtype" : "remote" + }, + "mp-weixin" : + { + "launchtype" : "remote" + }, + "type" : "uniCloud" + } ] } diff --git a/config/index.js b/config/index.js index 1dccdb5..d972d01 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,14 @@ // 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 = 'http://192.168.0.112:8088/api' // export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' +======= +// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' +export const VUE_APP_API_URL = 'http://192.168.0.110:8098/api' +// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api' +>>>>>>> 00824c5a0f2aa21e0580a759ffd2d820250d7841 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/utils/request.js b/utils/request.js index 0e3a1d2..6fdcfc1 100644 --- a/utils/request.js +++ b/utils/request.js @@ -62,6 +62,7 @@ function baseRequest(options) { // 如果接口需要登录,携带 token 去请求 options.headers = { + version: "2.0", ...options.headers, version: '2.0', }