From 48002d61430c1a3fcc02bd53af5204c9a5dcb74f Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 3 Sep 2021 15:43:46 +0800 Subject: [PATCH 1/6] conifg --- seller/src/config/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 177a5471..bf93b473 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -21,14 +21,14 @@ export default { * @description api请求基础路径 */ api_dev: { - 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://192.168.0.100:8890', - // buyer: 'http://192.168.0.100:8888', - // seller: 'http://192.168.0.100:8889', - // manager: 'http://192.168.0.100:8887' + // 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://192.168.0.111:8890', + buyer: 'http://192.168.0.111:8888', + seller: 'http://192.168.0.111:8889', + manager: 'http://192.168.0.111:8887' }, api_prod: { common: "https://common-api.pickmall.cn", -- Gitee From 0342f1d17a9f82113fe40990896ccf0305f2a7df Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 24 Sep 2021 16:32:23 +0800 Subject: [PATCH 2/6] fix dialog template shops storeDisable show error --- manager/src/views/lili-dialog/template/shops.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manager/src/views/lili-dialog/template/shops.vue b/manager/src/views/lili-dialog/template/shops.vue index b0907e83..fae0ad50 100644 --- a/manager/src/views/lili-dialog/template/shops.vue +++ b/manager/src/views/lili-dialog/template/shops.vue @@ -22,7 +22,7 @@
{{ item.storeName }}
{{ item.selfOperated ? '自营' : '非自营' }}
-
{{ item.storeDisable ? '开启中' : '关闭' }}
+
{{ item.storeDisable === 'OPEN' ? '开启中' : '未开启' }}
@@ -41,6 +41,7 @@ export default { params: { // 请求参数 pageNumber: 1, pageSize: 10, + storeDisable: "OPEN", storeName: "", }, shopsData: [], // 店铺数据 -- Gitee From 04cc8b991cad78cc1d80f40941dc2ecbc98ef05d Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 24 Sep 2021 16:34:42 +0800 Subject: [PATCH 3/6] reset config seller --- seller/public/config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/seller/public/config.js b/seller/public/config.js index 69441029..5c7a3ab9 100644 --- a/seller/public/config.js +++ b/seller/public/config.js @@ -7,6 +7,10 @@ var BASE = { buyer: "https://buyer-api.pickmall.cn", seller: "https://store-api.pickmall.cn", manager: "https://admin-api.pickmall.cn" + // common: "http://192.168.0.111:8890", + // buyer: "http://192.168.0.111:8888", + // seller: "http://192.168.0.111:8889", + // manager: "http://192.168.0.111:8887" }, API_PROD: { common: "https://common-api.pickmall.cn", -- Gitee From 9e8f369da4ed66508f8bc14e8df0505e57f74dd3 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 24 Sep 2021 16:37:33 +0800 Subject: [PATCH 4/6] reset config --- seller/src/config/index.js | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/seller/src/config/index.js b/seller/src/config/index.js index a3d1e757..dc7c47e9 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -13,32 +13,6 @@ export default { * 用来在菜单中显示文字 */ useI18n: true, - - - - /** - * @description api请求基础路径 - */ - api_dev: { - // 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://192.168.0.111:8890', - buyer: 'http://192.168.0.111:8888', - seller: 'http://192.168.0.111:8889', - manager: 'http://192.168.0.111:8887' - }, - api_prod: { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", - seller: "https://store-api.pickmall.cn", - manager: "https://admin-api.pickmall.cn" - }, - /** - * @description api请求基础路径前缀 - */ - baseUrlPrefix: "/store", /** * @description 高德web端申请的api key */ @@ -56,4 +30,4 @@ export default { developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误 } } -}; +}; \ No newline at end of file -- Gitee From 3674b63db42c1282c6cc3e71b664b1609a532a17 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 24 Sep 2021 16:38:27 +0800 Subject: [PATCH 5/6] reset config --- seller/public/config.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/seller/public/config.js b/seller/public/config.js index 5c7a3ab9..69441029 100644 --- a/seller/public/config.js +++ b/seller/public/config.js @@ -7,10 +7,6 @@ var BASE = { buyer: "https://buyer-api.pickmall.cn", seller: "https://store-api.pickmall.cn", manager: "https://admin-api.pickmall.cn" - // common: "http://192.168.0.111:8890", - // buyer: "http://192.168.0.111:8888", - // seller: "http://192.168.0.111:8889", - // manager: "http://192.168.0.111:8887" }, API_PROD: { common: "https://common-api.pickmall.cn", -- Gitee From 93768e4014e3bdc465d8ae1ae30fd3586008fb9a Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 24 Sep 2021 16:39:24 +0800 Subject: [PATCH 6/6] reset config --- seller/src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seller/src/config/index.js b/seller/src/config/index.js index dc7c47e9..c68c1be4 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -30,4 +30,4 @@ export default { developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误 } } -}; \ No newline at end of file +}; -- Gitee