+ 店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}
+ 入住企业名称：
+ 店铺联系人: {{ projectData.merchant&&projectData.merchant.service_phone }}
+
+ 营业执照：
+
+
+
+ 联系人电话：{{ projectData.unit_name }}
+
+
@@ -59,12 +76,12 @@
商品名称：
-
- 国产
- 进口
+
+ 国产
+ 进口
-
@@ -121,7 +121,7 @@
+
-
生产企业名称：{{ qualification.production_name }}
生产营业执照：
@@ -157,7 +174,7 @@
+
+
+
+
+
+
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index fa130b1..29ad17c 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -135,6 +135,7 @@
{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}
+
{{ scope.row.is_soldier ? '是' : '否' }}
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index f3ded6f..18f3bad 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -103,7 +103,7 @@
进口/企业境内总代企业名称: {{ qualification.import_name }}
- 店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}
- 入住企业名称：
-
- 营业执照：
-
@@ -548,7 +549,7 @@ export default {
return suffix == 'pdf'
},
// 点击商品图
- modalPicTap(tit, num, i) {
+ modalPicTap(tit, num, i) {
const _this = this;
const attr = [];
this.$modalUpload(function(img) {
@@ -576,9 +577,27 @@ export default {
getInfo(id) {
this.proId = id
this.loading = true
+ this.ruleForm.status_img = ''
productDetailApi(id).then(res => {
this.projectData = res.data
- this.qualification = res.data.qualification
+ let qualification={
+ production_name: '',
+ businessList: [],
+ licenceList: [],
+ trademarkList: [],
+ authorizedList: [],
+ commodityList: [],
+ otherList: [],
+ importBusinessList: [],
+ importAuthorizedList: [],
+ customsList: [],
+ packingList: [],
+ importOtherList: [],
+ commodity_type: 0,
+ brands_name: '',
+ import_name: ''
+ }
+ this.qualification = res.data.qualification || qualification
this.svip_type = res.data.svip_price_type
if (this.projectData.spec_type === 0) {
@@ -676,6 +695,7 @@ export default {
position: relative;
cursor: pointer;
display: inline-block;
+ vertical-align: middle;
img {
width: 100%;
height: 100%;
From 39000c124b09a69b1addabf063a272259888e9c8 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 5 Apr 2024 11:50:20 +0800
Subject: [PATCH 2/9] add
---
src/api/accounts.js | 64 ++++++++++---------
src/views/accounts/settings/index.vue | 2 +-
src/views/accounts/transferRecord/index.vue | 59 ++++++++++++++---
src/views/merchant/list/handle/merDetails.vue | 9 +++
.../merchant/list/handle/merEditForm.vue | 35 ++++++++++
src/views/merchant/list/handle/merInfo.vue | 24 +++++++
src/views/product/productExamine/index.vue | 7 +-
src/views/product/productExamine/info.vue | 35 ++++++----
8 files changed, 183 insertions(+), 52 deletions(-)
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 @@
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 @@
导出列表
+ 批量审核
+
{{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}
@@ -180,7 +183,7 @@
-
+
+
+
-
-
-
+
+ {{scope.row.is_huimei == 1 ? '是' : '否'}}
+
+
+
+
+ {{scope.row.is_soldier == 1 ? '是' : '否'}}
+
+
diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue
index d7b2927..040e8a0 100644
--- a/src/views/order/refund/index.vue
+++ b/src/views/order/refund/index.vue
@@ -153,6 +153,8 @@
size="small"
@click="onOrderDetail(scope.row.order.order_sn)"
>订单详情
+ 退款
+ 退款单详情
@@ -170,6 +172,8 @@
@@ -186,15 +190,18 @@
import {
refundorderListApi,
orderUpdateApi,
+ refundorderStatusApi,
+ refundorderDetailApi,
orderDeliveryApi, exportRefundOrderApi
} from "@/api/order";
import createWorkBook from '@/utils/newToExcel.js';
+import detailsFrom from './refundDetail'
import { fromList } from "@/libs/constants.js";
import fileList from '@/components/exportFile/fileList'
import { roterPre } from "@/settings";
import timeOptions from '@/utils/timeOptions';
export default {
- components: { fileList },
+ components: { fileList,detailsFrom },
name: "OrderRefund",
data() {
return {
@@ -232,6 +239,9 @@ export default {
dialogVisible: false,
cardLists: [],
orderDatalist: null,
+ orderDetails: {},
+ result: [],
+ dialogLogistics:false
};
},
mounted() {
@@ -252,6 +262,45 @@ export default {
this.getList('');
},
methods: {
+ // 退款
+ onOrderStatus(id) {
+ this.$modalForm(refundorderStatusApi(id)).then(() => this.getList(''))
+ },
+ // 详情
+ onRefundOrderDetail(id) {
+ this.orderId = id
+ this.$refs.orderDetail.dialogVisible = true
+ this.loading = true
+ refundorderDetailApi(id)
+ .then(res => {
+ this.orderDatalist = res.data
+ this.loading = false
+ this.$refs.orderDetail.onOrderLog(id)
+ })
+ .catch(({ message }) => {
+ this.loading = false
+ this.$message.error(message)
+ })
+ },
+ openLogistics(row) {
+ this.orderDetails = row
+ this.getOrderData(row.refund_order_id)
+ this.dialogLogistics = true
+ },
+ handleClose() {
+ this.dialogLogistics = false
+ this.dialogConfirm = false
+ },
+ // 获取订单物流信息
+ getOrderData(id) {
+ refundorderExpressApi(id)
+ .then(async res => {
+ this.result = res.data
+ })
+ .catch(res => {
+ this.$message.error(res.message)
+ })
+ },
/**重置 */
searchReset(){
this.timeVal = []
diff --git a/src/views/order/refund/refundDetail.vue b/src/views/order/refund/refundDetail.vue
new file mode 100644
index 0000000..3ee22d4
--- /dev/null
+++ b/src/views/order/refund/refundDetail.vue
@@ -0,0 +1,192 @@
+
+ 生产营业执照：
@@ -343,22 +360,6 @@
-
-
-
- 店铺联系人: {{ projectData.merchant&&projectData.merchant.service_phone }}
- 联系人电话：{{ projectData.unit_name }}
-
+
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 9fbd30e..1789d22 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -15,6 +15,14 @@
+
+
+
@@ -72,6 +84,18 @@
{{merData.is_margin == 0 ? '无' : merData.ot_margin}}
+ 商户信息
{{ transferData.merchant && transferData.merchant.mer_name }}
@@ -194,17 +197,17 @@
-
![]()
![]()
-
+
通过
拒绝
@@ -232,7 +235,8 @@
@@ -255,7 +259,7 @@
// | Author: CRMEB Team
// +----------------------------------------------------------------------
import { merSelectApi } from '@/api/product'
-import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import { transferReviewBatchApi,transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
import cardsData from "@/components/cards/index";
import createWorkBook from '@/utils/newToExcel.js';
import fileList from '@/components/exportFile/fileList'
@@ -276,6 +280,7 @@ export default {
{ label: "未到账", value: 0 }
],
listLoading: true,
+ isShow:false,
cardLists: [],
voucher_image: [],
formValidate: {
@@ -309,6 +314,8 @@ export default {
]
},
merSelect: [],
+ multipleSelection: [],
+ OffId: [],
tableFromLog: {
page: 1,
limit: 20
@@ -339,6 +346,40 @@ export default {
this.$refs.searchForm.resetFields()
this.getList(1)
},
+ selectable(row, index){
+ return !row.status
+ },
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ const data = []
+ this.multipleSelection.map((item) => {
+ data.push(item.financial_id)
+ })
+ this.OffId = data
+ console.log(this.OffId);
+ },
+ // 批量审核
+ batch() {
+ if(this.multipleSelection.length === 0) return this.$message.warning('请先选择记录')
+ this.isShow = false
+ this.dialogVisible = true
+ },
+ transferReviewBatchApi(){
+ let parmas = {
+ status: this.formValidate.status,
+ refusal: this.formValidate.refusal,
+ ids:this.OffId
+ }
+ transferReviewBatchApi(parmas).then(res => {
+ this.listLoading = false;
+ this.$message.success(res.message);
+ this.dialogVisible = false;
+ this.getList(1);
+ }).catch(res => {
+ this.listLoading = false;
+ this.$message.error(res.message)
+ })
+ },
// 商户列表
getMerSelect() {
merSelectApi()
@@ -363,6 +404,7 @@ export default {
if(num) this.voucher_image = []
transferDetailApi(id).then(res => {
this.listLoading = false;
+ this.isShow = true
this.dialogVisible = true;
this.transferData = res.data
this.formValidate.status = res.data.status
@@ -384,6 +426,7 @@ export default {
},
// 审核
transferReview(id){
+
let parmas = {
status: this.formValidate.status,
refusal: this.formValidate.refusal
diff --git a/src/views/merchant/list/handle/merDetails.vue b/src/views/merchant/list/handle/merDetails.vue
index 74cabf3..93913a9 100644
--- a/src/views/merchant/list/handle/merDetails.vue
+++ b/src/views/merchant/list/handle/merDetails.vue
@@ -162,6 +162,15 @@ export default {
this.loading = false;
this.drawer = true;
this.merData = res.data;
+ let financial_bank = {
+ name:'',
+ bank:'',
+ bank_code:'',
+ }
+ if(!res.data.financial_bank){
+ this.merData.financial_bank = financial_bank;
+ }
+ console.log(this.merData);
if(!this.isEdit)this.$refs.merInfo.onOperateLog(this.merId);
})
.catch((res) => {
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index b5df289..8024c6a 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -130,6 +130,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
收款信息
+ 收款信息
{{ transferData.financial_account.wechat }}
{{ transferData.financial_account.alipay }}
{{ transferData.extract_money }}
- {{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}
+ {{ transferData.extract_money }}
+ {{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}
{{ transferData.status_time }}
- {{ transferData.refusal }}
- {{ transferData.refusal }}
+ 银行卡信息
+ 商户类型：
{{merData.is_trader == 1 ? "自营" : "非自营"}}
+ 是否为惠美乡村:
+ {{merData.is_huimei == 1 ? "是" : "否"}}
+ 是否为军人:
+ {{merData.is_soldier == 1 ? "是" : "否"}}
+ 商户分类：
@@ -46,6 +54,10 @@
+
备注：
{{merData.mark}}
+ 营业执照：
+ 上架费：
+
+ {{merData.is_goods == 0 ? '无' : merData.goods_cost}}
+
+ 产品服务费：
+
+ {{merData.is_service == 0 ? '无' : merData.service_cost}}
+
+ 保证金支付状态：
{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 780ceb9..fa130b1 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -135,6 +135,11 @@
{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}
+
+
+ {{ scope.row.is_soldier ? '是' : '否' }}
+
+
+
联系人电话：{{ 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:'' }}
-
+
+
+
+
+
+
@@ -318,6 +343,11 @@ export default {
},
filters: {
},
+ computed: {
+ companyImage(){
+ return this.merData.ext?.company_image
+ }
+ },
methods: {
lookImg(item) {
this.imageUrl = item;
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index daf56b0..0ba9b11 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -106,6 +106,16 @@
>
+ 商品id：{{ projectData.product_id }}
+ 商品名称：{{ projectData.store_name }}
+ 平台分类：{{ projectData.storeCategory?projectData.storeCategory.cate_name:'' }}
+ 品牌：{{ projectData.brand?projectData.brand.brand_name:'其他' }}
+ 商品关键字：{{ projectData.keyword }}
+ 商品单位：{{ projectData.unit_name }}
+
商品分类：
{{ item.category?item.category.cate_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:'' }}
+
主图视频：
{{merData.update_time}}
+ 每日提现额度：
+ {{merData.exchange_limit}}
+ 备注：
{{merData.mark}}
营业执照：
- 银行卡信息
+ -
+
-
+ 名称：++ {{merData.financial_bank&&merData.financial_bank.name}} ++
+
-
+ 开户银行：++ {{merData.financial_bank&&merData.financial_bank.bank}} ++
+
-
+ 开户卡号：++ {{merData.financial_bank&&merData.financial_bank.bank_code}} +
+
+
+
+ 用户信息
+
+
+ 用户昵称：{{ orderDatalist.user.nickname }}
+ 退货人：{{ orderDatalist.order.real_name }}
+ 联系电话：{{ orderDatalist.order.user_phone }}
+ 退货地址：{{ orderDatalist.order.user_address }}
+ 备注：{{ orderDatalist.mark }}
+ {{orderDatalist.refund_type == 1 ? '退款信息' : '退回商品信息'}}
+
+
+ 订单编号：{{ orderDatalist.order.order_sn }}
+ 订单状态：{{ orderDatalist.status | orderRefundFilter }}
+ 退款单号：{{ orderDatalist.refund_order_sn }}
+ 退款商品名称：
+
+
+
+
+ {{item.product.cart_info.product.store_name}}
+
+ 退款发起方：{{ orderDatalist.create_user }}
+ 退款商品件数：{{ orderDatalist.refund_num }}件
+ 退款总金额：{{ orderDatalist.refund_price }}元
+ 退货快递单号：{{ orderDatalist.delivery_id }}
+ 创建时间：{{ orderDatalist.create_time }}
+ 商家备注：{{ orderDatalist.mer_mark }}
+ 退款凭证：
+
+
+
+
+
+ 订单记录
+
+
+
+
+ 退货物流信息
+
+
+
+ 快递公司：{{ orderDatalist.delivery_type }}
+ 物流查询
+
+ 快递单号：{{ orderDatalist.delivery_id }}
+
+ -
封面图：-
+ +
-
轮播图：-
+
+
+ 生产企业名称：{{ qualification.production_name }}
+
+
+ 生产营业执照：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 商标注册证：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 销售授权及其他：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 商品检测报告：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 其他资质：
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ 进口/企业境内总代企业名称: {{ qualification.import_name }}
+
+
+ 生产营业执照：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 销售授权及其他：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 海关检验检疫证书及报关单：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 产品外包装实物图：
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 其他资质：
+
+
+
+
+ {{ item.name }}
+
+
+
+ {{ transferData.financial_account.alipay }}
{{ transferData.extract_money }}
- {{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}
+ {{ getStatus(transferData.status) }}
{{ transferData.status_time }}
{{ transferData.refusal }}
-
@@ -155,7 +156,7 @@
-
@@ -202,6 +203,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -308,6 +309,7 @@
@@ -376,7 +378,38 @@
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+ 审核拒绝原因：+{{productData.refusal || ''}}+
+
-
+ 佐证图片：+
+
+
规格列表：
From c849a54e89688a5cb87af76d76e3e829feec07e9 Mon Sep 17 00:00:00 2001
From: yangtao
Date: Mon, 8 Apr 2024 09:09:23 +0800
Subject: [PATCH 5/9] 1
---
src/views/order/list/orderDetails.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue
index 847ad36..108f7bc 100644
--- a/src/views/order/list/orderDetails.vue
+++ b/src/views/order/list/orderDetails.vue
@@ -393,6 +393,10 @@
+
From 1024bd15a55bb4b4b10f3a1c554c936fdc8c0456 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Mon, 8 Apr 2024 17:44:44 +0800
Subject: [PATCH 6/9] add
---
.env.development | 4 +-
src/api/order.js | 12 +++
src/api/product.js | 88 +++++++++-------
src/views/merchant/deposit/index.vue | 2 +-
src/views/merchant/list/index.vue | 2 +-
src/views/order/list/index.vue | 13 ++-
src/views/order/list/orderDetails.vue | 4 +
src/views/order/logistics.vue | 112 +++++++++++++++++++++
src/views/order/orderCancellate/index.vue | 4 +-
src/views/order/refund/index.vue | 19 +++-
src/views/product/productExamine/index.vue | 48 ++++++---
src/views/product/productExamine/info.vue | 27 ++++-
12 files changed, 269 insertions(+), 66 deletions(-)
create mode 100644 src/views/order/logistics.vue
diff --git a/.env.development b/.env.development
index 1940fd8..2bc26f5 100644
--- a/.env.development
+++ b/.env.development
@@ -3,11 +3,11 @@ ENV = 'development'
# http://192.168.1.43:8324/admin
# http://mer.crmeb.net/admin
# base api
-VUE_APP_BASE_API = 'http://192.168.1.32:8080'
+VUE_APP_BASE_API = 'http://192.168.1.199:8080'
# VUE_APP_BASE_API = 'https://plus.hwms.shop'
# socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.32:8080'
+VUE_APP_WS_URL = 'ws://192.168.1.199:8080'
# VUE_APP_WS_URL = 'ws://plus.hwms.shop'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
diff --git a/src/api/order.js b/src/api/order.js
index e3f2e5e..3d44721 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -33,6 +33,18 @@ export function refundorderLogApi(id) {
export function refundorderStatusApi(id) {
return request.get(`order/refund/status/${id}/form`)
}
+/**
+ * @description 开启强制退款订单 -- 审核from
+ */
+export function refundorderOpenApi(id) {
+ return request.get(`order/refund/open/${id}/form`)
+}
+/**
+ * @description 退款单获取物流信息
+ */
+export function refundorderExpressApi(id) {
+ return request.get(`order/express/${id}`)
+}
/**
* @description 开启退款
*/
diff --git a/src/api/product.js b/src/api/product.js
index 17c1a94..f9b510e 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -114,32 +114,32 @@ export function brandStatusApi(id, status) {
/**
* @description 标签 -- 新增表单
*/
- export function labelCreateApi() {
- return request.get('product/label/create/form')
+export function labelCreateApi() {
+ return request.get('product/label/create/form')
}
/**
* @description 标签 -- 编辑表单
*/
- export function labelUpdateApi(id) {
- return request.get(`product/label/update/${id}/form`)
- }
+export function labelUpdateApi(id) {
+ return request.get(`product/label/update/${id}/form`)
+}
/**
* @description 标签 -- 列表
*/
- export function labelListApi(data) {
- return request.get('product/label/lst', data)
+export function labelListApi(data) {
+ return request.get('product/label/lst', data)
}
/**
* @description 标签 -- 删除
*/
- export function labelDeleteApi(id) {
- return request.delete(`product/label/delete/${id}`)
+export function labelDeleteApi(id) {
+ return request.delete(`product/label/delete/${id}`)
}
/**
* @description 标签列表 -- 修改状态
*/
- export function labelStatusApi(id, status) {
- return request.post(`product/label/status/${id}`, { status })
+export function labelStatusApi(id, status) {
+ return request.post(`product/label/status/${id}`, { status })
}
/**
* @description 商品列表 -- 列表
@@ -178,7 +178,19 @@ export function seckillProductDetailApi(id) {
return request.get(`seckill/product/detail/${id}`)
}
/**
- * @description 商品审核 -- 表单提交
+ * @description 商品审核 -- 初步审核
+ */
+export function productStatusFirstApi(data) {
+ return request.post(`store/product/status_first`, data)
+}
+/**
+ * @description 商品审核 -- 二次审核
+ */
+export function productStatusSecondApi(data) {
+ return request.post(`store/product/status_second`, data)
+}
+/**
+ * @description 商品审核 -- 最终审核
*/
export function productStatusApi(data) {
return request.post(`store/product/status`, data)
@@ -300,8 +312,8 @@ export function presellProDetailApi(id) {
/**
* @description 预售商品 -- 编辑
*/
-export function presellUpdateApi(id,data) {
- return request.post(`store/product/presell/update/${id}`,data)
+export function presellUpdateApi(id, data) {
+ return request.post(`store/product/presell/update/${id}`, data)
}
/**
* @description 预售商品审核 -- 表单提交
@@ -325,7 +337,7 @@ export function preSellAgreeInfo() {
* @description 申请管理 -- 预售协议保存
*/
export function preSellAgreeUpdate(data) {
- return request.post(`agreement/sys_product_presell_agree`,data)
+ return request.post(`agreement/sys_product_presell_agree`, data)
}
/**
* @description 助力 -- 列表
@@ -386,79 +398,79 @@ export function assistReviewDetailApi(id) {
/**
* @description 助力商品 -- 详情(编辑和查看)
*/
-export function assistProductUpdateApi(id,data) {
- return request.post(`store/product/assist/update/${id}`,data)
+export function assistProductUpdateApi(id, data) {
+ return request.post(`store/product/assist/update/${id}`, data)
}
/**
* @description 服务保障 -- 添加
*/
export function guaranteeAddApi() {
- return request.get(`guarantee/create/form`)
+ return request.get(`guarantee/create/form`)
}
/**
* @description 服务保障 -- 列表
*/
export function guaranteeLstApi(data) {
- return request.get(`guarantee/lst`,data)
+ return request.get(`guarantee/lst`, data)
}
/**
* @description 服务保障 -- 编辑排序
*/
-export function guaranteeSortApi(id,data) {
- return request.post(`guarantee/sort/${id}`,data)
+export function guaranteeSortApi(id, data) {
+ return request.post(`guarantee/sort/${id}`, data)
}
/**
* @description 服务保障 -- 修改显示状态
*/
export function guaranteeStatusApi(id, status) {
- return request.post(`guarantee/status/${id}`, status )
+ return request.post(`guarantee/status/${id}`, status)
}
/**
* @description 服务保障 -- 编辑
*/
export function guaranteeUpdateApi(id) {
- return request.get(`guarantee/update/${id}/form`)
+ return request.get(`guarantee/update/${id}/form`)
}
/**
* @description 服务保障 -- 删除
*/
export function guaranteeDeleteApi(id) {
- return request.delete(`guarantee/delete/${id}`)
+ return request.delete(`guarantee/delete/${id}`)
}
/**
* @description 商品列表 -- 编辑排序
*/
export function productSort(id, data) {
- return request.post(`store/reply/sort/${id}`,data)
+ return request.post(`store/reply/sort/${id}`, data)
}
/** 商品列表 -- 获取标签项 */
export function getProductLabelApi() {
- return request.get(`product/label/option`)
+ return request.get(`product/label/option`)
}
/** 商品列表 -- 编辑标签 */
export function updatetProductLabel(id, data) {
- return request.post(`store/product/labels/${id}`, data)
+ return request.post(`store/product/labels/${id}`, data)
}
/** 秒杀列表 -- 编辑标签 */
export function updatetSeckillLabel(id, data) {
- return request.post(`seckill/product/labels/${id}`, data)
+ return request.post(`seckill/product/labels/${id}`, data)
}
/** 预售列表 -- 编辑标签 */
- export function updatetPresellLabel(id, data) {
- return request.post(`store/product/presell/labels/${id}`, data)
+export function updatetPresellLabel(id, data) {
+ return request.post(`store/product/presell/labels/${id}`, data)
}
/** 助力列表 -- 编辑标签 */
export function updatetAssistLabel(id, data) {
- return request.post(`store/product/assist/labels/${id}`, data)
+ return request.post(`store/product/assist/labels/${id}`, data)
}
/** 拼团列表 -- 编辑标签 */
export function updatetCombinationLabel(id, data) {
- return request.post(`store/product/group/labels/${id}`, data)
+ return request.post(`store/product/group/labels/${id}`, data)
}
/**
* @description 上传视频
*/
- export function productGetTempKeysApi() {
+export function productGetTempKeysApi() {
return request.get(`upload/temp_key`)
}
/** 商品列表 -- 批量设置标签 */
@@ -491,15 +503,15 @@ export function deletePriceRuleApi(id) {
}
/** 价格说明 -- 是否显示 */
export function priceRuleStatusApi(id, status) {
- return request.post(`price_rule/status/${id}`,status)
+ return request.post(`price_rule/status/${id}`, status)
}
/** 参数模板 -- 添加 */
export function productSpecs(data) {
- return request.post(`store/params/temp/create`,data)
+ return request.post(`store/params/temp/create`, data)
}
/** 参数模板 -- 编辑 */
export function specsUpdate(id, data) {
- return request.post(`store/params/temp/update/${id}`,data)
+ return request.post(`store/params/temp/update/${id}`, data)
}
/** 参数模板 -- 详情 */
export function productSpecsInfo(id) {
@@ -525,6 +537,6 @@ export function merProductLstApi(data) {
return request.get(`store/product/list`, data)
}
/** 商品列表 -- 商品操作记录 */
-export function operateRecordList(id,data) {
- return request.get(`store/product/get_operate_list/${id}`,data)
+export function operateRecordList(id, data) {
+ return request.get(`store/product/get_operate_list/${id}`, data)
}
\ No newline at end of file
diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue
index cf9708e..885c31f 100644
--- a/src/views/merchant/deposit/index.vue
+++ b/src/views/merchant/deposit/index.vue
@@ -303,7 +303,7 @@
type="text"
size="small"
@click="offline(scope.row.mer_id)"
- >线下付款财务审核
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 0ba9b11..584e4a3 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -105,7 +105,7 @@
highlight-current-row
>
商户类别：
{{ orderDetailList.merchant.is_trader ? '自营' : '非自营' }}
+ 店铺客服电话：
+ {{ orderDetailList.user_phone }}
+ 商户类别：
{{ orderDetailList.merchant.is_trader ? '自营' : '非自营' }}
+ 店铺电话：
+ {{ orderDetailList.merchant.service_phone }}
+
+
+
+
+
+
+
diff --git a/src/views/order/orderCancellate/index.vue b/src/views/order/orderCancellate/index.vue
index 4393e1e..984385e 100644
--- a/src/views/order/orderCancellate/index.vue
+++ b/src/views/order/orderCancellate/index.vue
@@ -82,11 +82,11 @@
用户已删除
+ 
+
+
+ 物流公司：{{ logisticsName ? orderDatalist.delivery_type : orderDatalist.delivery_name }}
+ 物流单号：{{ orderDatalist.delivery_id }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -43,8 +43,8 @@
-
+
+
@@ -67,6 +67,12 @@
clearable
/>
+
+
+
+
搜索
重置
@@ -78,7 +84,7 @@
- 批量审核
+
批量强制下架
批量不显示
批量显示
@@ -118,7 +124,11 @@
+
+ {{ productTypeList[scope.row.audit_type].label }}
+
+
@@ -136,10 +146,10 @@
{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}
-
- {{ scope.row.is_soldier ? '是' : '否' }}
+ {{ scope.row.is_huimei ? '是' : '否' }}
- {{scope.row.is_audited?'上架商品修改':'首次提报'}}
+ {{ auditedList[scope.row.is_audited] }}
@@ -169,10 +179,10 @@
+
详情
- 审核
+ {{ getStatusName(scope.row.status) }}
预览
@@ -418,6 +428,7 @@ export default {
{ label: "2星", value: 2 },
{ label: "1星", value: 1 }
],
+ auditedList:['首次提报','非首次提报','首次修改'],
recommend: proOptions,
recommendList: [{
name: '热门榜单',
@@ -454,9 +465,9 @@ export default {
{ label: "平台关闭", value: -1 },
],
productTypeList: [
- { label: '普通商品', value: 0 },
- { label: '虚拟商品', value: 1 },
- { label: '卡密商品', value: 2 }
+ { label: '食品及保健品', value: 0 },
+ { label: '化妆品及日化品', value: 1 },
+ { label: '其他品类', value: 2 }
],
fullscreenLoading: false,
isShow: false,
@@ -474,6 +485,7 @@ export default {
sys_labels: '',
pid: '',
store_name: '',
+ audit_type:'',
type: '6',
mer_id: '',
keyword: '',
@@ -511,6 +523,16 @@ export default {
this.getLabelLst()
},
methods: {
+ getStatusName(val){
+ switch (val) {
+ case 0:
+ return '初始审核';
+ case 10:
+ return '二次审核';
+ case 11:
+ return '最终审核';
+ }
+ },
// 具体日期
onchangeTime(e) {
this.timeVal = e
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index 9f2ce58..e15eb3f 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -444,7 +444,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
-import { productDetailApi, productStatusApi } from '@/api/product'
+import { productDetailApi, productStatusApi,productStatusFirstApi,productStatusSecondApi } from '@/api/product'
const defaultObj = {
image: '',
slider_image: [],
@@ -634,11 +634,29 @@ export default {
}, tit);
},
onSubmit() {
- console.log(this.isShow);
+ console.log(this.projectData);
+ let mode = {
+ 0: {
+ 'api': productStatusFirstApi,
+ 'status':10
+ },
+ 10: {
+ 'api': productStatusSecondApi,
+ 'status':11
+ },
+ 11: {
+ 'api': productStatusApi,
+ 'status':1
+ }
+ }
this.$refs.ruleForm.validate(valid=>{
if(valid){
this.isShow ? this.ruleForm.id = this.proId : this.ruleForm.id = this.ids
- productStatusApi(this.ruleForm).then(res => {
+ let params = {
+ ...this.ruleForm,
+ status: this.ruleForm.status==-1?-1:mode[this.projectData.status].status,
+ }
+ mode[this.projectData.status].api(params).then(res => {
this.$message.success(res.message)
this.dialogVisible = false
this.activeNames = 'first'
@@ -659,7 +677,8 @@ export default {
this.loading = true
this.ruleForm.status_img = []
productDetailApi(id).then(res => {
- this.projectData = res.data
+ this.projectData = res.data,
+ this.ruleForm.status_img = res.data.status_img
let qualification={
production_name: '',
businessList: [],
From 788fcf0955fd350c2cff539636c4f0e7aebac2ac Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Mon, 8 Apr 2024 18:17:27 +0800
Subject: [PATCH 7/9] 1
---
.../product/productExamine/proDetails.vue | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index 7db3d7b..396b298 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -868,7 +868,24 @@ export default {
productDetailApi(id).then(res => {
this.loading = false;
this.productData = res.data
- this.qualification = res.data.qualification
+ let qualification={
+ production_name: '',
+ businessList: [],
+ licenceList: [],
+ trademarkList: [],
+ authorizedList: [],
+ commodityList: [],
+ otherList: [],
+ importBusinessList: [],
+ importAuthorizedList: [],
+ customsList: [],
+ packingList: [],
+ importOtherList: [],
+ commodity_type: 0,
+ brands_name: '',
+ import_name: ''
+ }
+ this.qualification = res.data.qualification || qualification
this.mer_svip_status = res.data.mer_svip_status
this.svip_type = res.data.svip_price_type
if (this.productData.spec_type === 0) {
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 8/9] 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) }}
+
+
+ {{ scope.row.is_service == 1 ? scope.row.service_cost : (scope.row.ot_service_cost-scope.row.service_cost).toFixed(2) }}
+
+
+
+
+ {{ scope.row.is_goods == 1 ? scope.row.goods_cost : (scope.row.ot_goods_cost-scope.row.goods_cost).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 @@
拒绝
-
+
- ![]()
+
+
-
+ 导出记录
@@ -56,7 +79,6 @@
@click="handleDelete(scope.row.feedback_id, scope.$index)"
>删除
{
+ exportOrderApi(excelData).then((res) => {
+ return resolve(res.data)
+ })
+ })
+ },
// 列表
getList(num) {
this.tableFrom.page = num || this.tableFrom.page;
From 667d40a39ad1e6c31c68ab836a21f6cfdc34c91c Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Tue, 9 Apr 2024 20:28:58 +0800
Subject: [PATCH 9/9] 1
---
src/api/userFeedback.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/api/userFeedback.js b/src/api/userFeedback.js
index fd6b200..6785ada 100644
--- a/src/api/userFeedback.js
+++ b/src/api/userFeedback.js
@@ -14,7 +14,12 @@ import request from './request'
export function feedbackListApi(data) {
return request.get(`user/feedback/lst`, data)
}
-
+/**
+ * @description 导出订单
+ */
+export function exportOrderApi(data) {
+ return request.get(`user/feedback/export`, data)
+}
/**
* @description 备注
*/
@@ -72,6 +77,6 @@ export function changeFeedbackStatus(id, status) {
/**
* @description 反馈回复
*/
- export function replyFeedbackApi(id) {
+export function replyFeedbackApi(id) {
return request.get(`user/feedback/reply/${id}/form`)
}
\ No newline at end of file
-
+
+
+
+
+
+
+
搜索
重置
@@ -17,7 +39,7 @@