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 @@ - +