liushengqiang 2 年之前
父节点
当前提交
c073fcf6be

+ 5 - 5
src/views/collection-record-detail/index.tsx

@@ -105,12 +105,12 @@ export default defineComponent({
 
     const formatOrderStatus = (status: string) => {
       const temp: any = {
-        WAIT_PAY: '支付中',
-        PAYING: '支付中',
-        PAID: '支付成功',
+        WAIT_PAY: '领取中',
+        PAYING: '领取中',
+        PAID: '领取成功',
         TIMEOUT: '订单超时',
-        FAIL: '支付失败',
-        CLOSED: '订单关闭',
+        FAIL: '领取失败',
+        CLOSED: '关闭',
         REFUNDING: '退回申请中',
         REFUNDED: '已退回'
       };

+ 3 - 2
src/views/collection-record/component/item.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
       default: () => ({})
     }
   },
-  emits: ['cancel', 'close'],
+  emits: ['refund', 'close'],
   setup(props, { emit }) {
     const data = reactive({
       open: false,
@@ -46,7 +46,7 @@ export default defineComponent({
     });
 
     const handleOpenDetail = () => {
-      if (props.item?.id) {
+      if (props.item?.orderNo) {
         postMessage({
           api: 'openWebView',
           content: {
@@ -93,6 +93,7 @@ export default defineComponent({
       showToast('申请退回成功');
       data.open = false;
       emit('close');
+      emit('refund')
     };
 
     /** 继续支付 */

+ 23 - 3
src/views/collection-record/component/list.tsx

@@ -1,4 +1,11 @@
-import { PropType, computed, defineComponent, onMounted, reactive } from 'vue';
+import {
+  PropType,
+  computed,
+  defineComponent,
+  onMounted,
+  reactive,
+  watch
+} from 'vue';
 import {
   IApiUserPaymentOrderPage,
   api_userPaymentOrderPage,
@@ -19,9 +26,14 @@ export default defineComponent({
     orderStatus: {
       type: String as PropType<IApiUserPaymentOrderPage['orderStatus']>,
       default: ''
+    },
+    refundIndex: {
+      type: Number,
+      default: 0
     }
   },
-  setup(props) {
+  emits: ['refund'],
+  setup(props, { emit }) {
     const time = new Date();
     const data = reactive({
       page: 1,
@@ -108,9 +120,11 @@ export default defineComponent({
       data.loading = false;
       data.skelete = false;
     };
+
     onMounted(() => {
       getList();
     });
+    watch(() => props.refundIndex, () => handlStart());
 
     const handlStart = () => {
       data.finished = false;
@@ -146,7 +160,13 @@ export default defineComponent({
               finished={data.finished}
               finishedText=" ">
               {data.list.map(item => {
-                return <Item item={item} onClose={() => handlStart()} />;
+                return (
+                  <Item
+                    item={item}
+                    onClose={() => handlStart()}
+                    onRefund={() => emit('refund')}
+                  />
+                );
               })}
             </List>
           )}

+ 4 - 3
src/views/collection-record/index.tsx

@@ -8,7 +8,8 @@ export default defineComponent({
   name: 'collection-record',
   setup() {
     const data = reactive({
-      tab: '1'
+      tab: '1',
+      refundIndex: 0
     });
     return () => (
       <div class={styles.container}>
@@ -23,7 +24,7 @@ export default defineComponent({
             </Tab>
             <Tab name="2" title="已领取">
               <div class={styles.wrap}>
-                <List orderStatus="PAID" />
+                <List orderStatus="PAID" onRefund={() => data.refundIndex = data.refundIndex + 1} />
               </div>
             </Tab>
             <Tab name="3" title="已关闭">
@@ -33,7 +34,7 @@ export default defineComponent({
             </Tab>
             <Tab name="4" title="退回">
               <div class={styles.wrap}>
-                <List orderStatus="REFUNDED" />
+                <List refundIndex={data.refundIndex} orderStatus="REFUNDED" />
               </div>
             </Tab>
           </Tabs>