abu/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突文件

Browse Source
This commit is contained in:
fengtianyangyang 2022-02-26 15:05:51 +08:00
parent 535a36c378
commit 25b403cde9
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buyer/public/config.js
View File

@ -3,19 +3,10 @@ var BASE = {
* @description api请求基础路径 * @description api请求基础路径
*/ */
API_DEV: { API_DEV: {
<<<<<<< HEAD
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: "http://127.0.0.1:8890",
buyer: "http://127.0.0.1:8892",
=======
common: "http://localhost:8890", common: "http://localhost:8890",
buyer: "http://localhost:8888", buyer: "http://localhost:8888",
seller: "http://localhost:8889", seller: "http://localhost:8889",
manager: "http://localhost:8887" manager: "http://localhost:8887"
>>>>>>> clerk
}, },
API_PROD: { API_PROD: {
common: "http://192.168.2.110:8890", common: "http://192.168.2.110:8890",

9
seller/public/config.js
View File

@ -3,19 +3,10 @@ var BASE = {
* @description api请求基础路径 * @description api请求基础路径
*/ */
API_DEV: { API_DEV: {
<<<<<<< HEAD
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: "http://127.0.0.1:8890",
seller: "http://127.0.0.1:8889",
=======
common: "http://localhost:8890", common: "http://localhost:8890",
buyer: "http://localhost:8888", buyer: "http://localhost:8888",
seller: "http://localhost:8889", seller: "http://localhost:8889",
manager: "http://localhost:8887" manager: "http://localhost:8887"
>>>>>>> clerk
}, },
API_PROD: { API_PROD: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",