From 6885d6de69a19131e8f9dcd481ab3b3864d2167f Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 7 Feb 2023 15:55:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8B=BC=E5=9B=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue |  2 +-
 pages/order/list.vue   | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 209f1738..9527412a 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -193,7 +193,7 @@
             })
           "
         >
-          {{ state.orderInfo.status_code === 'groupon_invalid' ? '拼团详情' : '邀请拼团' }}
+          {{ state.orderInfo.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
         </button>
         <button
           class="ss-reset-button cancel-btn"
diff --git a/pages/order/list.vue b/pages/order/list.vue
index c1401d05..ffa5b635 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -137,7 +137,7 @@
               class="tool-btn ss-reset-button"
               @tap.stop="onOrderGroupon(order)"
             >
-              {{ order.status_code === 'groupon_invalid' ? '拼团详情' : '邀请拼团' }}
+              {{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
             </button>
             <button
               v-if="order.btns.includes('invoice')"
@@ -240,6 +240,12 @@
   import sheep from '@/sheep';
   import _ from 'lodash';
 
+  const pagination = {
+    data: [],
+    current_page: 1,
+    total: 1,
+    last_page: 1,
+  };
   // 数据
   const state = reactive({
     currentTab: 0,
@@ -281,13 +287,7 @@
   function onTabsChange(e) {
     if (state.currentTab === e.index) return;
 
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
-
+    state.pagination = pagination
     state.currentTab = e.index;
 
     getOrderList();
@@ -379,7 +379,7 @@
   }
 
   // 申请退款
-  async function onRefund(orderId, confirm = false) {
+  async function onRefund(orderId) {
     uni.showModal({
       title: '提示',
       content: '确定要申请退款吗?',
@@ -408,15 +408,11 @@
     });
     state.error = res.error;
     if (res.error === 0) {
-      if (page >= 2) {
         let orderList = _.concat(state.pagination.data, res.data.data);
         state.pagination = {
           ...res.data,
           data: orderList,
         };
-      } else {
-        state.pagination = res.data;
-      }
 
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
@@ -447,6 +443,7 @@
 
   //下拉刷新
   onPullDownRefresh(() => {
+    state.pagination = pagination
     getOrderList();
     setTimeout(function () {
       uni.stopPullDownRefresh();