Procházet zdrojové kódy

Merge branch 'dev4.5' of ssh://192.168.3.207:10022/qmx/jy into dev4.5

yangfeng před 4 roky
rodič
revize
a7bc093535
25 změnil soubory, kde provedl 1115 přidání a 47 odebrání
  1. 4 4
      src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js
  2. 13 1
      src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html
  3. 2 2
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  4. 5 7
      src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html
  5. 2 2
      src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html
  6. 38 6
      src/web/staticres/common-module/collection/css/index.css
  7. binární
      src/web/staticres/common-module/collection/image/icon-right-bg.png
  8. binární
      src/web/staticres/common-module/collection/image/img-empty.png
  9. 3 1
      src/web/staticres/common-module/collection/js/area-mobile.js
  10. 8 1
      src/web/staticres/common-module/collection/js/industry-mobile.js
  11. 8 1
      src/web/staticres/common-module/collection/js/notice-mobile.js
  12. 164 0
      src/web/staticres/common-module/mainSearch/css/j-icons.css
  13. binární
      src/web/staticres/common-module/mainSearch/fonts/jyAPP.eot
  14. 118 0
      src/web/staticres/common-module/mainSearch/fonts/jyAPP.svg
  15. binární
      src/web/staticres/common-module/mainSearch/fonts/jyAPP.ttf
  16. binární
      src/web/staticres/common-module/mainSearch/fonts/jyAPP.woff
  17. binární
      src/web/staticres/common-module/mainSearch/image/img-empty.png
  18. 718 0
      src/web/staticres/common-module/mainSearch/js/utils.js
  19. 5 5
      src/web/staticres/css/wxsearch.css
  20. 4 4
      src/web/staticres/js/wxSupersearch.js
  21. 1 1
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html
  22. 13 1
      src/web/templates/frontRouter/wx/collection/sess/index.html
  23. 2 2
      src/web/templates/weixin/search/mainSearch.html
  24. 5 7
      src/web/templates/weixin/search/tabSearch.html
  25. 2 2
      src/web/templates/weixin/wxinfocontent_rec.html

+ 4 - 4
src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -222,13 +222,13 @@ var SuperSearch = {
 		});
 		//筛选菜单展示or隐藏
 		$("#supersearchPage").on("tap" , "#clickFilter", function(){
+      if ($(this).text().trim() !== '筛选' || $("#search-header-input").val().trim() === '') {
+        return
+      }
       if (vMainSearchComponent) {
         vMainSearchComponent.toggleEntShow(true)
       }
 		  return;
-      if ($(this).text().trim() !== '筛选') {
-        return
-      }
 			hideTab();
 			SuperSearch.inputBlur();
 			if(SuperSearch.requesting){
@@ -289,7 +289,7 @@ var SuperSearch = {
 		});
 		//提交查询
 		$("#supersearchPage").on('click', "#clickFilter",function(){
-            if ($(this).text().trim() !== '搜索') {
+            if ($(this).text().trim() !== '搜索' || $("#search-header-input").val().trim() === '') {
                 return
             }
             sessionStorage.setItem('isSearchListPage', 'true')

+ 13 - 1
src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html

@@ -26,7 +26,7 @@
   <div class="j-container">
     {{include "/big-member/header.html"}}
     <div class="j-main collection" id="myCollection" v-cloak ref="main">
-      <div class="j-container">
+      <div class="j-container" v-if="listState.list.length!==0">
         <div class="j-main">
           <div class="search-container van-fade-an" ref="searchContainer">
             <div class="listaction">
@@ -89,6 +89,18 @@
           </div>
         </div>
       </div>
+      <div class="j-container" v-if="listState.list.length==0">
+        <div class="j-main">
+          <div class="emptycom">
+            <div class="emptyimg">
+              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
+            </div>
+            <div class="emptytext">
+              您还没有收藏标讯
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
   <!--S-当前页面的资源-->

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

@@ -485,14 +485,14 @@
 <!--S-当前页面的资源-->
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/notice-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/cate-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
     window.jyUserPower = {
       entniche: false,

+ 5 - 7
src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1,9 +1,9 @@
 <!--S-当前页必定需要预加载的资源-->
-<link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/j-icons.css?v={{Msg "seo" "version"}}' />
+<link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/mainSearch/css/j-icons.css?v={{Msg "seo" "version"}}' />
 <!--E-当前页必定需要预加载的资源-->
 
 <!--S-当前页面的css资源-->
-<link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/j-icons.css?v={{Msg "seo" "version"}}' />
+<link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/mainSearch/css/j-icons.css?v={{Msg "seo" "version"}}' />
 <!--E-当前页面的css资源-->
 
 <style>
@@ -1246,7 +1246,7 @@
 <!--E-页面-->
 
 <!--S-脚本-->
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/utils.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/mainSearch/js/utils.js'></script>
 <script>
 
     function ajaxQueryAssociateList (data, callback) {
@@ -1652,10 +1652,8 @@
             landname: $(this).text()
         }))
         SuperSearch.setSessionStorage()
-        if(!isMember){
-           location.href = "/jyapp/big/page/landingPage"
-        }else{
-          location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent($(this).attr('data-eId'))
+        if (vEntSearchComponent) {
+          vEntSearchComponent.selectEnt({ name: $(this).text(), _id: $(this).attr('data-eid')})
         }
     }
 

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -619,7 +619,7 @@
 </div>
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=/common-module/keep-tags/keep-tags-template.js></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -1862,7 +1862,7 @@
         }
     })
 
-    
+
     function changeCollectStatus (f) {
         var $collButton = $('.collec_star')
         var $icon = $collButton.children('.icon')

+ 38 - 6
src/web/staticres/common-module/collection/css/index.css

@@ -347,13 +347,13 @@
 }
 .collection .unitType .van-tabs__wrap{
   height: 100%;
-  overflow: auto;
+  overflow: hidden;
 }
 .collection .unitType .van-tabs__content{
   flex: 1;
 }
 .unitType .van-tabs__wrap .van-tabs__nav.van-tabs__nav--card{
-  height: auto;
+  height: 100%;
   margin: 0;
   display: flex;
   flex-direction: column;
@@ -362,6 +362,7 @@
 }
 .unitType .van-tabs__wrap .van-tabs__nav.van-tabs__nav--card .van-tab{
   flex: none;
+  flex-basis: auto!important;
   width: 2.5rem;
   min-height: .8rem;
   background: #f5f6f7;
@@ -409,9 +410,9 @@
 /* 采购单位联系方式 */
 .icon-duihao{
   display: flex;
-  width: .36rem;
-  height: .36rem;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAcCAYAAAAEN20fAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTI4MkNFMEU3NTlCMTFFNzgzMUFFMzA2NTJBNTJDQTAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTI4MkNFMEY3NTlCMTFFNzgzMUFFMzA2NTJBNTJDQTAiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MjgyQ0UwQzc1OUIxMUU3ODMxQUUzMDY1MkE1MkNBMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1MjgyQ0UwRDc1OUIxMUU3ODMxQUUzMDY1MkE1MkNBMCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ps2Yfq0AAAIUSURBVHjaxJdZK0RhGMePIV/AkiRbIiG58gl8ALusoYgiLojImpQkLsgSubAUl4qyXomEklxYSpLdzZR1sv2feqbeTu8cZ2bOzPnXr87zznvO+Z93ed5nfBJX9hQT5Q9mwLSfySbmQQYItJhkggZglk3cggIzjPiCOZAFbCAH3FlMMEFrIpvjerBNFxYvm5gGeRzT9Yj9R4sXTUyCQo4PQLXYwRtG6B0ToITjJ5AJ3mVGPLWNfcA4KOX4G+SDK5nbVHAGUjxgYhSUC23NYN3RsA2BKLAGkg00MQwqhLZF0K81f5XgAwSwmSQDTNDHVQltJ6AM/GoZOQINHAeBDZDghpEBUCPEVpAOXv5b0QoP45JgZhPEu2iiTohpBIrAuZ6tZb+hjPM+KZjNxDlhoo8zpagu4QN1GSE9s/tvjkPYTKyO5/QK02vXMhtRnDWi8Iv7hDiU10yMxjO6QZOq7YLzxY+rRkhtYFeIw8AWiJb07QCtqrY3Pt6tzqZftb74a6wSM1Eqw+2S+ymLHrtyDsh0qcoDpHCeugjQAjod7JoFVyslR6IyLk04J0iRYJ9KO0l/GrFGd05GLVFiOlW1yUxcg1xhxxlu5JXXi02jzycvzid3a4X/dCjZnqKqeboUTxshDXKCUmsMTBlVPenRLy/ae6FtB9QaWcbp1SMoZlMPXInbjPyj44yoXukBq+DGyHLuT4ABAFb/aZSnxxGmAAAAAElFTkSuQmCC) no-repeat;
+  width: .48rem;
+  height: .48rem;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMpSURBVHgB7ZpNTttAFMffTKBV6YIcgU2lEKkivgEmUqWuWk5AOEHFCQg3oCcATpDuKrVF7g2cUClB6iZHyIqqbeLpvHxQPjzOjDMzAfN+mxiPLZGfPDPv/xwAgiAIgiAIgiAIgiAIgiAIXRg8ATZacflluXQIQjTwbyHYpys+OuiHwWDevSvwBHixXmoJIbavTzDRWEtKeLQ/714OBacaXZwwuCFnBhPvNW4vtqBq1LmeVncRAHOnF1JYQRM50FSNMwFnoEEhF+l5cuTYUbe+1QQNCidoM+p8kE/HsfICAzlIoQRVos4eF3CqGpfrzllvZ6sBBhRGUPVLXGMrPJISymnj8nxbygnAkEIs0pXP8cY8Ob9YEkIOHr0glMOfZ8rpC5bs6lTNaWhPscrXeJvx0js8Ho5GZz/fBG1YMjM58nAjbXwqJ7wMgz7kREtQ9TxuAOMnt+/kzW74+giWhA85iN4UY/zw3jmRNKvRj0NYAhg+pZwWKORIBjbkILprUOr8XpYkDJ/yo6a8wJIcREuQDHvq9cazJGX4nJKIZL8b2lsftQStMrErP7IlnV+cgGOywuf43xDJwWU9OAWLaAlqyy3y2aSOUEuSPRaXknTyVa8eHINljCvpzW+dU8ZhL+OS9pWUmbfuSMNm+DQlV9TwKcl2+DQldxaTtVEzdfv/Tz/5LXeTt/l3Exfh05SFwqpLSRg+YYXHqnEB4ntvp5YrX5mwUBbr1oOm3MGyqulxtYtVLxgwC5+q8Un4HO+szlk4rNqW5Dp8mmKtH2RjuvnKVyZYbZhVZKjld0PtbQZ/h0mY1gl4iHIQq/0grGKx1M+4pLwq15ZXuADfwGf4NMV6w2xc6g8TbG2q1giUFOMWPjuxtj5+clThcwBLkoM460lPt2n84mXVNQmDBge2nZWv8Im0na9McNq0r0RyuxY8YuqpkwmGTxf5ygSnPWmcFrh24AILpjgKn6Z4ee1j/CQ5zlcmeHsvpi3pAclBvL44nCfJR/g0xfub1VoUl/+I+9u6r/BpivcXh7PupIAEf36CtdJACPjoK3wSBEEQBEEQBEEQBEEQBEG44x/qVZ39mGkA4AAAAABJRU5ErkJggg==) no-repeat;
   background-size: contain;
 }
 
@@ -489,7 +490,7 @@
   position: absolute;
   right: 0;
   bottom: 0;
-  background: url(/jyapp/big-member/image/icon-check.png);
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==);
   width: 14px;
   height: 14px;
   background-size: 100% 100%;
@@ -507,4 +508,35 @@
 }
 .van-cell::after{
   border: 0;
+}
+.van-cell:not(:last-child)::after{
+  border-bottom: 0;
+}
+
+
+/* 空状态样式 */
+
+.emptycom{
+  margin-top: 3.6rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+}
+.emptycom .emptyimg{
+  width: 3.2rem;
+  height: 3.2rem;
+}
+.emptycom .emptyimg img{
+  width: 100%;
+  height: 100%;
+}
+.emptycom .emptytext{
+  margin-top: .24rem;
+  font-size: .28rem;
+  font-weight: 500;
+  text-align: CENTER;
+  color: #5f5e64;
+  line-height: .4rem;
 }

binární
src/web/staticres/common-module/collection/image/icon-right-bg.png


binární
src/web/staticres/common-module/collection/image/img-empty.png


+ 3 - 1
src/web/staticres/common-module/collection/js/area-mobile.js

@@ -32,7 +32,9 @@ var areaComponent = {
     },
     selectarealist: {
       type: Array,
-      default: []
+      default: function () {
+        return []
+      }
     }
   },
   data:function () {

+ 8 - 1
src/web/staticres/common-module/collection/js/industry-mobile.js

@@ -62,7 +62,14 @@ var industryComponentTemplate = `<div class="j-container">
 
 var industryComponent = {
   name: 'industry-mobile',
-  props: ['selectindustrylist'],
+  props: {
+    'selectindustrylist': {
+      type: Array,
+      default: function () {
+        return []
+      }
+    }
+  },
   template: industryComponentTemplate,
   data:function () {
     return {

+ 8 - 1
src/web/staticres/common-module/collection/js/notice-mobile.js

@@ -63,7 +63,14 @@ var noticeComponentTemplate = `<div class="j-container">
 
 var noticeComponent = {
   name: 'notice-mobile',
-  props: ['selectnoticelist'],
+  props: {
+    'selectnoticelist': {
+      type: Array,
+      default: function () {
+        return []
+      }
+    }
+  },
   template: noticeComponentTemplate,
   data:function () {
     return {

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 164 - 0
src/web/staticres/common-module/mainSearch/css/j-icons.css


binární
src/web/staticres/common-module/mainSearch/fonts/jyAPP.eot


+ 118 - 0
src/web/staticres/common-module/mainSearch/fonts/jyAPP.svg

@@ -0,0 +1,118 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20170924 at Mon May 11 19:01:57 2020
+ By www-data
+Typeface (c) (your company). 2018. All Rights Reserved
+</metadata>
+<defs>
+<font id="jyAPP" horiz-adv-x="2048" >
+  <font-face 
+    font-family="jyAPP"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="2048"
+    panose-1="2 0 5 0 0 0 0 0 0 0"
+    ascent="1638"
+    descent="-410"
+    bbox="0 -256.048 3103 2048"
+    underline-thickness="150"
+    underline-position="-292"
+    unicode-range="U+001D-00BB"
+  />
+<missing-glyph 
+ />
+    <glyph glyph-name=".notdef" 
+ />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="682" 
+ />
+    <glyph glyph-name="sterling" unicode="&#xa3;" horiz-adv-x="1259" 
+d="M1259 1024l-194 186l-871 838l-194 -186l872 -838l-872 -838l194 -186l871 838z" />
+    <glyph glyph-name="yen" unicode="&#xa5;" 
+d="M300 1748q-300 -300 -300 -724t300 -724t724 -300t724 300t300 724t-300 724t-724 300t-724 -300zM1535 755q-5 8 -14 23l-12 20q-12 18 -14 10q-36 -106 -88 -165q1 1 35 -22q41 -28 53 -61q22 -61 4 -90q-33 -53 -192 -70q-88 -10 -177 32q-25 12 -54 29q-23 14 -25 14
+h-64l-14 -12q-17 -14 -40 -25q-78 -38 -210 -38q-113 0 -161 59q-43 51 -14 101q19 33 56 59q28 21 25 24q-54 62 -81 134q-6 17 -9 31q-2 7 -12 -11q-1 -1 -10 -19q-7 -14 -13 -24q-37 -65 -66 -44q-72 53 -13 217q18 52 68 124q45 64 46 70q1 37 -2 70q-2 22 2 31
+q8 23 23 31q11 7 11 17q0 203 132 347t319 144q186 0 318 -144t132 -347q0 -2 15 -10q18 -10 25 -38q6 -21 2 -101q-1 -5 38 -55q45 -58 66 -139q24 -89 12 -154q-9 -45 -30 -63q-25 -21 -67 45z" />
+    <glyph glyph-name="brokenbar" unicode="&#xa6;" horiz-adv-x="2116" 
+d="M2111 931q-4 31 -27 51q-26 20 -56 16q-30 -5 -50 -31q-193 -193 -275 -255q-334 -251 -646 -251q-302 0 -642 253q-102 77 -282 257q-20 23 -51 26q-32 2 -55 -18t-25 -53q-2 -32 18 -55q49 -76 241 -230l-192 -203q-22 -23 -21 -55t25 -53q11 -23 45 -23q30 0 53 23
+l207 219q165 -116 344 -181l-79 -272q-9 -32 6 -59q15 -28 46 -37h23q26 0 46 16t26 42l79 272q101 -19 189 -19t188 19l79 -269q6 -25 28 -41q21 -16 44 -16q16 0 19 4q31 8 46 36t7 60l-80 268q178 64 344 181l204 -215q22 -23 52 -23q31 0 53 23t23 53q1 31 -19 54
+l-192 204q154 115 245 226q17 26 12 56z" />
+    <glyph glyph-name="section" unicode="&#xa7;" horiz-adv-x="1107" 
+d="M208 1021l874 -874q25 -25 25 -61q0 -35 -25 -61q-25 -25 -61 -25t-61 25l-935 935q-25 25 -25 61t25 61l935 935q25 25 61 25t61 -25q25 -26 25 -61q0 -36 -25 -61z" />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" 
+d="M300 1748q-300 -300 -300 -724t300 -724t724 -300t724 300t300 724t-300 724t-724 300t-724 -300zM1367 1459q24 -19 47 -41q51 -51 87 -115q8 -13 17 -31l-278 -277q3 16 0 540q68 -29 127 -76zM1025 1578q72 0 143 -19q21 -6 34 -11v-392q-10 13 -383 382q70 28 144 36
+q30 4 62 4zM633 1414q51 52 114 88q13 7 31 17l278 -278q-17 3 -541 0q30 68 76 127q21 25 42 46zM472 1025q0 72 19 142q4 15 11 34h392q-13 -10 -382 -382q-28 70 -36 143q-4 31 -4 63zM634 633q-51 51 -88 114q-9 16 -16 31l277 278q-2 -17 1 -540q-68 29 -127 75
+q-25 19 -47 42zM1023 470q-72 0 -142 19q-15 4 -34 11v392q10 -13 382 -382q-70 -28 -144 -36q-34 -4 -62 -4zM1413 632q-52 -52 -115 -88q-13 -7 -31 -17l-278 278q17 -3 541 0q-29 -67 -76 -127q-19 -24 -41 -46zM1546 846h-392q13 10 382 383q28 -70 36 -144q4 -30 4 -62
+q0 -72 -19 -143q-4 -15 -11 -34z" />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1904" 
+d="M1150 1847q34 34 34 82t-34 82t-82 34t-82 -34t-34 -82t34 -82t82 -34t82 34zM1416 1301v230h93l1 189h-1118l1 -189h93v-230l-449 -1060q-37 -85 12 -163t139 -78h1528q91 0 140 79q48 79 10 163zM1097 1400q41 -41 41 -98q0 -58 -41 -99t-99 -41t-99 41t-41 99
+q0 57 41 98t99 41t99 -41zM923 1042q27 -27 27 -65q0 -39 -27 -66t-66 -27q-38 0 -65 27q-28 27 -28 66q1 38 28 65q27 28 65 28q39 0 66 -28zM395 281q258 519 262 516q139 -142 354 -31q107 55 187 139l311 -624h-1114z" />
+    <glyph glyph-name="ordfeminine" unicode="&#xaa;" horiz-adv-x="2063" 
+d="M1990 1316l-616 95l-275 589q-20 42 -66 42h-4q-46 0 -66 -42l-275 -589l-616 -96q-44 -6 -58 -49q-14 -42 17 -74l448 -457l-107 -648q-8 -45 30 -72q3 -2 9 -5q17 -10 36 -10t35 9l549 305l549 -305q16 -9 35 -9q20 0 36 10q7 3 10 6q37 26 29 71l-106 648l448 457
+q31 33 17 75q-15 42 -59 49zM986 1185q-64 -113 -243 -134l-167 -20h-8q-25 0 -44 17q-20 17 -23 42q-3 28 15 50q17 22 44 25l167 19q104 12 141 66v0h1l114 203q14 24 41 32q26 7 51 -7q24 -13 31 -40t-6 -51z" />
+    <glyph glyph-name="guillemotleft" unicode="&#xab;" horiz-adv-x="2042" 
+d="M1951 0q-38 0 -65 27l-223 223q-103 -65 -223 -65q-172 0 -294 122t-122 294q0 173 122 295t294 122q173 0 295 -122t122 -294q0 -121 -65 -223l223 -223q27 -27 27 -65t-27 -64q-26 -27 -64 -27zM1244 798q-81 -82 -81 -196q0 -115 81 -197q82 -81 196 -81q115 0 197 81
+q81 82 81 197q0 114 -81 196q-82 81 -197 81q-114 0 -196 -81z" />
+    <glyph glyph-name="logicalnot" unicode="&#xac;" 
+d="M1127 1011q-15 -15 -15 -34q0 -16 15 -30q14 -13 32 -13q25 0 43 13t18 30q0 20 -18 34q-17 14 -43 14q-18 0 -32 -14zM958 1352q-21 -17 -21 -43q0 -25 21 -43q20 -16 48 -16q60 0 60 59q0 58 -60 58q-28 0 -48 -15zM627 1352q-23 -17 -23 -43q0 -25 23 -43
+q21 -16 49 -16q25 0 42 16q18 17 18 43q-1 58 -60 58q-28 0 -49 -15zM958 1352q-21 -17 -21 -43q0 -25 21 -43q20 -16 48 -16q60 0 60 59q0 58 -60 58q-28 0 -48 -15zM1127 1011q-15 -15 -15 -34q0 -16 15 -30q14 -13 32 -13q25 0 43 13t18 30q0 20 -18 34q-17 14 -43 14
+q-18 0 -32 -14zM1389 1011q-15 -14 -15 -34q0 -17 14 -30t33 -13q25 0 42 13t17 30q0 20 -17 34t-42 14q-18 0 -32 -14zM1389 1011q-15 -14 -15 -34q0 -17 14 -30t33 -13q25 0 42 13t17 30q0 20 -17 34t-42 14q-18 0 -32 -14zM1127 1011q-15 -15 -15 -34q0 -16 15 -30
+q14 -13 32 -13q25 0 43 13t18 30q0 20 -18 34q-17 14 -43 14q-18 0 -32 -14zM958 1352q-21 -17 -21 -43q0 -25 21 -43q20 -16 48 -16q60 0 60 59q0 58 -60 58q-28 0 -48 -15zM627 1352q-23 -17 -23 -43q0 -25 23 -43q21 -16 49 -16q25 0 42 16q18 17 18 43q-1 58 -60 58
+q-28 0 -49 -15zM300 1748q-300 -300 -300 -724t300 -724t724 -300t724 300t300 724t-300 724t-724 300t-724 -300zM830 764q-70 0 -164 27l-169 -84l48 143q-188 133 -188 318q0 169 139 285q138 115 334 115q174 0 309 -92q136 -94 166 -238q-28 5 -45 5q-169 0 -286 -110
+q-116 -110 -116 -265q1 -49 14 -102q-13 -2 -42 -2zM1433 553q-116 -25 -144 -25q-167 0 -284 101q-116 100 -116 244q0 143 116 243q117 100 284 100q161 0 280 -101q122 -102 122 -242q0 -150 -165 -271l33 -119zM1389 1011q-15 -14 -15 -34q0 -17 14 -30t33 -13
+q25 0 42 13t17 30q0 20 -17 34t-42 14q-18 0 -32 -14zM1127 1011q-15 -15 -15 -34q0 -16 15 -30q14 -13 32 -13q25 0 43 13t18 30q0 20 -18 34q-17 14 -43 14q-18 0 -32 -14zM1006 1367q-28 0 -48 -15q-21 -17 -21 -43q0 -25 21 -43q20 -16 48 -16q60 0 60 59q0 58 -60 58z
+M627 1352q-23 -17 -23 -43q0 -25 23 -43q21 -16 49 -16q25 0 42 16q18 17 18 43q-1 58 -60 58q-28 0 -49 -15zM627 1352q-23 -17 -23 -43q0 -25 23 -43q21 -16 49 -16q25 0 42 16q18 17 18 43q-1 58 -60 58q-28 0 -49 -15zM958 1352q-21 -17 -21 -43q0 -25 21 -43
+q20 -16 48 -16q60 0 60 59q0 58 -60 58q-28 0 -48 -15zM1127 1011q-15 -15 -15 -34q0 -16 15 -30q14 -13 32 -13q25 0 43 13t18 30q0 20 -18 34q-17 14 -43 14q-18 0 -32 -14zM1389 1011q-15 -14 -15 -34q0 -17 14 -30t33 -13q25 0 42 13t17 30q0 20 -17 34t-42 14
+q-18 0 -32 -14zM627 1352q-23 -17 -23 -43q0 -25 23 -43q21 -16 49 -16q25 0 42 16q18 17 18 43q-1 58 -60 58q-28 0 -49 -15zM1389 1011q-15 -14 -15 -34q0 -17 14 -30t33 -13q25 0 42 13t17 30q0 20 -17 34t-42 14q-18 0 -32 -14z" />
+    <glyph glyph-name="uni00AD" unicode="&#xad;" horiz-adv-x="1763" 
+d="M1242 1124q158 158 158 380q0 223 -158 380q-158 158 -381 158q-222 0 -380 -158q-158 -157 -158 -380q0 -222 158 -380t380 -158q223 0 381 158zM692 1473q25 -11 36 -36q9 -20 20 -35q50 -68 133 -68q84 0 134 68q12 17 20 35q10 26 36 37q26 10 52 0q25 -11 36 -37
+q11 -25 0 -51q-14 -33 -35 -63q-91 -124 -242 -124q-152 0 -242 124q-21 28 -35 61q-11 26 -1 52t36 37q26 10 52 0zM680 915q-281 0 -481 -199q-199 -199 -199 -480v-40q0 -132 197 -172q123 -24 483 -24h403q353 0 477 24q203 40 203 172v40q0 281 -199 480
+q-200 199 -481 199h-403z" />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="2044" 
+d="M1746 1274q-14 41 -34 82l111 166q25 38 21 84q-5 45 -37 78l-123 122q-37 38 -90 38q-39 0 -71 -22l-166 -111q-42 21 -83 35l-39 195q-9 45 -44 74q-36 29 -82 29h-173q-46 0 -81 -29q-36 -29 -45 -74l-39 -195q-39 -14 -82 -35l-167 112q-32 21 -71 21q-53 0 -90 -37
+l-123 -123q-32 -33 -37 -78q-4 -45 21 -84l111 -166q-20 -41 -34 -82l-196 -40q-45 -9 -74 -44t-29 -81v-174q0 -46 29 -81t74 -44l196 -39q14 -42 34 -83l-111 -166q-26 -38 -21 -84q4 -45 37 -77l123 -123q37 -38 90 -38q39 0 71 22l166 111q41 -20 82 -34l39 -196
+q9 -45 45 -74q35 -29 81 -29h174q45 0 81 29q35 29 44 74l39 196q39 13 82 34l167 -111q32 -22 71 -22q52 0 90 38l123 123q32 32 37 77q4 46 -21 84l-111 166q20 42 34 83l196 39q45 9 74 44q29 36 29 81v174q0 46 -28 81q-29 35 -74 44zM1721 896q-72 -14 -96 -83
+q-12 -35 -28 -69q-32 -66 8 -127l111 -166l-123 -123l-166 111q-32 22 -71 22q-29 0 -56 -13q-34 -17 -68 -29q-69 -24 -83 -95l-40 -196h-173l-39 196q-15 71 -84 95q-35 12 -69 29q-26 13 -55 13q-39 0 -71 -22l-167 -111l-123 123l111 166q41 61 9 127q-17 35 -29 69
+q-24 69 -95 83l-196 40v173l196 40q72 14 95 83q13 36 29 69q32 65 -9 126l-111 166l123 123l166 -111q32 -21 71 -21q29 0 56 13q35 16 69 28q69 24 83 96l39 195h174l39 -196q15 -71 83 -95q37 -13 69 -29q27 -12 56 -12q39 0 71 21l166 111l123 -123l-111 -166
+q-40 -61 -8 -127q16 -35 28 -69q24 -69 96 -83l195 -40v-173zM706 1339q-131 -131 -131 -317q0 -185 131 -316t316 -131q186 0 317 131t131 316t-132 316q-131 132 -316 132t-316 -131zM816 816q-86 85 -86 206t86 207q85 85 206 85t207 -85q85 -86 85 -207t-85 -206
+q-86 -86 -207 -86t-206 86z" />
+    <glyph glyph-name="macron" unicode="&#xaf;" horiz-adv-x="1877" 
+d="M1125 55q83 53 126 142h-625q43 -89 126 -142q85 -55 187 -55q101 0 186 55zM1778 494q-65 18 -106 70q-42 54 -42 123l1 2v2h-1v543h-1q-9 255 -177 446q-167 190 -415 233v12q0 51 -36 87t-87 36t-88 -36q-36 -36 -36 -87v-12q-248 -43 -414 -233q-168 -191 -177 -446
+h-1v-543h-1q1 -18 1 -11q0 -134 -123 -190q-75 -18 -75 -95q0 -41 29 -70t70 -29h1680q40 0 69 29t29 70t-29 70t-69 29h-1zM343 494q53 90 53 196q0 1 -1 4v4v486h1q-1 21 -1 25q0 215 152 367q152 151 367 151t367 -151q152 -152 152 -367q0 -4 -2 -25h2v-493
+q0 -106 53 -197h-1143z" />
+    <glyph glyph-name="uni00B3" unicode="&#xb3;" 
+d="M300 300q-300 300 -300 724t300 724t724 300t724 -300t300 -724t-300 -724t-724 -300t-724 300zM407 1641q-255 -256 -255 -617t255 -617q256 -255 617 -255t617 255q255 256 255 617t-255 617q-256 255 -617 255t-617 -255zM464 531q-20 0 -33 14q-14 13 -14 32v21
+q0 19 14 33q13 14 33 14h105v834q0 47 33 81q33 33 81 33h455q47 0 80 -33q34 -34 34 -81v-834h113v636q0 19 14 33q14 13 33 13h21q19 0 33 -13q13 -14 13 -33v-636h105q20 0 33 -14q14 -13 14 -33v-20q0 -20 -14 -33q-13 -14 -33 -14h-1120zM1138 1403q0 32 -22 54
+q-23 22 -54 22h-303q-32 0 -54 -22t-22 -54v-758h455v758v0zM964 1343q22 -22 22 -54q0 -31 -22 -53t-54 -22q-31 0 -53 22q-23 22 -23 53q0 32 23 54q22 22 53 22q32 0 54 -22zM964 1116q22 -23 22 -54q0 -32 -22 -54t-54 -22q-31 0 -53 22q-23 22 -23 54q0 31 23 54
+q22 22 53 22q32 0 54 -22zM964 888q22 -22 22 -54q0 -31 -22 -54q-22 -22 -54 -22q-31 0 -53 22q-23 23 -23 54q0 32 23 54q22 22 53 22q32 0 54 -22z" />
+    <glyph glyph-name="acute" unicode="&#xb4;" 
+d="M300 1748q-300 -300 -300 -724t300 -724t724 -300t724 300t300 724t-300 724t-724 300t-724 -300zM407 407q-255 256 -255 617t255 617q256 255 617 255t617 -255q255 -256 255 -617t-255 -617q-256 -255 -617 -255t-617 255zM1130 1567q-44 27 -106 27t-106 -27
+l-457 -281q-44 -27 -44 -65t44 -64l457 -281q44 -27 106 -27t106 27l457 281q44 26 44 64t-44 65zM1101 985q-32 -19 -77 -19t-77 19l-336 193q-32 18 -32 44t32 45l336 192q32 18 77 18t77 -18l336 -193q32 -18 32 -44t-32 -45zM1587 1090q44 -27 44 -65t-44 -65l-457 -281
+q-44 -27 -106 -27t-106 27l-457 281q-44 27 -44 65t44 65l150 -109l336 -193q32 -18 77 -18t77 18l336 193zM1587 894q44 -27 44 -65t-44 -65l-457 -281q-44 -27 -106 -27t-106 27l-457 281q-44 27 -44 65t44 64l150 -109l336 -192q32 -18 77 -18t77 18l336 193z" />
+    <glyph glyph-name="mu" unicode="&#xb5;" horiz-adv-x="3103" 
+d="M628 286q-399 265 -599 675l-29 60l29 60q200 409 599 675q429 286 923 286q495 0 924 -286q398 -266 599 -675l29 -60l-29 -60q-200 -409 -599 -675q-429 -286 -924 -286q-494 0 -923 286zM791 504q352 -231 760 -231q409 0 761 231q311 204 485 517q-174 313 -485 517
+q-352 231 -761 231q-408 0 -760 -231q-311 -204 -485 -517q174 -313 485 -517zM1188 658q-150 150 -150 363q0 212 150 363q151 151 363 151q213 0 364 -151q150 -151 150 -363q0 -213 -150 -363q-151 -151 -364 -151q-212 0 -363 151zM1360 1213q-80 -80 -80 -192t80 -192
+q79 -79 191 -79t192 79q80 80 80 192t-80 192q-80 79 -192 79t-191 -79z" />
+    <glyph glyph-name="paragraph" unicode="&#xb6;" horiz-adv-x="1763" 
+d="M1242 1124q158 158 158 380q0 223 -158 380q-158 158 -381 158q-222 0 -380 -158q-158 -157 -158 -380q0 -222 158 -380t380 -158q223 0 381 158zM692 1473q25 -11 36 -36q9 -20 20 -35q50 -68 133 -68q84 0 134 68q12 17 20 35q10 26 36 37q26 10 52 0q25 -11 36 -37
+q11 -25 0 -51q-14 -33 -35 -63q-91 -124 -242 -124q-152 0 -242 124q-21 28 -35 61q-11 26 -1 52t36 37q26 10 52 0zM680 915q-281 0 -481 -199q-199 -199 -199 -480v-40q0 -132 197 -172q123 -24 483 -24h403q353 0 477 24q203 40 203 172v40q0 281 -199 480
+q-200 199 -481 199h-403z" />
+    <glyph glyph-name="periodcentered" unicode="&#xb7;" 
+d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM150 1024q0 -362 256 -618t618 -256t618 256t256 618t-256 618t-618 256t-618 -256t-256 -618zM916 944v624q0 31 23 53q22 22 53 23
+q31 0 52 -23q22 -22 23 -53v-592l218 -220q22 -22 22 -53t-22 -53t-53 -22t-53 22l-240 241q-22 22 -23 53z" />
+    <glyph glyph-name="cedilla" unicode="&#xb8;" horiz-adv-x="1644" 
+d="M822 1238l-822 -940h1644z" />
+    <glyph glyph-name="uni00B9" unicode="&#xb9;" horiz-adv-x="1644" 
+d="M1644 1238h-1644l822 -940z" />
+    <glyph glyph-name="ordmasculine" unicode="&#xba;" horiz-adv-x="2332" 
+d="M2084 702h-24v-4q-36 -6 -59 -32t-25 -62v-568q-4 -44 -34 -70t-72 -26h-1546q-44 0 -73 26t-33 70v1388q4 42 33 69t73 27h858q28 -4 53 8t40 37t15 53t-15 52t-40 36t-53 10h-858q-130 2 -221 -80t-103 -212v-1388q10 -130 102 -212t222 -80h1546q130 -2 221 80
+t103 212v568q-4 42 -35 70t-75 28zM2296 1336l-474 426q-22 20 -49 27t-56 0t-49 -25t-28 -45t0 -52t28 -43l302 -272q-302 -22 -522 -98t-364 -212q-148 -140 -221 -349t-73 -495q0 -28 15 -50t40 -35t54 -13t54 13t39 35t16 50q-4 212 56 416q52 166 176 288
+q134 124 310 176q194 62 398 76l-280 -254q-22 -20 -29 -49t7 -57t40 -44t60 -16q42 0 76 28l474 428q36 26 36 72t-36 74z" />
+    <glyph glyph-name="guillemotright" unicode="&#xbb;" horiz-adv-x="1660" 
+d="M10 634l516 -518q12 -10 26 0l1096 1070q12 14 0 28l-70 66q-14 10 -26 0l-1002 -840q-14 -10 -26 -2l-400 318q-14 10 -26 -2l-88 -94q-10 -12 0 -26z" />
+  </font>
+</defs></svg>

binární
src/web/staticres/common-module/mainSearch/fonts/jyAPP.ttf


binární
src/web/staticres/common-module/mainSearch/fonts/jyAPP.woff


binární
src/web/staticres/common-module/mainSearch/image/img-empty.png


+ 718 - 0
src/web/staticres/common-module/mainSearch/js/utils.js

@@ -0,0 +1,718 @@
+/**
+ * utils.js v0.0.1
+ * 各类js工具函数
+ */
+
+/*
+   * 时间格式化函数(将时间格式化为,2019年08月12日,2019-08-12,2019/08/12的形式)
+   *
+   *
+   *   pattern参数(想要什么格式的数据就传入什么格式的数据)
+   *     · 'yyyy-MM-dd'  ---> 输出如2019-09-20
+   *     · 'yyyy-MM-dd hh:mm'  --->  输出如2019-09-20 08:20
+   *     · 'yyyy-MM-dd HH:mm:ss'  --->  输出如2019-09-20 18:20:23
+   *     · 'yyyy/MM/dd'  --->  输出如2019/09/20
+   *     · 'yyyy年MM月dd日'  --->  输出如2019年09月20日
+   *     · 'yyyy年MM月dd日 hh时mm分'  --->  输出如2019年09月20日 08时20分
+   *     · 'yyyy年MM月dd日 hh时mm分ss秒'  --->  输出如2019年09月20日 08时20分23秒
+   *     · 'yyyy年MM月dd日 hh时mm分ss秒 EE'  --->  输出如2019年09月20日 08时20分23秒 周二
+   *     · 'yyyy年MM月dd日 hh时mm分ss秒 EEE'  --->  输出如2019年09月20日 08时20分23秒 星期二
+   *
+   *  参考: https://www.cnblogs.com/mr-wuxiansheng/p/6296646.html
+   */
+Date.prototype.pattern = function (fmt) {
+    if (!fmt) return ''
+    var o = {
+        'y+': this.getFullYear(),
+        'M+': this.getMonth() + 1, // 月份
+        'd+': this.getDate(), // 日
+        // 12小时制
+        'h+': this.getHours() % 12 == 0 ? 12 : this.getHours() % 12, // 小时
+        // 24小时制
+        'H+': this.getHours(), // 小时
+        'm+': this.getMinutes(), // 分
+        's+': this.getSeconds(), // 秒
+        'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+        'S': this.getMilliseconds(), // 毫秒
+        'E+': this.getDay(), // 周
+    };
+    var week = {
+        '0': '日',
+        '1': '一',
+        '2': '二',
+        '3': '三',
+        '4': '四',
+        '5': '五',
+        '6': '六'
+    };
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    if (/(E+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? '星期' : '周') : '') + week[
+            this.getDay() + '']);
+    }
+    for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k])
+                .length)));
+        }
+    }
+    return fmt;
+}
+/*  挂载到Number原型上,格式化小数用tofixed会造成位数不够补零的情况(处理不让自动补零)
+    栗子: 不是number类型的需要转一下
+        Number('').fixed()
+        Number('213412DDD').fixed()
+        1234.152354.fixed()
+        1234.152354.fixed(2)
+        1234.152354.fixed(10)
+*/
+Number.prototype.fixed = function(len){
+    len = isNaN(len)?  0 : len
+    var num = Math.pow(10,len)
+    return Math.round(this*num) / num
+}
+
+var popupTip = {
+    setAlert: function (obj) {
+        var html =  `<p class="shiyong_text">试用功能数额已超限,请购买剑鱼大会员正式版</p><button onClick="location.href='/jyapp/big/page/landingPage'" class="shiyong_buy">立即购买</button>`
+        obj.$dialog.alert({
+            className: 'shiyong_common',
+            title: '温馨提醒',
+            message: html,
+            theme: 'round-button',
+            confirmButtonText:'取消,暂不使用',
+            confirmButtonColor:'#2ABED1'
+        }).then(() => {
+            // on close
+        });
+    }
+}
+
+
+var utils = {
+    // utils版本号
+    version: '0.0.1',
+    isWeiXinBrowser: navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1,
+    isAndroid: navigator.userAgent.toLowerCase().indexOf('android') !== -1,
+    isIos: /iphone|ipod|ipad|ios/.test(navigator.userAgent.toLowerCase()),
+    // 传入你要获取的参数的名字
+    getParam: function (name) {
+        var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+        var r = window.location.search.substr(1).match(reg); //获取url中'?'符后的字符串并正则匹配
+
+        var context = '';
+        if (r != null) context = r[2];
+        // 释放变量
+        reg = null;
+        r = null;
+        return context == null || context == '' || context == 'undefined' ? '' : context;
+    },
+    // 取[m, n]随机数
+    getRandomNumber: function (min, max) {
+        return Math.floor(Math.random() * (max - min + 1) + min);
+    },
+    // 获取唯一的uuid
+    // https://www.kancloud.cn/ifeng/js100/622666
+    getRandomUuid: function () {
+        var s = [];
+        var hexDigits = "0123456789abcdef";
+        for (var i = 0; i < 36; i++) {
+            s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+        }
+        s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
+        s[8] = s[13] = s[18] = s[23] = "-";
+
+        var uuid = s.join("");
+        return uuid;
+    },
+    // 获取随机字符串
+    // 不传参数则获取长度不固定的字符串
+    getRandomString: function (len) {
+        var randomString = '';
+        if (len) {
+            /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+            var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+            var maxPos = $chars.length;
+            for (i = 0; i < len; i++) {
+                randomString += $chars.charAt(Math.floor(Math.random() * maxPos));
+            }
+        } else {
+            // Math.random()  生成随机数字, eg: 0.123456
+            // .toString(36)  转化成36进制 : "0.4fzyo82mvyr"
+            // .substring(2)  去掉前面两位 : "yo82mvyr"
+            // .slice(-8)  截取最后八位 : "yo82mvyr"
+            randomString = Math.random().toString(36).substring(2)
+        }
+        return randomString;
+    },
+    // FROM: https://www.jianshu.com/p/90ed8b728975
+    // 比较两个对象是否相等
+    // 返回true为相等,返回false为不相等
+    deepCompare: function (x, y) {
+        var i, l, leftChain, rightChain;
+        function compare2Objects(x, y) {
+            var p;
+            // remember that NaN === NaN returns false
+            // and isNaN(undefined) returns true
+            if (isNaN(x) && isNaN(y) && typeof x === 'number' && typeof y === 'number') {
+                return true;
+            }
+
+            // Compare primitives and functions.
+            // Check if both arguments link to the same object.
+            // Especially useful on the step where we compare prototypes
+            if (x === y) {
+                return true;
+            }
+
+            // Works in case when functions are created in constructor.
+            // Comparing dates is a common scenario. Another built-ins?
+            // We can even handle functions passed across iframes
+            if ((typeof x === 'function' && typeof y === 'function') ||
+                (x instanceof Date && y instanceof Date) ||
+                (x instanceof RegExp && y instanceof RegExp) ||
+                (x instanceof String && y instanceof String) ||
+                (x instanceof Number && y instanceof Number)) {
+                return x.toString() === y.toString();
+            }
+
+            // At last checking prototypes as good as we can
+            if (!(x instanceof Object && y instanceof Object)) {
+                return false;
+            }
+
+            if (x.isPrototypeOf(y) || y.isPrototypeOf(x)) {
+                return false;
+            }
+
+            if (x.constructor !== y.constructor) {
+                return false;
+            }
+
+            if (x.prototype !== y.prototype) {
+                return false;
+            }
+
+            // Check for infinitive linking loops
+            if (leftChain.indexOf(x) > -1 || rightChain.indexOf(y) > -1) {
+                return false;
+            }
+
+            // Quick checking of one object being a subset of another.
+            // todo: cache the structure of arguments[0] for performance
+            for (p in y) {
+                if (y.hasOwnProperty(p) !== x.hasOwnProperty(p)) {
+                    return false;
+                } else if (typeof y[p] !== typeof x[p]) {
+                    return false;
+                }
+            }
+
+            for (p in x) {
+                if (y.hasOwnProperty(p) !== x.hasOwnProperty(p)) {
+                    return false;
+                } else if (typeof y[p] !== typeof x[p]) {
+                    return false;
+                }
+
+                switch (typeof (x[p])) {
+                    case 'object':
+                    case 'function':
+
+                        leftChain.push(x);
+                        rightChain.push(y);
+
+                        if (!compare2Objects(x[p], y[p])) {
+                            return false;
+                        }
+
+                        leftChain.pop();
+                        rightChain.pop();
+                        break;
+
+                    default:
+                        if (x[p] !== y[p]) {
+                            return false;
+                        }
+                        break;
+                }
+            }
+
+            return true;
+        }
+
+        if (arguments.length < 1) {
+            return true; //Die silently? Don't know how to handle such case, please help...
+            // throw "Need two or more arguments to compare";
+        }
+
+        for (i = 1, l = arguments.length; i < l; i++) {
+
+            leftChain = []; //Todo: this can be cached
+            rightChain = [];
+
+            if (!compare2Objects(arguments[0], arguments[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    },
+    // 判断变量是否是数组
+    isArray: function (o){
+        return Object.prototype.toString.call(o) == '[object Array]';
+    },
+    // 数组对象根据某一个值进行从小到大冒泡排序
+    // arr 数组
+    // value 字符串
+    bSort: function (arr, value) {
+        var len = arr.length;
+        for (var i = 0; i < len - 1; i++) {
+            for (var j = 0; j < len - 1 - i; j++) {
+                // 相邻元素两两对比,元素交换,大的元素交换到后面
+                if (arr[j][value] > arr[j + 1][value]) {
+                    var temp = arr[j];
+                    arr[j] = arr[j + 1];
+                    arr[j + 1] = temp;
+                }
+            }
+        }
+        return arr;
+    },
+    // 数组去重
+    unique: function (arr) {
+        if (!this.isArray(arr)) {
+            console.log('type error!')
+            return
+        }
+        var array = [];
+        for (var i = 0; i < arr.length; i++) {
+            if (array .indexOf(arr[i]) === -1) {
+                array .push(arr[i])
+            }
+        }
+        return array
+    },
+    // 数组乱序
+    shuffle: function (arr) {
+        var targetArr = JSON.parse(JSON.stringify(arr || []))
+        var hitArr = []
+        var len = targetArr.length
+        for (var i = 0; i < len; i++) {
+            // 获取随机下标
+            var index = Math.floor(Math.random() * targetArr.length)
+            hitArr.push(targetArr[index])
+            targetArr.splice(index, 1)
+        }
+        return hitArr.concat(targetArr)
+    },
+    // 解决ios返回不刷新页面的问题
+    iosBackRefresh: function () {
+        var isPageHide = false;
+        window.addEventListener('pageshow', function () {
+            if (isPageHide) {
+                location.reload();
+            }
+        });
+        window.addEventListener('pagehide', function () {
+            isPageHide = true;
+        });
+    },
+    // ios返回调用函数
+    iosBackInvoke: function (callback) {
+        var isPageHide = false;
+        window.addEventListener('pageshow', function () {
+            if (isPageHide) {
+                callback && callback();
+            }
+        });
+        window.addEventListener('pagehide', function () {
+            isPageHide = true;
+        });
+    },
+    /**
+     * 格式化金钱的函数
+     * @param {number} s 金额必传
+     * @param {int:0-100} n 保留小数的位数(int:0-100)
+     */
+    formatMoney: function (s, n) {
+        if (n === undefined) {
+            n = -1
+        } else {
+            n = n > 0 && n <= 20 ? n : 2;
+        }
+        var intS = parseInt(s)
+        var point = '.'
+        var left;
+        var right;
+        s = parseFloat((s + '').replace(/[^\d\.-]/g, ''))
+        // 没传n,默认(如果为整数,则不保留小数。如果为浮点数,则保留两位小数)
+        if (n === -1) {
+            if (s === intS) {
+                n = 0
+                right = ''
+                point = ''
+            } else {
+                n = 2
+                s = s.toFixed(n);
+                right = s.split('.')[1];
+            }
+            s = s + ''
+            left = s.split('.')[0].split('').reverse();
+        } else {
+            s = parseFloat((s + '').replace(/[^\d\.-]/g, '')).toFixed(n) + '';
+            left = s.split('.')[0].split('').reverse();
+            right = s.split('.')[1];
+        }
+
+        t = '';
+        for (i = 0; i < left.length; i++) {
+            t += left[i] + ((i + 1) % 3 == 0 && (i + 1) != left.length ? ',' : '');
+        }
+
+        var money = t.split('').reverse().join('') + point + right;
+        return money;
+    },
+    // 金额大写,链接:https://juejin.im/post/5a2a7a5051882535cd4abfce
+    // upDigit(1682) result:"人民币壹仟陆佰捌拾贰元整"
+    // upDigit(-1693) result:"欠壹仟陆佰玖拾叁元整"
+    upPrice: function (n) {
+        var fraction = ['角', '分', '厘']
+        var digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
+        var unit = [
+            ['元', '万', '亿'],
+            ['', '拾', '佰', '仟']
+        ]
+        // var head = n < 0 ? '欠人民币' : '人民币'
+        var head = ''
+        n = Math.abs(n)
+        var s = ''
+        for (var i = 0; i < fraction.length; i++) {
+            s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
+        }
+        s = s || '整'
+        n = Math.floor(n)
+        for (var i = 0; i < unit[0].length && n > 0; i++) {
+            var p = ''
+            for (var j = 0; j < unit[1].length && n > 0; j++) {
+                p = digit[n % 10] + unit[1][j] + p
+                n = Math.floor(n / 10)
+            }
+            s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
+            // s = p + unit[0][i] + s;
+        }
+        return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+    },
+    // 手机号中间4位加*
+    addConfusionForTel: function (tel) {
+        var reg = /^(\d{3})\d{4}(\d{4})$/
+        return tel.replace(reg, '$1****$2')
+    },
+    // 手机号加空格
+    addSpaceForTel: function (tel) {
+        var regMap = {
+            isConfuse: /^(\d{3})\*{4}(\d{4})$/,
+            addSpace: /^(\d{3})(\d{4})(\d{4})$/
+        }
+        var confusion = regMap.isConfuse.test(tel)
+        if (confusion) {
+            return tel.replace(regMap.isConfuse, '$1 **** $2')
+        } else {
+            return tel.replace(regMap.addSpace, '$1 $2 $3')
+        }
+    },
+    /**
+     * 时间戳转换 多少秒、多少分、多少小时前、多少天前  超出10天显示年月日
+     * @param {Date} originTime 要转换的时间对象(或者时间戳)
+     */
+    dateFromNow: function (originTime) {
+        if (!originTime) return
+        // 原始时间 - 传入的时间戳
+        var originTimeStamp = +new Date(originTime)
+        // 当前时间戳
+        var nowTimeStamp = +new Date()
+        // 时间戳相差多少
+        var diffTimeStamp = nowTimeStamp - originTimeStamp
+
+        var postfix = diffTimeStamp > 0 ? '前' : '后'
+        // 求绝对值 ms(毫秒)
+        var diffTimeStampAbsMs = Math.abs(diffTimeStamp)
+        var diffTimeStampAbsS = Math.round(diffTimeStampAbsMs / 1000)
+
+        // 10天的秒数
+        var days11 = 11 * 24 * 60 * 60
+        // var dataMap = {
+        //     zh: ['年', '个月', '星期', '天', '小时', '分钟', '秒'],
+        //     number: [365*24*60*60, 30*24*60*60, 7*24*60*60, 24*60*60, 60*60, 60, 1]
+        // }
+        var dataMap = {
+            zh: ['天', '小时', '分钟', '秒'],
+            number: [24 * 60 * 60, 60 * 60, 60, 1]
+        }
+
+        var timeString = ''
+        if (diffTimeStampAbsS > days11) {
+            // 大于10天,则使用正常日期显示
+            var originDate = new Date(originTimeStamp)
+            var nowDate = new Date()
+            // 是否同年
+            var sameYear = originDate.getFullYear() === nowDate.getFullYear()
+            // 如果是当年,则不显示年
+            var patternString = sameYear ? 'MM-dd' : 'yyyy-MM-dd'
+            timeString = originDate.pattern(patternString)
+        } else {
+            for (var i = 0; i < 7; i++) {
+                var inm = Math.floor(diffTimeStampAbsS / dataMap.number[i])
+                if (inm != 0) {
+                    timeString = inm + dataMap.zh[i] + postfix
+                    break
+                }
+            }
+        }
+        return timeString
+    },
+    /**
+     * 输入框获取焦点,隐藏底部固定按钮方法
+     * @param {Array} inputs 传入输入框的DOM对象
+     * @param {Object} footer 按键弹起要隐藏的footer的 DOM对象
+     */
+    inputFocusHideFooter: function (inputs, footer) {
+        var isShowBtn = function (f) {
+            if (f) {
+                footer.style.display = ''
+            } else {
+                footer.style.display = 'none'
+            }
+        }
+
+        // ios监听输入框的软键盘弹起和收起事件
+        if (this.isIos) {
+            inputs.forEach(function (item) {
+                item.addEventListener('focus', function () {
+                    console.log('IOS 键盘弹出')
+                    // IOS 键盘弹起后操作
+                    isShowBtn(false)
+                }, false)
+
+                // IOS 键盘收起:IOS 点击输入框以外区域或点击收起按钮,输入框都会失去焦点,键盘会收起,
+                item.addEventListener('blur', function () {
+                    console.log('IOS 键盘收起')
+                    // IOS 键盘收起后操作
+                    isShowBtn(true)
+                })
+            })
+        }
+
+        // Android 键盘收起:Android 键盘弹起或收起页面高度会发生变化,以此为依据获知键盘收起
+        if (this.isAndroid) {
+            var clientHeight = document.documentElement.clientHeight || document.body.clientHeight
+            window.addEventListener('resize', function () {
+                var nowClientHeight = document.documentElement.clientHeight || document.body.clientHeight
+                if (clientHeight > nowClientHeight) {
+                    // 键盘弹出的事件处理
+                    console.log('Android 键盘弹出')
+                    isShowBtn(false)
+                } else {
+                    console.log('Android 键盘收起')
+                    // 键盘收起的事件处理
+                    isShowBtn(true)
+                }
+            }, false)
+        }
+    },
+    /**
+     * 通用关键字高亮替换
+     * @param {String} value 要高亮的字符串
+     * @param {String|Array} oldChar 要被替换的字符串(或数组)
+     * @param {String|Array} newChar 要替换成的字符串(或数组)
+     *
+     * 比如:要将 - `剑鱼标讯工具函数` 字符串中的 `工具` 高亮
+     * 则此时 value -> `剑鱼标讯工具函数`
+     *        oldChar -> `工具`
+     *        newChar -> `<span class="highlight-text">工具</span>`
+     *
+     * 批量高亮-----
+     * 比如:要将 - `剑鱼标讯工具函数` 字符串中的 `工具` `剑鱼` 高亮
+     * 则此时 value -> `剑鱼标讯工具函数批量高亮`
+     *        oldChar -> ['工具', '剑鱼']
+     *        newChar -> ['<span class="highlight-text">', '</span>']
+     *
+     *   注意:此时newChar为一个长度为2的数组,数组中为高亮标签的起始标签和结束标签
+     *
+     */
+    replaceKeyword: function (value, oldChar, newChar) {
+        var _this = this
+        if (!oldChar || !newChar) return value
+        // oldChar的字符串数组,用来循环替换
+        var oldCharArr = []
+
+        if (this.isArray(oldChar)) {
+            oldCharArr = oldChar.concat()
+        } else {
+            oldCharArr.push(oldChar)
+        }
+
+        // 数组去重
+        oldCharArr = this.unique(oldCharArr)
+
+        try {
+            oldCharArr.forEach(function (item) {
+                // 去空格之后为空字符串,则直接跳过当前替换
+                if (item.replace(/\s+/g, '')) {
+                    var oc = item
+                    oc = oc.replace(/\$/g, '\\$')
+                        .replace(/\(/g, '\\(')
+                        .replace(/\)/g, '\\)')
+                        .replace(/\*/g, '\\*')
+                        .replace(/\+/g, '\\+')
+                        .replace(/\./g, '\\.')
+                        .replace(/\[/g, '\\[')
+                        .replace(/\]/g, '\\]')
+                        .replace(/\?/g, '\\?')
+                        .replace(/\\/g, '\\')
+                        .replace(/\//g, '\\/')
+                        .replace(/\^/g, '\\^')
+                        .replace(/\{/g, '\\{')
+                        .replace(/\}/g, '\\}')
+                        .replace(/\|/g, '\\|')
+
+                    if (_this.isArray(newChar)) {
+                        // 批量高亮
+                        var tempV = value
+                        value = value.replace(new RegExp('(' + oc + ')', 'gmi'), newChar[0] + oc + newChar[1])
+                        if (value === tempV && oc.indexOf('+') !== -1) {
+                          var splitReg = oc.split('\\+')
+                          splitReg.map(function (v) {
+                            value = value.replace(new RegExp('('+v+')', 'gmi'), newChar[0] + v + newChar[1])
+                          })
+                        }
+                    } else {
+                        // 普通单个高亮
+                        value = value.replace(new RegExp('(' + oc + ')', 'gmi'), newChar)
+                    }
+                }
+            })
+        } catch (e) {
+            console.log(e)
+            return value
+        }
+        return value
+    },
+    /**
+     * 批量删除sessionStorage中的数据
+     * @param {RegExp} reg 传入一个要匹配的正则表达式
+     */
+    clearBatchSessionStorage: function (reg) {
+        if (sessionStorage) {
+            var sessKeys = Object.keys(sessionStorage)
+            sessKeys.forEach(function (item) {
+                if (reg.test(item)) {
+                    sessionStorage.removeItem(item)
+                }
+            })
+        }
+    },
+    /**
+     * 获取图片原始宽高
+     * @param {Image/Object} img
+     * @param {Function} callback
+     */
+    getImgNaturalDimensions: function (img, callback) {
+        var naturalSize = {}
+        if (img.naturalWidth && img.naturalHeight) { // 现代浏览器
+            naturalSize.with = img.naturalWidth
+            naturalSize.height = img.naturalHeight
+        } else { // IE6/7/8
+            var image = new Image()
+            image.src = img.src
+            image.onload = function() {
+                naturalSize.with = image.width
+                naturalSize.height = image.height
+                callback && callback(naturalSize)
+            }
+        }
+        return naturalSize
+    },
+    moneyUnit: function (num, type, lv) {
+        if (num === '' || num == null || num == undefined || isNaN(num)) return ''
+        var levelArr = ['元', '万元', '亿元', '万亿元']
+        if (type === void 0) {
+            type = 'string';
+        }
+
+        if (lv === void 0) {
+            lv = 0;
+        }
+
+        if (num === 0) {
+            if (type === 'string') {
+                return '0';
+            }
+
+            if (type === 'lv') {
+                return levelArr[lv];
+            }
+
+            if (type === 'number') {
+                return 0;
+            }
+
+            if (type === 'index') {
+                return lv;
+            }
+        }
+
+        var result = num / Math.pow(10000, lv);
+
+        if (result > 10000 && lv < 2) {
+            return this.moneyUnit(num, type, lv + 1)
+        } else {
+            if (type === 'string') {
+                return String(Math.floor(result * 100) / 100).replace('.00', '') + levelArr[lv];
+            }
+
+            if (type === 'lv') {
+                return levelArr[lv];
+            }
+
+            if (type === 'index') {
+                return lv;
+            }
+
+            if (type === 'number') {
+                return String(Math.floor(result * 100) / 100).replace('.00', '');
+            }
+        }
+    },
+    /**
+     * 防抖
+     * @param {Function} func 函数
+     * @param {Number} delay 延时间隔 默认 200ms
+     * @param {Boolean} immediate 是否首次执行
+     */
+    debounce: function (func, delay, immediate){
+        var timer = null;
+        delay = delay || 200
+        return function() {
+            var context = this;
+            var args = arguments;
+            if(timer) clearTimeout(timer);
+            if(immediate){
+                var doNow = !timer;
+                timer = setTimeout(function(){
+                    timer = null;
+                },delay);
+                if(doNow){
+                    func.apply(context,args);
+                }
+            }else{
+                timer = setTimeout(function(){
+                    func.apply(context,args);
+                },delay);
+            }
+        }
+    }
+}

+ 5 - 5
src/web/staticres/css/wxsearch.css

@@ -2416,11 +2416,11 @@ body{
 /*******************字体图标**************************/
 @font-face {
 	font-family: 'jyapp';
-	src: url('/jyapp/fonts/jyAPP.eot?v=51430');
-	src: url('/jyapp/fonts/jyAPP.eot?v=51430#iefix') format('embedded-opentype'),
-	url('/jyapp/fonts/jyAPP.woff?v=51430') format('woff'),
-	url('/jyapp/fonts/jyAPP.ttf?v=51430') format('truetype'),
-	url('/jyapp/fonts/jyAPP.svg?v=51430') format('svg');
+	src: url('/common-module/mainSearch/fonts/jyAPP.eot?v=51430');
+	src: url('/common-module/mainSearch/fonts/jyAPP.eot?v=51430#iefix') format('embedded-opentype'),
+	url('/common-module/mainSearch/fonts/jyAPP.woff?v=51430') format('woff'),
+	url('/common-module/mainSearch/fonts/jyAPP.ttf?v=51430') format('truetype'),
+	url('/common-module/mainSearch/fonts/jyAPP.svg?v=51430') format('svg');
 }
 
 .jyapp-icon {

+ 4 - 4
src/web/staticres/js/wxSupersearch.js

@@ -203,13 +203,13 @@ var SuperSearch = {
 		});
 		//筛选菜单展示or隐藏
 		$("#supersearchPage").on("tap" , "#clickFilter", function(){
+      if ($(this).text().trim() !== '筛选' || $("#search-header-input").val().trim() === '') {
+        return
+      }
       if (vMainSearchComponent) {
         vMainSearchComponent.toggleEntShow(true)
       }
 		  return;
-		    if ($(this).text().trim() !== '筛选') {
-		        return
-            }
 			hideTab();
 			SuperSearch.inputBlur();
 			if(SuperSearch.requesting){
@@ -262,7 +262,7 @@ var SuperSearch = {
 		});
 		//提交查询
 		$("#supersearchPage").on('click', "#clickFilter",function(){
-            if ($(this).text().trim() !== '搜索') {
+            if ($(this).text().trim() !== '搜索' || $("#search-header-input").val().trim() === '') {
                 return
             }
             sessionStorage.setItem('isSearchListPage', 'true')

+ 1 - 1
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -112,7 +112,7 @@
 </style>
 <body>
 <div class="j-container">
-    <div id="ent-portrait" class="j-main">
+    <div id="ent-portrait" class="j-main" v-cloak>
         <div class="j-header ent-header">
             <span class="j-icon icon-company"></span>
             <span class="ent-title">${ entInfo.name }</span>

+ 13 - 1
src/web/templates/frontRouter/wx/collection/sess/index.html

@@ -34,7 +34,7 @@
   <div class="j-container">
     {{include "/big-member/header.html"}}
     <div class="j-main collection" id="myCollection" v-cloak ref="main">
-      <div class="j-container">
+      <div class="j-container" v-if="listState.list.length!==0">
         <div class="j-main">
           <div class="search-container van-fade-an" ref="searchContainer">
             <div class="listaction">
@@ -95,6 +95,18 @@
           </div>
         </div>
       </div>
+      <div class="j-container" v-if="listState.list.length==0">
+        <div class="j-main">
+          <div class="emptycom">
+            <div class="emptyimg">
+              <img src='{{Msg "seo" "cdn"}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
+            </div>
+            <div class="emptytext">
+              您还没有收藏标讯
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
   <!--S-当前页面的资源-->

+ 2 - 2
src/web/templates/weixin/search/mainSearch.html

@@ -889,14 +889,14 @@
 </div>
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/notice-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/cate-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/ent-search/ent-search-template.js'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/ent-search/ent-search-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
     window.jyUserPower = {
       entniche: false,

+ 5 - 7
src/web/templates/weixin/search/tabSearch.html

@@ -1,9 +1,9 @@
 <!--S-当前页必定需要预加载的资源-->
-<link rel="preload" as="style" href='{{Msg "seo" "cdn"}}/jyapp/big-member/css/j-icons.css?v={{Msg "seo" "version"}}' />
+<link rel="preload" as="style" href='{{Msg "seo" "cdn"}}/common-module/mainSearch/css/j-icons.css?v={{Msg "seo" "version"}}' />
 <!--E-当前页必定需要预加载的资源-->
 
 <!--S-当前页面的css资源-->
-<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/jyapp/big-member/css/j-icons.css?v={{Msg "seo" "version"}}' />
+<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/mainSearch/css/j-icons.css?v={{Msg "seo" "version"}}' />
 <!--E-当前页面的css资源-->
 
 <style>
@@ -1254,7 +1254,7 @@
 <!--E-页面-->
 
 <!--S-脚本-->
-<script src='{{Msg "seo" "cdn"}}/jyapp/big-member/js/utils.js'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/utils.js'></script>
 <script>
 
     function ajaxQueryAssociateList (data, callback) {
@@ -1662,10 +1662,8 @@
             landname: $(this).text()
         }))
         SuperSearch.setSessionStorage()
-        if(!isMember){
-           location.href = "/jyapp/big/page/landingPage"
-        }else{
-          location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent($(this).attr('data-eId'))
+        if (vEntSearchComponent) {
+          vEntSearchComponent.selectEnt({ name: $(this).text(), _id: $(this).attr('data-eid')})
         }
     }
 

+ 2 - 2
src/web/templates/weixin/wxinfocontent_rec.html

@@ -28,7 +28,7 @@ a:visited{text-decoration:none; }/*指已经访问过的链接*/
 
 a:hover{text-decoration:none;}/*指鼠标在链接*/
 
-a:active{text-decoration:none;}/* 指正在点的链接*/ 
+a:active{text-decoration:none;}/* 指正在点的链接*/
 table {
     border-collapse: inherit !important;
     border-spacing: 2px !important;
@@ -969,7 +969,7 @@ pre {
 </div>
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=/common-module/keep-tags/keep-tags-template.js></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
 sessionStorage.removeItem("remind"); //开标提醒标识
 var inithgt = 45;//tab高度

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů