Browse Source

合并代码

master
杨豪 3 years ago
parent
commit
32fa9618f9
  1. 1
      .gitignore
  2. 11
      .hbuilderx/launch.json
  3. 6
      config/index.js
  4. 1
      utils/request.js

1
.gitignore vendored

@ -14,3 +14,4 @@ yarn-error.log*
unpackage/
assets/css/style.css
assets/css/style.css.map
.hbuilderx

11
.hbuilderx/launch.json

@ -2,10 +2,15 @@
// launchtypelocalremote, localremote
"version": "0.0",
"configurations": [{
"type": "uniCloud",
"default": {
"default" :
{
"launchtype" : "remote"
}
},
"mp-weixin" :
{
"launchtype" : "remote"
},
"type" : "uniCloud"
}
]
}

6
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';

1
utils/request.js

@ -62,6 +62,7 @@ function baseRequest(options) {
// 如果接口需要登录,携带 token 去请求
options.headers = {
version: "2.0",
...options.headers,
version: '2.0',
}

Loading…
Cancel
Save