Merge branch 'master' into hotfix/v4.8.52.1

src/web/staticres/brand/css/brand.css

@@ -1010,7 +1010,10 @@
     margin-top: 40px;
     display: flex;
 }
-
+.qr_box > img {
+    width: 100%;
+    height: 100%;
+}
 .qr_box .item {
     flex: 1;
 }

src/web/staticres/css/dev2/superSearch-inside.css

@@ -229,8 +229,8 @@
 .el-pagination.is-background .el-pager li:not(.disabled):hover{
   color: #2cb7ca;
 }
-.el-pagination.is-background .btn-next, 
-.el-pagination.is-background .btn-prev, 
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
 .el-pagination.is-background .el-pager li{
   color: #1d1d1d;
 }
@@ -577,3 +577,7 @@ input, textarea {
   background: #ececec;
 }
 
+.self-list-loading .el-loading-spinner{
+    top: 65%;
+}
+

src/web/staticres/js/biddingSearch.js

@@ -309,11 +309,16 @@ $(function() {
 			}else if($(this).attr("id")=="right-export"){
 				//数据导出
         if(!searchInnerVue.listState.allCount) return
+        var loading = searchInnerVue.$loading({
+          background: 'rgba(255, 255, 255, .1)',
+          customClass: 'self-list-loading'
+        })
         $.ajax({
           type: "POST",
           url: "/front/dataExport/getDontPromptAgain",
           contentType: "application/x-www-form-urlencoded",
           success: function (res) {
+            loading.close()
             if(res.error_code === 0) {
               // 数据导出-判断是否展示弹框
               let countBool = false
@@ -342,6 +347,7 @@ $(function() {
             }
           },
           error: function(err) {
+            loading.close()
 				    toPaydataExport();
           }
         });
@@ -349,7 +355,7 @@ $(function() {
 		})
 	}
 
-  $('.have-thousand-close').click(function (e) { 
+  $('.have-thousand-close').click(function (e) {
     e.preventDefault();
     $('.have-thousand-dialog').hide()
   });