Merge branch 'dev/v4.9.36_yf' of qmx/jy into feature/v4.9.36

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -950,7 +950,7 @@
                     arr.push(industry[i]);
                     break
                 }
-                var str = industry[i].split("_")[1];
+                var str = industry[i].split("_")[1] !== '其他' ? industry[i].split("_")[1] : industry[i];
                 arr.push(str)
             }
             $("#industry").text(arr.toString().replace(/,/g, " "));

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -281,7 +281,9 @@
                     for (var i = 0; i < industry.length; i++) {
                         var d = industry[i];
                         if (d && d.split("_").length == 2) {
+                          if (d.split("_")[1] !== '其他') {
                             d = d.split("_")[1];
+                          }
                         } else {
                             d = "";
                         }

src/web/staticres/dataExport/js/delbox.js

@@ -58,7 +58,9 @@ var DelBox = function () {
     key: 'createDefaultTemp',
     value: function createDefaultTemp(s, i, k) {
       var _this = this;
-
+      if(s === '其他') {
+        s = k
+      }
       var temp = document.createElement('div');
       temp.innerHTML = '<div data-arrIndex="' + i + '" data-key="' + k + '"  class="delete-box-close">' + s + '</div>';
       var child = this.toJqDom(temp.children);

src/web/staticres/js/index/index_2023.12.js

@@ -141,6 +141,7 @@ var entAssoc = {
 }
 
 var searchHistory = {
+  isHaveSearch: false,
   preSearch: {
     hover: false,
     focus: false
@@ -149,9 +150,15 @@ var searchHistory = {
   browseList: [],
   init: function () {
     var _this = this
-    _this.getSearchHistory()
+    setTimeout(function () {
+      _this.getSearchHistory()
+    }, 300)
     // 控制list显示隐藏
     $('#keywords').on('focus', function () {
+      if(!_this.isHaveSearch) {
+        // 如果初始化时没拿到登录状态（没查询历史记录），获取焦点时再查询一次
+        _this.getSearchHistory()
+      }
       _this.preSearch.focus = true
       _this.checkListShow()
     }).on('blur', function () {
@@ -268,6 +275,7 @@ var searchHistory = {
       data: { type: type },
       success: function (res) {
         if (res.error_code === 0) {
+          _this.isHaveSearch = true
           _this.searchList = res.data.search
           if (res.data.browse) {
             // 格式化浏览历史数据(企业画像浏览记录跳转需要企业id， 存历史记录的时候保存格式为“企业名称_企业id”, 取的时候要分割开)

src/web/staticres/pccss/index_pc.css

@@ -1649,10 +1649,14 @@
   top: 38px;
   left: 0;
   width: 544px;
+  max-height: 520px;
   background: #fff;
   box-shadow: 0 0 20px rgb(0, 0, 0, 0.1);
   border-radius: 8px;
-  overflow: hidden;
+  overflow-y: auto;
+}
+.search-history-list::-webkit-scrollbar{
+  width: 4px;
 }
 .search-history-card .history-header{
   display: flex;
@@ -1672,6 +1676,8 @@
 }
 .search-history-card .search-tag-container{
   padding: 0 20px;
+  display: flex;
+  flex-wrap: wrap;
 }
 .search-history-card .search-tag-container .search-tag-item{
   display: inline-block;

src/web/templates/pc/orderDetail.html

@@ -326,7 +326,9 @@
                 for (var i = 0; i < industry.length; i++) {
                     var d = industry[i];
                     if (d && d.split("_").length == 2) {
-                        d = d.split("_")[1];
+                        if (d.split("_")[1] !== '其他') {
+                          d = d.split("_")[1];
+                        }
                     } else {
                         d = "";
                     }

src/web/templates/weixin/dataExport/dataExport.html

@@ -974,7 +974,7 @@
                     arr.push(industry[i]);
                     break
                 }
-                var str = industry[i].split("_")[1];
+                var str = industry[i].split("_")[1] !== '其他' ? industry[i].split("_")[1] : industry[i];
                 arr.push(str)
             }
             $("#industry").text(arr.toString().replace(/,/g," "));

src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -178,7 +178,9 @@
                     for (var i = 0; i < industry.length; i++) {
                         var d = industry[i];
                         if (d && d.split("_").length == 2) {
+                          if (d.split("_")[1] !== '其他') {
                             d = d.split("_")[1];
+                          }
                         } else {
                             d = "";
                         }