diff --git a/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue b/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue index 0dcb032..baf131a 100644 --- a/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue +++ b/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue @@ -271,7 +271,7 @@ const columns = ref([ } ]); const queryform = ref({ - state: "", + state: activeKey.value, cyclingOrder: '', phoneNumber: '', pageNum: config.pageParam.pageNum, @@ -299,6 +299,7 @@ const search = () => { const reset = () => { queryform.value = { + state: activeKey.value, cyclingOrder: '', phoneNumber: '', pageNum: config.pageParam.pageNum, @@ -308,7 +309,7 @@ const reset = () => { } const getData = async () => { - callUser("/staff/pageQueryStaffs", queryform.value).then((res) => { + callUser("/wxPayment/queryRefundList", queryform.value).then((res) => { if (res.code != 200) { message.error(res.message) dataSource.value = [] @@ -762,7 +763,6 @@ const handleCancelModalRevie = () => { }); } - const handleCompleteRefund = () => { openConfirm.value = true; nextTick(() => { @@ -791,5 +791,12 @@ const handleCancelModalConfirm = () => { }); } +const viewUserInfo = (record) => { + +} + +const viewOrderInfo = (record) => { + +} \ No newline at end of file diff --git a/ebike-operate/src/views/form/confirmrefund/ConfirmRefund.vue b/ebike-operate/src/views/form/confirmrefund/ConfirmRefund.vue index 1446ac8..3853d69 100644 --- a/ebike-operate/src/views/form/confirmrefund/ConfirmRefund.vue +++ b/ebike-operate/src/views/form/confirmrefund/ConfirmRefund.vue @@ -8,20 +8,20 @@ - 微信 + {{costInfo.orderNumber}} - 18507702086(王婷) + {{costInfo.phone}} @@ -29,20 +29,20 @@ - 微信 + {{costInfo.applyRefundAmount}} - 18507702086(王婷) + {{costInfo.refundMethod}} diff --git a/ebike-operate/src/views/form/operateregion/RegionFeeCofFrom.vue b/ebike-operate/src/views/form/operateregion/feeconfig/RegionFeeCofFrom.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/RegionFeeCofFrom.vue rename to ebike-operate/src/views/form/operateregion/feeconfig/RegionFeeCofFrom.vue diff --git a/ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/CustomerServiceConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/CustomerServiceConfigForm.vue diff --git a/ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/LockCarConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/LockCarConfigForm.vue diff --git a/ebike-operate/src/views/form/operateregion/OperateAddForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/OperateAddForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/OperateAddForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/OperateAddForm.vue diff --git a/ebike-operate/src/views/form/operateregion/OperateConfForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/OperateConfForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/OperateConfForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/OperateConfForm.vue diff --git a/ebike-operate/src/views/form/operateregion/OperateConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/OperateConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/OperateConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/OperateConfigForm.vue diff --git a/ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/ReturnCarConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/ReturnCarConfigForm.vue diff --git a/ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/SwitchConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/SwitchConfigForm.vue diff --git a/ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/operateconfig/UseCarConfigForm.vue similarity index 100% rename from ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue rename to ebike-operate/src/views/form/operateregion/operateconfig/UseCarConfigForm.vue diff --git a/ebike-operate/src/views/form/refundorderrevie/RefundOrderRevie.vue b/ebike-operate/src/views/form/refundorderrevie/RefundOrderRevie.vue index 61104df..c5efc66 100644 --- a/ebike-operate/src/views/form/refundorderrevie/RefundOrderRevie.vue +++ b/ebike-operate/src/views/form/refundorderrevie/RefundOrderRevie.vue @@ -12,7 +12,12 @@ :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }" > - {{costInfo.orderAmount}} 元= 起步费用:1.1 元 + 时长费用:2.25 元 + 调度费:0 元 + {{costInfo.totalAmount}} 元 + + = 起步费用:{{costInfo.startupCost}} 元 + 时长费用:{{costInfo.durationCost}} 元 + + 调度费:{{costInfo.dispatchFee}} 元 + + @@ -23,8 +28,13 @@ :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }" > - 0 元= 运营区外调度费用:0 元 + 禁停区调度费:0 元 + 停车区外调度费:0 元 + 头盔管理费:0 元 + 不规范停车费:0 元 - + {{costInfo.dispatchFee}} 元 + + = 运营区外调度费用:{{costInfo.dispatchFeeOutOperateArea}} 元 + 禁停区调度费:{{costInfo.dispatchFeeBanArea}} 元 + + 停车区外调度费:{{costInfo.parkingAreaOutDispatchFee}} 元 + 头盔管理费:{{costInfo.helmetManagementFee}} 元 + + 不规范停车费:{{costInfo.improperParkFee}} 元 + + @@ -35,7 +45,12 @@ :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }" > - 3.35 元= 订单金额:3.35 元 - 优惠金额:0 元 - 优惠券抵扣金额:0 元 - 骑行卡抵扣金额:0 元 + {{costInfo.actualAmount}} 元 + + = 订单金额:{{costInfo.totalAmount}} 元 - 优惠金额:{{costInfo.discountAmount}} 元 + - 优惠券抵扣金额:{{costInfo.couponAmount}} 元 - 骑行卡抵扣金额:{{costInfo.cyclingCardAmount}} 元 + + @@ -46,7 +61,7 @@ :label-col="{ span: 6 }" :wrapper-col="{ span: 21 }" > - 微信 + {{costInfo.payMethod}} @@ -55,7 +70,7 @@ :label-col="{ span: 6 }" :wrapper-col="{ span: 21 }" > - 18507702086(王婷) + {{costInfo.phoneAndUser}} @@ -66,7 +81,7 @@ :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }" > - 忘记还车 + {{costInfo.applyReason}} @@ -86,7 +101,7 @@ :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }" > - 3.35 元= 订单金额:3.35 元 - 优惠金额:0 元 - 优惠券抵扣金额:0 元 - 骑行卡抵扣金额:0 元 + {{costInfo.applyRefundAmount}} 元 @@ -162,8 +177,24 @@ const formData = () => ({ refundMethod: "" }); const costInfo = ref({ - orderAmount: 0, - + totalAmount: 0, + startupCost: 0, + durationCost: 0, + dispatchFee: 0, + dispatchFeeOutOperateArea: 0, + dispatchFeeBanArea: 0, + dispatchFeeOutOperateArea: 0, + parkingAreaOutDispatchFee: 0, + helmetManagementFee: 0, + improperParkFee: 0, + actualAmount: 0, + discountAmount: 0, + couponAmount: 0, + cyclingCardAmount: 0, + payMethod: "", + applyReason: "", + applyRefundAmount: 0, + phoneAndUser: "" }) const form = ref(formData());