优化交互

web/building_saas/pm/html/project-management.html

@@ -723,7 +723,7 @@
             <div class="modal-header">
                 <h5 class="modal-title">欢迎使用<%= title%></h5>
                 <label id="countdown" ></label>
-                <button type="button" id="welcomeCloseBtn" class="close text-danger" data-dismiss="modal" aria-label="Close">
+                <button type="button" id="welcomeCloseBtn" class="close text-danger" data-dismiss="modal" aria-label="Close" onclick="_showFreeUserInfo()">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -814,6 +814,13 @@
 <script src="/public/web/socket/connection.js"></script>
 <script src="/web/common/components/share/index.js" ></script>
 <script src="/web/building_saas/pm/js/pm_ajax.js"></script>
+<script type="text/javascript">
+    const isFree = JSON.parse('<%- isFree %>');
+    function _showFreeUserInfo() {
+        const showFreeUserInfo = `尊敬的用户：<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;养护云计价学习版，将于2022年5月8日停用。请在之前升级专业版，以便继续使用。如有疑问，请联系：<br>纵横全国服务热线：0756-3850888，企业QQ：800003850`;
+        if (isFree) hintBox.infoBox('温馨提示', showFreeUserInfo);
+    }
+</script>
 <script src="/web/building_saas/pm/js/pm_newMain.js"></script>
 <script src="/web/building_saas/pm/js/pm_gc.js"></script>
 <script src="/web/building_saas/pm/js/pm_share.js"></script>
@@ -844,13 +851,7 @@
     let compilationData = '<%- compilationData %>';
     let estimationData = '<%- estimationValuation %>';
     let adminLevelType = JSON.parse('<%- adminLevelType %>');
-    const isFree = JSON.parse('<%- isFree %>');
     compilationData = JSON.parse(compilationData.replace(/[\s\r\n]/g, ""));//去掉空格字符
     _iniAdminLevel();
-    function _showFreeUserInfo() {
-        const showFreeUserInfo = `尊敬的用户：<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;养护云计价学习版，将于2022年5月8日停用。请在之前升级专业版，以便继续使用。如有疑问，请联系：<br>纵横全国服务热线：0756-3850888，企业QQ：800003850`;
-        if (isFree) hintBox.infoBox('温馨提示', showFreeUserInfo);
-    }
-    if (isFree) _showFreeUserInfo();
 </script>
 </html>

web/building_saas/pm/js/pm_newMain.js

@@ -4252,4 +4252,6 @@ if(isShow){
    let welcomeTimer = setInterval("countdown()", 1000);   
  }
  $('#welcomePage').modal('show');//是否显示欢迎页
-} 
+} else if (isFree) {
+    _showFreeUserInfo();
+}