From f356da9f52121f5e8baa2e70fc4aadc524fd2e7f Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 26 Jul 2023 18:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8A=20fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ysf-redPackets.html | 39 +++++++++++++++++++++++++--------------
 ysf.css             | 19 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/ysf-redPackets.html b/ysf-redPackets.html
index 307777a..50546a2 100644
--- a/ysf-redPackets.html
+++ b/ysf-redPackets.html
@@ -35,29 +35,21 @@
                 </p>
                 <p class="information-p2">请在
                     {{receive_time.effect_time.start_time}} ~ {{receive_time.effect_time.end_time}} 内领取 </p>
-                <div>
+                <div class="card">
                     <p class="type">
                         {{ysf.entity.card_type|cardType}}
                     </p>
                 </div>
-                <p class="type" v-if="receive_time.use_time.type=='received'">
-                    领取后{{receive_time.use_time.effect_date_type==0?'立即':'次日凌晨'}}生效，有效期
-                    {{receive_time.use_time.effect_day}} 天
-                </p>
-                <p class="type" v-if="receive_time.use_time.type=='fiexd'">
-                    可用时间:{{receive_time.use_time.fiexd_time.start_time}} ~ {{receive_time.use_time.fiexd_time.end_time}}
-                </p>
             </div>
             <div class="form">
-                <div v-if="ysf.available===1">
+                <div>
                     <p class="form-label">云闪付账号</p>
                     <input class="form-input" maxlength="11" v-model="account" type="text" placeholder="请输入手机号" />
                     <input class="form-input mt0" maxlength="11" v-model="confirmAccount" type="text"
                         placeholder="请再次输入手机号" />
                     <p class="form-note">您可在云闪付的个人信息中查看【云闪付账号】</p>
                 </div>
-                <button :class="ysf.available!==1?'disable':''" class="form-button"
-                    @click="submit">{{ysf.available===1?'立即领取':'已领取'}}</button>
+                <button :class="ysf.available!==1?'disable':''" class="form-button" @click="submit">立即领取</button>
             </div>
             <div class="segmentation">
                 <i class="left"></i>
@@ -65,8 +57,15 @@
                 <i class="right"></i>
             </div>
             <div class="illustrate">
-                <p class="illustrate-title" v-if="['week','irregular'].includes(receive_time.use_time.type)">可用时间</p>
-                <div class=" available_time" v-if="receive_time.use_time.type=='week'">
+                <p class="illustrate-title">可用时间</p>
+                <p class="received-fiexd" v-if="receive_time.use_time.type=='received'">
+                    领取后{{receive_time.use_time.effect_date_type==0?'立即':'次日凌晨'}}生效，有效期
+                    {{receive_time.use_time.effect_day}} 天
+                </p>
+                <p class="received-fiexd" v-if="receive_time.use_time.type=='fiexd'">
+                    可用时间:{{receive_time.use_time.fiexd_time.start_time}} ~ {{receive_time.use_time.fiexd_time.end_time}}
+                </p>
+                <div class="available_time" v-if="receive_time.use_time.type=='week'">
                     <ul class="timeList">
                         <li v-for="(item,index) in sortWeeks(receive_time.use_time.week)" :key="index">
                             <p>{{item}}</p>
@@ -115,6 +114,7 @@
                 cls: null,
                 receive_time: JSON.parse(sessionStorage.getItem('goodsInfo')).entity.time_limit,
                 isMini: false,
+                is: false,
             };
         },
 
@@ -126,6 +126,12 @@
             /* 判断是否是微信小程序内 */
             let ua = window.navigator.userAgent.toLowerCase();
             this.isMini = /miniProgram/i.test(ua);
+
+            /* 初始弹窗 */
+            if (this.ysf.available != 1) {
+                this.is = true;
+                this.tip(product_status(this.ysf.available, this.ysf), 2);
+            }
         },
         filters: {
             cardType (val) {
@@ -197,6 +203,11 @@
             backGoodsFn () {
                 /* 判断是否web-view打开 则不返回 */
                 if (this.isMini) return;
+                /* 不让其关闭弹窗 */
+                if (this.is) {
+                    this.popShow = true;
+                    return;
+                }
                 if (this.backAble) {
                     window.location.replace('./homepage.html');
                 } else {
@@ -205,7 +216,7 @@
             },
 
             /* 触发提示 */
-            tip (text, status,) {
+            tip (text, status) {
                 this.popText = text;
                 this.popStatus = status; /*1 成功 2提示 3失败 */
                 this.popShow = true;
diff --git a/ysf.css b/ysf.css
index 5baec73..b789aba 100644
--- a/ysf.css
+++ b/ysf.css
@@ -285,6 +285,7 @@ body {
 
 .available_time {
   text-align: left;
+  margin-bottom: 0.1rem;
 }
 
 .timeList {
@@ -306,7 +307,7 @@ body {
 
 .type {
   font-size: 0.1rem;
-  background-color: rgb(238, 25, 32);
+  background-color: rgba(238, 25, 32);
   border-radius: 0.2rem;
   padding: 0.03rem 0.15rem;
   display: inline-block;
@@ -317,3 +318,19 @@ body {
 .information-tag {
   font-size: 0.2rem;
 }
+
+.card {
+  text-align: center;
+}
+
+.card .type {
+  border-radius: 0.05rem;
+  padding: 0.03rem 0.1rem;
+}
+
+.received-fiexd {
+  color: rgb(150, 152, 158);
+  font-size: 0.12rem;
+  line-height: 0.24rem;
+  margin-bottom: 0.1rem;
+}