fix: 新增登陆时租户配置遇限时提示动画

hooks/pre-commit.js

@@ -10,19 +10,22 @@
 
 const execSync = require('child_process').execSync;
 
-// 获取当前分支名称
-const branchName = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
-// 校验分支名是否合法
-const firstPattern = new RegExp('dev|rc|gray|master');
-const secondPattern = new RegExp('(feature|hotfix)/[a-z]{4,}/[0-9]{8,}/[a-zA-Z-]{4,}');
+// // 获取当前分支名称
+// const branchName = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+// // 校验分支名是否合法
+// const firstPattern = new RegExp('dev|rc|gray|master');
+// const secondPattern = new RegExp('(feature|hotfix)/[a-z]{4,}/[0-9]{8,}/[a-zA-Z-]{4,}');
+// const firstMatch = firstPattern.test(branchName);
+// console.log('firstPattern ====>',firstMatch)
 
-const firstMatch = firstPattern.test(branchName);
-const secondMatch = secondPattern.test(branchName);
-if (!firstMatch && !secondMatch) {
-  // eslint-disable-next-line no-console
-  console.error(`\x1b[31m ${branchName}不符合分支规范，具体规范请访问 http://wiki.ixm5.cn/pages/viewpage.action?pageId=2918496 \x1b[31m`);
-  process.exit(1);
-}
+// const secondMatch = secondPattern.test(branchName);
+// console.log('firstPattern ====>',secondMatch)
+
+// if (!firstMatch && !secondMatch) {
+//   // eslint-disable-next-line no-console
+//   console.error(`\x1b[31m ${branchName}不符合分支规范，具体规范请访问 http://wiki.ixm5.cn/pages/viewpage.action?pageId=2918496 \x1b[31m`);
+//   process.exit(1);
+// }
 
 // 获取缓存区内容
 // 通过diff指令获得所有改动过（不包括删除）的js文件路径

public/h5.html

-<!--
- * @Author: zhangleyuan
- * @Date: 2021-04-08 14:56:33
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-04-13 18:09:09
- * @Description: 描述一下
- * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
--->
+
 <!--
  * @Author: 吴文洁
  * @Date: 2020-08-24 12:20:57
@@ -24,10 +17,10 @@
     <meta name="theme-color" content="#000000" />
     <!-- <link rel="apple-touch-icon" href="../src/common/images/logo.png" /> -->
     <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/KGSYFEpcHT.png">
-
     <title>小麦企培</title>
-
     <script type="text/javascript" charset="utf-8" src="./jquery.min.js"></script>
+    <script src="./lottie.js"></script>
+    <script  type="text/javascript" src='./animation.json'></script>
     <style type="text/css">
         .box {
             width: 100%;
@@ -56,6 +49,17 @@
             display: none;
             text-align: center;
         }
+        #lottie{
+            width: 150px;
+            height: 150px;
+            margin: 0 auto;
+        }
+        #tenant-config-error-message{
+            max-width: 70%;
+            margin: 25px auto;
+            font-size: 14px;
+            color: #999;
+        }
     </style>
 </head>
 
@@ -70,11 +74,12 @@
         <div id="error" class='hide'>
             <img src="https://image.xiaomaiketang.com/xm/6kSAYFMm2r.png
             " style='width:60px' alt="">
-            <p id='message'>
-
-            </p>
+            <p id='message'></p>
+        </div>
+        <div id="tenant-config-error" class='hide'>
+            <div id="lottie"></div>
+            <p id='tenant-config-error-message'></p>
         </div>
-
 
     </div>
 
@@ -122,9 +127,12 @@
             }, (res) => {
                 if (res.code == 200) {
                     $('#success').show()
-                } else {
+                }else if(res.code === 'DEPLOY_CROP_ADD_USER_NO'){
+                    $('#tenant-config-error').show();
+                    $('#tenant-config-error-message').html(res.message)
+                    emptyAnimation() 
+                }  else {
                     $('#error').show();
-
                     var message = res.message.split(',').join('<br />')
                     if(message === "非当前企业学院"){
                         $('#message').html("<div><div>非当前企业学院</div><div class='desc'>尝试扫描「企业外部客户」二维码登录</div></div>");
@@ -151,7 +159,16 @@
 
             $.ajax(ajaxOptions)
         }
-
+        function emptyAnimation(){
+            let params = {
+                container: document.getElementById('lottie'),
+                renderer: 'svg',
+                loop: true,
+                autoplay: true,
+                animationData: jsonDate
+            };
+            lottie.loadAnimation(params);
+        }
     });
 </script>