From 0a7eb5b3bf9396035e434005ee1c1e21aa042a65 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Tue, 9 Apr 2024 20:28:36 +0800 Subject: [PATCH 1/2] add --- src/api/merchant.js | 98 +++++++++++++------- src/libs/modal-form.js | 10 +-- src/views/merchant/deposit/index.vue | 100 +++++++++++++++++++-- src/views/product/productExamine/index.vue | 11 ++- src/views/product/productExamine/info.vue | 23 +++-- src/views/userFeedback/list/index.vue | 71 +++++++++++++-- 6 files changed, 259 insertions(+), 54 deletions(-) diff --git a/src/api/merchant.js b/src/api/merchant.js index 896e11e..b45ac8f 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -67,8 +67,8 @@ export function merchantUpdateApi(id) { /** * @description 商户列表 -- 编辑 */ -export function merchantUpdate(id,data) { - return request.post(`system/merchant/update/${id}`,data) +export function merchantUpdate(id, data) { + return request.post(`system/merchant/update/${id}`, data) } /** * @description 商户列表 -- 删除 @@ -198,19 +198,19 @@ export function intentionAgreeInfo() { * @description 申请管理 -- 入驻协议保存 */ export function intentionAgreeUpdate(data) { - return request.post(`agreement/sys_intention_agree`,data) + return request.post(`agreement/sys_intention_agree`, data) } /** * @description 店铺类型 -- 获取说明 */ - export function getStoreTypeApi(key) { - return request.get(`agreement/${key}`) +export function getStoreTypeApi(key) { + return request.get(`agreement/${key}`) } /** * @description 店铺类型 -- 编辑说明 */ export function updateStoreTypeApi(type, data) { - return request.post(`agreement/${type}`, data) + return request.post(`agreement/${type}`, data) } /** * @description 商户列表 -- 开启关闭 @@ -229,150 +229,186 @@ export function merchantCountApi() { * @description 店铺类型 -- 创建店铺类型 */ export function storeTypeCreateApi(data) { - return request.post(`merchant/type/create`, data) + return request.post(`merchant/type/create`, data) } /** * @description 店铺类型 -- 列表 */ - export function storeTypeLstApi(data) { +export function storeTypeLstApi(data) { return request.get(`merchant/type/lst`, data) } /** * @description 店铺类型 -- 店铺权限 */ - export function storeJurisdictionApi() { +export function storeJurisdictionApi() { return request.get(`merchant/mer_auth`) } /** * @description 店铺类型 -- 创建店铺类型 */ export function storeTypeUpdateApi(id, data) { - return request.post(`merchant/type/update/${id}`, data) + return request.post(`merchant/type/update/${id}`, data) } /** * @description 店铺类型列表 -- 删除 */ export function storeTypeDeleteApi(id) { - return request.delete(`merchant/type/delete/${id}`) + return request.delete(`merchant/type/delete/${id}`) } /** * @description 店铺类型列表 -- 备注 */ export function merchantTypeMarkForm(id) { - return request.get(`merchant/type/mark/${id}`) + return request.get(`merchant/type/mark/${id}`) } /** * @description 店铺类型列表 -- 详情 */ - export function merchantTypeDetailApi(id) { +export function merchantTypeDetailApi(id) { return request.get(`/merchant/type/detail/${id}`) } /** * @description 店铺类型 -- 获取选择项 */ export function getstoreTypeApi() { - return request.get(`merchant/type/options`) + return request.get(`merchant/type/options`) } /** * @description 商户分类 -- 获取选择项 */ export function getMerCateApi() { - return request.get(`system/merchant/category/options`) + return request.get(`system/merchant/category/options`) } /** * @description 服务申请 -- 列表 */ export function getApplymentLst(data) { - return request.get(`system/applyments/lst`, data) + return request.get(`system/applyments/lst`, data) } /** * @description 服务申请 -- 审核 */ export function applymentStatusApi(id, data) { - return request.post(`system/applyments/status/${id}`, data) + return request.post(`system/applyments/status/${id}`, data) } /** * @description 服务申请 -- 详情 */ export function applymentDetailApi(id) { - return request.get(`system/applyments/detail/${id}`) + return request.get(`system/applyments/detail/${id}`) } /** * @description 商户 -- 分账列表 */ - export function applymentLstApi(data) { - return request.get(`profitsharing/lst`, data) +export function applymentLstApi(data) { + return request.get(`profitsharing/lst`, data) } /** * @description 商户 -- 分账(立即分账) */ - export function splitAccountApi(id) { - return request.post(`profitsharing/again/${id}`) +export function splitAccountApi(id) { + return request.post(`profitsharing/again/${id}`) } /** * @description 分账申请 -- 备注 */ export function splitAccountMark(id) { - return request.get(`system/applyments/mark/${id}/form`) + return request.get(`system/applyments/mark/${id}/form`) } /** * @description 分账管理 -- 导出 */ - export function ledgerManageExportApi(data) { +export function ledgerManageExportApi(data) { return request.get(`profitsharing/export`, data) } /** * @description 缴存保证金 -- 列表 */ - export function marginLstApi(data) { +export function marginLstApi(data) { return request.get(`margin/lst`, data) } +/** + * @description 缴存服务费 -- 列表 + */ +export function marginServiceLstApi(data) { + return request.get(`margin/service_lst`, data) +} +/** + * @description 缴存上架费 -- 列表 + */ +export function marginGoodsLstApi(data) { + return request.get(`margin/goods_lst`, data) +} /** * @description 待缴保证金 -- 列表 */ export function marginDepositLstApi(data) { return request.get(`margin/make_up`, data) } +/** + * @description 待缴服务费 -- 列表 + */ +export function marginServiceDepositLstApi(data) { + return request.get(`margin/make_service_up`, data) +} +/** + * @description 待缴上架费 -- 列表 + */ +export function marginGoodsDepositLstApi(data) { + return request.get(`margin/make_goods_up`, data) +} /** * @description 待缴保证金 -- 线下付款 */ export function marginPaymentApi(id) { return request.get(`margin/local/${id}/form`) } +/** + * @description 待缴服务费 -- 财务审核 + */ +export function marginServicePaymentApi(id) { + return request.get(`margin/local_service/${id}/form`) +} +/** + * @description 待缴上架费 -- 财务审核 + */ +export function marginGoodsPaymentApi(id) { + return request.get(`margin/local_goods/${id}/form`) +} /** * @description 退回保证金 -- 列表 */ - export function marginRefundLstApi(data) { +export function marginRefundLstApi(data) { return request.get(`margin/refund/lst`, data) } /** * @description 退回保证金 -- 审核 */ - export function marginRefundStatus(id) { +export function marginRefundStatus(id) { return request.get(`margin/refund/status/${id}/form`) } /** * @description 退回保证金 -- 备注 */ - export function marginRefundMark(id) { +export function marginRefundMark(id) { return request.get(`margin/refund/mark/${id}/form`) } /** * @description 退回保证金 -- 退回信息 */ - export function marginRefundInfo(id) { +export function marginRefundInfo(id) { return request.get(`margin/refund/show/${id}`) } /** * @description 退回保证金 -- 扣费记录 */ - export function marginDeductionRecord(id, data) { +export function marginDeductionRecord(id, data) { return request.get(`margin/list/${id}`, data) } /** * @description 退回保证金 -- 保证金扣费 */ - export function marginDeductionForm(id) { +export function marginDeductionForm(id) { return request.get(`margin/set/${id}/form`) } /** diff --git a/src/libs/modal-form.js b/src/libs/modal-form.js index 4cf6e93..a08d6fb 100644 --- a/src/libs/modal-form.js +++ b/src/libs/modal-form.js @@ -18,14 +18,14 @@ const uniqueId = () => ++unique export default function modalForm(formRequestPromise, config = {}) { const h = this.$createElement return new Promise((resolve) => { - formRequestPromise.then(({data}) => { + formRequestPromise.then(({ data }) => { data.config.submitBtn = false data.config.resetBtn = false if (!data.config.form) data.config.form = {} if (!data.config.formData) data.config.formData = {} - data.config.formData = {...data.config.formData, ...config.formData} - data.config.form.labelWidth = '110px' - data.config.form.size="small" + data.config.formData = { ...data.config.formData, ...config.formData } + // data.config.form.labelWidth = '110px' + data.config.form.size = "small" data.config.global = { upload: { props: { @@ -41,7 +41,7 @@ export default function modalForm(formRequestPromise, config = {}) { this.$msgbox({ title: data.title, customClass: config.class || 'modal-form', - message: h('div', {class: 'common-form-create', key: uniqueId()}, [ + message: h('div', { class: 'common-form-create', key: uniqueId() }, [ h('formCreate', { props: { rule: data.rule, diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue index 885c31f..3f51320 100644 --- a/src/views/merchant/deposit/index.vue +++ b/src/views/merchant/deposit/index.vue @@ -238,6 +238,26 @@ {{ scope.row.is_margin == 1 ? scope.row.margin : (scope.row.ot_margin-scope.row.margin).toFixed(2) }} + + + + + + @@ -456,11 +476,17 @@ // +---------------------------------------------------------------------- import { marginLstApi, + marginServiceLstApi, + marginGoodsLstApi, marginRefundLstApi, marginRefundStatus, marginRefundMark, marginDepositLstApi, + marginServiceDepositLstApi, + marginGoodsDepositLstApi, marginPaymentApi, + marginServicePaymentApi, + marginGoodsPaymentApi, getstoreTypeApi, marginDeductionForm, getMerCateApi, @@ -493,11 +519,31 @@ export default { type: "2", title: "待缴保证金", }, + { + count: "", + type: "3", + title: "待缴服务费", + }, + { + count: "", + type: "4", + title: "待缴上架费", + }, { count: "", type: "1", title: "缴存保证金", }, + { + count: "", + type: "5", + title: "缴存服务费", + }, + { + count: "", + type: "6", + title: "缴存上架费", + }, { count: "", type: "0", @@ -599,6 +645,46 @@ export default { this.listLoading = false; this.$message.error(res.message); }) + : this.type == 3 ? marginServiceDepositLstApi(this.tableFrom) //待缴 + .then((res) => { + this.tableData.data = res.data.list; + this.tableData.total = res.data.count; + this.listLoading = false; + }) + .catch((res) => { + this.listLoading = false; + this.$message.error(res.message); + }) + : this.type == 4 ? marginGoodsDepositLstApi(this.tableFrom) //待缴 + .then((res) => { + this.tableData.data = res.data.list; + this.tableData.total = res.data.count; + this.listLoading = false; + }) + .catch((res) => { + this.listLoading = false; + this.$message.error(res.message); + }) + : this.type == 5 ? marginServiceLstApi(this.tableFrom) //缴存服务费 + .then((res) => { + this.tableData.data = res.data.list; + this.tableData.total = res.data.count; + this.listLoading = false; + }) + .catch((res) => { + this.listLoading = false; + this.$message.error(res.message); + }) + : this.type == 6 ? marginGoodsLstApi(this.tableFrom) //缴存上架费 + .then((res) => { + this.tableData.data = res.data.list; + this.tableData.total = res.data.count; + this.listLoading = false; + }) + .catch((res) => { + this.listLoading = false; + this.$message.error(res.message); + }) : marginRefundLstApi(this.tableFrom) //退回 .then((res) => { this.tableData.data = res.data.list; @@ -667,7 +753,11 @@ export default { }, // 线下付款 offline(id) { - this.$modalForm(marginPaymentApi(id)).then(() => this.getList("")); + this.type == 2? + this.$modalForm(marginPaymentApi(id)).then(() => this.getList("")) + : this.type == 3 ? + this.$modalForm(marginServicePaymentApi(id)).then(() => this.getList("")) + :this.$modalForm(marginGoodsPaymentApi(id)).then(() => this.getList("")) }, // 退回记录 handleRecord(id) { diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index ed72dce..e59b66b 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -67,12 +67,19 @@ clearable /> - + + + + + + + + 搜索 重置 @@ -493,6 +500,8 @@ export default { hot_type: '', star: '', svip_price_type: '', + is_audited:'', + is_huimei:'', product_id: this.$route.query.id ? this.$route.query.id : "" }, categoryList: [], diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue index e15eb3f..84cf9fb 100644 --- a/src/views/product/productExamine/info.vue +++ b/src/views/product/productExamine/info.vue @@ -378,7 +378,7 @@ 拒绝 - +
- + + { this.projectData = res.data, this.ruleForm.status_img = res.data.status_img diff --git a/src/views/userFeedback/list/index.vue b/src/views/userFeedback/list/index.vue index 7c93178..071f44b 100644 --- a/src/views/userFeedback/list/index.vue +++ b/src/views/userFeedback/list/index.vue @@ -1,7 +1,7 @@ +