diff --git a/src/api/hard/hard-after-sale.ts b/src/api/hard/hard-after-sale.ts index 2462cb0..ad4ae65 100644 --- a/src/api/hard/hard-after-sale.ts +++ b/src/api/hard/hard-after-sale.ts @@ -1,84 +1,88 @@ import request from "/@/utils/request" +export function adminRefund(data?: Object) { + return request({ + url: "/hard/hard-after-sale/admin-refund", + method: "post", + data, + }) +} export function history(query?: Object) { - return request({ - url: '/hard/hard-after-sale/history', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/history", + method: "get", + params: query, + }) } export function agree(obj?: Object) { - return request({ - url: '/hard/hard-after-sale/agree', - method: 'put', - params: obj - }) + return request({ + url: "/hard/hard-after-sale/agree", + method: "put", + params: obj, + }) } export function disagree(obj?: Object) { - return request({ - url: '/hard/hard-after-sale/disagree', - method: 'post', - data: obj - }) + return request({ + url: "/hard/hard-after-sale/disagree", + method: "post", + data: obj, + }) } - export function detailByOrderId(query?: Object) { - return request({ - url: '/hard/hard-after-sale/detail-by-order-id', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/detail-by-order-id", + method: "get", + params: query, + }) } - export function pageJoin(query?: Object) { - return request({ - url: '/hard/hard-after-sale/page-join', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/page-join", + method: "get", + params: query, + }) } export function fetchList(query?: Object) { - return request({ - url: '/hard/hard-after-sale/page', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/page", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'post', - data: obj - }) + return request({ + url: "/hard/hard-after-sale", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/hard/hard-after-sale/' + id, - method: 'get' - }) + return request({ + url: "/hard/hard-after-sale/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'delete', - data: ids - }) + return request({ + url: "/hard/hard-after-sale", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'put', - data: obj - }) + return request({ + url: "/hard/hard-after-sale", + method: "put", + data: obj, + }) } - diff --git a/src/api/hard/hard-invoice.ts b/src/api/hard/hard-invoice.ts index 9884606..7a9b8dc 100644 --- a/src/api/hard/hard-invoice.ts +++ b/src/api/hard/hard-invoice.ts @@ -1,13 +1,5 @@ import request from "/@/utils/request" -export function adminRefund(query?: Object) { - return request({ - url: "/hard/hard-invoice/admin-refund", - method: "get", - params: query, - }) -} - export function print(query?: Object) { return request({ url: "/hard/hard-invoice/print", diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue index 89c6243..a6aae9d 100644 --- a/src/views/hard/hard-after-sale/order-refund.vue +++ b/src/views/hard/hard-after-sale/order-refund.vue @@ -105,9 +105,12 @@ {{ globalData.afterSaleData.applyReason }} - + {{ globalData.afterSaleData.applyDescription }} + + + diff --git a/src/views/hard/hard-order/admin-refund-dialog.vue b/src/views/hard/hard-order/admin-refund-dialog.vue new file mode 100644 index 0000000..d61f26d --- /dev/null +++ b/src/views/hard/hard-order/admin-refund-dialog.vue @@ -0,0 +1,139 @@ + + + diff --git a/src/views/hard/hard-order/form.vue b/src/views/hard/hard-order/form.vue index a02e4e5..264e733 100644 --- a/src/views/hard/hard-order/form.vue +++ b/src/views/hard/hard-order/form.vue @@ -1,120 +1,121 @@ \ No newline at end of file + openDialog, +}) + diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index fe03193..1092b2a 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -180,7 +180,7 @@ @@ -254,6 +256,7 @@ const { push } = useRouter() // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const AdminRefundDialog = defineAsyncComponent(() => import("./admin-refund-dialog.vue")) const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue")) const TransactionList = defineAsyncComponent(() => import("/@/views/wallet/components/transaction-list.vue")) // 定义查询字典 @@ -269,6 +272,7 @@ const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refun const formDialogRef = ref() const shopCarDialogRef = ref() const transactionListRef = ref() +const adminRefundDailogRef = ref() const tabList = ref([{}]) const activeName = ref(null) // 搜索变量 diff --git a/src/views/wallet/wallet-setting/components/recharge-package/index.vue b/src/views/wallet/wallet-setting/components/recharge-package/index.vue index 7f52871..73233dc 100644 --- a/src/views/wallet/wallet-setting/components/recharge-package/index.vue +++ b/src/views/wallet/wallet-setting/components/recharge-package/index.vue @@ -1,71 +1,106 @@ \ No newline at end of file + try { + await delObjs(ids) + getDataList() + useMessage().success("删除成功") + } catch (err: any) { + useMessage().error(err.msg) + } +} +