From 43c5bcf966eaa64f8d2fb8f3888a165e2053fd04 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Sat, 6 Apr 2024 21:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=8C=85=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 combining.html         | 12 ------------
 packkey/combining.html | 16 ++++++++--------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/combining.html b/combining.html
index 6a2b15b..3947132 100644
--- a/combining.html
+++ b/combining.html
@@ -315,18 +315,6 @@
         },
 
         methods: {
-            preventTouchMove(e) {
-                e.preventDefault(); // 阻止默认的处理方式(阻止下拉滑动的效果)
-            },
-            // 阻止ios滑动
-            stopIos() {
-                let self = this;
-                document.body.addEventListener('touchmove', self.preventTouchMove, { passive: false })
-            },
-            rmStopIos() {
-                let self = this;
-                document.body.removeEventListener('touchmove', self.preventTouchMove, { passive: false })
-            },
             // 错误弹出框关闭
             knowFn() {
                 this.popboxshow = false;
diff --git a/packkey/combining.html b/packkey/combining.html
index eced3cd..bf49535 100644
--- a/packkey/combining.html
+++ b/packkey/combining.html
@@ -140,7 +140,7 @@
 
             <!-- 弹窗 -->
             <div class="tip-pop mask" v-show="popMsg">
-                <div class="tip-main" style="top: 10%;">
+                <div class="tip-main">
                     <div class="tip-pop-head">
                         <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/combining/zh-dd.png"
                             class="tip-pop-dd" />
@@ -166,7 +166,7 @@
                     </p>
 
                     <div v-if="errListShow"
-                        style="padding: 0 0.2rem;overflow-y: scroll;max-height: 2rem;text-align: left;">
+                        style="padding: 0 0.2rem;text-align: left;max-height: 2rem;overflow-y: scroll;">
                         <p class="err-list-p" v-for="(item,index) in goods.err_msg">错误{{Number(index) + 1}}: {{ item }}
                         </p>
                     </div>
@@ -176,8 +176,9 @@
 
                     <button class="tip-btn" v-show="goods.send_status === 4" @click="() => {
                             errListShow = !errListShow
+
                             if(errListShow === false){
-                                popMsg = false;
+                                popMsg = false; 
                             }
                         }">{{
                         errListShow ? '我知道了' : '查看失败原因' }}</button>
@@ -383,11 +384,10 @@
             // 轮循
             groupProductVoucherDetail() {
                 let self = this;
-                req.axiosGet('/key/group/groupProductVoucherDetail', {
+                req.axiosPost('/key/group/groupProductVoucherDetail', {
                     token: this.token,
                     code_batch_id: this.code_batch_id
                 }).then(res => {
-
                     if (res.code === 200) {
 
                         // send_status 1发放中，2全部成功 ，3全部失败，4部分失败 ，5未领取
@@ -453,7 +453,7 @@
                             // 错误去重 
                             self.goods.err_msg = [...new Set(all_err)];
 
-                            self.timeGet = null;
+                            self.popMsg = true;
                             return
                         } else if (errLength.length > 0 && product_all.length > errLength.length) {
                             // 领取失败数，小于全部数量 -> send_status 4 部分失败
@@ -463,7 +463,7 @@
                             self.isErrLength = errLength.length;
                             self.goods.send_status = 4;
 
-                            self.timeGet = null;
+                            self.popMsg = true;
                             return
                         }
 
@@ -472,7 +472,7 @@
                         if (allOkLength.length > 0 && allOkLength.length === product_all.length) {
                             self.goods.send_status = 2;
 
-                            self.timeGet = null;
+                            self.popMsg = true;
                             return
                         }
                     }