فهرست منبع

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

wangshan 4 سال پیش
والد
کامیت
6c73f2a934
21فایلهای تغییر یافته به همراه106 افزوده شده و 89 حذف شده
  1. 1 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 4 19
      src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js
  3. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  4. 2 1
      src/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html
  5. 1 5
      src/jfw/modules/app/src/web/templates/me/mine.html
  6. 4 3
      src/jfw/modules/bigmember/src/entity/portrait.go
  7. 0 3
      src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go
  8. 4 3
      src/web/staticres/common-module/collection/js/ent_portrait.js
  9. 7 0
      src/web/staticres/common-module/portraitRecord/css/index.css
  10. 2 2
      src/web/staticres/common-module/portraitRecord/js/index-wx.js
  11. 2 2
      src/web/staticres/common-module/portraitRecord/js/index.js
  12. 8 5
      src/web/staticres/css/dev2/biddingSearch.css
  13. 2 2
      src/web/staticres/css/dev2/superSearch.css
  14. 9 0
      src/web/staticres/frontRouter/pc/seeHistory/css/index-pc.css
  15. 3 2
      src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js
  16. 19 19
      src/web/staticres/me/js/mine.js
  17. 1 0
      src/web/templates/frontRouter/pc/seeHistory/sess/index.html
  18. 2 1
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html
  19. 21 7
      src/web/templates/frontRouter/wx/portraitRecord/sess/index.html
  20. 12 9
      src/web/templates/pc/supsearch.html
  21. 1 5
      src/web/templates/weixin/my.html

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

@@ -981,6 +981,7 @@ var vNode = {
                 Object.assign(this.topProject, $data.topProject || {})
                 Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
                 Object.assign(this.powerInfo, $data.powerInfo || {})
+                Object.assign(this.entvisit, $data.entvisit || {})
                 this.singleTab = $data.singleTab
                 this.scrollTop = $data.scrollTop
                 this.gotTab2 = $data.gotTab2

+ 4 - 19
src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -21,8 +21,6 @@ var mine = {
         this.showUserMerge()
         // 获取小红点状态
         this.getRedDotState()
-        // 企业画像访问量查询
-        this.getEntVisits()
     },
     // ios返回刷新问题
     iosBackInvoke: function () {
@@ -86,23 +84,6 @@ var mine = {
             return false
         }
     },
-    // 企业画像访问量查询
-    getEntVisits: function() {
-      let _this = this
-      $.ajax({
-          type: "POST",
-          url: "/bigmember/portrait/subVipPortrait/usage",
-          success: function (res) {
-              console.log(res)
-              if(res.error_code == 0) {
-                  if(res.data) {
-                      $('.ent-follow-history .his_usage').text(res.data.usage)
-                      $('.ent-follow-history .his_total').text('/' + ' ' + res.data.total)
-                  }
-              }
-          }
-      });
-    },
     // 设置用户头像
     setUserImg: function () {
         console.log(pageUserInfo)
@@ -241,6 +222,10 @@ 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 ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -195,7 +195,7 @@
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
                     <span v-if="!hasOnePower || !surplus" class="bid_upgrade">升级</span>
-                    <span v-if="hasOnePower && surplus" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
+                    <span v-if="hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
                     <div class="card-row zb-info">

+ 2 - 1
src/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html

@@ -30,7 +30,7 @@
           <div class="p-date">
             <div class="d-box flex">
               使用记录
-              <van-field v-model="dValue" @click="usedHised" placeholder="显示图标" right-icon="play" readonly/>
+              <van-field v-model="dValue" @click="usedHised" placeholder="选择年月" right-icon="play" readonly/>
             </div>
             <div class="word-tips">
               当前已使用:<span>{points.usage}个</span>
@@ -39,6 +39,7 @@
           <!-- 日期弹出框 -->
           <van-popup v-model:show="pShow" round position="bottom">
             <van-datetime-picker
+              class="record-time-d"
               v-model="curDate"
               type="year-month"
               title="选择日期"

+ 1 - 5
src/jfw/modules/app/src/web/templates/me/mine.html

@@ -168,16 +168,12 @@
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
-                    <div data-need-bind-phone class="menu_list ent-follow-history" data-href='/jyapp/frontPage/portraitRecord/sess/index'>
+                    <div style="display: none;" data-need-bind-phone class="menu_list ent-follow-history" data-href='/jyapp/frontPage/portraitRecord/sess/index'>
                         <div class="menu_list_left">
                             <span class="j-icon base-icon icon-company"></span>
                             <span class="label">企业画像记录</span>
                         </div>
                         <div class="menu_list_right">
-                            <span style="margin-right: .08rem;">
-                                <span class="his_usage" style="font-size: .28rem;color: #2ABED1;"></span>
-                                <span class="his_total" style="font-size: .22rem;color: #9B9CA3;"></span>
-                            </span>
                             <i class="dot-red"></i>
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>

+ 4 - 3
src/jfw/modules/bigmember/src/entity/portrait.go

@@ -29,9 +29,10 @@ func CreatePortraitManager(userid string, pageFlag string) (*Portrait, error) {
 	if pageFlag == "" {
 		return nil, errors.New("未知请求")
 	}
-	isBuy := bigMsg.CheckBigVipBackPower(pageFlag)
-	if bigMsg.Status <= 0 || !isBuy {
-		return nil, errors.New("非法请求")
+	if pageFlag != "entDetail" { ////企业基本信息接口 无权限控制
+		if bigMsg.Status <= 0 || !bigMsg.CheckBigVipBackPower(pageFlag) {
+			return nil, errors.New("非法请求")
+		}
 	}
 	uid := qutil.If(bigMsg.Pid == "", userid, bigMsg.Pid).(string) //若为子账号则显示主账号行业信息
 	return &Portrait{uid}, nil

+ 0 - 3
src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -172,9 +172,6 @@ func (this *BigVipBaseMsg) CheckBigVipFrontPower(reqFlag string) (pass bool) {
 }
 
 func (this *BigVipBaseMsg) CheckBigVipBackPower(reqFlag string) (pass bool) {
-	if reqFlag == "entDetail" { //企业基本信息接口 无权限控制
-		return true
-	}
 	return this.checkPower(reqFlag, BackService)
 }
 

+ 4 - 3
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -112,9 +112,9 @@ var vNode = {
                 btntext: '去开通'
             },
             entvisit: {
-                total: 150, // 本月画像次数总量
-                usage: 10, // 本月已使用次数
-                provin: -1 // 购买省份数量
+                total: 0, // 本月画像次数总量
+                usage: 0, // 本月已使用次数
+                provin: 0 // 购买省份数量
             }
         }
     },
@@ -974,6 +974,7 @@ var vNode = {
                 Object.assign(this.topProject, $data.topProject || {})
                 Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
                 Object.assign(this.powerInfo, $data.powerInfo || {})
+                Object.assign(this.entvisit, $data.entvisit || {})
                 this.singleTab = $data.singleTab
                 this.scrollTop = $data.scrollTop
                 this.gotTab2 = $data.gotTab2

+ 7 - 0
src/web/staticres/common-module/portraitRecord/css/index.css

@@ -88,6 +88,10 @@
     font-size: .24rem;
     color: #171826;
 }
+.p-date .d-box .van-cell .van-field__right-icon {
+    padding: 0;
+    padding-right: 8px;
+}
 .p-date .d-box .van-cell .van-icon-play::before {
     -webkit-transform: rotate(90deg);
     transform:rotate(90deg);
@@ -362,4 +366,7 @@
     text-align: CENTER;
     color: #5f5e64;
     line-height: .4rem;
+}
+.record-time-d .van-picker__confirm {
+    color: #2ABED1;
 }

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

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

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

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

+ 8 - 5
src/web/staticres/css/dev2/biddingSearch.css

@@ -428,7 +428,7 @@ margin-left: 176px;
   width: 15px;
   height: 2px;
   line-height: 15px;
-  background-color: #000;
+  background-color: #E0E0E0;
   padding: 0;
   margin: 12px 6px 0;
 }
@@ -470,9 +470,12 @@ margin-left: 176px;
 #searchInner .searchControl .searchTender .release-time .timerInput {
   margin-top: -9px;
   margin-left: 40px;
-	border: 1px solid #fff;
-/*    background-color: #fff;*/
-    padding: 5px 5px;
+	/* border: 1px solid #fff; */
+  background-color: #F5F6F7;
+  padding: 5px 5px;
+}
+#searchInner .searchControl .searchTender .release-time .timerInput.active{
+  background-color: #2cb7ca;
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput input[type="text"] {
@@ -490,7 +493,7 @@ margin-left: 176px;
   width: 15px;
   height: 2px;
   line-height: 15px;
-  background-color: #000;
+  background-color: #E0E0E0;
   padding: 0;
   margin: 12px 6px 0;
 }

+ 2 - 2
src/web/staticres/css/dev2/superSearch.css

@@ -8,8 +8,8 @@
 .pricefat{
 	float: left;
 	margin-top: -9px;
-	border: 1px solid #fff;
-    background-color: #fff;
+	/* border: 1px solid #fff; */
+    background-color: #F5F6F7;
 	padding: 5px 5px;
 	border-radius:2px;
 }

+ 9 - 0
src/web/staticres/frontRouter/pc/seeHistory/css/index-pc.css

@@ -32,6 +32,9 @@
 .l-tabs .tips span {
     color: #2CB7CA;
 }
+.r-tabs {
+    position: relative;
+}
 .r-tabs .r-word {
     color: #686868;
     line-height: 22px;
@@ -50,6 +53,12 @@
 .r-tabs .date-class .el-input__suffix {
     top: -5px;
 }
+.r-tabs .r-icons {
+    position: absolute;
+    top: 6px;
+    right: 8px;
+    color: #aaa;
+}
 .see-content .lists {
     flex-direction: initial;
     align-items: flex-start;

+ 3 - 2
src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -54,7 +54,8 @@ var vm = new Vue({
     created() {
         this.years = new Date().getFullYear()
         this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = this.years + '年' + this.months + '月'
+        // this.dateVal = this.years + '年' + this.months + '月'
+        this.dateVal = new Date()
         this.subPoint()
         this.subRecord()
     },
@@ -96,7 +97,7 @@ var vm = new Vue({
                             abbr: getShortName(v.company_name),
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
                             legal: v.legal_person,
-                            money: parseInt(v.capital),
+                            money: v.capital,
                             phone: v.company_phone,
                             time: v.establishStamp,
                             address: v.company_address,

+ 19 - 19
src/web/staticres/me/js/mine.js

@@ -22,8 +22,8 @@ var mine = {
 
         this.linkClickEvents()
         this.getOfflineMessageCount()
-        // 企业画像访问量查询
-        this.getEntVisits()
+        // 企业画像记录访问权限
+        this.getBigVipState()
     },
     // ios返回刷新问题
     iosBackInvoke: function () {
@@ -38,23 +38,6 @@ var mine = {
             isPageHide = true
         });
     },
-    // 企业画像访问量查询
-    getEntVisits: function() {
-      let _this = this
-      $.ajax({
-          type: "POST",
-          url: "/bigmember/portrait/subVipPortrait/usage",
-          success: function (res) {
-              console.log(res)
-              if(res.error_code == 0) {
-                  if(res.data) {
-                      $('#ent-follow-history .his_usage').text(res.data.usage)
-                      $('#ent-follow-history .his_total').text('/' + ' ' + res.data.total)
-                  }
-              }
-          }
-      });
-    },
     // 设置用户头像
     setUserImg: function () {
         $('.user-img > img').attr("src", this.pageUserInfo.avatar || this.pageUserInfo.headimageurl)
@@ -100,6 +83,23 @@ var mine = {
             }
         })
     },
+    getBigVipState: function () {
+      var _this = this
+      $.ajax({
+          type: 'GET',
+          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.vipStatus > 0 && res.data.viper ) {
+                        $('#ent-follow-history').show()
+                      }
+                  }
+              }
+          }
+      })
+    },
     setPageState: function (info) {
         if (!info) return
         Object.assign(this.pageUserInfo, info)

+ 1 - 0
src/web/templates/frontRouter/pc/seeHistory/sess/index.html

@@ -43,6 +43,7 @@
                     :clearable="false"
                     :editable="false">
                 </el-date-picker>
+                <i class="el-icon-arrow-down r-icons"></i>
             </div>
         </div>
         <div class="see-content w" v-show="seeList.length !== 0">

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

@@ -200,7 +200,7 @@
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
                     <span v-if="!hasOnePower || !surplus" class="bid_upgrade">升级</span>
-                    <span v-if="hasOnePower && surplus" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
+                    <span v-if="hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
                     <div class="card-row zb-info">
@@ -228,6 +228,7 @@
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
                     </div>
                 </div>
+                <div class="vip_component" v-if="getStatus" style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%"></div>
                 <div class="j-container empty" v-if="conf._13 && !conf._4 && topProject.list.length === 0">
                     <div class="j-img img-empty empty-img"></div>
                     <p class="empty-text">暂无项目动态</p>

+ 21 - 7
src/web/templates/frontRouter/wx/portraitRecord/sess/index.html

@@ -1,14 +1,28 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
-    <!--引入公共资源头部-->
-    {{include "/big-member/meta.html"}}
+    <meta charset="utf-8">
+    <meta name="keywords" content="剑鱼标讯">
+    <meta name="description" content="剑鱼标讯">
+    <meta name="author" content="剑鱼标讯">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+    <meta name="browsermode" content="application">
+    <meta name="x5-orientation" content="portrait">
+    <meta name="screen-orientation" content="portrait">
+    <meta name="x5-page-mode" content="app">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
     <title>企业画像记录</title>
+    <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
-    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/portraitRecord/css/index.css?v={{Msg "seo" "version"}}' />
+    <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/loadjs/4.2.0/dist/loadjs.umd.js"></script>
 </head>
 <body>
   <div class="j-container">
@@ -19,7 +33,7 @@
           <div class="t-bg flex">
             <div class="nums">
               <span>{points.total}</span>个
-              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
+              <img src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
             </div>
             <div class="btns flex">
               <span>当月企业画像剩余数</span>
@@ -86,7 +100,7 @@
           </div>
           <div class="emptycom" v-if="list.length==0">
             <div class="emptyimg">
-              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
+              <img src='{{Msg "seo" "cdn"}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
             </div>
             <div class="emptytext">
               暂无企业画像记录
@@ -102,8 +116,8 @@
   <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
   <!--E-当前页面的资源-->
   {{include "/big-member/commonjs.html"}}
-  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
-  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
   {{include "/common/baiducc.html"}}
 </body>
 

+ 12 - 9
src/web/templates/pc/supsearch.html

@@ -17,7 +17,6 @@
 <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
-<script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
 <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
 <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
 <style type="text/css">
@@ -267,7 +266,7 @@ function isPower () {
 }
 isPower()
 var areas = {{.T.area}}!=null?{{.T.area}}:"";
-var selectPublishtime = {{.T.publishtime}}!=null?{{.T.publishtime}}:"";
+var selectPublishtime = {{.T.publishtime}}?{{.T.publishtime}}:"lately-7";
 var selectTimeslot = {{.T.timeslot}}!=null?{{.T.timeslot}}:"";
 var toptype = {{.T.toptype}}!=null?{{.T.toptype}}:"";
 var subtype = {{.T.subtype}}!=null?{{.T.subtype}}:"";
@@ -437,7 +436,9 @@ $(function(){
 		if(selectPublishtime.indexOf("_") > -1){
 			$(".timerInput").addClass("active");
 		}
-	}
+	} else {
+    $(".timer [data-value='lately-7']").addClass("active").siblings().removeClass('active');
+  }
 	if(selectTimeslot != "" && selectTimeslot.indexOf("_") > -1){
 		$("#starttime").css({"border-color":"#2cb7ca"});
 		$("#endtime").css({"border-color":"#2cb7ca"});
@@ -671,6 +672,7 @@ $(function(){
 </script>
 <script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
 <script src="/js/superSearch.js?v={{Msg "seo" "version"}}"></script>
+<script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
 <style>
   .control-tabBtn{
     margin-top: 0;
@@ -880,18 +882,19 @@ $(function(){
 				</div>
 				<div class="fl timer">
 					<ul>
-						<li id="timerAll" class="active" data-value="">全部</li>
-						<li data-value="lately-7">最近天</li>
+						<li id="timerAll" class="active" data-value="" style="display: none;">全部</li>
+						<li data-value="lately-7">最近7天</li>
 						<li data-value="lately-30">最近30天</li>
-						<li data-value="thisyear">年</li>
+						<li data-value="thisyear">最近一年</li>
 					</ul>
 				</div>
 				<div class="timerInput fl">
-					<input type="text"  onClick="WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',maxDate:'#F{$dp.$D(\'endtime\')}'})" id="starttime" readonly="true" placeholder="" />
+					<input type="text"  onClick="if(!vipState) return openVipDialog();WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',maxDate:'#F{$dp.$D(\'endtime\')}'})" id="starttime" readonly="true" placeholder="" />
 					<span></span>
-					<input type="text" name="maxtime"  onClick="WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',minDate:'#F{$dp.$D(\'starttime\')}'})" id="endtime" readonly="true" placeholder="" />
+          <input type="text" name="maxtime"  onClick="if(!vipState) return openVipDialog();WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',minDate:'#F{$dp.$D(\'starttime\')}'})" id="endtime" readonly="true" placeholder="" />
 					<button class="fl" id="timebut" style="display:none;">确定</button>
-				</div>
+        </div>
+        <img src="/images/biddingSearch/VIP.png" alt="" style="width:38px;height:18px;margin-left:8px;margin-top:-8px">
 			</div>
 			<!--项目地区-->
 			<div class="region clearfix">

+ 1 - 5
src/web/templates/weixin/my.html

@@ -144,16 +144,12 @@
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
-                    <div class="menu-list-item clickable" id="ent-follow-history" data-href="/weixin/frontPage/portraitRecord/sess/index">
+                    <div style="display: none;" class="menu-list-item clickable" id="ent-follow-history" data-href="/weixin/frontPage/portraitRecord/sess/index">
                         <div class="m-l-i-left">
                             <span class="j-icon base-icon icon-company"></span>
                             <span class="m-l-i-label">企业画像记录</span>
                         </div>
                         <div class="m-l-i-right">
-                            <span style="margin-right: .08rem;">
-                                <span class="his_usage" style="font-size: .28rem;color: #2ABED1;"></span>
-                                <span class="his_total" style="font-size: .22rem;color: #9B9CA3;"></span>
-                            </span>
                             <i class="dot-red"></i>
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>