Merge branch 'dev' of http://192.168.3.207:10080/jianyu/page_bigmember_pc into dev

src/components/forecast/ForeCast.vue

@@ -106,7 +106,7 @@
     </ul>
     <!-- 潜在项目预测 -->
     <ul class="listData_ul" v-if="type=='potential'">
-      <li class="list_li poten_li" v-for="(item, index) in listStatePoten.list" :key="index" @click="goPotenSimiLar(item.id, item.results)">
+      <li class="list_li poten_li" v-for="(item, index) in listState.list" :key="index" @click="goPotenSimiLar(item.id, item.results)">
         <div class="list_name">
           <div class="list_name_left">
             <span class="pur_company">采购单位</span>
@@ -164,7 +164,7 @@
         </div>
       </div>
     </Empty>
-    <div class="el-pagination-container" v-if="listState.list.length >= listState.pageSize">
+    <div class="el-pagination-container" v-if="getShowPagination">
       <el-pagination
         background
         layout="prev, pager, next, ->"
@@ -205,14 +205,6 @@ export default {
         total: 0, // 一共多少条数据
         list: [] // 查询请求返回的数据
       },
-      listStatePoten: {
-        loaded: true, // 是否已经搜索过
-        loading: false,
-        pageNum: 1, // 当前页
-        pageSize: 10, // 每页多少条数据
-        total: 0, // 一共多少条数据
-        list: [] // 查询请求返回的数据
-      },
       isFollow: '1',
       potenCode: 0,
       tips: '' // 空状态提示
@@ -230,7 +222,6 @@ export default {
     // 潜在项目预测列表
     if (this.type === 'potential') {
       this.potenInitData(this.potenObj)
-      this.listStatePoten.total = this.potenObj.total
     }
     // 潜在项目近似列表
     if (this.type === 'potensimilar') {
@@ -269,7 +260,14 @@ export default {
       bidnum: state => state.forcast.bidForeCastNum
     }),
     showEmpty () {
-      return !this.listState.list.length && !this.listStatePoten.list.length
+      return !this.listState.list.length
+    },
+    getShowPagination () {
+      let show = true
+      if (this.listState.pageNum === 1 && this.listState.list.length < this.listState.pageSize) {
+        show = false
+      }
+      return show
     },
     getTipText () {
       return this.tips
@@ -296,7 +294,6 @@ export default {
     dateFormatter,
     moneyUnit,
     initData (list, type) {
-      console.log(list)
       if (list.length !== 0) {
         this.listState.list = this.unique(list)
         this.listState.total = list.length
@@ -339,11 +336,11 @@ export default {
     potenInitData (obj) {
       console.log(obj)
       if (obj.list && obj.list.length !== 0) {
-        this.listStatePoten.list = obj.list
-        this.listStatePoten.total = obj.total
+        this.listState.list = obj.list
+        this.listState.total = obj.count
       } else {
-        this.listStatePoten.list = []
-        this.listStatePoten.total = 0
+        this.listState.list = []
+        this.listState.total = 0
         console.log(obj.code)
         if (obj.code === 2) {
           this.potenCode = 2

src/components/push-list/PotentialList.vue

@@ -48,7 +48,7 @@
         </div>
       </empty>
     </div>
-    <div class="el-pagination-container" v-if="listState.list.length >= listState.pageSize">
+    <div class="el-pagination-container" v-if="getShowPagination">
       <el-pagination
         background
         layout="prev, pager, next, ->"
@@ -101,6 +101,13 @@ export default {
     showEmpty () {
       return this.listState.list.length === 0 && this.listState.loaded
     },
+    getShowPagination () {
+      let show = true
+      if (this.listState.pageNum === 1 && this.listState.list.length < this.listState.pageSize) {
+        show = false
+      }
+      return show
+    },
     getFilters () {
       return this.filters
     },

src/views/potential-for/PotenTial.vue

@@ -56,7 +56,12 @@ export default {
               res.data.list.forEach(function (v, i) {
                 v.createtime = v.createtime.replace(/-/g, '/')
               })
+              let tempTotal = res.data.count
+              if (p !== 1) {
+                tempTotal = this.potenObj.count
+              }
               this.potenObj = res.data
+              this.potenObj.count = tempTotal
             }
           }
         }