zc

src/components/comHeader.vue

@@ -115,7 +115,7 @@ export default {
         { name: '图书名称', val: 'name' },
         { name: '作者姓名', val: 'author' },
         { name: 'ISBN号', val: 'isbn' },
-        { name: '丛书名称', val: 'bookSeries' },
+        { name: '丛书名称', val: 'seriesname' },
         { name: '书代号', val: 'goodscode' },
       ],
       selectResourceList:[

src/utils/common.js

@@ -23,6 +23,19 @@ Vue.prototype.delHtmlLabel = function(str){
 	return msg
 }
 
+//文件大小
+Vue.prototype.filterSize = function(value){
+	if(value.indexOf('M') != -1){
+		return value
+	}else{
+		if(value == 0) return "0B"
+		var k = 1024
+		var sizes = ['B','K','M','G','T','P','E','Z','Y'],
+		i = Math.floor(Math.log(value) / Math.log(k));
+		return (value / Math.pow(k,i)).toPrecision(3) + '' + sizes[i];
+	}
+}
+
 //默认封面--碎图
 Vue.prototype.errImg = function(type) {
 	let typeList = {

src/views/productsWorld/detail.vue

@@ -29,7 +29,7 @@
           <div class="pressBottom">
             <div class="bottomPressCell" v-for="(item,index) in downResourceList" :key="'pd'+index">
               <div class="cellLeft">
-                <div class="typeImg">
+                <div class="typeImg" @click="downOrLook(item)">
                   <img src="@/assets/productsWorld/ebook.png" alt="" v-if="item.resourceType == '2'">
                   <img src="@/assets/productsWorld/video.png" alt="" v-if="item.resourceType == '5'">
                   <img src="@/assets/productsWorld/audio.png" alt="" v-if="item.resourceType == '6'">
@@ -40,16 +40,16 @@
                 <div class="typeBtn" @click="downOrLook(item)">详细</div>
               </div>
               <div class="cellRight">
-                <div class="name" :title="item.name">{{item.name}}</div>
+                <div class="name" :title="item.name" @click="downOrLook(item)">{{item.name}}</div>
                 <div class="other">
-                  <span class="author">作者：{{item.author && item.author.length > 0?item.author.join(','):'暂无'}}</span>
+                  <span class="author" v-if="item.author">作者：{{item.author && item.author.length>0?item.author[0]:item.author}}</span>
                   <span class="msg">
-                    <span class="size">资源大小：{{item.size?item.size:'暂无'}}</span>
-                    <span class="num">下载次数：{{item.browseNum?item.browseNum:'暂无'}}</span>
+                    <span class="size">资源大小：{{item.size?filterSize(item.size):'暂无'}}</span>
+                    <span class="num">下载次数：{{item.downloadNum?item.downloadNum:'暂无'}}</span>
                   </span>
-                  <span class="time">上传时间：{{item.publishTime?item.publishTime:'暂无'}}</span>
+                  <span class="time">上传时间：{{item.createdTime?item.createdTime:'暂无'}}</span>
                 </div>
-                <div class="synopses">{{item.synopsis?$getSimpleText(item.synopsis):'暂无'}}</div>
+                <div class="synopses">{{item.synopsis?$getSimpleText(item.synopsis):''}}</div>
               </div>
             </div>
             <div class="bottomPressCell" style="height:280px;" v-if="downResourceList && downResourceList.length%2 != 0">&nbsp;</div>
@@ -113,7 +113,6 @@ export default {
         pageNum:1,
         pageSize:20,
         resourceType:null,
-        typeView:null,
       },
       tabList:[
         { name:'富媒体',icon: require('@/assets/productsWorld/ico-fumeiti.png'), iconH: require('@/assets/productsWorld/ico-fumeiti-h.png') ,type: 10},
@@ -124,6 +123,7 @@ export default {
         { name:'视频',icon: require('@/assets/productsWorld/ico-video.png'), iconH: require('@/assets/productsWorld/ico-video-h.png') ,type: 5},
       ],
       currentTabIndex:null,
+      currentTypeView:null,
       downResourceList:[],
       hash:null,
       loadFlag:false,
@@ -172,17 +172,36 @@ export default {
 
     getPressNewsList(){
       this.loadFlag = true
+      let dataQuery = {}
       if(this.listQuery.resourceType == 12){
-        this.listQuery.typeView = '电子课件'
+        let data1 = {
+          pageNum: this.listQuery.pageNum,
+          pageSize: this.listQuery.pageSize,
+          resourceType: this.listQuery.resourceType,
+          typeView: '电子课件',
+        }
+        dataQuery = data1
       }else if(this.listQuery.resourceType == 10){
-        this.listQuery.resourceType = 12
-        this.listQuery.typeView = '富媒体'
+        let data2 = {
+          pageNum: this.listQuery.pageNum,
+          pageSize: this.listQuery.pageSize,
+          resourceType: 12,
+          typeView: '富媒体',
+        }
+        dataQuery = data2
+      }else{
+        let data3 = {
+          pageNum: this.listQuery.pageNum,
+          pageSize: this.listQuery.pageSize,
+          resourceType: this.listQuery.resourceType,
+        }
+        dataQuery = data3
       }
-      worldResourceListAPI(this.listQuery).then(res => {
+      worldResourceListAPI(dataQuery).then(res => {
         if(res.data.code == 0){
           this.downResourceList = res.data.data.resList ? res.data.data.resList : []
           this.loadFlag = false
-          this.totalPage = res.data.data.currentPage ? res.data.data.currentPage : 0
+          this.totalPage = res.data.data.pageCount ? res.data.data.pageCount : 0
         }
       })
     },

src/views/productsWorld/index.vue

@@ -316,7 +316,7 @@ import comFooter from "@/components/comFooter.vue"
 import levitate from "@/components/index/levitate.vue"
 import sidebar from "@/components/index/sidebar.vue"
 import mapIframe from "@/components/common/map.vue"
-import { clearInterval, setInterval } from 'timers';
+import { clearInterval, setInterval, setTimeout } from 'timers';
 export default {
   name: "index",
   components: {
@@ -381,17 +381,6 @@ export default {
     window.addEventListener('scroll',this.scrollEvent) // 监听滚动事件，然后⽤scrollEvent这个⽅法进⾏相应的处
     this.initMsg()
     this.getAdsign()
-    var swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 5,
-        paginationClickable: true,
-        spaceBetween: 100,
-        nextButton: '.swiper-button-next', //前进按钮
-        prevButton: '.swiper-button-prev', //后退按钮
-        loop: true, //循环
-        autoplay:3000,
-        autoplayDisableOnInteraction:false,
-    });
   },
   beforeDestroy(){
 
@@ -512,6 +501,19 @@ export default {
       getRecommendAPI({code:'syjptj',num:12}).then((res) => {
         if(res.data.code == 0){
           this.digitalDetailList = res.data.data.resourcelist
+          setTimeout(() => {
+            var swiper = new Swiper('.swiper-container', {
+              pagination: '.swiper-pagination',
+              slidesPerView: 5,
+              paginationClickable: true,
+              spaceBetween: 100,
+              nextButton: '.swiper-button-next', //前进按钮
+              prevButton: '.swiper-button-prev', //后退按钮
+              loop: true, //循环
+              autoplay:5000,
+              autoplayDisableOnInteraction:false,
+            });
+          },500)
         }
       })
     },