From f7f08968933abb3c12486e8d98d02d8dafff8af0 Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Fri, 2 Jul 2021 15:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E9=A1=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirDownload.vue     | 33 +++++++++++++------
 fir_client/src/components/ShortDownload.vue   | 32 ++++++++++++------
 .../src/components/user/FirSuperSignBase.vue  |  3 +-
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index 769803d..90be833 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -3,12 +3,14 @@
         <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0">
 
 
-        <div class="wechat_tip_content" v-if="agent === 'wxandroid' || agent === 'wxapple'">
-            <div class="wechat_tip" v-show="agent === 'wxandroid'">
-                <i class="triangle-up"/>请点击右上角<br>选择"在浏览器打开"
-            </div>
-            <div class="wechat_tip" v-show="agent === 'wxapple'">
-                <i class="triangle-up"/>请点击右上角<br>选择"在Safari中打开"
+        <div class="wechat_tip_content" v-if="(agent === 'wxandroid' || agent === 'wxapple') && !wrong">
+            <div class="mask">
+                <div class="wechat_tip" v-show="agent === 'wxandroid'">
+                    <i class="triangle-up"/>请点击右上角<br>选择"在浏览器打开"
+                </div>
+                <div class="wechat_tip" v-show="agent === 'wxapple'">
+                    <i class="triangle-up"/>请点击右上角<br>选择"在Safari中打开"
+                </div>
             </div>
         </div>
 
@@ -64,12 +66,13 @@
 
                                 <div id="actions" class="actions" v-if="agent !==''"
                                      style="margin-top: 20%;margin-bottom: 20%">
+                                    <button type="button" v-if="wrong">{{ msg }}</button>
 
-                                    <el-button type="info" round v-if="agent === 'wxandroid' || agent === 'wxapple'">
+                                    <el-button type="info" round
+                                               v-else-if="agent === 'wxandroid' || agent === 'wxapple'">
                                         不支持在微信内下载
                                     </el-button>
 
-                                    <button type="button" v-else-if="wrong">{{ msg }}</button>
                                     <div v-else style="margin-top: 20%;margin-bottom: 20%">
                                         <div v-if="isdownload">
                                             <div v-if="gomobile">
@@ -692,6 +695,15 @@
 </script>
 
 <style scoped>
+    .mask {
+        z-index: 9;
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        background: rgba(0, 0, 0, .5);
+    }
 
     .text-black {
         color: #505556
@@ -710,7 +722,8 @@
 
     .wechat_tip, .wechat_tip > i {
         position: absolute;
-        right: 10px
+        right: 10px;
+        z-index: 99999;
     }
 
     .wechat_tip {
@@ -727,7 +740,7 @@
         color: #fff;
         font-size: 14px;
         font-weight: 500;
-        width: 135px;
+        width: 166px;
         height: 60px;
         border-radius: 10px;
         top: 15px
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index dc151e1..fb588ae 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -24,12 +24,14 @@
         <div ref="bg" class="bg"></div>
 
 
-        <div class="wechat_tip_content" v-if="agent === 'wxandroid' || agent === 'wxapple'">
-            <div class="wechat_tip" v-show="agent === 'wxandroid'">
-                <i class="triangle-up"/>请点击右上角<br>选择"在浏览器打开"
-            </div>
-            <div class="wechat_tip" v-show="agent === 'wxapple'">
-                <i class="triangle-up"/>请点击右上角<br>选择"在Safari中打开"
+        <div class="wechat_tip_content" v-if="(agent === 'wxandroid' || agent === 'wxapple') && !wrong">
+            <div class="mask">
+                <div class="wechat_tip" v-show="agent === 'wxandroid'">
+                    <i class="triangle-up"/>请点击右上角<br>选择"在浏览器打开"
+                </div>
+                <div class="wechat_tip" v-show="agent === 'wxapple'">
+                    <i class="triangle-up"/>请点击右上角<br>选择"在Safari中打开"
+                </div>
             </div>
         </div>
 
@@ -85,12 +87,12 @@
 
                                 <div id="actions" class="actions" v-if="agent !==''"
                                      style="margin-top: 20%;margin-bottom: 20%">
+                                    <button type="button" v-if="wrong">{{ msg }}</button>
 
-                                    <button v-if="agent === 'wxandroid' || agent === 'wxapple'">
+                                    <button v-else-if="agent === 'wxandroid' || agent === 'wxapple'">
                                         不支持在微信内下载
                                     </button>
 
-                                    <button type="button" v-else-if="wrong">{{ msg }}</button>
                                     <div v-else style="margin-top: 20%;margin-bottom: 20%">
                                         <div v-if="isdownload">
                                             <div v-if="gomobile">
@@ -678,6 +680,15 @@
 </script>
 
 <style scoped>
+    .mask {
+        z-index: 9;
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        background: rgba(0, 0, 0, .5);
+    }
 
     .text-black {
         color: #505556
@@ -696,7 +707,8 @@
 
     .wechat_tip, .wechat_tip > i {
         position: absolute;
-        right: 10px
+        right: 10px;
+        z-index: 99999;
     }
 
     .wechat_tip {
@@ -713,7 +725,7 @@
         color: #fff;
         font-size: 14px;
         font-weight: 500;
-        width: 135px;
+        width: 166px;
         height: 60px;
         border-radius: 10px;
         top: 15px
diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
index 6b1762b..d09afe8 100644
--- a/fir_client/src/components/user/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -158,7 +158,8 @@
                             width="100">
                         <template slot-scope="scope">
                             <el-popover trigger="hover" placement="top">
-                                <p v-if="!scope.row.certid && scope.row.is_actived === true">开发证书不可用，请在编辑中导入或手动创建发布证书</p>
+                                <p v-if="!scope.row.certid && scope.row.is_actived === true">
+                                    开发证书不可用，请在编辑中导入或手动创建发布证书</p>
                                 <p v-if="!scope.row.certid && scope.row.is_actived !== true">请先激活开发者账户</p>
                                 <p v-if="scope.row.certid && scope.row.is_actived === true">账户已经启用</p>
                                 <div slot="reference" class="name-wrapper">