Merge remote-tracking branch 'origin/feature/v4.8.0' into feature/v4.8.0

src/web/staticres/css/pc.css

@@ -4633,7 +4633,7 @@ h6 {
   overflow: hidden;
   margin-top: -282px;
   /* left: calc(50vw - 360px); */
-  left: calc((100vw - 360px) / 2);
+  left: 50%;
   box-sizing: border-box;
   border-radius: 16px;
   font-family: Microsoft YaHei,sans-serif;
@@ -4643,6 +4643,23 @@ h6 {
   display: block;
 }
 
+/* 此处代码处理登录注册弹框居在宽度未知情况居中问题，且保证bootstrap动画效果（淡入淡出） */
+.modal.fade .modal-dialog{
+  -webkit-transform: translate(-50%,-25%);
+  -ms-transform: translate(-50%,-25%);
+  -o-transform: translate(-50%,-25%);
+  transform: translate(-50%,-25%);
+  -webkit-transition: -webkit-transform .3s ease-out;
+  -o-transition: -o-transform .3s ease-out;
+  transition: transform .3s ease-out;
+}
+.modal.in .modal-dialog {
+  -webkit-transform: translate(-50%,0);
+  -ms-transform: translate(-50%,0);
+  -o-transform: translate(-50%,0);
+  transform: translate(-50%,0);
+}
+
 .login-dig-box .logo {
   width: 96px;
   height: 25px;

src/web/templates/dataMarket/customExport/index.html

@@ -115,7 +115,7 @@
             </div>
             <div class="con-info">
               <img src='{{Msg "seo" "cdn"}}/frontRouter/pc/customExport/image/export-b-text2.png?v={{Msg "seo" "version"}}' alt="">
-              <p>有多年经验的专业数据团队+人工智能，通过人机结合的方式，把数据的误差控制在1‰的范围内。</p>
+              <p>有多年经验的专业数据团队+人工智能，通过人机结合的方式，把数据的误差控制在1%的范围内。</p>
             </div>
           </div>
           <div class="con-row">

src/web/templates/dataMarket/index.html

@@ -192,7 +192,9 @@
   // 数据导出
   function dataExport () {
     checkLogin()
-    location.href = "/front/dataExport/toSieve"
+    if(loginflag){
+      location.href = "/front/dataExport/toSieve"
+    }
   }
   function checkLogin () {
     var moduleOpen = $('body').hasClass('modal-open')
@@ -206,5 +208,7 @@
     location.href = "/front/dataMarket/customExport"
   }
 </script>
+<!--百度统计-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>