From 45a05608d8c0e07fb6430a95140aaad60a10eddc Mon Sep 17 00:00:00 2001
From: zhangds <wuyunbaxyz@163.com>
Date: Tue, 9 Apr 2024 16:22:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=98=B2=E6=8A=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 combining.css          |  6 +++++-
 combining.html         | 20 ++++++++++++++++----
 index.html             |  4 ++--
 packkey/combining.html | 11 ++++++++---
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/combining.css b/combining.css
index 01d271f..2be329c 100644
--- a/combining.css
+++ b/combining.css
@@ -243,7 +243,11 @@ body {
 .content .box .box-cotent .but {
   margin-top: 0.05rem;
   width: 100%;
-  max-height: 100%;
+  height: 0.66rem;
+  background: url("https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/combining/ysf_but.png")
+    no-repeat;
+  background-size: 100%;
+  border: none;
 }
 
 .ff-btn {
diff --git a/combining.html b/combining.html
index 9cbeea0..7a7bbe0 100644
--- a/combining.html
+++ b/combining.html
@@ -101,11 +101,17 @@
                         </template>
 
                         <!-- 普通状态 -->
-                        <img class="but"
+                        <!-- <img class="but"
                             :style="{marginTop:goods.group_info.channel==2||goods.group_info.channel==1&&goods.group_info.receive_mode==1&&'0.12rem'}"
                             src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/combining/ysf_but.png"
+                            alt="" @click="submit" disabled=""
+                            v-show="goods.send_status === 5 || goods.send_status === 3 || goods.send_status === 4"> -->
+
+                        <!-- 普通状态 -->
+                        <button type="button" class="but"
+                            :style="{marginTop:goods.group_info.channel==2||goods.group_info.channel==1&&goods.group_info.receive_mode==1&&'0.12rem'}"
                             alt="" @click="submit" :disabled="loading"
-                            v-show="goods.send_status === 5 || goods.send_status === 3 || goods.send_status === 4">
+                            v-show="goods.send_status === 5 || goods.send_status === 3 || goods.send_status === 4"></button>
 
                         <!-- 发放中。。。 -->
                         <div class="ff-btn" v-show="goods.send_status === 1">
@@ -525,6 +531,12 @@
             /* ******************************************** 官方领取 ******************************************** */
             /* 直接领取 */
             directSubmit() {
+                const self = this;
+                self.loading = true;
+                setTimeout(() => {
+                    self.loading = false;
+                }, 5000)
+
                 /* 公众号打开 */
                 if (this.goods.group_info.channel == 2 && this.goods.group_info.is_webview == 1 && !this.openId) {
                     const linkId = localStorage.getItem('linkId');
@@ -654,9 +666,9 @@
             /* 验证后 最终提交 */
             finalSubmit() {
                 const self = this;
-                this.loading = true;
+                self.loading = true;
                 setTimeout(() => {
-                    this.loading = false;
+                    self.loading = false;
                 }, 5000)
 
                 if (this.goods.send_status === 3 || this.goods.send_status === 4) {
diff --git a/index.html b/index.html
index ad28674..53e9b04 100644
--- a/index.html
+++ b/index.html
@@ -123,9 +123,9 @@
             let self = this;
             //获取链接携带的参数
             let linkId = getQueryString('id');
-            // let linkId = "2253"
+            // let linkId = "2264"
             let keyCode = getQueryString('key');
-
+            // let keyCode = "AAAB7dHYKyNV4eej"
             if (!linkId) {//地址栏无携带id
                 let path = window.location.pathname;
                 let parmas = path.split('/');
diff --git a/packkey/combining.html b/packkey/combining.html
index 725a12b..694fb17 100644
--- a/packkey/combining.html
+++ b/packkey/combining.html
@@ -538,6 +538,11 @@
             /* ******************************************** 官方领取 ******************************************** */
             /* 直接领取 */
             directSubmit() {
+                const self = this;
+                self.loading = true;
+                setTimeout(() => {
+                    self.loading = false;
+                }, 5000)
                 /* 公众号打开 */
                 if (this.goods.group_info.channel == 2 && this.goods.group_info.is_webview == 1 && !this.openId) {
                     const linkId = localStorage.getItem('linkId');
@@ -694,10 +699,10 @@
             /* 验证后 最终提交 */
             finalSubmit() {
                 const self = this;
-                this.loading = true;
+                self.loading = true;
                 setTimeout(() => {
-                    this.loading = false;
-                }, 2000)
+                    self.loading = false;
+                }, 5000)
 
                 if (this.goods.send_status === 3 || this.goods.send_status === 4) {
                     let params = {