Home Esplora Aiuto
Accedi
qmx
/
jy
14
0
Forka 0
File Problemi 2 Pull Requests 0 Wiki
Sfoglia il codice sorgente

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

xgwangman 4 anni fa
parent
099d7485ad 7af3f889f7
commit
dd555ef061
21 ha cambiato i file con 556 aggiunte e 41 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 3 3
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 19 0
      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. 84 2
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html
  5. 31 6
      src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html
  6. 3 3
      src/jfw/modules/app/src/web/templates/me/mine.html
  7. 4 2
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  8. 3 2
      src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html
  9. 17 0
      src/web/staticres/common-module/collection/css/index.css
  10. 10 2
      src/web/staticres/common-module/collection/js/index-wx.js
  11. 11 1
      src/web/staticres/common-module/collection/js/index.js
  12. 18 3
      src/web/staticres/common-module/collection/js/vip-dialog.js
  13. 16 3
      src/web/staticres/common-module/ent-search/ent-search-template.js
  14. 35 1
      src/web/staticres/css/dev2/newBidSearch.css
  15. 19 0
      src/web/staticres/me/js/mine.js
  16. 2 2
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html
  17. 203 0
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html
  18. 30 5
      src/web/templates/frontRouter/wx/collection/sess/index.html
  19. 40 0
      src/web/templates/pc/supsearch.html
  20. 3 3
      src/web/templates/weixin/my.html
  21. 4 2
      src/web/templates/weixin/search/mainSearch.html

+ 3 - 3
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
Vedi File 

@@ -113,9 +113,9 @@ var vNode = {
 
                 btntext: '去开通'
 
             },
 
             entvisit: {
 
-                total: 150, // 本月画像次数总量
 
-                usage: 150, // 本月已使用次数
 
-                provin: 3 // 购买省份数量
 
+                total: 0, // 本月画像次数总量
 
+                usage: 0, // 本月已使用次数
 
+                provin: 0 // 购买省份数量
 
             }
 
         }
 
     },

+ 19 - 0
src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js
Vedi File 

@@ -21,6 +21,8 @@ var mine = {
 
         this.showUserMerge()
 
         // 获取小红点状态
 
         this.getRedDotState()
 
+        // 企业画像访问量查询
 
+        this.getEntVisits()
 
     },
 
     // ios返回刷新问题
 
     iosBackInvoke: function () {
 
@@ -84,6 +86,23 @@ 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)

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

@@ -186,7 +186,7 @@
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <div class="bg-white tab-card ent-change-history" @click="goToEntHistory" v-if="!svip && conf._12">
 
+                <div class="bg-white tab-card ent-change-history" @click="goToEntHistory">
 
                     <div class="ent-change-l">企业情报历史记录</div>
 
                     <div class="j-icon icon-back base-icon"></div>
 
                 </div>

+ 84 - 2
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html
Vedi File 

@@ -16,17 +16,31 @@
 
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
 
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
 
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/ent_portrait.css?v={{Msg "seo" "version"}}' />
 
     <!--E-当前页面的css资源-->
 
 </head>
 
+<style>
 
+    .vip_openDialog{
 
+        padding: 0.56rem 0 0.64rem;
 
+        width: 6.06rem;
 
+        /* height: 6.88rem; */
 
+        background: url('{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/image/openVip.png') no-repeat;
 
+        background-size: 100% 100%;
 
+        box-sizing: border-box;
 
+    }
 
+</style>
 
 <body>
 
 <div class="j-container">
 
     {{include "/big-member/header.html"}}
 
     <div id="ent-portrait-change" class="j-main" v-cloak>
 
-        <div class="j-container empty" v-if="changeList.length === 0" key="changeList">
 
+        <div class="j-container empty" v-if="changeList.length === 0 && getStatus" key="changeList">
 
             <div class="j-img img-empty empty-img"></div>
 
             <p class="empty-text">暂无企业情报历史记录</p>
 
         </div>
 
+        <div class="vip_component" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
 
+            <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
 
+        </div>
 
         <ul class="ent-change-list" v-else key="changeList">
 
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
 
                 <div class="header-time">${new Date(item.changeTime).pattern('yyyy.MM.dd')}</div>
 
@@ -60,14 +74,30 @@
 
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
 
 <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
 
 {{include "/big-member/commonjs.html"}}
 
 <script>
 
 var vNode = {
 
     delimiters: ['${', '}'],
 
     el: '#ent-portrait-change',
 
+    components: {
 
+        vipComponent: vipComponent
 
+    },
 
     data: {
 
         eId: '',
 
-        changeList: []
 
+        changeList: [],
 
+        entvisit: {
 
+            total: 0, // 本月画像次数总量
 
+            usage: 0, // 本月已使用次数
 
+            provin: 0 // 购买省份数量
 
+        },
 
+        powerInfo: {},
 
+        conf: {
 
+            _12: false
 
+        },
 
+        isVip: false,
 
+        vipststus: 0
 
+
 
     },
 
     created: function () {
 
         var eId = utils.getParam('eId')
 
@@ -75,9 +105,61 @@ var vNode = {
 
             eId = decodeURIComponent(eId)
 
             this.eId = eId
 
         }
 
+        this.getUserInfo()
 
+        this.getEntVisits()
 
         this.getEntHistory()
 
     },
 
+    computed: {
 
+        getStatus: function () {
 
+            return this.conf._12 || (this.isVip && this.entvisit.total > this.entvisit.usage)
 
+        }  
+    },
 
     methods: {
 
+        // 获取权限信息
 
+        getUserInfo: function() {
 
+            let _this = this
 
+            $.ajax({
 
+                type: 'POST',
 
+                url: '/bigmember/use/isAdd',
 
+                success: function(res) {
 
+                    console.log(res.data)
 
+                    if (res.data) {
 
+                        _this.powerInfo = res.data
 
+                    }
 
+                    if (res.data && $.isArray(res.data.power)) {
 
+                        // 根据power判断权限，企业画像包含权限(12)
 
+                        var power = res.data.power
 
+                        // 判断是否是超级订阅会员、老用户还是新用户
 
+                        if (res.data.viper) {
 
+                            _this.isVip = true
 
+                        } else {
 
+                            if(res.data.vipStatus > 0) {
 
+                                _this.vipststus = res.data.vipststus
 
+                            }
 
+                        }
 
+                        if (power.indexOf(12) != -1) {
 
+                            // 获取企业情报历史记录-12
 
+                            _this.conf._12 = true
 
+                        }
 
+                    }
 
+                }
 
+            })
 
+        },
 
+        // 企业画像访问量查询
 
+        getEntVisits: function() {
 
+            let _this = this
 
+            $.ajax({
 
+                type: "POST",
 
+                url: "/bigmember/portrait/subVipPortrait/usage",
 
+                success: function (res) {
 
+                    if(res.error_code == 0) {
 
+                        if(res.data) {
 
+                            _this.entvisit = res.data
 
+                        }
 
+                    }
 
+                }
 
+            });
 
+        },
 
         getEntHistory: function () {
 
             var _this = this
 
             $.ajax({

+ 31 - 6
src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html
Vedi File 

@@ -50,14 +50,38 @@
 
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
 
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
 
             </van-dropdown-item>
 
-            <van-dropdown-item :title="tagText.cateText" ref="cateItem">
 
-              <cate-component ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
 
+            <van-dropdown-item ref="cateItem">
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">${tagText.cateText}</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>${tagText.cateText}</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+            </template>
 
+              <cate-component v-if="screenShow" ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
-            <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
 
-              <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>
 
+            <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone">
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">采购单位联系方式</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>采购单位联系方式</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+              </template>
 
+              <phone-component v-if="screenShow" :data="params.buyerData" @confirm="confirm"></phone-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
-            <van-dropdown-item ref="winnerItem" v-model="limitlist.winnerPhone"  title="中标企业联系方式">
 
-              <phone-component :data="params.winnerData" @confirm="confirm"></phone-component>
 
+            <van-dropdown-item ref="winnerItem" v-model="limitlist.winnerPhone">
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">中标企业联系方式</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>中标企业联系方式</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+              </template>
 
+              <phone-component v-if="screenShow" :data="params.winnerData" @confirm="confirm"></phone-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
           </van-dropdown-menu>
 
           <div class="list-mian" ref="jList" v-if="listState.list.length!==0">
 
@@ -124,6 +148,7 @@
 
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/tags-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/cate-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/root-mobile.js?v={{Msg "seo" "version"}}'></script>
 
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/phone-mobile.js?v={{Msg "seo" "version"}}'></script>
 
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/index.js?v={{Msg "seo" "version"}}'></script>
 
   {{include "/common/baiducc.html"}}

+ 3 - 3
src/jfw/modules/app/src/web/templates/me/mine.html
Vedi File 

@@ -168,15 +168,15 @@
 
                             <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/collection/sess/index'>
 
+                    <div 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 style="font-size: .28rem;color: #2ABED1;">12</span>
 
-                                <span style="font-size: .22rem;color: #9B9CA3;">/ 500</span>
 
+                                <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>

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

@@ -499,7 +499,8 @@
 
     window.jyUserPower = {
 
       entniche: false,
 
       member: false,
 
-      vip: 0
 
+      vip: 0,
 
+      isOld: false
 
     }
 
     $.ajax({
 
       url: '/publicapply/bidcoll/power',
 
@@ -509,7 +510,8 @@
 
           window.jyUserPower = {
 
             entniche: r.data.entniche,
 
             member: r.data.member,
 
-            vip: r.data.vip
 
+            vip: r.data.vip,
 
+            isOld: r.data.isOld
 
           }
 
         }
 
     })

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

@@ -1869,7 +1869,8 @@
 
                 if(data && data.length !== 0) {
 
                     $('.collec_list').show()
 
                     data.forEach(function(item, index) {
 
-                        collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.labelname}</span>`
 
+                        console.log(item)
 
+                        collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.title}</span>`
 
                     })
 
                     $('.collec_list').html(collecHtml)
 
                 } else {
 
@@ -1877,7 +1878,7 @@
 
                 }
 
             },
 
             tagClick (i) {
 
-                location.href = '/jyapp/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].id)
 
+                location.href = '/jyapp/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].lid)
 
             }
 
         }
 
     })

+ 17 - 0
src/web/staticres/common-module/collection/css/index.css
Vedi File 

@@ -772,6 +772,7 @@
 
     background: #e5fcff;
 
     font-size: .26rem;
 
     color: #2cb7ca;
 
+    border-top-right-radius: .08rem;
 
 }
 
 .vip_openDialog  .vip_head .vip_extend{
 
     font-size: 0.26rem;
 
@@ -794,4 +795,20 @@
 
     font-weight: 400;
 
     text-align: CENTER;
 
     color: #ffffff;
 
+}
 
+
 
+
 
+.rootstyletitle{
 
+    display: inline-block;
 
+    height: 100%;
 
+    font-size: .28rem;
 
+    font-weight: 500;
 
+    color: #c0c4cc;
 
+}
 
+.rootstyletitle .root_open{
 
+    padding: .04rem .12rem;
 
+    border: 1px solid #fb483d;
 
+    border-radius: 9px;
 
+    font-size: .2rem;
 
+    color: #fb483d;
 
 }

+ 10 - 2
src/web/staticres/common-module/collection/js/index-wx.js
Vedi File 

@@ -5,7 +5,8 @@ var vNode = {
 
     tagsComponent: tagsComponent,
 
     dateComponent: dateComponent,
 
     cateComponent: cateComponent,
 
-    phoneComponent: phoneComponent
 
+    phoneComponent: phoneComponent,
 
+    rootComponent: rootComponent
 
   },
 
   data: {
 
     sessStorageKey: '$data-collection',
 
@@ -154,11 +155,11 @@ var vNode = {
 
         url: '/publicapply/bidcoll/power',
 
         type: 'POST',
 
         success: function(res) {
 
-          console.log(res)
 
           if(res.data.entniche || res.data.member || res.data.vip > 0) {
 
             _this.screenShow = true
 
           } else {
 
             _this.screenShow = false
 
+            _this.limitshow = true
 
           }
 
         }
 
       })
 
@@ -354,6 +355,9 @@ var vNode = {
 
         this.limitlist.buyerPhone = parseInt(data.data)
 
       } else if (data.name == 'winnerItem') {
 
         this.limitlist.winnerPhone = parseInt(data.data)
 
+      } else if (data.name == 'rootItem') {
 
+        location.href = "/front/vipsubscribe/vipsubscribe_new";
 
+        return
 
       }
 
       this.limitlist.pageNum = 1
 
       this.setToggle()
 
@@ -381,7 +385,11 @@ var vNode = {
 
         this.limitlist.buyerPhone = 0
 
       } else if (data.name == 'winnerItem') {
 
         this.limitlist.winnerPhone = 0
 
+      } else if(data.name == 'rootItem') {
 
+        this.setToggle()
 
+        return
 
       }
 
+      this.limitlist.pageNum = 1
 
       this.reLoadList(true)
 
       this.setToggle()
 
     },

+ 11 - 1
src/web/staticres/common-module/collection/js/index.js
Vedi File 

@@ -5,7 +5,8 @@ var vNode = {
 
     tagsComponent: tagsComponent,
 
     dateComponent: dateComponent,
 
     cateComponent: cateComponent,
 
-    phoneComponent: phoneComponent
 
+    phoneComponent: phoneComponent,
 
+    rootComponent: rootComponent
 
   },
 
   data: {
 
     sessStorageKey: '$data-collection',
 
@@ -154,6 +155,7 @@ var vNode = {
 
             _this.screenShow = true
 
           } else {
 
             _this.screenShow = false
 
+            _this.limitshow = true
 
           }
 
         }
 
       })
 
@@ -279,6 +281,7 @@ var vNode = {
 
     },
 
     // 确定按钮事件
 
     confirm: function(data) {
 
+      console.log(data)
 
       if(data.name == 'dateItem'){
 
         const timeRange = {
 
           start: (data.data.start / 1000).toFixed(0),
 
@@ -347,6 +350,9 @@ var vNode = {
 
         this.limitlist.buyerPhone = parseInt(data.data)
 
       } else if (data.name == 'winnerItem') {
 
         this.limitlist.winnerPhone = parseInt(data.data)
 
+      } else if (data.name == 'rootItem') {
 
+        location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
 
+        return
 
       }
 
       isScreen = true
 
       this.limitlist.pageNum = 1
 
@@ -374,7 +380,11 @@ var vNode = {
 
         this.limitlist.buyerPhone = 0
 
       } else if (data.name == 'winnerItem') {
 
         this.limitlist.winnerPhone = 0
 
+      } else if(data.name == 'rootItem') {
 
+        this.setToggle()
 
+        return
 
       }
 
+      this.limitlist.pageNum = 1
 
       this.reLoadList(true)
 
       this.setToggle()
 
     },

+ 18 - 3
src/web/staticres/common-module/collection/js/vip-dialog.js
Vedi File 

@@ -41,6 +41,12 @@ var vipComponent = {
 
       default: function () {
 
         return ''
 
       }
 
+    },
 
+    "vipststus": {
 
+      type: Number,
 
+      default: function () {
 
+        return 0
 
+      }
 
     }
 
   },
 
   data: function() {
 
@@ -58,11 +64,14 @@ var vipComponent = {
 
   },
 
   methods: {
 
     setVisitStatus: function () {
 
-      if (this.entvisit.total - this.entvisit.usage == 0) {
 
-        this.titleText = '超级订阅'
 
-        if (this.entvisit.provin != -1) {
 
+      if (this.entvisit.total == this.entvisit.usage || this.vipststus > 0) {
 
+        if (this.entvisit.provin == 0) {
 
+          this.btnText = '去开通'
 
+        } else if (this.entvisit.provin != -1) {
 
+          this.titleText = '超级订阅'
 
           this.btnText = '去升级'
 
         } else if(this.entvisit.provin == -1) {
 
+          this.titleText = '超级订阅'
 
           this.btnText = '联系客服'
 
         }
 
       }
 
@@ -109,6 +118,12 @@ var vipComponent = {
 
           this.headText.bot = '与供应商关系远近，辅助投标决策！'
 
           break
 
         }
 
+        // 企业情报历史记录
 
+        case 'item_8': {
 
+          this.headText.top = '快速查询全国企业工商信息、法人信息、'
 
+          this.headText.bot = '联系方式，全面掌控企业动态！'
 
+          break
 
+        }
 
         default: {
 
           this.headText.top = '通过实时监控项目的招标、中标、合同等'
 
           this.headText.bot = '信息，全面挖掘更多潜在商机！'

+ 16 - 3
src/web/staticres/common-module/ent-search/ent-search-template.js
Vedi File 

@@ -767,7 +767,7 @@ var vMainSearchComponent = new Vue({
 
           },
 
           {
 
             title: '中标企业',
 
-            tag: '老用户免费专享',
 
+            tag: '',
 
             disabled: true,
 
             checked: false,
 
             key: 'winner'
 
@@ -879,14 +879,27 @@ var vMainSearchComponent = new Vue({
 
       var resultPower = false
 
       if (tempPower) {
 
         resultPower = tempPower.entniche || tempPower.member || tempPower.vip !== 0
 
-        this.changePower(!resultPower, tempPower.member)
 
+        this.changePower(!resultPower, tempPower.member, tempPower)
 
       }
 
       return resultPower
 
     },
 
-    changePower (type, member) {
 
+    changePower (type, member, tempPower) {
 
       this.entTabs[8].disabled = type
 
       this.entTabs[9].disabled = type
 
       this.entTabs[10].disabled = type
 
+
 
+      // 搜索范围权限调整
 
+      this.conditionMap[1][2].disabled = type
 
+      this.conditionMap[1][3].disabled = type
 
+      this.conditionMap[1][4].disabled = type
 
+      this.conditionMap[1][5].disabled = type
 
+      this.conditionMap[1][2].tag = ''
 
+
 
+      if (tempPower.isOld && type) {
 
+        this.conditionMap[1][2].disabled = false
 
+        this.conditionMap[1][2].tag = '老用户免费专享'
 
+      }
 
+
 
       if (utils.isWeiXinBrowser) {
 
         this.entTabs[7].hide = true
 
       } else {

+ 35 - 1
src/web/staticres/css/dev2/newBidSearch.css
Vedi File 

@@ -1,4 +1,38 @@
 
-
 
+/* 搜索范围 */
 
+.searchSpace{
 
+  padding-top: 16px;
 
+}
 
+.searchSpace .search-list{
 
+  display: inline-block;
 
+  margin-right: 16px;
 
+  line-height: 22px;
 
+  color: #1D1D1D;
 
+  cursor: pointer;
 
+}
 
+.searchSpace .search-list>input[type="checkbox"]{
 
+  width: 14px;
 
+  float: left;
 
+  height: 14px;
 
+  margin-top: 4px;
 
+  margin-right: 8px;
 
+  border: 1px solid #E0E0E0;
 
+  border-radius: 2px;
 
+}
 
+.searchSpace .search-list>input[type="checkbox"]:checked{
 
+  background: url(/images/biddingSearch/icon-checked.png) no-repeat center;
 
+  background-size: contain;
 
+  border: 0;
 
+}
 
+.searchSpace .search-list label{
 
+  float: left;
 
+}
 
+.searchSpace .search-list .icon-vip{
 
+  float: left;
 
+  display: inline-block;
 
+  width: 38px;
 
+  height: 18px;
 
+  margin-left: 8px;
 
+}
 
 /* 高级筛选 */
 
 .advanced-filter{
 
   padding: 12px 0px 16px;

+ 19 - 0
src/web/staticres/me/js/mine.js
Vedi File 

@@ -22,6 +22,8 @@ var mine = {
 
 
         this.linkClickEvents()
 
         this.getOfflineMessageCount()
 
+        // 企业画像访问量查询
 
+        this.getEntVisits()
 
     },
 
     // ios返回刷新问题
 
     iosBackInvoke: function () {
 
@@ -36,6 +38,23 @@ 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)

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

@@ -184,10 +184,10 @@
 
                         </div>
 
                     </div>
 
                 </div>
 
-                <!-- <div class="bg-white tab-card ent-change-history" @click="goToEntHistory" v-if="!svip">
 
+                <div class="bg-white tab-card ent-change-history" @click="goToEntHistory">
 
                     <div class="ent-change-l">企业情报历史记录</div>
 
                     <div class="j-icon icon-back base-icon"></div>
 
-                </div> -->
 
+                </div>
 
             </van-tab>
 
             <van-tab name="2" v-if="!singleTab">
 
                 <template #title>

+ 203 - 0
src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html
Vedi File 

@@ -0,0 +1,203 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-CN" style="font-size: 50px;">
 
+<head>
 
+    <!--S-meta-->
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport"
 
+        content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
+    <meta name="format-detection" content="telephone=yes"/>
 
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+    <title>企业情报历史记录</title>
 
+    <script src="/big-member/js/rem.js"></script>
 
+    <script src="/big-member/js/utils.js"></script>
 
+    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
 
+    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
 
+    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
 
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/public.css?v={{Msg "seo" "version"}}'>
 
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/j-icons.css?v={{Msg "seo" "version"}}'>
 
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/ent_portrait.css?v={{Msg "seo" "version"}}' />
 
+</head>
 
+<style>
 
+    .vip_openDialog{
 
+        padding: 0.56rem 0 0.64rem;
 
+        width: 6.06rem;
 
+        /* height: 6.88rem; */
 
+        background: url('{{Msg "seo" "cdn"}}/big-member/image/openVip.png') no-repeat;
 
+        background-size: 100% 100%;
 
+        box-sizing: border-box;
 
+    }
 
+</style>
 
+<body>
 
+<div class="j-container">
 
+    {{include "/big-member/header.html"}}
 
+    <div id="ent-portrait-change" class="j-main" v-cloak>
 
+        <div class="j-container empty" v-if="changeList.length === 0 && getStatus" key="changeList">
 
+            <div class="j-img img-empty empty-img"></div>
 
+            <p class="empty-text">暂无企业情报历史记录</p>
 
+        </div>
 
+        <div class="vip_component" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
 
+            <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
 
+        </div>
 
+        <ul class="ent-change-list" v-else key="changeList">
 
+            <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
 
+                <div class="header-time">${new Date(item.changeTime).pattern('yyyy.MM.dd')}</div>
 
+                <ul class="change-type-list bg-white" v-for="(iitem, iindex) in item.changeTerms" :key="iindex">
 
+                    <li class="change-type-item border-line-b">
 
+                        <div class="change-type-header">${iitem.change_name_new}</div>
 
+                        <div class="change-type-content">
 
+                            <div class="change-type">
 
+                                <span class="change-type-label">变更前</span>
 
+                                <span class="change-type-text">${iitem.content_before}</span>
 
+                            </div>
 
+                            <div class="change-type">
 
+                                <span class="change-type-label">变更后</span>
 
+                                <span class="change-type-text">${iitem.content_after}</span>
 
+                            </div>
 
+                        </div>
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+        </ul>
 
+    </div>
 
+</div>
 
+<!--S-当前页面的资源-->
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 
+<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
 
+<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
 
+<script src='{{Msg "seo" "cdn"}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
 
+{{include "/big-member/commonjs.html"}}
 
+<script>
 
+var vNode = {
 
+    delimiters: ['${', '}'],
 
+    el: '#ent-portrait-change',
 
+    components: {
 
+        vipComponent: vipComponent
 
+    },
 
+    data: {
 
+        eId: '',
 
+        changeList: [],
 
+        entvisit: {
 
+            total: 0, // 本月画像次数总量
 
+            usage: 0, // 本月已使用次数
 
+            provin: 0 // 购买省份数量
 
+        },
 
+        powerInfo: {},
 
+        conf: {
 
+            _12: false
 
+        },
 
+        isVip: false,
 
+        vipststus: 0
 
+
 
+    },
 
+    created: function () {
 
+        var eId = utils.getParam('eId')
 
+        if (eId) {
 
+            eId = decodeURIComponent(eId)
 
+            this.eId = eId
 
+        }
 
+        this.getUserInfo()
 
+        this.getEntVisits()
 
+        this.getEntHistory()
 
+    },
 
+    computed: {
 
+        getStatus: function () {
 
+            return this.conf._12 || (this.isVip && this.entvisit.total > this.entvisit.usage)
 
+        }  
+    },
 
+    methods: {
 
+        // 获取权限信息
 
+        getUserInfo: function() {
 
+            let _this = this
 
+            $.ajax({
 
+                type: 'POST',
 
+                url: '/bigmember/use/isAdd',
 
+                success: function(res) {
 
+                    console.log(res.data)
 
+                    if (res.data) {
 
+                        _this.powerInfo = res.data
 
+                    }
 
+                    if (res.data && $.isArray(res.data.power)) {
 
+                        // 根据power判断权限，企业画像包含权限(12)
 
+                        var power = res.data.power
 
+                        // 判断是否是超级订阅会员、老用户还是新用户
 
+                        if (res.data.viper) {
 
+                            _this.isVip = true
 
+                        } else {
 
+                            if(res.data.vipStatus > 0) {
 
+                                _this.vipststus = res.data.vipststus
 
+                            }
 
+                        }
 
+                        if (power.indexOf(12) != -1) {
 
+                            // 获取企业情报历史记录-12
 
+                            _this.conf._12 = true
 
+                        }
 
+                    }
 
+                }
 
+            })
 
+        },
 
+        // 企业画像访问量查询
 
+        getEntVisits: function() {
 
+            let _this = this
 
+            $.ajax({
 
+                type: "POST",
 
+                url: "/bigmember/portrait/subVipPortrait/usage",
 
+                success: function (res) {
 
+                    if(res.error_code == 0) {
 
+                        if(res.data) {
 
+                            _this.entvisit = res.data
 
+                        }
 
+                    }
 
+                }
 
+            });
 
+        },
 
+        getEntHistory: function () {
 
+            var _this = this
 
+            $.ajax({
 
+                type: 'POST',
 
+                url: '/bigmember/follow/ent/entChangeList',
 
+                data: {
 
+                    entId: _this.eId
 
+                },
 
+                success: function (res) {
 
+                    if (res.error_code == 0) {
 
+                        if (res.data && $.isArray(res.data)) {
 
+                            _this.changeList = _this.sortChangeList(res.data)
 
+                        }
 
+                    } else {
 
+                        // _this.$toast(res.error_msg)
 
+                    }
 
+                },
 
+                error: function (error) {
 
+                    console.log(error)
 
+                }
 
+            })
 
+        },
 
+        sortChangeList: function (list) {
 
+            var dateList = []
 
+            list.forEach(function (date) {
 
+                for (var key in date) {
 
+                    var dateItems = []
 
+                    date[key].forEach(function (item) {
 
+                        item.change_date = item.change_date.replace(/-/g, '/')
 
+                        dateItems.push(item)
 
+                    })
 
+                    dateList.push({
 
+                        changeTerms: dateItems,
 
+                        changeTime: key.replace(/-/g, '/'),
 
+                    })
 
+                }
 
+            })
 
+            return dateList
 
+        }
 
+    }
 
+}
 
+var vueComponent = new Vue(vNode)
 
+</script>
 
+
 
+{{include "/common/baiducc.html"}}
 
+</body>
 
+</html>

+ 30 - 5
src/web/templates/frontRouter/wx/collection/sess/index.html
Vedi File 

@@ -56,14 +56,38 @@
 
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
 
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
 
             </van-dropdown-item>
 
-            <van-dropdown-item :title="tagText.cateText" ref="cateItem">
 
-              <cate-component ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
 
+            <van-dropdown-item ref="cateItem">
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">${tagText.cateText}</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>${tagText.cateText}</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+            </template>
 
+              <cate-component v-if="screenShow" ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
-            <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
 
-              <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>
 
+            <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone">
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">采购单位联系方式</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>采购单位联系方式</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+              </template>
 
+              <phone-component v-if="screenShow" :data="params.buyerData" @confirm="confirm"></phone-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
             <van-dropdown-item ref="winnerItem" v-model="limitlist.winnerPhone"  title="中标企业联系方式">
 
-              <phone-component :data="params.winnerData" @confirm="confirm"></phone-component>
 
+              <template #title>
 
+                <span v-if="screenShow" class="cateText">中标企业联系方式</span>
 
+                <span v-if="!screenShow" class="rootstyletitle">
 
+                    <span>中标企业联系方式</span>
 
+                    <span class="root_open">开通</span>
 
+                </span>
 
+              </template>
 
+              <phone-component v-if="screenShow" :data="params.winnerData" @confirm="confirm"></phone-component>
 
+              <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
 
             </van-dropdown-item>
 
           </van-dropdown-menu>
 
           <div class="list-mian" ref="jList" v-if="listState.list.length!==0">
 
@@ -131,6 +155,7 @@
 
   <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/cate-mobile.js?v={{Msg "seo" "version"}}'></script>
 
   <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/phone-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+  <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/root-mobile.js?v={{Msg "seo" "version"}}'></script>
 
   <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
 
   {{include "/common/baiducc.html"}}
 
 </body>

+ 40 - 0
src/web/templates/pc/supsearch.html
Vedi File 

@@ -793,6 +793,46 @@ $(function(){
 
 		</div>
 
 		<!--头部功能-->
 
 		<div class="searchTender w">
 
+      <!--搜索范围：-->
 
+			<div class="searchSpace clearfix">
 
+				<div class="leftTitle">
 
+					搜索范围：
 
+				</div>
 
+				<div class="search-content">
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="all-space">
 
+            <label for="all-space">全部</label>
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="title-space">
 
+            <label for="title-space">标题</label>
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="main-space">
 
+            <label for="main-space">正文</label>
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="buyer-space">
 
+            <label for="buyer-space">采购单位</label>
 
+            <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="bid-space">
 
+            <label for="bid-space">中标企业</label>
 
+            <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="agency-space">
 
+            <label for="agency-space">招标代理机构</label>
 
+            <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
 
+          </span>
 
+          <span class="search-list">
 
+            <input type="checkbox" name="" id="accessory-space">
 
+            <label for="accessory-space">附件</label>
 
+            <img class="icon-vip" src="/images/biddingSearch/VIP.png" alt="">
 
+          </span>
 
+				</div>
 
+			</div>
 
 			<!--行业-->
 
 			<div class="industry">
 
 				<div class="leftTitle">

+ 3 - 3
src/web/templates/weixin/my.html
Vedi File 

@@ -144,15 +144,15 @@
 
                             <span class="j-icon base-icon icon-arrow-right"></span>
 
                         </div>
 
                     </div>
 
-                    <div class="menu-list-item clickable" id="ent-follow-history" data-href="/jylab/followent/entList">
 
+                    <div 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 style="font-size: .28rem;color: #2ABED1;">12</span>
 
-                                <span style="font-size: .22rem;color: #9B9CA3;">/ 500</span>
 
+                                <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>

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

@@ -908,7 +908,8 @@
 
     window.jyUserPower = {
 
       entniche: false,
 
       member: false,
 
-      vip: 0
 
+      vip: 0,
 
+      isOld: false
 
     }
 
     $.ajax({
 
       url: '/publicapply/bidcoll/power',
 
@@ -918,7 +919,8 @@
 
           window.jyUserPower = {
 
             entniche: r.data.entniche,
 
             member: r.data.member,
 
-            vip: r.data.vip
 
+            vip: r.data.vip,
 
+            isOld: r.data.isOld
 
           }
 
         }
 
     })