From 6117026fbb859a87165e35362b733a7f781de5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com> Date: Mon, 15 Dec 2025 10:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BC=A0=E5=80=BC=20=E6=B7=BB=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/contract.js | 1 + api/shop.js | 2 + packages/customerService/addMer/index.vue | 2 +- .../customerService/applyLedgerMer/index.vue | 6 +-- packages/customerService/sign/index.vue | 2 +- packages/storeManagement/index/index.vue | 38 +++++++++++++++++-- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/api/contract.js b/api/contract.js index 5fd989ea..7459f060 100644 --- a/api/contract.js +++ b/api/contract.js @@ -9,4 +9,5 @@ export const apiArr = { queryMerchant: "/api/v2/wechat/lkl-split-business/query-merchant", //商户进件信息查询 applyLedgerMer: "/api/v2/wechat/lkl-split-business/apply-ledger-mer", //商户分账业务开通申请 queryLedgerMer: "/api/v2/wechat/lkl-split-business/query-ledger-mer", //商户分账信息查询 + progresss: "/api/v2/wechat/lkl-split-business/progress", //商户分账进度查询 }; diff --git a/api/shop.js b/api/shop.js index 934860e3..859064a2 100644 --- a/api/shop.js +++ b/api/shop.js @@ -16,6 +16,8 @@ export const apiArr = { addAddress: '/api/v2/wechat/commodity/receiving_address/add', // 收货地址添加 addAddressList: '/api/v2/wechat/commodity/receiving_address', // 收货地址列表 queryOrder: '/api/v2/wechat/commodity/order/trade_query', // 查询订单 + splitLedger: '/api/v2/wechat/commodity/order/split-ledger', // 分账 + orderUpdate: '/api/v2/wechat/commodity/order/update', getComment: '/api/v2/wechat/commodity/review/list', // 获取评论 mergePreorder: '/api/v2/wechat/commodity/order/preorder', // 商品订单合并预下单 diff --git a/packages/customerService/addMer/index.vue b/packages/customerService/addMer/index.vue index bffa15ba..5cd76cea 100644 --- a/packages/customerService/addMer/index.vue +++ b/packages/customerService/addMer/index.vue @@ -296,7 +296,7 @@ export default { return { // 表单数据 formData: { - mch_id: '000', // 商户ID + mch_id: uni.getStorageSync('mchId'), // 商户ID merRegName: '', // 商户注册名称 merRegDistCode: '', // 商户地区代码 merRegAddr: '', // 商户详细地址 diff --git a/packages/customerService/applyLedgerMer/index.vue b/packages/customerService/applyLedgerMer/index.vue index 6513d14b..359ecb8d 100644 --- a/packages/customerService/applyLedgerMer/index.vue +++ b/packages/customerService/applyLedgerMer/index.vue @@ -3,11 +3,11 @@
- + @@ -86,7 +86,7 @@ export default { return { // 表单数据 formData: { - mch_id: null, // 商户号（必需） + mch_id: uni.getStorageSync('mchId'), // 商户号（必需） merInnerNo: '', // 拉卡拉内部商户号（可选） merCupNo: '', // 银联商户号（可选） contactMobile: '', // 联系手机号（必需） diff --git a/packages/customerService/sign/index.vue b/packages/customerService/sign/index.vue index ce22549d..bbdea888 100644 --- a/packages/customerService/sign/index.vue +++ b/packages/customerService/sign/index.vue @@ -134,7 +134,7 @@ export default { data() { return { formData: { - mch_id: '000', + mch_id: uni.getStorageSync('mchId'), ec_type_code: 'Ec007', cert_type: '', cert_name: '', diff --git a/packages/storeManagement/index/index.vue b/packages/storeManagement/index/index.vue index a6e45548..fe5e4552 100644 --- a/packages/storeManagement/index/index.vue +++ b/packages/storeManagement/index/index.vue @@ -42,10 +42,10 @@ - + - {{ item.name }} + {{ item.name }} @@ -99,6 +99,7 @@ import { apiArr } from '../../../api/community'; import { apiArr as walletApi } from '../../../api/wallet'; +import { apiArr as apiArr2 } from '../../../api/contract'; export default { @@ -121,36 +122,47 @@ export default { image: "https://static.hshuishang.com/gp_cancelAfterVerification.png", name: "到店核销", url: "/packages/storeManagement/orderVerification/index", + isShow: true, }, { image: "https://static.hshuishang.com/kefu0.png", name: "客服", url: "/packages/customerService/chattingRecords/index", + isShow: true, }, { image: "https://static.hshuishang.com/contract.png", name: "电子签约", url: "/packages/customerService/sign/index", + index: 1, + isShow: false, }, { image: "https://static.hshuishang.com/contract.png", name: "商户进件", url: "/packages/customerService/addMer/index", + index: 2, + isShow: false, }, { image: "https://static.hshuishang.com/contract.png", name: "分账开通", url: "/packages/customerService/applyLedgerMer/index", + index: 4, + isShow: false, }, { image: "https://static.hshuishang.com/contract.png", name: "创建接收方", url: "/packages/customerService/establishAcceptor/index", + isShow: false, }, { image: "https://static.hshuishang.com/contract.png", name: "申请绑定", url: "/packages/customerService/applyBind/index", + index: 5, + isShow: false, } ], walletInfo: {}, @@ -161,10 +173,28 @@ export default { this.top = meun.top; // this.top = meun.height + meun.top; this.localHeight = meun.height; - this.getShopList(); + this.getShopList().then(() => { + uni.setStorageSync('mchId', this.selectedShop.id); + this.getStep(); + }); }, methods: { + // 获取进件流程步骤 + getStep() { + const params = { + mch_id: this.selectedShop.id, + } + request(apiArr2.progresss, 'POST', params, { silent: false }).then(res => { + if(res.data.link){ + this.baseList.forEach(item => { + if(item.index == res.data.link){ + item.isShow = true; + } + }) + } + }) + }, // 获取钱包信息 getWalletInfo() { const params = { @@ -176,7 +206,7 @@ export default { }, // 获取商家列表 getShopList() { - request(apiArr.getShopList, 'POST', {}, { silent: false }).then(res => { + return request(apiArr.getShopList, 'POST', {}, { silent: false }).then(res => { res.rows.map(item => { item.album_images = picUrl + item.album_images; })