From 4c1d1b28d410682100a7b3a69c3cd65e66a98d16 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 13 Oct 2022 09:51:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=9C=BA=E5=9E=8B=E4=B8=8D=E5=85=BC=E5=AE=B9=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 0d2172d..d71e1f1 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -25,9 +25,9 @@
         <img class="backPresTy" @click="backHandler"
             src=" https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png" alt="">
 
-        <div id="refresh" @touchstart="touchStart($event)" @touchmove="touchMove($event)" @touchend="touchEnd($event)"
-            style="height:100%;">
-            <img v-show='loadShowHeight' class='img-lodging'
+        <div id="refresh" @touchstart="touchStart($event)" @touchmove="touchMove($event)"
+            @touchcancel="touchEnd($event)" style="height:100%;">
+            <img v-show='!!loadShowHeight' class='img-lodging'
                 src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/img-logding.png" alt="">
             <div class="content" slot="content">
                 <div class="content-item" v-for="item in orderList" :key="item.order_number">
@@ -152,9 +152,6 @@
                 touchEnd () {
                     if (this.loadShowHeight >= 60) {
                         this.getOrderList()
-                        setTimeout(() => {
-                            this.loadShowHeight = 0;
-                        }, 2000);
                     } else {
                         this.loadShowHeight = 0
                     }
@@ -245,13 +242,20 @@
 
                 /* 请求订单数据 */
                 getOrderList () {
+                    this.orderList = []
+                    this.loadShowHeight = true
                     const token = localStorage.getItem('token')
                     req.axiosGet(`/key/order/${token}`, { page: this.page, limit: this.limit }).then(({ data, code, message }) => {
                         if (code === -1) {
                             this.popFunction({ title: '温馨提示', text: message, status: 2, b_text: '我知道了', show: true })
                             return this.redirect = true
                         }
-                        if (code === 200) this.orderList = data
+                        if (code === 200) {
+                            setTimeout(() => {
+                                this.loadShowHeight = 0;
+                                this.orderList = data
+                            }, 1 * 1000)
+                        }
                     })
                 },