Merge remote-tracking branch 'origin/dev4.5.1' into dev4.5.1

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -879,6 +879,9 @@ var SuperSearch = {
     SuperSearch.reqParam["pageNum"]++;//翻页请求
   },
   initDropload: function(hasNextPage,pgNum){
+    $("#supersearchPage .tabs-box").addClass("hidden")
+    $("#supersearchPage #selLable").removeClass("hidden");
+    $("#supersearchPage #selLable").show();
     $(".loading_").show();
     $("#wrapper").css('opacity', '0')
     $("#supersearchPage #working").removeClass("hidden");
@@ -901,64 +904,64 @@ var SuperSearch = {
       $(".loading_").hide();
       $("#supersearchPage #working").addClass("hidden");
       $("#wrapper").css('opacity', 'unset')
-    SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
-      scrollArea: $("#supersearchPage .app-layout-content-b #wrapper"),
-      loadDownFn: function(me){
-        if(SuperSearch.dropload == null){
-          SuperSearch.dropload = me;
-        }
-        if(!hasNextPage){
-          SuperSearch.noMoreData();
-          return;
-        }
-        if(SuperSearch.limitFlag){
-          setTimeout(function(){
-            SuperSearch.limitPaging(me);
-          },500);
-          return
-        }
-        if(SuperSearch.secondFlag=="T"&&SuperSearch.reqParam["pageNum"]==2){
-          var html = SuperSearch.getHtml(SuperSearch.secondList,SuperSearch.reqParam["pageNum"]);
-          // 每次数据插入，必须重置
-          SuperSearch.appendListHtml(html);
-          SuperSearch.noMoreData();
-          return;
-        }
-        $.ajax({
-          type: 'post',
-          url: '/jyapp/swordfish/searchlist/paging',
-          data: SuperSearch.reqParam,
-          dataType: 'json',
-          success: function(data){
-            //没有数据
-            if(data["list"] == null || data["list"].length == 0){
-              SuperSearch.noMoreData();
-              $(".loading_").hide();
-              return;
-            }
-            var html = SuperSearch.getHtml(data["list"],SuperSearch.reqParam["pageNum"]);
+      SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
+        scrollArea: $("#supersearchPage .app-layout-content-b #wrapper"),
+        loadDownFn: function(me){
+          if(SuperSearch.dropload == null){
+            SuperSearch.dropload = me;
+          }
+          if(!hasNextPage){
+            SuperSearch.noMoreData();
+            return;
+          }
+          if(SuperSearch.limitFlag){
+            setTimeout(function(){
+              SuperSearch.limitPaging(me);
+            },500);
+            return
+          }
+          if(SuperSearch.secondFlag=="T"&&SuperSearch.reqParam["pageNum"]==2){
+            var html = SuperSearch.getHtml(SuperSearch.secondList,SuperSearch.reqParam["pageNum"]);
             // 每次数据插入，必须重置
-            //$(".app-layout-content-b").css("overflow-y","unset")
             SuperSearch.appendListHtml(html);
-            //没有下一页了 || 和pc端保持一致 最多显示500条
-            //console.log(member_status)
-            var count =10;
-            if (member_status>0){
-              count=40;
-            }
-            if(!data.hasNextPage||SuperSearch.reqParam["pageNum"]==count){
-              SuperSearch.noMoreData();
-              return;
-            }
-            me.resetload();
-            SuperSearch.reqParam["pageNum"]++;//翻页请求
-          },
-          error: function(xhr, type){
             SuperSearch.noMoreData();
+            return;
           }
-        });
-      }
-    });
+          $.ajax({
+            type: 'post',
+            url: '/jyapp/swordfish/searchlist/paging',
+            data: SuperSearch.reqParam,
+            dataType: 'json',
+            success: function(data){
+              //没有数据
+              if(data["list"] == null || data["list"].length == 0){
+                SuperSearch.noMoreData();
+                $(".loading_").hide();
+                return;
+              }
+              var html = SuperSearch.getHtml(data["list"],SuperSearch.reqParam["pageNum"]);
+              // 每次数据插入，必须重置
+              //$(".app-layout-content-b").css("overflow-y","unset")
+              SuperSearch.appendListHtml(html);
+              //没有下一页了 || 和pc端保持一致 最多显示500条
+              //console.log(member_status)
+              var count =10;
+              if (member_status>0){
+                count=40;
+              }
+              if(!data.hasNextPage||SuperSearch.reqParam["pageNum"]==count){
+                SuperSearch.noMoreData();
+                return;
+              }
+              me.resetload();
+              SuperSearch.reqParam["pageNum"]++;//翻页请求
+            },
+            error: function(xhr, type){
+              SuperSearch.noMoreData();
+            }
+          });
+        }
+      });
       //判断是否是table  (2.7.5table只显示20条数据)
       if(!sessionStorage.superSearch_showType){
         if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
@@ -971,7 +974,10 @@ var SuperSearch = {
         SuperSearch.noMoreData();
         return;
       }
-    }, 10)
+      if ($(".dropload-refresh").length) {
+        SuperSearch.dropload.opts.loadDownFn(SuperSearch.dropload)
+      }
+    }, 50)
   },
   clearSessionStorage: function(){
     if(!sessionStorage){

src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html

@@ -69,9 +69,7 @@
             >
               <div class="collec_li" v-for="(item, index) in listState.list" :key="index" @click="linkRouter(item._id)">
                 <div class="collec_head">
-                  <div class="collec_title ellipsis-2">
-                    ${item.title}
-                  </div>
+                  <div class="collec_title ellipsis-2" v-html="item.title"></div>
                   <div class="collec_star" @click="collecClick(event,item._id)">
                     <span class="shoucang" v-if="condition"></span>
                     <!-- <span class="weishoucang" v-if="!condition"></span> -->

src/jfw/modules/app/src/web/templates/vipsubscribe/commonRules.html

@@ -1,7 +1,7 @@
 <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/rights_page.css?v={{Msg "seo" "version"}}'>
 <div class="vip-rights">
   <table class="table">
-    <caption class="table_title b-line">超级订阅2.0版专属权益</caption>
+    <caption class="table_title b-line">超级订阅专属权益</caption>
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">超级订阅</p>
@@ -64,7 +64,7 @@
     </tr>
   </table>
   <div class="table">
-    <div class="table_title b-line">开通超级订阅2.0版，解锁以下权限</div>
+    <div class="table_title b-line">开通超级订阅，解锁以下权限</div>
     <div>
       <div class="grid-item">
         <p class="grid-title">信息权益</p>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_renew.html

@@ -152,7 +152,7 @@
                 <div class="tip-title l-line">续费说明</div>
                 <div class="tip-content">
                     <div>1、仅支持原套餐延长周期续费，不支持套餐变更（含增加、减少、更改）原订阅的省份、城市、行业。 <br />续费费用=续费周期（按月/年）/原地区/原行业</div>
-                    <div>2、套餐周期内，用户也可以选择升级超级订阅2.0版享受更多权益。</div>
+                    <div>2、套餐周期内，用户也可以选择升级超级订阅享受更多权益。</div>
                 </div>
             </div>
             <div data-new-vip style="display: none;">

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

@@ -752,7 +752,7 @@
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
-                            <div v-show="activeTabIndex === 6">
+                            <div v-show="activeTabIndex === 6" style="min-height: 4.8rem">
                                 <ul class="ent-search-list-box" id="select-win-list"></ul>
                                 <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
                                     <input type="search" id="search-win-input" placeholder="输入中标企业名称">

src/web/staticres/common-module/collection/js/date-mobile.js

@@ -201,12 +201,16 @@ var dateComponent = {
           case 'exact': {
             this.setTimeSelectListState('exact')
             this.dateStyle = true
-            this.dateTimePickerState.start = new Date(data.startDate)
-            this.dateTimePickerState.end = new Date(data.endDate)
-            this.dateTimePickerState.startPlaceHolder = new Date(data.startDate).pattern('yyyy年MM月dd日')
-            this.dateTimePickerState.endPlaceHolder = new Date(data.endDate).pattern('yyyy年MM月dd日')
-            this.datePicker.startcurrentDate = new Date(new Date(data.startDate).pattern('yyyy'), new Date(data.startDate).pattern('MM') - 1 , new Date(data.startDate).pattern('dd'))
-            this.datePicker.endcurrentDate = new Date(new Date(data.endDate).pattern('yyyy'), new Date(data.endDate).pattern('MM') - 1, new Date(data.endDate).pattern('dd'))
+            if (data.startDate) {
+              this.dateTimePickerState.start = new Date(data.startDate)
+              this.dateTimePickerState.startPlaceHolder = new Date(data.startDate).pattern('yyyy年MM月dd日')
+              this.datePicker.startcurrentDate = new Date(new Date(data.startDate).pattern('yyyy'), new Date(data.startDate).pattern('MM') - 1 , new Date(data.startDate).pattern('dd'))
+            }
+            if (data.end) {
+              this.dateTimePickerState.end = new Date(data.endDate)
+              this.dateTimePickerState.endPlaceHolder = new Date(data.endDate).pattern('yyyy年MM月dd日')
+              this.datePicker.endcurrentDate = new Date(new Date(data.endDate).pattern('yyyy'), new Date(data.endDate).pattern('MM') - 1, new Date(data.endDate).pattern('dd'))
+            }
             break
           }
           default: {
@@ -253,14 +257,17 @@ var dateComponent = {
         } else {
           timeState.start = ''
         }
-        console.log(this.dateTimePickerState.end == '')
         if(this.dateTimePickerState.end != '') {
           timeState.end = this.dateTimePickerState.end.getTime()
         } else {
           timeState.end = ''
         }
+
+        // 如果开始时间===结束时间，则表示为同一天，取开始时间和结束时间相差23小时
+        if (timeState.start === timeState.end) {
+          timeState.end = timeState.end + (60 * 60 * 1000 * 24) - 1000
+        }
       }
-      console.log(timeState)
       return timeState
     },
     // 计算lately7/lately30/lastYear的开始和结束时间

src/web/staticres/common-module/collection/js/index-wx.js

@@ -285,6 +285,19 @@ var vNode = {
           start: (data.data.start / 1000).toFixed(0),
           end: (data.data.end / 1000).toFixed(0)
         }
+
+        // 开始时间未选择，则默认开始时间为2000年
+        if (!timeRange.start || timeRange.start == 0) {
+          timeRange.start = +new Date('2000') / 1000
+        }
+        // 结束时间未选择，则默认当天23点
+        if (!timeRange.end || timeRange.end == 0) {
+          var today = new Date().pattern('yyyy/MM/dd')
+          var day1 = 24 * 60 * 60 * 1000
+          var todayEnd = +new Date(today) + day1 - 1000
+          timeRange.end = Math.round(todayEnd / 1000)
+        }
+
         if (timeRange.start == 0 && timeRange.end == 0) {
           this.limitlist.selectTime = ''
           this.tagText.timeText = '收藏时间'
@@ -325,7 +338,6 @@ var vNode = {
             break
           }
         }
-        this.limitlist.selectTime = (data.data.start / 1000).toFixed(0) + '_' + (data.data.end / 1000).toFixed(0)
       } else if (data.name == 'cateItem') {
         this.tagText.cateText = '采购单位类型' + data.t
         this.limitlist.buyerclass = data.data.join(',')

src/web/staticres/common-module/collection/js/index.js

@@ -277,7 +277,19 @@ var vNode = {
           start: (data.data.start / 1000).toFixed(0),
           end: (data.data.end / 1000).toFixed(0)
         }
-        console.log(timeRange)
+
+        // 开始时间未选择，则默认开始时间为2000年
+        if (!timeRange.start || timeRange.start == 0) {
+          timeRange.start = +new Date('2000') / 1000
+        }
+        // 结束时间未选择，则默认当天23点
+        if (!timeRange.end || timeRange.end == 0) {
+          var today = new Date().pattern('yyyy/MM/dd')
+          var day1 = 24 * 60 * 60 * 1000
+          var todayEnd = +new Date(today) + day1 - 1000
+          timeRange.end = Math.round(todayEnd / 1000)
+        }
+
         if (timeRange.start == 0 && timeRange.end == 0) {
           this.limitlist.selectTime = ''
           this.tagText.timeText = '收藏时间'

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -918,6 +918,13 @@ var vMainSearchComponent = new Vue({
             if (this.conditionStrMap.publishtime === '_' || this.conditionStrMap.publishtime === 'all') {
               this.conditionStrMap.publishtime = ''
             }
+          } else {
+            this.selectDate = {
+              startDate: '',
+              endDate: '',
+              exact: 'all'
+            }
+            this.conditionStrMap.publishtime = ''
           }
           break
         }
@@ -961,6 +968,8 @@ var vMainSearchComponent = new Vue({
           }
           if (tempParams) {
             this.conditionStrMap.winner = tempParams.join(',')
+          } else {
+            this.conditionStrMap.winner = ''
           }
           break
         }

src/web/staticres/css/wxsearch.css

@@ -1660,13 +1660,14 @@ body{
 	vertical-align: sub !important;
 }
 .detail{
-	font-size: 14px;
-	margin-top: 12px;
-	color: #646464;
 	padding-left: 0;
 	word-wrap: break-word;
 	word-break: break-all;
 	white-space: normal !important;
+    margin-top: 0.24rem;
+    font-size: 0.26rem;
+    line-height: 0.4rem;
+    color: #5F5E64;
 }
 .resnumb .two{
 	max-height:45px;

src/web/staticres/js/wxSupersearch.js

@@ -851,6 +851,9 @@ var SuperSearch = {
     SuperSearch.reqParam["pageNum"]++;//翻页请求
   },
   initDropload: function(hasNextPage,pgNum){
+    $("#supersearchPage .tabs-box").addClass("hidden")
+    $("#supersearchPage #selLable").removeClass("hidden");
+    $("#supersearchPage #selLable").show();
     $(".loading_").show();
     $("#wrapper").css('opacity', '0')
     $("#supersearchPage #working").removeClass("hidden");
@@ -927,21 +930,23 @@ var SuperSearch = {
           });
         }
       });
-    }, 10)
-
-    //判断是否是table  (2.7.5table只显示20条数据)
-    if(!sessionStorage.superSearch_showType){
-      if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-        SuperSearch.isTable(false);
-      }else{
-        SuperSearch.isTable(true);
+      //判断是否是table  (2.7.5table只显示20条数据)
+      if(!sessionStorage.superSearch_showType){
+        if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
+          SuperSearch.isTable(false);
+        }else{
+          SuperSearch.isTable(true);
+        }
       }
-    }
 
-    if(!hasNextPage){
-      SuperSearch.noMoreData();
-      return;
-    }
+      if(!hasNextPage){
+        SuperSearch.noMoreData();
+        return;
+      }
+      if ($(".dropload-refresh").length) {
+        SuperSearch.dropload.opts.loadDownFn(SuperSearch.dropload)
+      }
+    }, 50)
   },
   clearSessionStorage: function(){
     if(!sessionStorage){
@@ -1324,9 +1329,7 @@ var SuperSearch = {
             $("#supersearchPage .app-layout-content-b #wrapper").scrollTop(0)
           }
           $(window).scrollTop(0);
-          if (data.hasNextPage) {
             SuperSearch.initDropload(data.hasNextPage,2);
-          }
         }
       },
       error: function(xhr,type){
@@ -1767,7 +1770,11 @@ var SuperSearch = {
   noMoreData: function(){
     SuperSearch.noMoreCache = true;
     // 锁定
-    SuperSearch.dropload.lock();
+    try {
+      SuperSearch.dropload.lock();
+    } catch (e) {
+      console.warn('获取dropload错误')
+    }
     // 无数据
     SuperSearch.dropload.noData();
     SuperSearch.dropload.resetload();

src/web/templates/common/commonRules.html

@@ -1,7 +1,7 @@
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/vipsubscribe/css/rights_page.css?v={{Msg "seo" "version"}}'>
 <div class="vip-rights">
   <table class="table">
-    <caption class="table_title b-line">超级订阅2.0版专属权益</caption>
+    <caption class="table_title b-line">超级订阅专属权益</caption>
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">超级订阅</p>
@@ -64,7 +64,7 @@
     </tr>
   </table>
   <div class="table">
-    <div class="table_title b-line">开通超级订阅2.0版，解锁以下权限</div>
+    <div class="table_title b-line">开通超级订阅，解锁以下权限</div>
     <div>
       <div class="grid-item">
         <p class="grid-title">信息权益</p>

src/web/templates/common/pchead.html

@@ -928,7 +928,7 @@
             }
 
             // 导航栏是否固定
-            var noFixedArr = ['/article/indexcontent','/article/content']
+            var noFixedArr = ['/article/indexcontent','/article/content', '/article/mailprivate']
             var hasPage = noFixedArr.some(function (v) {
                 return $href.indexOf(v) !== -1
             })

src/web/templates/frontRouter/wx/collection/sess/index.html

@@ -75,9 +75,7 @@
             >
               <div class="collec_li" v-for="(item, index) in listState.list" :key="index" @click="linkRouter(item._id)">
                 <div class="collec_head">
-                  <div class="collec_title ellipsis-2">
-                    ${item.title}
-                  </div>
+                  <div class="collec_title ellipsis-2" v-html="item.title"></div>
                   <div class="collec_star" @click="collecClick(event,item._id)">
                     <span class="shoucang" v-if="condition"></span>
                     <!-- <span class="weishoucang" v-if="!condition"></span> -->

src/web/templates/pc/biddetail_rec.html

@@ -528,9 +528,9 @@ function isWechat() {
             var params = {
               lids: lids,
               laction: 'S',
-              binfo: {
-                bid: {{.T.obj._id}}
-              }
+              binfo: [
+                { bid: {{.T.obj._id}} }
+              ]
             } 
             // console.log(params)
             $('.tags-box').hide(function() {

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

@@ -760,7 +760,7 @@
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
-                            <div v-show="activeTabIndex === 6">
+                            <div v-show="activeTabIndex === 6"  style="min-height: 4.8rem">
                                 <ul class="ent-search-list-box" id="select-win-list"></ul>
                                 <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
                                     <input type="search" id="search-win-input" placeholder="输入中标企业名称">

src/web/templates/weixin/vipsubscribe/vip_renew.html

@@ -130,7 +130,7 @@
                     <div class="tip-title l-line">续费说明</div>
                     <div class="tip-content">
                         <div>1、仅支持原套餐延长周期续费，不支持套餐变更（含增加、减少、更改）原订阅的省份、城市、行业。 <br />续费费用=续费周期（按月/年）/原地区/原行业</div>
-                        <div>2、套餐周期内，用户也可以选择升级超级订阅2.0版享受更多权益。</div>
+                        <div>2、套餐周期内，用户也可以选择升级超级订阅享受更多权益。</div>
                     </div>
                 </div>
             </ul>