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 1/5] 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 @@ - （单位： 天），冻结期：仅针对线下转账模式，指用户支付成功后多少天，商户余额可解冻；设置为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:'' }} + 主图视频：
+ + 商品名称： + + 国产 + 进口 + + +
+ 生产企业名称：{{ 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 }} +
+ +
+
+
+ +
+ @@ -575,6 +782,23 @@ export default { return { loading: true, productId: '', + qualification:{ + production_name: '', + businessList: [], + licenceList: [], + trademarkList: [], + authorizedList: [], + commodityList: [], + otherList: [], + importBusinessList: [], + importAuthorizedList: [], + customsList: [], + packingList: [], + importOtherList: [], + commodity_type: 0, + brands_name: '', + import_name: '' + }, direction: 'rtl', activeName: 'basic', productData: {}, @@ -617,6 +841,11 @@ export default { filters: { }, methods: { + getType(val){ + var regex = /(?:\.([^.]+))?$/; + let suffix = regex.exec(val.url)[1] + return suffix == 'pdf' + }, handleClose() { this.activeName = 'basic'; this.$emit('closeDrawer'); @@ -627,6 +856,7 @@ export default { productDetailApi(id).then(res => { this.loading = false; this.productData = res.data + this.qualification = res.data.qualification this.mer_svip_status = res.data.mer_svip_status this.svip_type = res.data.svip_price_type if (this.productData.spec_type === 0) { @@ -764,6 +994,40 @@ export default { } } } +.sp { + display: block; + // width: 33%; + margin-bottom: 20px; + } +.upload{ + display: flex; + flex-direction: row; + // align-content: center; + align-items: center; + height: 60px; + // line-height: 60px; + margin-bottom: 20px; + &_right{ + display: flex; + height: 60px; + } + &_left{ + width: 115px; + } + .txt{ + width: 60px; + height: 60px; + line-height: 60px; + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + border: 1px solid #DCDFE6; + border-radius: 4px; + margin-right: 10px; + color: blue; + } + } .tabNumWidth{ max-height: 350px; overflow-y: auto; From 109c18fa57e06ac17d29bbdff38871e9615aa31f Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Sun, 7 Apr 2024 20:06:17 +0800 Subject: [PATCH 3/5] add --- src/api/accounts.js | 12 ++ src/views/accounts/transferRecord/index.vue | 79 ++++++++-- src/views/product/productExamine/index.vue | 144 +++++++++++++++++- src/views/product/productExamine/info.vue | 119 +++++++++++++-- .../product/productExamine/proDetails.vue | 12 ++ 5 files changed, 334 insertions(+), 32 deletions(-) diff --git a/src/api/accounts.js b/src/api/accounts.js index 38bebf2..372249d 100644 --- a/src/api/accounts.js +++ b/src/api/accounts.js @@ -164,6 +164,18 @@ export function transferDetailApi(id) { export function transferReviewApi(id, data) { return request.post(`financial/status/${id}`, data) } +/** + * @description 申请转账 -- 第二步审核 + */ +export function transferReviewFirstApi(id, data) { + return request.post(`financial/status_first/${id}`, data) +} +/** + * @description 申请转账 -- 最终审核 + */ +export function transferReviewSecondApi(id, data) { + return request.post(`financial/status_second/${id}`, data) +} /** * @description 申请转账 -- 批量审核 */ diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue index c7f67f6..b5ba125 100644 --- a/src/views/accounts/transferRecord/index.vue +++ b/src/views/accounts/transferRecord/index.vue @@ -108,7 +108,7 @@
导出列表 - 批量审核 +
- + + 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 5/5] 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 > - + - + - + @@ -346,7 +347,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- -import { orderListApi, chartApi, cardListApi, exportOrderApi,openRefundApi } from "@/api/order"; +import { refundorderOpenApi,orderListApi, chartApi, cardListApi, exportOrderApi,openRefundApi } from "@/api/order"; import { merSelectApi } from "@/api/product"; import userDetails from '../../user/list/userDetails'; import orderDetail from './orderDetails.vue'; @@ -564,6 +565,10 @@ export default { this.drawer = true; // this.$refs.orderDetail.onOrderDetails(id); // this.$refs.orderDetail.onOrderLog(id); + }, + // 开启强制退款 + onOrderOpen(id) { + this.$modalForm(refundorderOpenApi(id)).then(() => this.getList('')) }, // 开启退款 // onOrderOpenRefund(id) { diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue index 847ad36..51f7e5f 100644 --- a/src/views/order/list/orderDetails.vue +++ b/src/views/order/list/orderDetails.vue @@ -393,6 +393,10 @@
商户类别：
{{ orderDetailList.merchant.is_trader ? '自营' : '非自营' }}
+
  • +
    店铺电话：
    +
    {{ orderDetailList.merchant.service_phone }}
    +
    • diff --git a/src/views/order/logistics.vue b/src/views/order/logistics.vue new file mode 100644 index 0000000..e1b3504 --- /dev/null +++ b/src/views/order/logistics.vue @@ -0,0 +1,112 @@ + + + + + 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 @@ 用户已删除 - + @@ -192,21 +206,24 @@ import { orderUpdateApi, refundorderStatusApi, refundorderDetailApi, + refundorderExpressApi, orderDeliveryApi, exportRefundOrderApi } from "@/api/order"; import createWorkBook from '@/utils/newToExcel.js'; import detailsFrom from './refundDetail' +import logisticsFrom from '../logistics' 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,detailsFrom }, + components: { fileList,detailsFrom,logisticsFrom }, name: "OrderRefund", data() { return { pickerOptions: timeOptions, orderId: 0, + logisticsName: 'refund', roterPre: roterPre, tableData: { data: [], diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index df63af8..ed72dce 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -1,7 +1,7 @@ - + + + - + @@ -147,7 +157,7 @@ @@ -169,10 +179,10 @@ - +