diff --git a/src/api/accounts.js b/src/api/accounts.js index f1211b6..38bebf2 100644 --- a/src/api/accounts.js +++ b/src/api/accounts.js @@ -100,19 +100,19 @@ export function capitalFlowExportApi(data) { /** * @description 转账记录 -- 导出 */ - export function transferRecordsExportApi(data) { +export function transferRecordsExportApi(data) { return request.get(`financial/export`, data) } /** * @description 资金记录 -- 导出 */ - export function fundingRecordsExportApi(data) { +export function fundingRecordsExportApi(data) { return request.get(`bill/export`, data) } /** * @description 提现管理 -- 导出 */ - export function extractManageExportApi(data) { +export function extractManageExportApi(data) { return request.get(`user/extract/export`, data) } /** @@ -132,115 +132,121 @@ export function extractManageDetail(id) { * @description 获取版本号 */ export function getVersion() { - return request.get(`version`) + return request.get(`version`) } /** * @description 转账设置 */ export function transferSettingApi(key) { - return request.get(`config/${key}`) + return request.get(`config/${key}`) } /** * @description 转账记录 */ export function transferRecordApi(data) { - return request.get(`financial/lst`, data) + return request.get(`financial/lst`, data) } /** * @description 转账记录 -- 头部数据 */ export function transferHeaderDataApi() { - return request.get(`financial/title`) + return request.get(`financial/title`) } /** * @description 转账信息 */ export function transferDetailApi(id) { - return request.get(`financial/detail/${id}`) + return request.get(`financial/detail/${id}`) } /** * @description 申请转账 -- 审核 */ export function transferReviewApi(id, data) { - return request.post(`financial/status/${id}`, data) + return request.post(`financial/status/${id}`, data) +} +/** + * @description 申请转账 -- 批量审核 + */ +export function transferReviewBatchApi(data) { + return request.post(`financial/status_batch`, data) } /** * @description 申请转账 -- 备注 */ export function transferMarkApi(id) { - return request.get(`financial/mark/${id}/form`) + return request.get(`financial/mark/${id}/form`) } /** * @description 申请转账 -- 转账 */ export function transferEditApi(id, data) { - return request.post(`financial/update/${id}`, data) + return request.post(`financial/update/${id}`, data) } /** * @description 财务账单 -- 列表 */ export function financialLstApi(data) { - return request.get(`financial_record/lst`, data) + return request.get(`financial_record/lst`, data) } /** * @description 财务账单 -- 详情 */ export function financialDetailApi(type, data) { - return request.get(`financial_record/detail/${type}`, data) + return request.get(`financial_record/detail/${type}`, data) } /** * @description 财务账单 -- 头部数据 */ export function finaHeaderDataApi(data) { - return request.get(`financial_record/title`, data) + return request.get(`financial_record/title`, data) } /** * @description 财务账单 -- 下载账单 */ export function downloadFinancialApi(type, data) { - return request.get(`financial_record/detail_export/${type}`, data) + return request.get(`financial_record/detail_export/${type}`, data) } /** * @description 资金流水 -- 统计数据 */ export function getStatisticsApi(data) { - return request.get(`financial_record/count`,data) + return request.get(`financial_record/count`, data) } /** * @description 发票 -- 获取发票说明 */ export function getReceiptApi(key) { - return request.get(`agreement/${key}`) + return request.get(`agreement/${key}`) } /** * @description 发票 -- 编辑发票说明 */ export function updateReceiptApi(type, data) { - return request.post(`agreement/${type}`, data) + return request.post(`agreement/${type}`, data) } /** * @description 发票 -- 列表 */ export function invoiceListApi(data) { - return request.get(`receipt/lst`, data) + return request.get(`receipt/lst`, data) } /** * @description 发票 -- 详情 */ - export function invoiceDetailApi(id) { - return request.get(`receipt/detail/${id}`) +export function invoiceDetailApi(id) { + return request.get(`receipt/detail/${id}`) } /** * @description 分账单 -- 获取配置 */ - export function getSettingApi() { - return request.get(`profitsharing/config`) +export function getSettingApi() { + return request.get(`profitsharing/config`) } /** * @description 分账单 -- 修改配置 */ - export function updateSettingApi(data) { - return request.post(`profitsharing/config`, data) +export function updateSettingApi(data) { + return request.post(`profitsharing/config`, data) } /** * @description 商户账单 -- 列表 @@ -251,24 +257,24 @@ export function merchantBillList(data) { /** * @description 单个商户账单 -- 列表 */ -export function singleMerBillList(id,data) { +export function singleMerBillList(id, data) { return request.get(`financial_record/mer_list/${id}`, data) } /** * @description 单个商户账单 -- 详情 */ -export function singleMerBillDetail(type,data) { +export function singleMerBillDetail(type, data) { return request.get(`financial_record/mer_detail/${type}`, data) } /** * @description 单个商户账单 -- 导出 */ -export function singleMerBillExport(type,data) { +export function singleMerBillExport(type, data) { return request.get(`financial_record/mer_excel/${type}`, data) } /** * @description 单个商户账单 -- 统计 */ -export function singleMerBillHeader(id,data) { +export function singleMerBillHeader(id, data) { return request.get(`financial_record/mer_title/${id}`, data) } \ No newline at end of file diff --git a/src/views/accounts/settings/index.vue b/src/views/accounts/settings/index.vue index d65e22f..4be38d1 100644 --- a/src/views/accounts/settings/index.vue +++ b/src/views/accounts/settings/index.vue @@ -34,7 +34,7 @@ - (单位: 天),冻结期:仅针对线下转账模式,指用户支付成功后多少天,商户余额可解冻;设置为0,即无冻结期。 + (单位: 天),冻结期:确认收货后多少天,商户余额可解冻;设置为0,即无冻结期。 diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue index 19981e0..0130f7e 100644 --- a/src/views/accounts/transferRecord/index.vue +++ b/src/views/accounts/transferRecord/index.vue @@ -108,6 +108,7 @@
导出列表 + 批量审核
+ + + + @@ -703,8 +708,8 @@ export default { }, batch() { if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品') - this.$refs.infoFrom.dialogVisible = true this.isShow = false + this.$refs.infoFrom.dialogVisible = true }, handleSelectionChange(val) { this.multipleSelection = val diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue index 35e538b..f3ded6f 100644 --- a/src/views/product/productExamine/info.vue +++ b/src/views/product/productExamine/info.vue @@ -4,7 +4,8 @@ title="商品审核" :visible.sync="dialogVisible" :append-to-body='isAppend' - width="860px" + width="1260px" + top="60px" :before-close="handleClose" class="projectInfo" > @@ -22,27 +23,27 @@ />
+ 联系人电话:{{ projectData.unit_name }} - - -
- 商品名称:{{ projectData.store_name }} - 平台分类:{{ projectData.storeCategory?projectData.storeCategory.cate_name:'' }} - 品牌:{{ projectData.brand?projectData.brand.brand_name:'其他' }} - 商品关键字:{{ projectData.keyword }} - 商品单位:{{ projectData.unit_name }} - 运费模板:{{ projectData.temp?projectData.temp.name:'' }} - 运费说明:{{ projectData.temp?projectData.temp.info:'' }} - +
+ 商品id:{{ projectData.product_id }} + 商品名称:{{ projectData.store_name }} + 平台分类:{{ projectData.storeCategory?projectData.storeCategory.cate_name:'' }} + 品牌:{{ projectData.brand?projectData.brand.brand_name:'其他' }} + 商品关键字:{{ projectData.keyword }} + 商品单位:{{ projectData.unit_name }} + 商品分类: - - 商品简介:{{ projectData.store_info }} + 商品简介:{{ projectData.store_info }} + 商品备注:{{ projectData.remark }} + 是否惠美乡村:{{ projectData.is_huimei?'是':'否' }} 商品封面图:
@@ -53,6 +54,13 @@ />
+
+ + +
+ 运费模板:{{ projectData.temp?projectData.temp.name:'' }} + 运费说明:{{ projectData.temp?projectData.temp.info:'' }} + 主图视频: