From 7bec9e9314bddab211e7399d4dfda60a652893d9 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Jan 2025 13:02:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?H5=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/order/detail.vue | 10 ++--
src/pages/refund/apply.vue | 10 ++--
src/pages/tabbar/order.vue | 116 ++++++++++---------------------------
src/sheep/api/common.ts | 2 +-
src/sheep/api/order.ts | 2 +-
src/sheep/api/refund.ts | 20 +++----
6 files changed, 53 insertions(+), 107 deletions(-)
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index f80cfef..f02d458 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -6,6 +6,8 @@ import { isEmpty } from "radash"
import { hooks, constant, router } from "@@/index"
import { orderApi, refundApi } from "@@/api"
+import { filePath } from "@@/utils/file";
+
const data = {
}
@@ -90,10 +92,6 @@ const doCancelRefund = async () => {
商户
{{ state.detail.merchantStr }}
-
- 部门
- {{ state.detail.deptName }}
-
订单号
@@ -117,7 +115,7 @@ const doCancelRefund = async () => {
-
+
{{ v.productName }}
¥ {{ hooks.useMoney(v.productPrice) }}
@@ -139,7 +137,7 @@ const doCancelRefund = async () => {
-
+
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index 3c6dec3..c048abf 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -6,6 +6,8 @@ import { isEmpty } from "radash"
import { hooks, router } from "@@/index"
import { orderApi, refundApi, commonApi } from "@@/api"
+import { filePath } from "@@/utils/file";
+
const data = {
payType: [
{ text: "仅退款", disabled: false, visible: true, type: "10", value: "10" },
@@ -42,7 +44,7 @@ const getSetting = async () => {
const _pa = {};
const { data } = await commonApi.setting(_pa)
state.setting = data
- state.selectList = data.afterSaleRefundReasons.map(v => {
+ state.selectList = data.afterSaleRefundReasons?.split(",").map(v => {
return {
id: v,
title: v,
@@ -119,7 +121,7 @@ const doSubmit = async () => {
-
+
{{ v.productName }}
¥ {{ hooks.useMoney(v.productPrice) }}
@@ -135,7 +137,7 @@ const doSubmit = async () => {
实付款
¥
- {{ hooks.useMoney(state.detail.practicalTotalPrice) }}
+ {{ hooks.useMoney(state.detail.payPrice) }}
@@ -151,7 +153,7 @@ const doSubmit = async () => {
退款金额
- ¥{{ hooks.useMoney(state.detail.practicalTotalPrice) }}
+ ¥{{ hooks.useMoney(state.detail.payPrice) }}
({
},
});
-onLoad(() => {});
+onLoad(() => { });
onShow(async () => {
const isLogin = await hooks.useCheckLogin();
if (!isLogin) return;
@@ -37,11 +39,11 @@ const doTab = (e: any) => {
};
const pageRef = ref(null);
-const pageHook = hooks.usePage(pageRef, orderApi.page, null, "data.list");
+const pageHook = hooks.usePage(pageRef, orderApi.page, null, "data.records");
const query = (page: number, pagesize: number) => {
const isLogin = hooks.useStaticCheckLogin();
- console.log(isLogin,"isLogin");
-
+ console.log(isLogin, "isLogin");
+
if (!isLogin) return;
pageHook.startPage(page, pagesize, false, state.pa);
};
@@ -50,7 +52,7 @@ const doToDetail = (v: any) => {
router.jump("/pages/order/detail", { id: v.id });
};
-const doAppraise = () => {};
+const doAppraise = () => { };
const doRefund = (v: any) => {
router.jump("/pages/refund/apply", { id: v.id });
@@ -59,20 +61,9 @@ const doRefund = (v: any) => {
-
+
@@ -80,39 +71,23 @@ const doRefund = (v: any) => {
-
+
-
+
- {{ v.merchantStr }}
-
+ {{ v.merchantName }}
+
- 未支付
- 待核销
- 售后中
+ 未支付
+ 待核销
+ 售后中
已核销
-
+
下单时间
{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
@@ -128,22 +103,14 @@ const doRefund = (v: any) => {
-
-
-
+ ">
+
+
{{ pV.productName }}
@@ -154,37 +121,16 @@ const doRefund = (v: any) => {
- ¥ {{ hooks.useMoney(v.totalPrice) }}
- 共 {{ v.shopCarList.length }} 件
+ class="absolute top-0 right-0 bottom-0 z-10 flex-col items-end w-160rpx p-x-20rpx bg-white bg-opacity-95">
+ ¥ {{ hooks.useMoney(v.totalPrice) }}
+ 共 {{ v.carList.length }} 件
-
- 评价
- 退款
+
+ 退款
-
+
核销码
diff --git a/src/sheep/api/common.ts b/src/sheep/api/common.ts
index 28c11b5..c245088 100644
--- a/src/sheep/api/common.ts
+++ b/src/sheep/api/common.ts
@@ -3,7 +3,7 @@ import request from "@/sheep/utils/request";
export default {
setting: (params: any) =>
request({
- url: "pay/setting/get",
+ url: "wallet/wallet-setting/app/get-setting",
method: "GET",
params,
custom: {
diff --git a/src/sheep/api/order.ts b/src/sheep/api/order.ts
index e242bd9..88e64ef 100644
--- a/src/sheep/api/order.ts
+++ b/src/sheep/api/order.ts
@@ -21,7 +21,7 @@ export default {
}),
shopCarList: (params: any) =>
request({
- url: `/hardware/car/get-by-order-id`,
+ url: `/hard/hard-car/app/order-id`,
method: "GET",
params,
custom: {
diff --git a/src/sheep/api/refund.ts b/src/sheep/api/refund.ts
index 59da91e..709c16b 100644
--- a/src/sheep/api/refund.ts
+++ b/src/sheep/api/refund.ts
@@ -3,28 +3,28 @@ import request from "@/sheep/utils/request";
export default {
create: (data: any) => {
return request({
- url: "/hardware/trade-after-sale/create",
+ url: "/hard/hard-after-sale/app/create",
method: "POST",
data,
});
},
+ cancel: (params: any) => {
+ return request({
+ url: "/hard/trade-after-sale/app/cancel",
+ method: "GET",
+ params,
+ });
+ },
get: (params: any) => {
return request({
- url: "/hardware/trade-after-sale/get-by-order-id",
+ url: "/hard/trade-after-sale/app/detail-by-order-id",
method: "GET",
params,
});
},
history: (params: any) => {
return request({
- url: "/hardware/trade-after-sale/history",
- method: "GET",
- params,
- });
- },
- cancel: (params: any) => {
- return request({
- url: "/hardware/trade-after-sale/cancel",
+ url: "/hard/trade-after-sale/app/history",
method: "GET",
params,
});
From 80dee791a2d55cba2916e22c246dcf6b2e897b68 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Jan 2025 14:14:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=88=86=E9=A1=B5=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/refund/apply.vue | 2 +-
src/sheep/api/refund.ts | 6 +++---
src/sheep/hooks/use-page.ts | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index c048abf..4480179 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -93,7 +93,7 @@ const doSubmit = async () => {
const _pa = {
way: applyForm.way,
refundPrice: state.detail.practicalTotalPrice,
- orderItemId: state.detailId,
+ orderId: state.detailId,
images: [],
applyReason: applyForm.reasonStr,
applyDescription: applyForm.remark,
diff --git a/src/sheep/api/refund.ts b/src/sheep/api/refund.ts
index 709c16b..428adbf 100644
--- a/src/sheep/api/refund.ts
+++ b/src/sheep/api/refund.ts
@@ -10,21 +10,21 @@ export default {
},
cancel: (params: any) => {
return request({
- url: "/hard/trade-after-sale/app/cancel",
+ url: "/hard/hard-after-sale/app/cancel",
method: "GET",
params,
});
},
get: (params: any) => {
return request({
- url: "/hard/trade-after-sale/app/detail-by-order-id",
+ url: "/hard/hard-after-sale/app/detail-by-order-id",
method: "GET",
params,
});
},
history: (params: any) => {
return request({
- url: "/hard/trade-after-sale/app/history",
+ url: "/hard/hard-after-sale/app/history",
method: "GET",
params,
});
diff --git a/src/sheep/hooks/use-page.ts b/src/sheep/hooks/use-page.ts
index d7c91c7..aa404ab 100644
--- a/src/sheep/hooks/use-page.ts
+++ b/src/sheep/hooks/use-page.ts
@@ -50,8 +50,8 @@ export const usePage = (
return state;
}
const _data = {
- pageNo: page,
- pagesize: pagesize,
+ current: page,
+ size: pagesize,
...query,
};
try {