From f2491124d1f1ca61866e9a56d236a22893e77112 Mon Sep 17 00:00:00 2001 From: RyanRan <1410277647@qq.com> Date: Sun, 20 Oct 2024 21:43:59 +0800 Subject: [PATCH] =?UTF-8?q?B2C=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/App.vue | 3 + buyer/src/api/common.js | 13 + buyer/src/api/member.js | 41 ++ buyer/src/components/invoiceModal/index.vue | 160 ++++- buyer/src/components/mixes/talkIm.vue | 12 +- buyer/src/pages/GoodsDetail.vue | 20 +- .../src/pages/home/orderCenter/AfterSale.vue | 8 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 7 +- buyer/src/vuex/store.js | 1 + manager/public/static/instructions.xlsx | Bin 0 -> 33228 bytes manager/public/static/logisticsType.xlsx | Bin 0 -> 15428 bytes manager/src/api/order.js | 5 + manager/src/router/router.js | 6 + .../src/views/goods/goodsOperationThird.vue | 6 +- manager/src/views/logistics/company.vue | 580 ++++++++++-------- manager/src/views/logistics/index.vue | 9 - manager/src/views/main-parts/message-tip.vue | 3 +- .../after-order/afterSaleOrderDetail.vue | 34 + manager/src/views/order/flow/paymentLog.vue | 7 +- manager/src/views/order/order/orderDetail.vue | 41 +- .../promotions/coupon/coupon-publish.vue | 17 +- .../promotions/pintuan/pintuan-goods.vue | 157 ++++- .../src/views/promotions/pintuan/pintuan.vue | 22 +- .../points-goods/points-goods-add.vue | 5 +- .../promotions/points-goods/points-goods.vue | 6 +- .../sys/setting-manage/setting/IM_SETTING.vue | 72 ++- .../sys/setting-manage/settingManage.vue | 2 +- seller/src/views/shop/ship/logistics.vue | 1 - 28 files changed, 866 insertions(+), 372 deletions(-) create mode 100644 manager/public/static/instructions.xlsx create mode 100644 manager/public/static/logisticsType.xlsx diff --git a/buyer/src/App.vue b/buyer/src/App.vue index c7719c7f..6bc9a7b7 100644 --- a/buyer/src/App.vue +++ b/buyer/src/App.vue @@ -10,10 +10,12 @@ import { getBaseSite } from "@/api/common.js"; export default { name: "App", mounted() { + this.init(); }, methods:{ init(){ + if(!storage.getItem("siteName")||!storage.getItem("logoImg")||!storage.getItem("sitelogo_expiration_time")) { this.getSite(); }else{ @@ -33,6 +35,7 @@ export default { } }, + getSite(){ //获取基本站点信息 getBaseSite().then((res) => { diff --git a/buyer/src/api/common.js b/buyer/src/api/common.js index 8c579162..5c2877de 100644 --- a/buyer/src/api/common.js +++ b/buyer/src/api/common.js @@ -10,6 +10,19 @@ export function getVerifyImg (verificationEnums) { needToken: false }); } + + +export function getImSetting(params) { + return request({ + url: `/buyer/other/setting/get/IM_SETTING`, + method: Method.GET, + needToken: true, + params, + }); +} + + + /** * 验证码校验 */ diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index eeb7de21..09dc8438 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -527,3 +527,44 @@ export function getGoodsDistribution (distributionId) { needToken: true }); } + +/** + * 获取会员发票抬头列表 + */ +export function getMemberReceiptList (params) { + return request({ + url: `/buyer/wallet/receipt`, + method: Method.GET, + needToken: true, + params + }); +} + +/** + * 保存会员发票抬头 + */ +export function setMemberReceiptList (params) { + return request({ + url: `/buyer/wallet/receipt`, + method: Method.POST, + needToken: true, + data:params + }); +} + + +/** + * 保存会员发票抬头 + */ +export function delMemberReceipt(id) { + return request({ + url: `/buyer/wallet/receipt/${id}`, + method: Method.DELETE, + needToken: true, + params:{id}, + headers: { + "Content-Type": "application/x-www-form-urlencoded", + } + }); +} + diff --git a/buyer/src/components/invoiceModal/index.vue b/buyer/src/components/invoiceModal/index.vue index 2b5c0588..2ff5b20d 100644 --- a/buyer/src/components/invoiceModal/index.vue +++ b/buyer/src/components/invoiceModal/index.vue @@ -6,11 +6,11 @@
@@ -45,11 +83,15 @@ \ No newline at end of file + diff --git a/manager/src/views/logistics/company.vue b/manager/src/views/logistics/company.vue index d0577dc8..a0155f3d 100644 --- a/manager/src/views/logistics/company.vue +++ b/manager/src/views/logistics/company.vue @@ -4,56 +4,72 @@