Merge branch 'dev4.5.2' of ssh://127.0.0.1:10022/qmx/jy into dev4.5.2

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -134,11 +134,10 @@ var vNode = {
         this.entInfo.id = eId
         this.entInfo.name = ''
         this.restore = this.reStoreState()
+        this.getPowerInfo()
         if (!this.restore) {
-            this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
-            this.getEntVisits()
         }
     },
     mounted: function () {
@@ -180,6 +179,10 @@ var vNode = {
                             _this.gotTab2 = true
                             console.log('获取企业中标动态...')
                         }
+                        // if(_this.powerInfo.memberStatus <= 0) {
+                        //     // 不是大会员时才请求访问量接口
+                        //     _this.getEntVisits()
+                        // }
                         _this.gotTab2 = true
                     }
                 });
@@ -197,7 +200,7 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0)
         },
         surplus: function () {
             return this.entvisit.total >= this.entvisit.usage
@@ -452,6 +455,22 @@ var vNode = {
                 type: 'GET',
                 url: '/bigmember/use/isAdd',
                 success: function (res) {
+                    res = {
+                        "error_code": 0,
+                        "error_msg": "",
+                        "data": {
+                          "combo": "专家版",
+                          "entname": "北京百智享科技有限公司",
+                          "isSubCount": false,
+                          "isUsed": true,
+                          "is_member_trial": false,
+                          "memberStatus": 0,
+                          "power": [
+                          ],
+                          "vipStatus": 2,
+                          "viper": true
+                        }
+                      }
                     if (res.error_code == 0) {
                         _this.conf.powerLoaded = true
                         if (res.data) {
@@ -483,6 +502,7 @@ var vNode = {
                             } else {
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
+                                _this.getEntVisits()
                             }
                             _this.singleTab = false
                         }

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -222,10 +222,16 @@ var mine = {
                 if (res && res.data) {
                     if (res.data.memberStatus != null || res.data.memberStatus != undefined) {
                         pageUserInfo.bigMemberStatus = res.data.memberStatus
-                        // 大会员和免费用户不显示企业画像记录菜单
-                        if(res.data.vipStatus > 0 && res.data.viper ) {
-                          $('.ent-follow-history').show()
-                        }
+                    }
+                    if (res.data.memberStatus <= 0) {
+                      // 大会员和免费用户不显示企业画像记录菜单
+                      if(res.data.vipStatus > 0 && res.data.viper ) {
+                        $('#ent-follow-history').show()
+                      } else {
+                        $('#ent-follow-history').hide()
+                      }
+                    } else {
+                      $('#ent-follow-history').hide()
                     }
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power

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

@@ -27,7 +27,7 @@
               <van-button round type="primary" v-else @click="setBook">订阅设置</van-button>
             </div>
           </div>
-          <div class="p-date">
+          <div class="p1-date">
             <div class="d-box flex">
               使用记录
               <van-field v-model="dValue" @click="usedHised" placeholder="选择年月" right-icon="play" readonly/>
@@ -44,6 +44,7 @@
               type="year-month"
               title="选择日期"
               :formatter="formatter11"
+              :max-date="maxTime"
               @confirm="confirmed"
               @cancel="canceled"
             />
@@ -53,7 +54,7 @@
               v-model="listInfo.loading"
               :finished="listInfo.finished"
               finished-text=""
-              @onLoad="onLoad"
+              @load="onLoad"
             >
                 <div class="ent-search-item" v-for="(item, i) in list" :key="item._id" @click="detailed(item._id)">
                     <div class="ent-info-top">

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

@@ -1,40 +1,5 @@
 <html>
 <head>
-    <script>
-        try {
-            window.onlyUserID = {{session "userId"}}
-        } catch (e) {
-            console.log('获取ID失败')
-        }
-        function clearOtherUserLocalStorage () {
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.length) {
-                try {
-                    var oCookie = window.onlyUserID || null
-                    var isUserNext = readUserID.indexOf(oCookie) === -1
-                    if (isUserNext) {
-                        localStorage.removeItem('big_member_full_video_play')
-                    } else {
-                        localStorage.setItem('big_member_full_video_play', 'true')
-                    }
-                } catch (e) {
-                    console.log('cookie 获取失败02')
-                }
-            } else {
-                localStorage.removeItem('big_member_full_video_play')
-            }
-        }
-        clearOtherUserLocalStorage()
-        if (localStorage.getItem('big_member_full_video_play')) {
-            console.log('已经播放')
-        } else {
-          console.log('应该跳转')
-          window.onload = function () {
-            history.pushState({state: 'full'}, null)
-            location.href = '/jyapp/big/page/full'
-          }
-        }
-    </script>
     {{include "/common/meta.html"}}
     <!--S-当前页必定需要预加载的资源-->
     <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js' />
@@ -59,6 +24,11 @@
     {{include "/common/js.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js'></script>
     <title>搜索</title>
+    <script>
+        try{
+            JyObj.hiddenBottom("1");
+        }catch(e){}
+    </script>
 </head>
 <body class="p13" id="home_main" data-weui-theme="light">
 <style>

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

@@ -750,7 +750,7 @@
                             </div>
                             <div class="collection">
                                 <industry-component v-show="isActiveForTab['行业']" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
-                                <date-component :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
+                                <date-component :times="times" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="isActiveForTab['类型']" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
                                 <cate-component v-show="!isWaitBuy && isActiveForTab['采购单位']" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>

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

@@ -124,29 +124,35 @@ var dateComponent = {
     "rootopen": {
       type: Boolean,
       default: true
+    },
+    'times': {
+      type: Array,
+      default: function () {
+        return [
+          {
+            name: '最近7天',
+            value: 'lately7',
+            selected: true
+          },
+          {
+            name: '最近30天',
+            value: 'lately30',
+            selected: false
+          },
+          {
+            name: '最近一年',
+            value: 'lastYear',
+            selected: false
+          }
+        ]
+      }
     }
   },
   template: dateComponentTemplate,
   data:function () {
     return {
       colDate: 0,
-      timeSelectList:[
-        {
-          name: '最近7天',
-          value: 'lately7',
-          selected: true
-        },
-        {
-          name: '最近30天',
-          value: 'lately30',
-          selected: false
-        },
-        {
-          name: '最近一年',
-          value: 'lastYear',
-          selected: false
-        }
-      ],
+      timeSelectList: JSON.parse(JSON.stringify(this.times)),
       // 点击选择时间添加样式
       dateStyle: false,
       // 时间选择参数

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

@@ -136,7 +136,6 @@ var vNode = {
             this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
-            this.getEntVisits()
         }
 
     },
@@ -483,6 +482,7 @@ var vNode = {
                             } else {
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
+                                _this.getEntVisits()
                             }
                             _this.singleTab = false
                         }

src/web/staticres/common-module/collection/js/history-project.js

@@ -95,18 +95,23 @@ var hisproComponent = {
           if(res.error_code == 0) {
             loading.clear()
             if(res.data && res.data.list && res.data.list.length !== 0) {
-              let phoneArr = []
               res.data.list.forEach(function(item, i) {
+                let phoneArr = []
                 if(item.date) {
                   item.date = new Date(item.date * 1000).pattern('yyyy-MM-dd')
                 } else {
                   item.date = ''
                 }
-                Object.keys(item.contacts)[0].split(',').forEach(function(items, i) {
-                  console.log(item.contacts)
-                  phoneArr.push({[items]: item.contacts[Object.keys(item.contacts)[0]]})
+                console.log(Object.keys(item.contacts))
+
+                Object.keys(item.contacts).forEach(function(items, index) {
+                  console.log(items)
+                  console.log({[items]: item.contacts[Object.keys(item.contacts)[index]]})
+                  phoneArr.push({[items]: item.contacts[Object.keys(item.contacts)[index]]})
                 })
                 item.contacts = phoneArr
+                // console.log(item.contacts)
+
               })
               if(res.data.list.length <= 3) {
                 _this.hisData.showMoreBtn = false

src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -143,9 +143,9 @@ var vipComponent = {
       let isWeixin = utils.isWeiXinBrowser
       if(!isWeixin) {
         if (this.btnText == '去开通') {
-          if(this.type == 'item_9' || item.type == 'item_8') {
+          if(this.type == 'item_9' || this.type == 'item_8') {
             // 跳转到大会员
-            location.href = '/jyapp/big/page/landingPage'
+            location.href = '/jyapp/big/page/buy_commit'
           } else {
             // 跳转到超级订阅
             location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
@@ -159,9 +159,9 @@ var vipComponent = {
         }
       } else {
         if (this.btnText == '去开通') {
-          if(this.type == 'item_9') {
+          if(this.type == 'item_9' || this.type == 'item_8') {
             // 跳转到大会员
-            location.href = '/big/wx/page/landingPage'
+            location.href = '/big/wx/page/buy_commit'
           } else {
             // 跳转到超级订阅
             location.href = '/front/vipsubscribe/vipsubscribe_new'

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

@@ -707,6 +707,23 @@ var vMainSearchComponent = new Vue({
       activeTabIndex: 0,
       beforeTabIndex: 1,
       // 选择的时间数据
+      times: [
+      {
+        name: '最近7天',
+        value: 'lately7',
+        selected: false
+      },
+      {
+        name: '最近30天',
+        value: 'lately30',
+        selected: true
+      },
+      {
+        name: '最近一年',
+        value: 'lastYear',
+        selected: false
+      }
+    ],
       selectDate: {
         startDate: '',
         endDate: '',

src/web/staticres/common-module/portraitRecord/css/index.css

@@ -62,37 +62,36 @@
     font-size: .32rem;
     color: #F7F9FA;
 }
-.p-date {
-    height: .88rem;
+.p1-date {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 16px;
+    padding: 12px 16px;
 }
-.p-date div {
+.p1-date div {
     font-size: .26rem;
     color: #9b9ca3;
 }
-.p-date .word-tips span {
+.p1-date .word-tips span {
     color: #2ABED1;
 }
-.p-date .d-box .van-cell {
+.p1-date .d-box .van-cell {
     padding: 0 12px;
     width: 2rem;
     height: .48rem;
     border-radius: 53px;
     margin-left: 8px;
 }
-.p-date .d-box .van-cell .van-field__control {
+.p1-date .d-box .van-cell .van-field__control {
     height: .48rem;
     font-size: .24rem;
     color: #171826;
 }
-.p-date .d-box .van-cell .van-field__right-icon {
+.p1-date .d-box .van-cell .van-field__right-icon {
     padding: 0;
     padding-right: 8px;
 }
-.p-date .d-box .van-cell .van-icon-play::before {
+.p1-date .d-box .van-cell .van-icon-play::before {
     -webkit-transform: rotate(90deg);
     transform:rotate(90deg);
 }
@@ -124,7 +123,7 @@
     background-size: contain;
 }
 .c-list .ent-search-item {
-    margin-top: 8px;
+    margin-bottom: 8px;
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;

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

@@ -48,6 +48,7 @@ var vm = new Vue({
       dValue: '',
       pShow: false,
       curDate: '',
+      maxTime: '',
       points: [],
       years: '',
       months: '',
@@ -70,6 +71,7 @@ var vm = new Vue({
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
       this.curDate = new Date()
+      this.maxTime = new Date(this.years, this.months - 1)
       this.subPoint()
       this.onLoad()
   },
@@ -110,9 +112,7 @@ var vm = new Vue({
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
-            this.showUpTip = false
           } else {
-            this.showUpTip = true
             this.listInfo.finished = true
           }
         }

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

@@ -48,6 +48,7 @@ var vm = new Vue({
       dValue: '',
       pShow: false,
       curDate: '',
+      maxTime: '',
       points: [],
       years: '',
       months: '',
@@ -70,6 +71,7 @@ var vm = new Vue({
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
       this.curDate = new Date()
+      this.maxTime = new Date(this.years, this.months - 1)
       this.subPoint()
       this.onLoad()
   },
@@ -110,9 +112,7 @@ var vm = new Vue({
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
-            this.showUpTip = false
           } else {
-            this.showUpTip = true
             this.listInfo.finished = true
           }
         }

src/web/staticres/js/superSearch.js

@@ -371,7 +371,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
       // 全文搜索
 			if(flag && selectType.indexOf('content') > -1){
         listHtml +='<div class="luce-left"><em style="padding-left:30px;">'+index+'.</em>'
-						+'<div class="left-title" style="width:1100px;">'
+						+'<div class="left-title" style="width:1080px;">'
 						+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
 						+'</div>'
         // 全文搜索选择框
@@ -952,7 +952,7 @@ function pcAjaxReqCallBack(r){
 		if(isAllSearch){
 			$("#allSearchModel").hide();
 		}else{
-			$("#allSearchModel").show();
+			// $("#allSearchModel").show();
 		}
 		//分页过程中，突然切换控制状态
 		if(r.limitFlag && LimitClass.prevNoLimitFlag){

src/web/staticres/me/js/mine.js

@@ -90,11 +90,15 @@ var mine = {
           url: '/bigmember/use/isAdd?t=' + Date.now(),
           success: function (res) {
               if (res && res.data) {
-                  if (res.data.memberStatus != null || res.data.memberStatus != undefined) {
+                  if (res.data.memberStatus <= 0) {
                       // 大会员和免费用户不显示企业画像记录菜单
                       if(res.data.vipStatus > 0 && res.data.viper ) {
                         $('#ent-follow-history').show()
+                      } else {
+                        $('#ent-follow-history').hide()
                       }
+                  } else {
+                    $('#ent-follow-history').hide()
                   }
               }
           }

src/web/templates/common/pchead.html

@@ -1,282 +1,3 @@
-<!--S-视频-->
-<style>
-    .fullscreenvideo {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 100%;
-        height: 100%;
-        z-index: 99999999;
-        background: url('{{Msg "seo" "cdn"}}/images/mp4/start.jpg') no-repeat center center;
-        background-color: black;
-        -webkit-transform: translateX(-50%) translateY(-50%);
-        transform: translateX(-50%) translateY(-50%);
-        -webkit-transition: 1s opacity;
-        transition: 1s opacity;
-    }
-    .videocontainer{
-        position: fixed;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        z-index: 99999999;
-    }
-    .videocontainer:before{
-        content: "";
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        display: block;
-        z-index: 99999999;
-        top: 0;
-        left: 0;
-        background: rgba(25,29,34,.65);
-    }
-    .full-video-mask-video-box {
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        position: absolute;
-        z-index: 99999999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        display: none;
-        background-color: rgba(0, 0, 0, 0.75);
-    }
-    #rePalyFullVideo, #goFullVideoInfo {
-        font-size: 18px;
-        line-height: 52px;
-        text-align: center;
-        margin: 10px 20px;
-        border: 1px solid #FFFFFF;
-        width: 136px;
-        height: 52px;
-        box-sizing: border-box;
-        border-radius: 34px;
-        color: #fff;
-        cursor: pointer;
-        display: inline-block;
-    }
-    #goFullVideoInfo {
-        border: 1px solid #2CB7CA;
-        background-color: #2CB7CA;
-    }
-    @keyframes rotate-music {
-        0% {
-            transform: rotate(0deg);
-        }
-        100% {
-            transform: rotate(1turn);
-        }
-    }
-    #music-control-box,
-    #skip-video-box {
-        position: fixed;
-        overflow: hidden;
-        z-index: 999999999;
-        right: 0;
-        top: 0;
-        padding: 20px;
-        cursor: pointer;
-    }
-    #skip-video-box {
-        right: 70px;
-        color: #fff;
-        font-size: 16px;
-        line-height: 30px;
-        padding: 20px 8px;
-    }
-    #music-control-box.run-music .music-icon-box {
-        -webkit-animation-play-state: running;
-        animation-play-state: running;
-    }
-    #music-control-box.run-music .music-icon-box::before {
-        content: none;
-    }
-    #music-control-box .music-icon-box {
-        position: relative;
-        width: 30px;
-        height: 30px;
-        border-radius: 50%;
-        border: 1px solid #fff;
-        box-sizing: border-box;
-        overflow: hidden;
-        background-color: rgba(0, 0, 0, 0.6);
-        -webkit-animation: rotate-music 3s linear infinite;
-        animation: rotate-music 3s linear infinite;
-        -webkit-animation-play-state: paused;
-        animation-play-state: paused;
-    }
-    #music-control-box .music-icon-box::before {
-        content: '';
-        width: 16px;
-        height: 2px;
-        background: #fff;
-        position: absolute;
-        top: 12px;
-        left: 6px;
-        transform: rotate(45deg);
-    }
-    #music-control-box .music-icon-box img {
-        width: 18px;
-        height: 18px;
-        margin: 5px;
-    }
-</style>
-<div class="videocontainer" id="FullVideo">
-    <div id="music-control-box">
-        <div class="music-icon-box">
-            <img src='{{Msg "seo" "cdn"}}/images/mp4/music-icon.png' />
-        </div>
-    </div>
-    <div id="skip-video-box">跳过</div>
-    <video id="bgvid" class="fullscreenvideo" poster='{{Msg "seo" "cdn"}}/images/mp4/start.jpg'
-           muted preload="auto"
-           playsinline="true" webkit-playsinline="true" mtt-playsinline="true"
-           x5-video-player-type="h5-page"
-           autoplay="true" >
-        <source src='{{Msg "seo" "cdn"}}/images/mp4/start_hd.mp4' type="video/mp4">
-    </video>
-    <div class="full-video-mask-video-box">
-        <div class="full-video-button">
-            <div id="rePalyFullVideo">再次播放</div>
-            <div id="goFullVideoInfo">查看详情</div>
-        </div>
-    </div>
-</div>
-<script>
-     var jyTempLog = window.console.log
-     if (window.localStorage.getItem('log') === '1') {
-        window.console.log = jyTempLog
-     } else {
-        window.console.log = function () {
-          return null
-        }
-     }
-    function getCookieValue(name) {
-        var result = document.cookie.match("(^|[^;]+)\\s*" + name + "\\s*=\\s*([^;]+)")
-        return result ? result.pop() : ""
-    }
-    try {
-        window.onlyUserID = {{session "userId"}}
-        if (location.pathname === '/' || location.pathname === '' || location.pathname.indexOf('article/content/') !== -1 || location.pathname.indexOf('article/mailprivate/') !== -1) {
-            // 首页userId有redis缓存，采用cookie判断
-            window.onlyUserID = getCookieValue('SESSIONID')
-        }
-    } catch (e) {
-        console.log('获取ID失败')
-    }
-    function setOnlyCookie () {
-        try {
-            var oCookie = window.onlyUserID || null
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.indexOf(oCookie) === -1) {
-                readUserID.push(oCookie)
-            }
-            if (readUserID.indexOf(getCookieValue('SESSIONID')) === -1) {
-                readUserID.push(getCookieValue('SESSIONID'))
-            }
-            localStorage.setItem('big_member_full_video_play_reads', JSON.stringify(readUserID))
-        } catch (e) {
-            console.log('cookie 获取失败01')
-        }
-    }
-
-    function clearOtherUserLocalStorage () {
-        var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-        if (readUserID.length) {
-            try {
-                var oCookie = window.onlyUserID || null
-                var isUserNext = readUserID.indexOf(oCookie) === -1
-                if (isUserNext) {
-                    localStorage.removeItem('big_member_full_video_play')
-                } else {
-                    localStorage.setItem('big_member_full_video_play', 'true')
-                }
-            } catch (e) {
-                console.log('cookie 获取失败02')
-            }
-        } else {
-            localStorage.removeItem('big_member_full_video_play')
-        }
-    }
-    if (document.referrer === location.origin || document.referrer === location.origin + '/') {
-        if (localStorage.getItem('big_member_full_video_play')) {
-            setOnlyCookie()
-        }
-    }
-    function checkSkipPages () {
-      var skipPages = ['/big/page/index?source=baidusem', '/front/structed/pc_index.html?source=baidusem']
-      return skipPages.some(function (v) {
-        return location.href.indexOf(v) !== -1
-      })
-    }
-
-    clearOtherUserLocalStorage()
-    var isAutoPlayMusic = false
-    if (checkSkipPages()) {
-      $("#FullVideo").remove()
-    } else if (localStorage.getItem('big_member_full_video_play')) {
-        $("#FullVideo").remove()
-    } else {
-        var bgvid = document.getElementById("bgvid");
-        var b_re = document.getElementById('rePalyFullVideo')
-        var b_info = document.getElementById('goFullVideoInfo')
-        var b_music = document.getElementById('music-control-box')
-        var fullbox = document.getElementById("FullVideo");
-        var skipVideo = document.getElementById("skip-video-box");
-        fullbox.addEventListener('mousedown', function(){
-            if (isAutoPlayMusic) {
-                isAutoPlayMusic = false
-                bgvid.muted = false
-                b_music.classList.add('run-music')
-            }
-        }, false);
-        b_music.addEventListener('click', function (e) {
-            if (b_music.classList.contains('run-music')) {
-                bgvid.muted = true
-                b_music.classList.remove('run-music')
-            } else {
-                bgvid.muted = false
-                b_music.classList.add('run-music')
-            }
-        })
-        b_re.addEventListener('click', function () {
-            bgvid.play()
-            document.querySelector('.full-video-mask-video-box').style.display = 'none'
-        })
-        skipVideo.addEventListener('click', function () {
-            $("#FullVideo").remove()
-            localStorage.setItem('big_member_full_video_play', 'true')
-            setOnlyCookie()
-        })
-        b_info.addEventListener('click', function () {
-            location.href = '/big/page/index'
-        })
-        bgvid.addEventListener('play', function () { //播放开始执行的函数
-            console.log("开始播放");
-            b_music.style.display = 'block'
-            skipVideo.style.display = 'block'
-        });
-        bgvid.addEventListener('pause', function () { //暂停开始执行的函数
-            console.log("暂停播放");
-        });
-        bgvid.addEventListener('waiting', function () { //加载
-            console.log("加载中");
-        });
-        bgvid.addEventListener('ended', function () { //结束
-            console.log("播放结束");
-            document.querySelector('.full-video-mask-video-box').style.display = 'flex'
-            b_music.style.display = 'none'
-            skipVideo.style.display = 'none'
-            localStorage.setItem('big_member_full_video_play', 'true')
-            setOnlyCookie()
-        }, false);
-    }
-</script>
-<!--E-视频-->
 <style>
 	.new-info {
 		position: relative;

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

@@ -41,7 +41,7 @@
               <van-button round type="primary" v-else @click="setBook">订阅设置</van-button>
             </div>
           </div>
-          <div class="p-date">
+          <div class="p1-date">
             <div class="d-box flex">
               使用记录
               <van-field v-model="dValue" @click="usedHised" placeholder="显示图标" right-icon="play" readonly/>
@@ -57,6 +57,7 @@
               type="year-month"
               title="选择日期"
               :formatter="formatter11"
+              :max-date="maxTime"
               @confirm="confirmed"
               @cancel="canceled"
             />
@@ -66,7 +67,7 @@
               v-model="listInfo.loading"
               :finished="listInfo.finished"
               finished-text=""
-              @onLoad="onLoad"
+              @load="onLoad"
             >
                 <div class="ent-search-item" v-for="(item, i) in list" :key="item._id" @click="detailed(item._id)">
                     <div class="ent-info-top">

src/web/templates/pc/supsearch.html

@@ -266,7 +266,7 @@ function isPower () {
 }
 isPower()
 var areas = {{.T.area}}!=null?{{.T.area}}:"";
-var selectPublishtime = {{.T.publishtime}}?{{.T.publishtime}}:"lately-7";
+var selectPublishtime = {{.T.publishtime}}?{{.T.publishtime}}:"lately-30";
 var selectTimeslot = {{.T.timeslot}}!=null?{{.T.timeslot}}:"";
 var toptype = {{.T.toptype}}!=null?{{.T.toptype}}:"";
 var subtype = {{.T.subtype}}!=null?{{.T.subtype}}:"";
@@ -274,7 +274,7 @@ var isopen = {{.T.isopen}}!=null?{{.T.isopen}}:"";
 var keys = {{.T.keywords}}!=null?{{.T.keywords}}:"";
 var minprice = {{.T.minprice}}!=null?{{.T.minprice}}:"";
 var maxprice = {{.T.maxprice}}!=null?{{.T.maxprice}}:"";
-var selectType = {{.T.selectType}}!=null?{{.T.selectType}}:'title';//全文或标题
+var selectType = {{.T.selectType}}?{{.T.selectType}}:'title';//全文或标题
 var industry = {{.T.industry}}!=null?{{.T.industry}}:"";
 var industrylist = {{.T.industrylist}}!=null?{{.T.industrylist}}:"";
 var sortArray = {{.T.sortArray}}!=null?{{.T.sortArray}}:"";
@@ -437,7 +437,7 @@ $(function(){
 			$(".timerInput").addClass("active");
 		}
 	} else {
-    $(".timer [data-value='lately-7']").addClass("active").siblings().removeClass('active');
+    $(".timer [data-value='lately-30']").addClass("active").siblings().removeClass('active');
   }
 	if(selectTimeslot != "" && selectTimeslot.indexOf("_") > -1){
 		$("#starttime").css({"border-color":"#2cb7ca"});
@@ -830,7 +830,7 @@ $(function(){
             <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
           </span>
           <span class="search-list">
-            <span data-name="winner" class="search-list-checkbox">中标企业</span>  
+            <span data-name="winner" class="search-list-checkbox">中标企业<em style="color: #2cb7ca;font-size: 12px;"> 老用户免费专享</em></span>  
             <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
           </span>
           <span class="search-list">

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

@@ -1,36 +1,5 @@
 <html>
 <head>
-    <script>
-        try {
-            window.onlyUserID = {{session "userId"}}
-        } catch (e) {
-            console.log('获取ID失败')
-        }
-        function clearOtherUserLocalStorage () {
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.length) {
-                try {
-                    var oCookie = window.onlyUserID || null
-                    var isUserNext = readUserID.indexOf(oCookie) === -1
-                    if (isUserNext) {
-                        localStorage.removeItem('big_member_full_video_play')
-                    } else {
-                        localStorage.setItem('big_member_full_video_play', 'true')
-                    }
-                } catch (e) {
-                    console.log('cookie 获取失败02')
-                }
-            } else {
-                localStorage.removeItem('big_member_full_video_play')
-            }
-        }
-        clearOtherUserLocalStorage()
-        if (localStorage.getItem('big_member_full_video_play')) {
-            console.log('已经播放')
-        } else {
-            location.href = '/big/wx/page/full'
-        }
-    </script>
 <meta charset="UTF-8" />
 <meta name="format-detection" content="telephone=no" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

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

@@ -758,7 +758,7 @@
                             </div>
                             <div class="collection">
                                 <industry-component v-show="isActiveForTab['行业']" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
-                                <date-component :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
+                                <date-component :times="times" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="isActiveForTab['类型']" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
                                 <cate-component v-show="!isWaitBuy && isActiveForTab['采购单位']" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>