0201

pages/bookReading/index.vue

@@ -13,7 +13,7 @@
 	  <!-- <view class="book_content" style="font-size:{{bookFontSize}}rpx;line-height:{{1.8*bookFontSize}}rpx"> -->
 	  <view class="book_content" :class="catalogFlag?'showcatalog':''">
 	      <view class="rich_view" :class="checkBgColor==1?'content_white':'content_black'" v-if="contentFlag"  @touchstart="mytouchstart"  @touchend="mytouchend">
-	       <!-- <view class="book_title">{{bookTitle}}</view> -->
+	       <view class="book_title">{{bookTitle}}</view>
 	        <view id="richtext" class="richtext" v-html="bookContent"></view>
 	        <view class="bottom_view"></view>
 	      </view>
@@ -393,6 +393,7 @@
 	}
 	/deep/h1{
 		font-size: 1.2em;
+		display: none;
 	}
 	/deep/p{
 		text-indent: 2em;

pages/search/list.vue

@@ -3,7 +3,7 @@
 		<view class="fixedBox">
 			<view class="searchHeader">
 				<view class="backImgBox" @click="goBack">
-					<image src=../../static/back.png mode="" class="back"></image>
+					<image src="../../static/back.png" mode="" class="back"></image>
 				</view>
 				
 				<view class="ipt">
@@ -25,7 +25,7 @@
 		<view class="listBox">
 			<!-- <uni-load-more status="loading" v-if="isShowLoad"></uni-load-more>
 			<mescroll-uni v-else @down="downCallback" @up="upCallback" @init="mescrollInit"> -->
-				<view class="olist">
+				<view class="olist" v-if="booklist.length>0">
 					<view class="list" v-for="(item,index) in booklist" :key="index" @click="toDetails(item)">
 						<view class="tit">{{item.name}}</view>
 						<view class="intro" v-html="item.synopsis"></view>
@@ -40,7 +40,7 @@
 		</view>
 		<view class="bottomLine" v-if="isLast && !isNull">——   这是我的底线   ——</view>
 		<view class="nodata_view" v-if="isNull">
-		  <image class="nodata_img" mode="aspectFit" src="../../static/nodata.png"></image>
+		  <image class="nodata_img" mode="aspectFit" src="../../static/book/nodata.png"></image>
 		  <text class="nodata_text">抱歉，没有找到相关内容</text>
 		</view>
 		
@@ -98,16 +98,21 @@ export default {
 			this.getList()
 		},
 		methods: {
-			goBack(){
-				// uni.navigateBack({
-				// 	delta: 1
-				// });
+			goBack(){
 				window.history.back(-1);
 			},
 			deletes(){
 				this.listQuery.keywords=''
 			},
-			tabs(item,index){
+			tabs(item,index){
+				this.isNull = false
+				this.isLast = false
+				this.booklist = []
+				this.listQuery.pageNum = 1
+				uni.pageScrollTo({
+				    scrollTop: 0,
+				    duration: 0
+				});
 				this.isShowLoad=true;
 				this.tabList.forEach((ele,idx) => {
 					this.tabList[idx].id=this.tabList[idx].id.replace(/Ac/g,"")

pages/search/yearList.vue

@@ -18,7 +18,7 @@
 		</view>
 		<view class="managizeList">
 			<uni-load-more status="loading" v-if="isShowLoad"></uni-load-more>
-			<mescroll-uni v-else @down="downCallback" @up="upCallback" @init="mescrollInit">
+			<!-- <mescroll-uni v-else @down="downCallback" @up="upCallback" @init="mescrollInit"> -->
 				<view :class="['olist',index%3!=2?'marginR':'']" @click="toDetails(item.id)" v-for="(item,index) in list" :key="index">
 					<view class="imgs">
 						<image :src="fileUrl(item.bookCover)" v-if="item.bookCover" mode=""></image>
@@ -27,7 +27,12 @@
 					<view class="txt">{{item.mainBody}}</view>
 				</view>
 				<view class="" v-if="showLoading"></view>
-			</mescroll-uni>
+			<!-- </mescroll-uni> -->
+		</view>
+		<view class="bottomLine" v-if="isLast && !isNull">——   这是我的底线   ——</view>
+		<view class="nodata_view" v-if="isNull">
+		  <image class="nodata_img" mode="aspectFit" src="../../static/nodata.png"></image>
+		  <text class="nodata_text">抱歉，没有找到相关内容</text>
 		</view>
 	</view>
 </template>
@@ -55,7 +60,9 @@ export default {
 				downOption: { 
 					use: false, 
 					auto: false
-				},
+				},
+				isLast:false,
+				isNull:false,
 				listQuery:{
 					type:1,
 					year:null,
@@ -67,26 +74,28 @@ export default {
 		},
 		//注册滚动到底部的事件,用于上拉加载
 		onReachBottom() {
-			this.mescroll && this.mescroll.onReachBottom();
-		},
-		//注册列表滚动事件,用于下拉刷新
-		onPageScroll(e) {
-			this.mescroll && this.mescroll.onPageScroll(e);
+			if (!this.isLast) {//判断是否有下一页
+			  this.listQuery.pageNum += 1
+			  this.getList()
+			}
 		},
+		
 		onLoad(option) {
 			this.subjectId=option.subjectId;
 			this.listQuery.mainBody=option.subjectId;
 			this.listQuery.year=option.year;
 			this.getYear();
 			this.siteCode=option.index;
-			
+			this.getList()
 		},
 		methods: {
 			//切换杂志年份
 			tapTab(val,index){
 				this.siteCode=index;
 				this.isShowLoad=true;
-				this.listQuery.year=val.yearId;
+				this.listQuery.year=val.yearId;
+				this.list = []
+				this.listQuery.pageNum = 1
 				this.getList()
 			},
 			goBack(){
@@ -117,9 +126,12 @@ export default {
 			//获取杂志
 			getList(){
 				getListAPI(this.listQuery).then(res => {
-					this.isShowLoad=false
+					this.isShowLoad=false
+					console.log("hahah")
 					if(res.data.code==0){
-						this.list=res.data.data.list
+						this.list.push(...res.data.data.list)
+						this.isNull = res.data.data.total == 0 ? true : false
+						this.isLast = !res.data.data.hasNextPage
 					}else{
 						this.list=[]
 					}
@@ -139,12 +151,12 @@ export default {
 				mescroll.resetUpScroll()
 			},
 			upCallback(mescroll) {
-				console.log(9)
+				console.log(mescroll)
 				//联网加载数据
 				this.listQuery.pageNum=mescroll.num;
 				this.getListDataFromNet(this.listQuery, (curPageData)=>{
 					mescroll.endSuccess(curPageData.length);
-			
+					console.log(curPageData,'curPageData')
 					//设置列表数据
 					if(mescroll.num == 1) this.list = [];
 					this.list=this.list.concat(curPageData); 
@@ -159,12 +171,12 @@ export default {
 						data:postdata,
 						method:'get',
 						success: (data) => {
-								var listData=[];
-								if(data.data.code==0){
-									listData=data.data.data.list
-								}
-								//联网成功的回调
-								successCallback && successCallback(listData);
+							var listData=[];
+							if(data.data.code==0){
+								listData=data.data.data.list
+							}
+							//联网成功的回调
+							successCallback && successCallback(listData);
 						},
 						fail: () => {
 							errorCallback && errorCallback();
@@ -253,7 +265,8 @@ export default {
 		}
 		
 		.managizeList{
-			padding: 40upx 24upx 50upx;
+			padding: 40upx 24upx 50upx;
+			overflow: hidden;
 			// display: flex;
 			// flex-wrap: wrap;
 			.olist{
@@ -278,5 +291,26 @@ export default {
 		}
 		
 	}
-	
+	.bottomLine{
+	  width: 100%;
+	  padding-bottom: 40rpx;
+	  text-align: center;
+	  color: #D5D7E0;
+	  font-size: 24rpx;
+	  margin-top: 20rpx;
+	}
+	.nodata_view{
+	  text-align: center;
+	}
+	.nodata_img{
+	  width: 452rpx;
+	  margin-top: 100rpx;
+	}
+	.nodata_view .nodata_text{
+	  display: inline-block;
+	  width: 100%;
+	  margin-top: 54rpx;
+	  font-size: 34rpx;
+	  color: #999999;
+	}
 </style>

unpackage/dist/build/h5/index.html

 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>中国政协杂志社</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.58d5e7ce.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.cfb20cce.js></script><script src=./static/js/index.4429f2c3.js></script></body></html>
\ No newline at end of file
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.58d5e7ce.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.cfb20cce.js></script><script src=./static/js/index.1709dd96.js></script></body></html>
\ No newline at end of file