订单列表修改

src/views/collection-record/api.ts

@@ -28,13 +28,13 @@ export interface IApiUserPaymentOrderPage {
   /** 当前页 */
   page: number;
   /** 订单年份, 类似: 2023-06 */
-  paymentYear: string;
+  payMonth: string;
 }
 /** 获取领取列表 */
 export const api_userPaymentOrderPage = (
   params: IApiUserPaymentOrderPage
 ): Promise<any> => {
-  return request.post('/edu-app/userPaymentOrder/page', {
+  return request.post('/edu-app/userPaymentOrder/studentOrderPage', {
     data: params
   });
 };

src/views/collection-record/component/item.tsx

@@ -69,7 +69,7 @@ export default defineComponent({
         data.order = res.data;
       }
     };
-    /** 取消订单 */
+    /** 申请退款 */
     const handleCancel = async () => {
       await api_userPaymentOrderRefundPayment({
         merOrderNo: data.order.orderNo,

src/views/collection-record/component/list.tsx

@@ -24,7 +24,7 @@ export default defineComponent({
   name: 'collection-record-list',
   props: {
     orderStatus: {
-      type: String as PropType<IApiUserPaymentOrderPage['orderStatus']>,
+      type: String,
       default: ''
     },
     refundIndex: {
@@ -85,7 +85,8 @@ export default defineComponent({
         if (res?.code === 200 && Array.isArray(res?.data?.rows)) {
           data.list = res.data.rows.map((item: any) => {
             return {
-              ...item,
+              orderType: item.orderType,
+              paymentCashAmount: item.paymentCashAmount,
               createTime: item.refundTime,
               statusName: refundTypes[item.refundAudit],
               statusColor: statusColors[item.status]
@@ -98,13 +99,17 @@ export default defineComponent({
         res = await api_userPaymentOrderPage({
           page: data.page,
           rows: 10,
-          orderStatus: props.orderStatus,
-          paymentYear: data.dateTime[0]
+          orderStatus: props.orderStatus as any,
+          payMonth: data.dateTime.join('-')
         });
         if (res?.code === 200 && Array.isArray(res?.data?.rows)) {
           data.list = res.data.rows.map((item: any) => {
             return {
-              ...item,
+              refundable: item.refundable,
+              status: item.status,
+              orderType: item.orderType,
+              paymentCashAmount: item.paymentCashAmount,
+              createTime: item.payTime,
               statusName: statusTypes[item.status],
               statusColor: statusColors[item.status]
             };
@@ -124,7 +129,10 @@ export default defineComponent({
     onMounted(() => {
       getList();
     });
-    watch(() => props.refundIndex, () => handlStart());
+    watch(
+      () => props.refundIndex,
+      () => handlStart()
+    );
 
     const handlStart = () => {
       data.finished = false;

src/views/collection-record/index.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
           <Tabs v-model:active={data.tab} animated swipeable>
             <Tab name="1" title="待领取">
               <div class={styles.wrap}>
-                {/* <List orderStatus="WAIT_PAY" /> */}
+                {/* WAIT_PAY, */}
                 <List orderStatus="PAYING" />
               </div>
             </Tab>