提交代码

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

@@ -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';

src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -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) {

src/web/templates/frontRouter/pc/seeHistory/sess/index.html

@@ -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>