Merge branch 'bug-1.01-4.29' into test

src/view/popup/top-up/info.vue

@@ -30,10 +30,15 @@
             </div>
 
             <div class="tips">
-                <div class="tip-title">TIPS</div>
-                <p>1、请通过客户端或在线钱包将您需要充值的相应币种数目发送到该地址。</p>
-                <p>2、发送完成后，系统会自动在此交易获得 相应数量确认后将该笔虚拟币充值到您在本站的账户，相应数量的确认需要大约 0.5 到 1 小时时间，请耐心等待</p>
-                <p>3、同一个地址可多次充值，不影响到账。最小充值金额 0.0001。</p>
+                <div class="tips-icon">
+                    <img :src="require('@/assets/svg/icon-top-up-tips-warning.svg')" alt="">
+                </div>
+                <div class="tips-content">
+                    <p>Make sure you also selected </p>
+                    <p style="color: red;">BNB Smart Chain (BEP20) </p>
+                    <p>as the Network on the platform where you are withdrawing funds for this deposiit. Otherwise,
+                        you'll lose your assets.</p>
+                </div>
             </div>
         </div>
 
@@ -251,13 +256,26 @@ onMounted(() => {
         }
 
         .tips {
-            margin-top: 14px;
+            margin-top: 12px;
             font-size: 13px;
-            height: 80px;
+            height: 118;
             overflow: auto;
+            background: #FCF5E5;
+            display: flex;
+                padding: 10px;
+                border-radius: 10px;
+
+            .tips-icon {
+            
+                width: 30px;
+                img {
+                    width: 20px;
+                    height: 20px;
+                }
+            }
 
-            .tip-title {
-                color: #000000;
+            .tips-content {
+                flex: 1;
             }
 
             p {
@@ -274,8 +292,8 @@ onMounted(() => {
         display: flex;
         align-items: center;
         justify-content: center;
-        position: absolute;
-        bottom: 0;
+        // position: absolute;
+        // bottom: 0;
 
         .confirm-btn {
             width: 335px;

src/view/popup/withdraw/info.vue

@@ -43,8 +43,16 @@
       </div>
 
       <div class="tips">
-        <div class="tip-title">TIPS</div>
-        <div class="tip-content">asdasdasdasd</div>
+        <div class="tips-icon">
+          <img :src="require('@/assets/svg/icon-top-up-tips-warning.svg')" alt="">
+        </div>
+        <div class="tips-content">
+          <p>1.Make sure you also selected </p>
+          <p style="color: red;">BNB Smart Chain (BEP20) </p>
+          <p>BNB Smart Chain (BEP20)
+            on the platform where you are depositing funds to. Otherwise, you'll lose your assets.</p>
+          <p>2.As the withdrawal is transferred out, you can check the transaction history. </p>
+        </div>
       </div>
     </div>
     <!-- 底部 -->
@@ -306,21 +314,40 @@ const clickWithdrawalAll = () => {
     }
 
     .tips {
-      margin-top: 30px;
+      margin-top: 12px;
       font-size: 13px;
+      height: 118;
+      overflow: auto;
+      background: #FCF5E5;
+      display: flex;
+      padding: 10px;
+      border-radius: 10px;
 
-      .tip-title {
-        color: #000000;
+      .tips-icon {
+
+        width: 30px;
+
+        img {
+          width: 20px;
+          height: 20px;
+        }
       }
 
-      .tip-content {
-        color: #000000;
+      .tips-content {
+        flex: 1;
+      }
+
+      p {
+        margin: 0;
+        padding: 0;
       }
     }
 
   }
 
   .footer {
+    z-index: 11;
+    background: #fff;
     border-top: 1px solid #DBDBDB;
     bottom: 0;
     height: 80px;

src/view/red-packet.vue

@@ -625,8 +625,8 @@ function handleFinishRedPacket() {
       postId: data.postId
     }
   }).then((res) => {
+    data.loading_show = false
     if (res.code == 0) {
-      data.loading_show = false
       if (res.data.finished) {
         data.status = 'success'
         data.receiveAmount = res.data.receiveAmount