Merge branch 'dev4.5' of http://192.168.3.207:8080/qmx/jy into dev4.5

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -875,6 +875,9 @@
             window.event.returnValue = false;
             //超级搜索
             if(SuperSearch.isMyPage){
+              if ($("#search-header-input").val().trim() === '') {
+                return
+              }
               var isNowIndex = $(".tabs-box .tabs-nav .active").index()
                 if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
                     if (isNowIndex === 1) {

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1470,6 +1470,7 @@
             }
             $("#search-ent-list").html('')
             $("#search-buyer-list").html('')
+            window.isKeyDownToEntSearch = false
             createSearchResultList()
 
             // KB需求:#12441 (清空输入框显示历史记录)

src/web/templates/pc/entsearchindex.html

@@ -187,7 +187,7 @@
                             @click="toDetail(item.id)"
                             :key="item.id">
                             <div class="ei-i-left">
-                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_shortname.slice(0,4) }</div>
+                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_shortname ? item.company_shortname.slice(0,4) : item.company_name.slice(0,4) }</div>
                             </div>
                             <div class="ei-i-right">
                                 <div class="ei-r-title-container flex">

src/web/templates/weixin/search/mainSearch.html

@@ -1005,6 +1005,9 @@
             window.event.returnValue = false;
 			//超级搜索
 			if(SuperSearch.isMyPage){
+			  if ($("#search-header-input").val().trim() === '') {
+			    return
+              }
               var isNowIndex = $(".tabs-box .tabs-nav .active").index()
                 if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
                     if (isNowIndex === 1) {

src/web/templates/weixin/search/tabSearch.html

@@ -1479,6 +1479,7 @@
             }
             $("#search-ent-list").html('')
             $("#search-buyer-list").html('')
+            window.isKeyDownToEntSearch = false
             createSearchResultList()
 
             // KB需求:#12441 (清空输入框显示历史记录)