Merge branch 'dev/v4.8.46_wmh' of qmx/jy into feature/v4.8.46

src/web/staticres/css/dev2/newBidSearch.css

@@ -17,15 +17,15 @@
 
 .searchSpace .search-list .search-list-checkbox{
   float: left;
-  padding-left: 22px;
+  padding-left: 28px;
   cursor: pointer;
-  background: url(/images/biddingSearch/icon-checkbox.png) no-repeat center left;
-  background-size: 14px 14px;
+  background: url(/images/biddingSearch/icon-checkbox-new.png) no-repeat center left;
+  background-size: 22px 22px;
   border: 0;
 }
 .searchSpace .search-list-checkbox.checkbox-checked{
-  background: url(/images/biddingSearch/icon-checked.png) no-repeat center left;
-  background-size: 14px 14px;
+  background: url(/images/biddingSearch/icon-checked-new.png) no-repeat center left;
+  background-size: 22px 22px;
 }
 .searchSpace .search-list .icon-vip{
   /* float: left; */

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

@@ -589,9 +589,14 @@
     height: 18px;
     margin-left: 8px;
 }
-.searchSpace .vip_box .search-list-checkbox{
-  background: url(/images/biddingSearch/novip-icon.png) no-repeat center left !important;
-  background-size: 14px 14px!important;
+.searchSpace .vip_box .search-list .search-list-checkbox{
+  background: url(/images/biddingSearch/novip-icon.png) no-repeat center left;
+  background-size: 22px 22px;
+
+}
+.searchSpace .vip_box .search-list .search-list-checkbox.checkbox-checked{
+  background: url(/images/biddingSearch/novip-icon-check.png) no-repeat center left;
+  background-size: 22px 22px;
 
 }
 .searchSpace .vip_box .search-list-checkbox em{

src/web/templates/pc/supsearch.html

@@ -1037,7 +1037,7 @@
             <div class="leftTitle">
               搜索范围：
             </div>
-            <div class="search-content" v-if = "vipState || !islogin">
+            <div class="search-content" v-show = "vipState || !islogin">
               <!-- <span class="search-list">
                 <span data-name="all" class="search-list-checkbox">全部</span>
               </span> -->
@@ -1090,7 +1090,7 @@
               </span>
             </div>
             <!-- 非VIP用户 -->
-            <div class="search-content flex-box" v-else> 
+            <div class="search-content flex-box" v-show = "!(vipState || !islogin)"> 
               <!-- <span class="search-list">
                 <span data-name="all" class="search-list-checkbox">全部</span>
               </span> -->
@@ -1106,9 +1106,11 @@
               <div class="vip_box">
                 <span class="search-list nologin-hide">
                   <span data-name="ppa" class="search-list-checkbox" onClick="return openVipDialog();">项目名称/标的物</span>
+                  <span class="icon-vip"></span>
                 </span>
                 <span class="search-list nologin-hide">
                   <span data-name="buyer" class="search-list-checkbox" onClick="return openVipDialog();">采购单位</span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -1117,7 +1119,8 @@
                   </span>
                 </span>
                 <span class="search-list nologin-hide">
-                  <span data-name="winner" class="search-list-checkbox" onClick="return openVipDialog();">中标企业<em style="color: #B1700E;font-size: 12px;"> 老用户免费专享</em></span>
+                  <span data-name="winner" class="search-list-checkbox">中标企业<em style="color: #B1700E;font-size: 12px;"> 老用户免费专享</em></span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -1127,6 +1130,7 @@
                 </span>
                 <span class="search-list nologin-hide">
                   <span data-name="agency" class="search-list-checkbox" onClick="return openVipDialog();">招标代理机构</span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -2415,7 +2419,7 @@
       var hasVipIcon = $(this).siblings().hasClass('icon-vip'); // 有无点击付费的搜索范围
       // 如果是老用户（版本更新前注册的用户）可以使用中标企业搜索范围
       // 不是付费用户引导去付费
-      // console.log(vipState, hasVipIcon);
+      console.log(vipState, hasVipIcon);
       if (!vipState && hasVipIcon) {
         if($(this).text().indexOf('中标企业')> -1 && isOld) {
           var typeArr = selectType ? selectType.split(',') : []