From ebea398cfee775edb4980450e022b365e60c2bcb Mon Sep 17 00:00:00 2001
From: zhangds <wuyunbaxyz@163.com>
Date: Tue, 18 Jun 2024 16:21:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E4=BA=91=E9=97=AA?=
 =?UTF-8?q?=E4=BB=98=E8=BF=87=E6=9C=9F=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packkey/ysf.html | 11 +++++++++--
 ysf.html         | 12 ++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packkey/ysf.html b/packkey/ysf.html
index 4b818e9..1189659 100644
--- a/packkey/ysf.html
+++ b/packkey/ysf.html
@@ -24,7 +24,7 @@
             {{prompt_text}}
         </div>
         <!-- 弹出提示 -->
-        <model-pop @backFunction="backGoodsFn" :show.sync="popShow" title="温馨提示" :status="popStatus"
+        <model-pop @backFunction="backGoodsFn" :show_close="is" :show.sync="popShow" title="温馨提示" :status="popStatus"
             :text="popText"></model-pop>
         <div v-show="money" class="mask" @touchmove.prevent @mousewheel.prevent>
             <div class="random-pop">
@@ -119,7 +119,8 @@
                 cls: null,
                 money: 0,
                 isMini: false,
-                loading: false
+                loading: false,
+                is: false,
             };
         },
 
@@ -137,6 +138,12 @@
             /* 判断是否是微信小程序内 */
             let ua = window.navigator.userAgent.toLowerCase();
             this.isMini = /miniProgram/i.test(ua);
+
+            /* 初始弹窗 */
+            if (this.ysf && ![1, 9].includes(this.ysf.available)) {
+                this.is = true;
+                this.tip(product_status(this.ysf.available, this.ysf), 2);
+            }
         },
 
         methods: {
diff --git a/ysf.html b/ysf.html
index 51c2871..9d333e9 100644
--- a/ysf.html
+++ b/ysf.html
@@ -23,8 +23,9 @@
             {{prompt_text}}
         </div>
         <!-- 弹出提示 -->
-        <model-pop @backFunction="backGoodsFn" :show.sync="popShow" title="温馨提示" :status="popStatus"
+        <model-pop @backFunction="backGoodsFn" :show_close="is" :show.sync="popShow" title="温馨提示" :status="popStatus"
             :text="popText"></model-pop>
+
         <div v-show="money" class="mask" @touchmove.prevent @mousewheel.prevent>
             <div class="random-pop">
                 <p class="r-p-money"><span class="r-p-tag">￥</span>{{parseFloat(money)}}</p>
@@ -117,7 +118,8 @@
                 cls: null,
                 money: 0,
                 isMini: false,
-                loading: false
+                loading: false,
+                is: false,
             };
         },
 
@@ -130,6 +132,12 @@
             /* 判断是否是微信小程序内 */
             let ua = window.navigator.userAgent.toLowerCase();
             this.isMini = /miniProgram/i.test(ua);
+
+            /* 初始弹窗 */
+            if (this.ysf && ![1, 9].includes(this.ysf.available)) {
+                this.is = true;
+                this.tip(product_status(this.ysf.available, this.ysf), 2);
+            }
         },
 
         methods: {