Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

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

wangkaiyue 4 years ago
parent
a9068c0985 6575a456c3
commit
0f603d93b8
10 changed files with 114 additions and 42 deletions
Split View Show Diff Stats
  1. 11 3
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 5 1
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html
  3. 36 14
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  4. 3 1
      src/web/staticres/common-module/collection/css/index.css
  5. 7 4
      src/web/staticres/common-module/collection/js/date-mobile.js
  6. 11 3
      src/web/staticres/common-module/collection/js/ent_portrait.js
  7. 18 14
      src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js
  8. 7 1
      src/web/staticres/js/ent-search-index-pc.js
  9. 11 0
      src/web/templates/frontRouter/pc/seeHistory/sess/index.html
  10. 5 1
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html

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

@@ -116,7 +116,8 @@ var vNode = {
 
             entvisit: {
 
                 total: 0, // 本月画像次数总量
 
                 usage: 0, // 本月已使用次数
 
-                provin: 0 // 购买省份数量
 
+                provin: 0, // 购买省份数量
 
+                visited: false // 是否查看中标信息
 
             }
 
         }
 
     },
 
@@ -180,8 +181,11 @@ var vNode = {
 
                             console.log('获取企业中标动态...')
 
                         }
 
                         if(_this.powerInfo.memberStatus <= 0) {
 
-                            // 不是大会员时才请求访问量接口
 
-                            _this.getEntVisits()
 
+                            // 不是大会员点击中标信息使用次数加一
 
+                            if(!_this.entvisit.visited) {
 
+                                _this.entvisit.usage++
 
+                                _this.entvisit.visited = true
 
+                            }
 
                         }
 
                         _this.gotTab2 = true
 
                     }
 
@@ -302,6 +306,9 @@ var vNode = {
 
             $.ajax({
 
                 type: "POST",
 
                 url: "/bigmember/portrait/subVipPortrait/usage",
 
+                data: {
 
+                    entId: _this.entInfo.id
 
+                },
 
                 success: function (res) {
 
                     console.log(res)
 
                     if(res.error_code == 0) {
 
@@ -490,6 +497,7 @@ var vNode = {
 
                             } else {
 
                                 _this.entInfo.followSearchFinish = true
 
                                 _this.entInfo.entExist = false
 
+                                _this.getEntVisits()
 
                             }
 
                             _this.singleTab = false
 
                         }

+ 5 - 1
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html
View File 

@@ -29,6 +29,9 @@
 
         background-size: 100% 100%;
 
         box-sizing: border-box;
 
     }
 
+    .bigVip_com{
 
+        display: none;
 
+    }
 
 </style>
 
 <body>
 
 <div class="j-container">
 
@@ -38,7 +41,7 @@
 
             <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%">
 
+        <div class="vip_component bigVip_com" 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">
 
@@ -141,6 +144,7 @@ var vNode = {
 
                         if (power.indexOf(12) != -1) {
 
                             // 获取企业情报历史记录-12
 
                             _this.conf._12 = true
 
+                            $('.bigVip_com').css({'display':'flex'})
 
                         }
 
                     }
 
                 }

+ 36 - 14
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
View File 

@@ -175,10 +175,10 @@
 
                         <div class="jy_sprite_home_icon icon_1"></div>
 
                         <span>投标决策</span>
 
                     </a>
 
-                    <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
 
+                    <!-- <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
 
                         <div class="jy_sprite_home_icon_add icon_9"></div>
 
                         <span>潜在项目预测</span>
 
-                    </a>
 
+                    </a> -->
 
                     <a class="tab_item" data-only-name="中标企业预测" id="mainSearch-tab3">
 
                         <div class="jy_sprite_home_icon icon_3"></div>
 
                         <span>中标企业预测</span>
 
@@ -190,7 +190,11 @@
 
                     <a class="tab_item" data-only-name="剑鱼文库" id="">
 
                       <div class="jy_sprite_home_icon icon_2"></div>
 
                       <span>剑鱼文库</span>
 
-                  </a>
 
+                    </a>
 
+                    <a class="tab_item" data-only-name="剑鱼伙伴" id="mainSearch-tab2">
 
+                        <div class="jy_sprite_home_icon_add icon_9"></div>
 
+                        <span>剑鱼伙伴</span>
 
+                    </a>
 
                 </div>
 
                 <div class="tab_container">
 
                     <a class="tab_item" data-only-name="数据导出" id="mainSearch-tab5">
 
@@ -953,17 +957,17 @@
 
                     }
 
                     break
 
                 }
 
-                case '潜在项目预测': {
 
-                    sessionStorage.setItem('landinfo', JSON.stringify({
 
-                        anchor: '潜在项目预测'
 
-                    }))
 
-                    if ($this.attr('data-access')) {
 
-                        window.location.href = '/jyapp/big/page/forecast_list';
 
-                    } else {
 
-                        location.href = '/jyapp/big/page/landingPage';
 
-                    }
 
-                    break
 
-                }
 
+                // case '潜在项目预测': {
 
+                //     sessionStorage.setItem('landinfo', JSON.stringify({
 
+                //         anchor: '潜在项目预测'
 
+                //     }))
 
+                //     if ($this.attr('data-access')) {
 
+                //         window.location.href = '/jyapp/big/page/forecast_list';
 
+                //     } else {
 
+                //         location.href = '/jyapp/big/page/landingPage';
 
+                //     }
 
+                //     break
 
+                // }
 
                 case '中标企业预测':  {
 
                     sessionStorage.setItem('landinfo', JSON.stringify({
 
                         anchor: '中标企业预测'
 
@@ -1014,6 +1018,24 @@
 
                     }
 
                     break
 
                 }
 
+                case '剑鱼伙伴': {
 
+                    if(userId==""){
 
+                        window.location.href='/jyapp/free/login?back=index';
 
+                    }else{
 
+                        $.ajax({
 
+                            url: '/distribution/partner/isPartner?t=' + new Date().getTime(),
 
+                            type: 'POST',
 
+                            success: function (r) {
 
+                                if (r.isPartner) {
 
+                                    window.location.href = "/page_partner/home"
 
+                                } else {
 
+                                    window.location.href = "/page_partner/partner/partner.html" // 协议页面
 
+                                }
 
+                            }
 
+                        })
 
+                    }
 
+                    break
 
+                }
 
                 case '签到': {
 
                     if(userId==""){
 
                         window.location.href='/jyapp/free/login?back=index';

+ 3 - 1
src/web/staticres/common-module/collection/css/index.css
View File 

@@ -852,7 +852,9 @@
 
 
 
 /* 企业画像历史项目联系人 */
 
-
 
+.history-list .project-info-item{
 
+    padding: .24rem 0;
 
+}
 
 .history-list .project-info-item .his-pro-title{
 
     width: 100%;
 
     font-size: .28rem;

+ 7 - 4
src/web/staticres/common-module/collection/js/date-mobile.js
View File 

@@ -307,11 +307,13 @@ var dateComponent = {
 
           t.start = t.end - durations.day30
 
           break
 
         }
 
+        // 最近一年
 
         case 'lastYear': {
 
-          const year = new Date(t.end).getFullYear()
 
-          const lastYear = year - 1
 
-          t.start = +new Date(`${lastYear}`)
 
-          t.end = +new Date(`${year}`) - durations.hour1 * 8 - 1
 
+          const year = new Date().getTime()
 
+          console.log(year)
 
+          const lastYear = year - 60 * 60 * 1000 * 24 * 30 * 12
 
+          t.start = +lastYear
 
+          t.end = year
 
           break
 
         }
 
         default: {
 
@@ -320,6 +322,7 @@ var dateComponent = {
 
           break
 
         }
 
       }
 
+      console.log(t)
 
       return t
 
     },
 
     selectFixedDate: function(item) {

+ 11 - 3
src/web/staticres/common-module/collection/js/ent_portrait.js
View File 

@@ -114,7 +114,8 @@ var vNode = {
 
             entvisit: {
 
                 total: 0, // 本月画像次数总量
 
                 usage: 0, // 本月已使用次数
 
-                provin: 0 // 购买省份数量
 
+                provin: 0, // 购买省份数量
 
+                visited: false // 是否查看中标信息
 
             }
 
         }
 
     },
 
@@ -179,8 +180,11 @@ var vNode = {
 
                             console.log('获取企业中标动态...')
 
                         }
 
                         if(_this.powerInfo.memberStatus <= 0) {
 
-                            // 不是大会员时才请求访问量接口
 
-                            _this.getEntVisits()
 
+                            // 不是大会员点击中标信息使用次数加一
 
+                            if(!_this.entvisit.visited) {
 
+                                _this.entvisit.usage++
 
+                                _this.entvisit.visited = true
 
+                            }
 
                         }
 
                         _this.gotTab2 = true
 
                     }
 
@@ -302,6 +306,9 @@ var vNode = {
 
             $.ajax({
 
                 type: "POST",
 
                 url: "/bigmember/portrait/subVipPortrait/usage",
 
+                data: {
 
+                    entId: _this.entInfo.id
 
+                },
 
                 success: function (res) {
 
                     console.log(res)
 
                     if(res.error_code == 0) {
 
@@ -490,6 +497,7 @@ var vNode = {
 
                             } else {
 
                                 _this.entInfo.followSearchFinish = true
 
                                 _this.entInfo.entExist = false
 
+                                _this.getEntVisits()
 
                             }
 
                             _this.singleTab = false
 
                         }

+ 18 - 14
src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js
View File 

@@ -40,15 +40,12 @@ var vm = new Vue({
 
             points: [],
 
             statusEnum: ['存续', '吊销', '注销', '撤销'],
 
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
 
-            listInfo: {
 
-                value: '',
 
-                pageNum: 0,
 
-                pageSize: 10,
 
-                total: -1,
 
-                loading: true,
 
-                finished: false
 
-            },
 
-            seeList: []
 
+            seeList: {
 
+                pageNum: 1, // 当前页
 
+                pageSize: 50, // 每页多少条数据
 
+                total: 0, // 总页数
 
+                list: [] // 返回的数据
 
+            }
 
         }
 
     },
 
     created() {
 
@@ -77,8 +74,8 @@ var vm = new Vue({
 
             return {
 
                 year: this.years,
 
                 month: this.months,
 
-                pageSize: this.listInfo.pageSize,
 
-                pageNum: this.listInfo.pageNum
 
+                pageSize: this.seeList.pageSize,
 
+                pageNum: this.seeList.pageNum
 
             }
 
         },
 
         subRecord() {
 
@@ -91,6 +88,9 @@ var vm = new Vue({
 
             }).done(res => {
 
                 var _this = this
 
                 if (res.error_code == 0 && res.data.list) {
 
+                    if (res.data.count) {
 
+                        this.listState.total = res.data.count
 
+                    }
 
                     res.data.list.forEach(v => {
 
                         const arrs = {
 
                             name: v.company_name,
 
@@ -106,16 +106,20 @@ var vm = new Vue({
 
                             statusWord: v.company_status,
 
                             checked: false
 
                         }
 
-                        this.seeList.push(arrs)
 
+                        this.seeList.list.push(arrs)
 
                     })
 
                 }
 
             })
 
         },
 
+        onPageChange(page) {
 
+            this.seeList.pageNum = page
 
+            this.subRecord()
 
+        },
 
         dateHandler(val) {
 
             this.years = val.getFullYear()
 
             this.months = val.getMonth() + 1
 
-            this.listInfo.pageNum = 0
 
-            this.seeList = []
 
+            this.seeList.pageNum = 0
 
+            this.seeList.list = []
 
             this.subRecord()
 
         },
 
         detailed(ids) {

+ 7 - 1
src/web/staticres/js/ent-search-index-pc.js
View File 

@@ -504,7 +504,13 @@ var vm = new Vue({
 
             $('#go-customer-4').trigger('click')
 
         },
 
         toDetail: function (id) {
 
-            window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
 
+            if (this.powerInfo.vip > 1) {
 
+                // 去超级订阅画像
 
+                window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
 
+            } else {
 
+                // 去大会员画像
 
+                window.open('/swordfish/page_big_pc/ent_portrait/' + id)
 
+            }
 
         },
 
         calcListItemForCap: function (p) {
 
             if (p) {

+ 11 - 0
src/web/templates/frontRouter/pc/seeHistory/sess/index.html
View File 

@@ -59,6 +59,17 @@
 
                     <div class="cont-tips di-zhi">地址：<span>{item.address}</span></div>
 
                 </div>
 
             </div>
 
+            <div class="el-pagination-container">
 
+                <el-pagination
 
+                    background
 
+                    layout="prev, pager, next, ->"
 
+                    :hide-on-single-page="true"
 
+                    :current-page="seeList.pageNum"
 
+                    :page-size="seeList.pageSize"
 
+                    :total="seeList.total"
 
+                    @current-change="onPageChange"
 
+                ></el-pagination>
 
+            </div>
 
         </div>
 
         <div class="no-data" v-show="seeList.length === 0"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
 
     </section>

+ 5 - 1
src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html
View File 

@@ -30,6 +30,9 @@
 
         background-size: 100% 100%;
 
         box-sizing: border-box;
 
     }
 
+    .bigVip_com{
 
+        display: none;
 
+    }
 
 </style>
 
 <body>
 
 <div class="j-container">
 
@@ -39,7 +42,7 @@
 
             <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%">
 
+        <div class="vip_component bigVip_com" 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">
 
@@ -134,6 +137,7 @@ var vNode = {
 
                         if (power.indexOf(12) != -1) {
 
                             // 获取企业情报历史记录-12
 
                             _this.conf._12 = true
 
+                            $('.bigVip_com').css({'display':'flex'})
 
                         }
 
                     }
 
                 }