Merge remote-tracking branch 'origin/dev1.0.11' into dev1.0.11

src/router.js

@@ -120,12 +120,12 @@ export default new Router({
                     meta: {title: '合作案例详情'}
                 },
                 {
-                    path: '/computerlist',
+                    path: '/knowledge',
                     component: resolve => require(['./views/knowledge/computer/computerlist.vue'], resolve),
                     meta: {title: '知识资源'}
                 },
                 {
-                    path: '/computerdetails',
+                    path: '/knowledgedetails',
                     component: resolve => require(['./views/knowledge/computer/computerdetails.vue'], resolve),
                     meta: {title: '知识资源详情'}
                 },

src/views/knowledge/computer/computerlist.vue

@@ -27,7 +27,7 @@
                 </el-tabs>
             </div>
             <div>
-                <div v-for="(item,index) in datapage" :key="index" @click="$router.push({path:'/computerdetails',query:{entid:item.id}})">
+                <div v-for="(item,index) in datapage" :key="index" @click="$router.push({path:'/knowledgedetails',query:{entid:item.id}})">
                     <img :src="item.imageList">
                     <p>{{item.title}}</p>
                     <span>{{item.beforeTitle}}</span>
@@ -76,58 +76,62 @@
                 let lastindex=firstindex+8;
                 this.datapage=this.datajson.slice(firstindex,lastindex);
                 },
-            imgclk(val){
-
-            },
             handleClick(tab, event){
-                this.datapage = [];
+                // this.datapage = [];
                 this.cur_page = 1;
                 if(tab.name == 'tabType'){
-                    this.datapage=this.datajson;
+                    this.datapage=this.datajson.slice(0,8);
+                    this.totalListResult = 20;
                 }else if(tab.name == 'tabType1'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 1){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType2'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 2){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType3'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 3){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType4'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 4){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType5'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 5){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType6'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 6){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }else if(tab.name == 'tabType7'){
                     for ( let i in this.datajson ){
                         if(this.datajson[i].type == 7){
                             this.datapage.push(this.datajson[i]);
                         }
                     }
+                    this.totalListResult = this.datapage.length;
                 }
-                this.totalListResult = this.datapage.length;
             }
         },
         mounted() {