From dc0cb5a76c07a7cc51a5436fa8f93c682e6cc618 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 17 May 2021 15:40:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=8F=B7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=B1=80?= =?UTF-8?q?=E5=9F=9F=E7=BD=91ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/config/index.js | 2 +- buyer/src/config/index.js | 8 ++++---- manager/src/config/index.js | 8 ++++---- manager/vue.config.js | 2 +- seller/src/config/index.js | 8 ++++---- seller/vue.config.js | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/buyer/config/index.js b/buyer/config/index.js index 529e7a7f..2189ed6d 100644 --- a/buyer/config/index.js +++ b/buyer/config/index.js @@ -22,7 +22,7 @@ module.exports = { // Various Dev Server settings host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8889, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 10000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index d5cc3dc7..4f37451c 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,10 +17,10 @@ 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://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8f1ce647..95414e80 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,10 +17,10 @@ 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://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/manager/vue.config.js b/manager/vue.config.js index b5be380c..446a2847 100644 --- a/manager/vue.config.js +++ b/manager/vue.config.js @@ -17,7 +17,7 @@ module.exports = { } }, devServer: { - port: 9999 + port: 10003 // proxy: { // '/lili': { // target: 'http://127.0.0.1:8888', // 请求本地 需要lili后台项目 diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 0ae255f4..f80acd5a 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,10 +18,10 @@ 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://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/seller/vue.config.js b/seller/vue.config.js index c287a6f8..cebe4ff1 100644 --- a/seller/vue.config.js +++ b/seller/vue.config.js @@ -17,7 +17,7 @@ module.exports = { }, devServer: { - port: 9998, + port: 10002, // proxy: { // '/lili': { // target: 'http://127.0.0.1:8888', // 请求本地 需要lili后台项目 From a0eaff276b714f870cd0f3a79dba30f0b4799704 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 17 May 2021 17:43:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=87=AA=E8=90=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/shop/shopAuditList.vue | 2 +- manager/src/views/seller/shop/shopDetail.vue | 2 +- manager/src/views/seller/shop/shopOperation.vue | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue index f352a6dd..fc6332ec 100644 --- a/manager/src/views/seller/shop/shopAuditList.vue +++ b/manager/src/views/seller/shop/shopAuditList.vue @@ -113,7 +113,7 @@ color: params.row.selfOperated ? "default" : "primary", }, }, - params.row.selfOperated == 0 ? "自营" : "非自营" + params.row.selfOperated ? "自营" : "非自营" ); }, }, diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index a10a074a..131edfc9 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -18,7 +18,7 @@

{{storeInfo.createTime}} 开店

-

+

自营

diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index 58851a74..2fdf0997 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -20,9 +20,10 @@ - - 自营 - 非自营 + + + 自营 + 非自营 @@ -340,7 +341,7 @@ export default { settlementCycle: [], // 结算周期 shopForm: { // 店铺数据 settlementCycle: "", - selfOperated: 0, + selfOperated: "", memberName: "", companyName: "", addressPath: "", From c63e44793ccf9ceef5abc573a856c33a37e7f5bd Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 17 May 2021 18:07:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?radio=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/invoiceModal/index.vue | 4 ++-- buyer/src/pages/home/memberCenter/Invoice.vue | 4 ++-- buyer/src/pages/home/memberCenter/Profile.vue | 2 +- buyer/src/pages/home/memberCenter/evaluation/AddEval.vue | 2 +- .../src/pages/home/memberCenter/evaluation/EvalDetail.vue | 2 +- buyer/src/pages/home/orderCenter/ApplyAfterSale.vue | 2 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 2 +- manager/src/views/distribution/distributionCash.vue | 2 +- manager/src/views/member/list/index.vue | 2 +- manager/src/views/member/list/memberDetail.vue | 2 +- manager/src/views/member/list/memberRecycle.vue | 2 +- .../src/views/member/message-manage/addOrEditMessage.vue | 2 +- manager/src/views/member/notice/addMessage.vue | 2 +- .../src/views/order/after-order/afterSaleOrderDetail.vue | 2 +- manager/src/views/promotion/coupon/couponPublish.vue | 2 +- manager/src/views/promotion/fullCut/fullCutDetail.vue | 4 ++-- manager/src/views/promotion/seckill/seckillGoods.vue | 2 +- manager/src/views/region/index.vue | 2 +- manager/src/views/seller/shop/shopOperation.vue | 2 +- manager/src/views/sys/app-version/appVersion.vue | 4 ++-- manager/src/views/sys/message/noticeMessageTemplate.vue | 4 ++-- manager/src/views/sys/message/sms.vue | 2 +- manager/src/views/sys/oss-manage/ossManage.vue | 6 +++--- manager/src/views/sys/role-manage/roleManage.vue | 2 +- manager/src/views/sys/setting-manage/platformSetting.vue | 4 ++-- .../views/sys/setting-manage/setting/GOODS_SETTING.vue | 2 +- seller/src/views/goods/goods-seller/goods.vue | 2 +- seller/src/views/goods/goods-seller/goodsOperation.vue | 8 ++++---- .../src/views/order/after-order/reurnGoodsOrderDetail.vue | 2 +- seller/src/views/promotion/coupon/couponPublish.vue | 2 +- seller/src/views/promotion/fullCut/newFullCut.vue | 4 ++-- seller/src/views/promotion/pintuan/newPintuan.vue | 2 +- seller/src/views/shop/ship/shipTemplate.vue | 2 +- 33 files changed, 45 insertions(+), 45 deletions(-) diff --git a/buyer/src/components/invoiceModal/index.vue b/buyer/src/components/invoiceModal/index.vue index 608ac538..e332635b 100644 --- a/buyer/src/components/invoiceModal/index.vue +++ b/buyer/src/components/invoiceModal/index.vue @@ -19,7 +19,7 @@ :label-width="110" > - + 个人 单位 @@ -39,7 +39,7 @@ - + 不开发票 商品明细 diff --git a/buyer/src/pages/home/memberCenter/Invoice.vue b/buyer/src/pages/home/memberCenter/Invoice.vue index 68bb3122..18f82ce7 100644 --- a/buyer/src/pages/home/memberCenter/Invoice.vue +++ b/buyer/src/pages/home/memberCenter/Invoice.vue @@ -19,7 +19,7 @@ :label-width="110" > - + 单位 @@ -36,7 +36,7 @@ - + 商品明细 diff --git a/buyer/src/pages/home/memberCenter/Profile.vue b/buyer/src/pages/home/memberCenter/Profile.vue index 63e28f79..cf2716ac 100644 --- a/buyer/src/pages/home/memberCenter/Profile.vue +++ b/buyer/src/pages/home/memberCenter/Profile.vue @@ -24,7 +24,7 @@ - + 男 女 diff --git a/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue index e538b581..ad2cf190 100644 --- a/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue +++ b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue @@ -28,7 +28,7 @@

商品评价： - + 好评 中评 差评 diff --git a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue index 25cff5cb..c3f2d724 100644 --- a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue +++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue @@ -27,7 +27,7 @@
商品评价： - + 好评 中评 差评 diff --git a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue index 1a37f1ab..8d56a2f4 100644 --- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue +++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue @@ -18,7 +18,7 @@
- + 退货 退款 diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 79f6039b..6be14b2f 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -101,7 +101,7 @@
- + {{item.reason}} diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue index 0c4225f7..e2d07a12 100644 --- a/manager/src/views/distribution/distributionCash.vue +++ b/manager/src/views/distribution/distributionCash.vue @@ -42,7 +42,7 @@ - + 通过 拒绝 diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue index 199ee821..4d456da8 100644 --- a/manager/src/views/member/list/index.vue +++ b/manager/src/views/member/list/index.vue @@ -84,7 +84,7 @@ - + 男 diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue index 78f8cf98..ed8e1b0b 100644 --- a/manager/src/views/member/list/memberDetail.vue +++ b/manager/src/views/member/list/memberDetail.vue @@ -351,7 +351,7 @@ - + 是 否 diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue index 815aa435..b5789951 100644 --- a/manager/src/views/member/list/memberRecycle.vue +++ b/manager/src/views/member/list/memberRecycle.vue @@ -102,7 +102,7 @@ - + 男 diff --git a/manager/src/views/member/message-manage/addOrEditMessage.vue b/manager/src/views/member/message-manage/addOrEditMessage.vue index 436951e9..8dc212d5 100644 --- a/manager/src/views/member/message-manage/addOrEditMessage.vue +++ b/manager/src/views/member/message-manage/addOrEditMessage.vue @@ -39,7 +39,7 @@
- + 全体用户 指定用户成员 diff --git a/manager/src/views/member/notice/addMessage.vue b/manager/src/views/member/notice/addMessage.vue index 209e3a72..f3cd9b8b 100644 --- a/manager/src/views/member/notice/addMessage.vue +++ b/manager/src/views/member/notice/addMessage.vue @@ -24,7 +24,7 @@
- + 全部会员 指定会员 diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue index efed062b..76bf9190 100644 --- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue +++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue @@ -77,7 +77,7 @@
是否同意
- + 同意 diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index bf75a38f..10ead81a 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -57,7 +57,7 @@ - + 全品类 指定商品 部分商品分类 diff --git a/manager/src/views/promotion/fullCut/fullCutDetail.vue b/manager/src/views/promotion/fullCut/fullCutDetail.vue index 6449d159..f0284b20 100644 --- a/manager/src/views/promotion/fullCut/fullCutDetail.vue +++ b/manager/src/views/promotion/fullCut/fullCutDetail.vue @@ -53,7 +53,7 @@ 消费达到当前金额可以参与优惠 - + 减现金 打折 @@ -140,7 +140,7 @@ /> - + 全品类 指定商品 diff --git a/manager/src/views/promotion/seckill/seckillGoods.vue b/manager/src/views/promotion/seckill/seckillGoods.vue index b1d4646e..6b69bf24 100644 --- a/manager/src/views/promotion/seckill/seckillGoods.vue +++ b/manager/src/views/promotion/seckill/seckillGoods.vue @@ -125,7 +125,7 @@ - + 通过 拒绝 diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue index fc2c608b..26fbe42e 100644 --- a/manager/src/views/region/index.vue +++ b/manager/src/views/region/index.vue @@ -28,7 +28,7 @@ - + 国家 省份 市 diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index 2fdf0997..81f45439 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -21,7 +21,7 @@ - + 自营 非自营 diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue index 4b4ed5b5..1f7a7177 100644 --- a/manager/src/views/sys/app-version/appVersion.vue +++ b/manager/src/views/sys/app-version/appVersion.vue @@ -77,13 +77,13 @@ > - + 强制更新 非强制更新 - + 苹果 安卓 diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue index fd8dd444..ef3bc3da 100644 --- a/manager/src/views/sys/message/noticeMessageTemplate.vue +++ b/manager/src/views/sys/message/noticeMessageTemplate.vue @@ -156,7 +156,7 @@ /> - + 全站 指定商家 @@ -200,7 +200,7 @@ /> - + 全站 指定商家 diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue index 556d22ef..a70028b8 100644 --- a/manager/src/views/sys/message/sms.vue +++ b/manager/src/views/sys/message/sms.vue @@ -115,7 +115,7 @@

已选 {{memberNum}}人，预计耗费条数{{this.smsForm.num}}条

- + 全部会员 自定义选择 diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index bd798484..0553b143 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -69,7 +69,7 @@ 所有类型 @@ -78,7 +78,7 @@ @@ -292,7 +292,7 @@ export default { picTitle: "", // 图片title videoTitle: "", // 视频title modalTitle: "", // 添加或编辑标题 - searchForm: { + searchForm: { // 搜索框对应data对象 name: "", fileKey: "", diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue index e08e4987..8059d46b 100644 --- a/manager/src/views/sys/role-manage/roleManage.vue +++ b/manager/src/views/sys/role-manage/roleManage.vue @@ -162,7 +162,7 @@ >
{{ item.title }} - + 操作数据权限 diff --git a/manager/src/views/sys/setting-manage/platformSetting.vue b/manager/src/views/sys/setting-manage/platformSetting.vue index 0ddf9d74..dbdbb474 100644 --- a/manager/src/views/sys/setting-manage/platformSetting.vue +++ b/manager/src/views/sys/setting-manage/platformSetting.vue @@ -103,7 +103,7 @@ :rules="goodsValidate" > - + 开启 关闭 @@ -763,4 +763,4 @@ } }; - \ No newline at end of file + diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue index 39fa52e5..42359af9 100644 --- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue @@ -2,7 +2,7 @@
- + 开启 关闭 diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index e27815aa..1f6fdc65 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -75,7 +75,7 @@ - + 买家承担运费 diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 5a3362d7..49a179e5 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -139,7 +139,7 @@ label="销售模式" prop="salesModel" > - + 零售型 @@ -523,7 +523,7 @@ - @@ -554,7 +554,7 @@

其他信息

- + 立即发布 @@ -564,7 +564,7 @@ - + 推荐 diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index 4b54b99b..e6ccb29a 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -84,7 +84,7 @@
是否同意
- + 同意 diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue index ca803917..bcf42760 100644 --- a/seller/src/views/promotion/coupon/couponPublish.vue +++ b/seller/src/views/promotion/coupon/couponPublish.vue @@ -114,7 +114,7 @@ - + 全品类 指定商品 部分商品分类 diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue index d7fc23b6..77558a7f 100644 --- a/seller/src/views/promotion/fullCut/newFullCut.vue +++ b/seller/src/views/promotion/fullCut/newFullCut.vue @@ -53,7 +53,7 @@ 消费达到当前金额可以参与优惠 - + - + 全品类 diff --git a/seller/src/views/promotion/pintuan/newPintuan.vue b/seller/src/views/promotion/pintuan/newPintuan.vue index fb938388..96e580ff 100644 --- a/seller/src/views/promotion/pintuan/newPintuan.vue +++ b/seller/src/views/promotion/pintuan/newPintuan.vue @@ -47,7 +47,7 @@ 如果设置为0则视为不限制购买数量 - + 开启 diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index 3ca479fd..60541d26 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -65,7 +65,7 @@ - + 按重量 按件数 From c457f6abc93a1c35d50a220e11de9f14ee6604a2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 17 May 2021 18:08:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/shop/shopOperation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index 81f45439..e3db7ae4 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -21,7 +21,7 @@ - + 自营 非自营