diff --git a/pages/eBook/bookContent.vue b/pages/eBook/bookContent.vue
index 6daf45c..27d9e90 100644
--- a/pages/eBook/bookContent.vue
+++ b/pages/eBook/bookContent.vue
@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;padding: 30rpx;">
-		<z-nav-bar title="电子书详情"></z-nav-bar>
+		<z-nav-bar title="书籍详情"></z-nav-bar>
 		<view class="book_neir flexbox">
 			<view class="bn_img">
 			<img :src="bookMessage.images" mode="scaleToFill">
diff --git a/pages/library/library.vue b/pages/library/library.vue
index e997084..3a06316 100644
--- a/pages/library/library.vue
+++ b/pages/library/library.vue
@@ -1,26 +1,26 @@
 <template>
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
-		<!-- <public-module></public-module>	 -->	
+		<!-- <public-module></public-module>	 -->
 		<!-- <z-nav-bar title="我的图书"></z-nav-bar> -->
 		<view class="home_bg">
 			<view class="" style=" ">
 				<view class="icon_hua">
 					<image src="../../static/icon/home_icon_3.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>	
+				</view>
 				<view class="hehan">
 					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>	
+				</view>
 				<view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">
 						<text class="icon_search"></text>
 						<text class="prompt">请输入想要搜索的书名</text>
-					</view>				
+					</view>
 				</view>
 				<!-- <view class="searBtn flexbox">
 					<text>搜索</text>
 				</view> -->
-			</view>		
+			</view>
 			<!-- <view class="home_lunbo">
 				<u-swiper :list="list3" indicator indicatorMode="line" circular style="height: 180rpx;"></u-swiper>
 			</view> -->
@@ -29,103 +29,69 @@
 			<u-tabs :scrollable="false" bg-color="#d4d4d4" active-color="#2979ff" inactive-color="#606266" bar-height="10" :list="contentButtonList" @click="contentButtonClick" lineWidth="42" :inactiveStyle="{fontSize:'32rpx'}" :activeStyle="{color: '#303133',fontWeight: 'bold', transform: 'scale(1.01)'}"></u-tabs>
 		</view> -->
 		<view class="" style="padding: 20rpx;">
-		<view class="mytabs flexbox">
-			<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
-				已购图书
-			</view>
-			<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
-				推荐图书
+			<view class="mytabs flexbox">
+				<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+					已购图书
+				</view>
+				<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+					推荐图书
+				</view>
 			</view>
 		</view>
-		</view>
-		<view class="listenList" >
-			<view class="wrap" v-if="contentShow == 1">	
-					<view class="" v-if="bookList.length > 0">						
+		<view class="listenList">
+			<view class="wrap" v-if="contentShow == 1">
+				<view class="" v-if="bookList.length > 0">
 					<u-row gutter="16" justify="flex-start">
-						<u-col span="6" v-for="(item,index) in bookList" :key="index">
-							<view >
-							<view class="flexbox listenItem">
-								<view class="info">
-									<view class="videoBox demo-layout bg-purple" @click="goToListenFree(item)">
-										<image :src="item.image" mode="scaleToFill" ></image>
-									</view>									
-								</view>
-								
-								<view class="btns">
-									<!-- <view class="item flexbox" @click="">
-										 <u-icon name="bookmark" color="#55aaff" size="24"></u-icon> 
-										<image src="../../static/icon/tu1.png" mode="aspectFit"></image>
-										<text >读 书</text>
-									</view> -->
-									<view class="item flexbox" @click="goToListenFree(item)">
-										<!-- <u-icon name="volume" color="#71d5a1" size="24"></u-icon> -->
-										<image  src="../../static/icon/tu2.png" mode="aspectFit"></image>
-										<text>听 书</text>
-									</view>
-									<view class="item flexbox" @click="goPingshu(item.bookId)">
-										<!-- <u-icon name="chat" color="#fcbd71" size="24"></u-icon> -->
-										<image  src="../../static/icon/tu3.png" mode="aspectFit"></image>
-										<text>评 书</text>
+						<u-col span="4" v-for="(item,index) in bookList" :key="index">
+								<view class=" listenItem">
+									<view class="" @click="goDetail(item)">
+										<image v-if="item.images != '' && item.images != null" :src="item.images" mode="scaleToFill"></image>
+										<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
 									</view>
+									<view class="bookName">{{item.name}}</view>
 								</view>
-							</view>
-							<view class="bookName">{{item.bookName}}</view>	
-							</view>
-						</u-col>						
+						</u-col>
 					</u-row>
 					<view>
 						<view v-if="status==0" style="text-align: center;">
 							<u-loading-icon style="display: inline-block;"></u-loading-icon>
-							<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+							<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中
+							</font>
 						</view>
 						<view v-if="status==1">
 							<u-divider text="全部加载完成"></u-divider>
 						</view>
-					</view>					
 					</view>
-					<u-divider v-else text="暂无已购买图书~"></u-divider>
-				</view>			
-				<view class="wrap" v-if="contentShow == 2">	
-					<view class="" v-if="tjBookLIst.length > 0">
-						<u-row gutter="16" justify="flex-start" >
-							<u-col span="6"  v-for="(item,index) in tjBookLIst" :key="index">
-								<view class="flexbox listenItem">
-									<view class="info">
-										<view class="videoBox demo-layout bg-purple" @click="goDetail(item)">
-											<image :src="item.images" mode="scaleToFill" ></image>											
-										</view>
-									</view>
-									<view class="btns">
-										<view class="item flexbox" @click="goDetail(item)">
-											<image src="../../static/icon/tu1.png" mode="aspectFit"></image>
-											<text>读 书</text>
-										</view>
-										<view class="item flexbox" @click="goToListen(item)">
-											<image src="../../static/icon/tu2.png" mode="aspectFit"></image>
-											<text>听 书</text>
-										</view>
-										<view class="item flexbox" @click="wgGoPingshu(item)">
-											<image src="../../static/icon/tu3.png" mode="aspectFit"></image>
-											<text>评 书</text>
-										</view>
-									</view>
+				</view>
+				<u-divider v-else text="暂无已购买图书~"></u-divider>
+			</view>
+			<view class="wrap" v-if="contentShow == 2">
+				<view class="" v-if="tjBookLIst.length > 0">
+					<u-row gutter="16" justify="flex-start">
+						<u-col span="4" v-for="(item,index) in tjBookLIst" :key="index">
+							<view class=" listenItem">
+								<view class="" @click="goDetail(item)">
+									<image v-if="item.images != '' && item.images != null" :src="item.images" mode="scaleToFill"></image>
+									<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
 								</view>
-								<view class="bookName">{{item.name}}</view>
-							</u-col>						
-						</u-row>
-						<view>
-							<view v-if="tjstatus==0" style="text-align: center;">
-								<u-loading-icon style="display: inline-block;"></u-loading-icon>
-								<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-							</view>
-							<view v-if="tjstatus==1">
-								<u-divider text="全部加载完成"></u-divider>
+								<view class="bookName"><text>{{item.name}}</text></view>
 							</view>
+						</u-col>
+					</u-row>
+					<view>
+						<view v-if="tjstatus==0" style="text-align: center;">
+							<u-loading-icon style="display: inline-block;"></u-loading-icon>
+							<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中
+							</font>
+						</view>
+						<view v-if="tjstatus==1">
+							<u-divider text="全部加载完成"></u-divider>
 						</view>
 					</view>
-					<u-divider v-else text="暂无推荐图书~"></u-divider>
-			</view>	
-		</view>		
+				</view>
+				<u-divider v-else text="暂无推荐图书~"></u-divider>
+			</view>
+		</view>
 		<!-- <view class="shuwuLink">
 			<image @click="" src="../../static/icon/shuwu.jpg" mode="aspectFit"></image>
 		</view> -->
@@ -135,7 +101,7 @@
 </template>
 
 <script>
-	 import musicPlay from '@/components/music.vue'
+	import musicPlay from '@/components/music.vue'
 	import {
 		mapState
 	} from 'vuex';
@@ -147,18 +113,18 @@
 					'../../static/icon/home_ban_2.jpg',
 					'../../static/icon/home_ban_3.jpg',
 				],
-				showEbook:false,
-				playData:{},
-				loadingNow : false,
-				bookList:[],
-				contentShow:1,
-				page:1, // 页码
+				showEbook: false,
+				playData: {},
+				loadingNow: false,
+				bookList: [],
+				contentShow: 1,
+				page: 1, // 页码
 				status: 3,
-				ygtotalPage:1,
-				tjPage:1,
-				tjstatus:3,
-				tjTotalPage:1,
-				tjBookLIst:[],
+				totalPage: 1,
+				tjPage: 1,
+				tjstatus: 3,
+				tjTotalPage: 1,
+				tjBookLIst: [],
 				contentButtonList: [{
 						name: '已购图书'
 					},
@@ -169,14 +135,14 @@
 			}
 		},
 		onLoad() {
-			
+
 		},
 		onHide() {
 			// this.contentShow = 1
 			this.page = 1
 			this.tjPage = 1
-			this.bookList = []			
-			this.tjBookLIst = []			
+			this.bookList = []
+			this.tjBookLIst = []
 		},
 		onShow() {
 			this.getListDate()
@@ -184,144 +150,146 @@
 		},
 		onPullDownRefresh() {
 			console.log('下拉刷新了')
-			uni.stopPullDownRefresh(); 
-			this.contentShow = 1
+			// this.contentShow = 1
 			this.page = 1
 			this.tjPage = 1
 			this.bookList = []
 			this.getfreeBook()
 			this.tjBookLIst = []
-			this.getListDate()			
+			this.getListDate()
+			uni.stopPullDownRefresh();
 		},
 		onReachBottom() {
 			// this.loadingNow = true
 			console.log('到底了')
-			
-			if(this.contentShow == 1){	
-				//console.log(this.page , this.ygtotalPage)
-				// if(this.page < this.ygtotalPage){	
-				// 	this.page++
-				// 	console.log('加载',this.page)
-				// 	this.status = 0
-				// 	this.getfreeBook()
-					
-				// }else{
-				// 	this.status = 1
-				// 	console.log('加载完成了',this.page)
-				// 	return
-				// }
-				
-			}else if(this.contentShow == 2){				
-				if(this.tjPage+1 < this.tjTotalPage){
+			if (this.contentShow == 1) {
+				if (this.page+1 <= this.totalPage) {
+					this.page++
+					this.status = 0
+					this.getfreeBook()
+				} else {
+					this.status = 1
+				}
+
+			} else if (this.contentShow == 2) {
+				if (this.tjPage + 1 <= this.tjTotalPage) {
 					this.tjPage++
 					// console.log('加载',this.tjPage)
 					this.tjstatus = 0
-					this.getListDate()					
-				}else{
-					this.tjstatus = 1	
+					this.getListDate()
+				} else {
+					this.tjstatus = 1
 				}
 			}
 		},
-		components:{
+		components: {
 			musicPlay
 		},
 		computed: {
 			...mapState(['userInfo'])
 		},
-		methods: {	
-			setData(e){
+		methods: {
+			setData(e) {
 				this.contentShow = e
 			},
 			// 未购买图书，评书跳转
-			wgGoPingshu(item){
-				console.log('未购买评书',item)
-					uni.navigateTo({
-						 url: '../comments/comments?bookid='+item.id,
-						// url:'../bookShop/commodityDetail'
-						
-					});
-				
+			wgGoPingshu(item) {
+				console.log('未购买评书', item)
+				uni.navigateTo({
+					url: '../comments/comments?bookid=' + item.id,
+					// url:'../bookShop/commodityDetail'
+
+				});
+
 			},
 			// 跳转到评书
-			goPingshu(val){
-				console.log('评书',val)
+			goPingshu(val) {
+				console.log('评书', val)
 				uni.navigateTo({
-					 url: '../comments/comments?bookid='+val,
+					url: '../comments/comments?bookid=' + val,
 				});
-			},			
-			contentButtonClick(e){
+			},
+			contentButtonClick(e) {
 				this.contentShow = e.index
 			},
 			// 获取已购买书籍
-			getfreeBook(){			
+			getfreeBook() {
 				this.$http
-					.post('book/userebookbuy/buylist', {
-					// .post('book/buyorderdetail/querybuy', {
-						'id': this.userInfo.id,
-						'page':this.page,
-						'limit':10
+					.post('book/book/getMyBooks', {
+						// .post('book/buyorderdetail/querybuy', {
+						'userId': this.userInfo.id,
+						'page': this.page,
+						'limit': 10
 					})
 					.then(res => {
-						
-						if(res.code == 0){
-							// this.ygtotalPage = res.page.totalPage
-							//var arr = res.page
-							this.bookList = res.page							
-							 console.log(res,'获取已购买书籍')
-						//	this.status = 3
-						}					
-						
+
+						if (res.code == 0) {
+							console.log(res, '获取已购买书籍')
+							if (res.page.records.length > 0) {
+								this.bookList = this.bookList.concat(res.page.records)
+								this.totalPage = res.page.pages
+								if(this.page == this.totalPage){
+									this.status = 1
+								}else{
+									this.status = 3
+								}
+								
+							} else {
+								this.bookList = []
+							}
+						}
+
 					});
 			},
-			
+
 			// 获取推荐图书（未购买）
-			getListDate(){				
+			getListDate() {
 				this.loadingNow = false
 				// 获取书架列表
 				this.$http
 					.post('book/book/getBestBooks', {
 						'userId': this.userInfo.id,
-						'limit':10,
-						'page':this.tjPage
+						'limit': 10,
+						'page': this.tjPage
 					})
 					.then(res => {
-						console.log(res,'获取推荐图书（未购买）')
-						if(res.code == 0){
+						console.log(res, '获取推荐图书（未购买）')
+						if (res.code == 0) {
 							// this.tjTotalPage = res.pages.totalPage
 							var arr = []
-							if(res.page.records.length > 0){							
+							if (res.page.records.length > 0) {
 								this.tjBookLIst = this.tjBookLIst.concat(res.page.records)
 								this.tjTotalPage = res.page.pages
 								this.tjstatus = 3
-						}else{
-							this.tjBookLIst = []
-							this.tjTotalPage = 1
+							} else {
+								this.tjBookLIst = []
+								this.tjTotalPage = 1
+							}
 						}
-							}			
-						
+
 					});
 			},
-		
+
 			// 跳转详情页
 			goDetail(item) {
-				console.log(item,'goDetail-----')				
+				console.log(item, 'goDetail-----')
 				uni.navigateTo({
 					url: '../eBook/bookContent?Id=' + item.id
 					// url: '../bookShop/commodityDetail?id=' + item.id
 				});
 			},
-			goToListen(item){	
-				console.log(item,'item')				
-					uni.navigateTo({						
-						url: "../listen/listen?bookid="+item.id		
-					});
-								
+			goToListen(item) {
+				console.log(item, 'item')
+				uni.navigateTo({
+					url: "../listen/listen?bookid=" + item.id
+				});
+
 			},
 			// 跳转到听书详情
-			goToListenFree(item){
+			goToListenFree(item) {
 				// console.log(item,'item')								
 				uni.navigateTo({
-					url: "../listen/listen?bookid="+item.bookId+"&fengImg="+item.image   // 前台播放版本
+					url: "../listen/listen?bookid=" + item.bookId + "&fengImg=" + item.image // 前台播放版本
 				});
 			},
 			// 跳转11
@@ -336,83 +304,147 @@
 
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-	.hehan{width: 50%; margin: 0 auto;}
+
+	.hehan {
+		width: 50%;
+		margin: 0 auto;
+	}
+
 	.home_lunbo {
 		margin: 40rpx 30rpx 0 30rpx;
 	}
-	.mytabs{
+
+	.mytabs {
 		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
-		 height:110rpx ;  margin-bottom: 50rpx;
-		.item{
-				border-radius: 10rpx;background-color: #adb6b7; width: 48%; margin: 0 10rpx; text-align: center; color:#fff ; font-size: 36rpx; line-height:110rpx ;
-		}		
-		.item.active{
-			background-color: #73837b;
+		height: 80rpx;
+		margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
 		}
-		.item1{
-			background-color: #adb6b7;
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			// background-color: #adb6b7;
 		}
 	}
-	.listenItem{
-		.btns{margin-top: 60rpx; margin-left: 20rpx;   font-size: 34rpx; justify-content: space-between;
-			.item{ margin-bottom:30rpx;
-				image{
-					width: 24px !important;height:24px;display: block; margin-right: 10rpx;
-				}
-			}
+
+	.listenItem {
+
+		image {
+			width: 100%;
+			height: 280rpx;
+			border-radius: 20rpx;
 		}
-		.info{width: 50%;
-		image{width:100% ; height: 280rpx; border-radius: 20rpx;}
+
+	}
+
+	.shuwuLink {
+		padding: 0 20rpx;
+
+		image {
+			border-radius: 30rpx;
 		}
 	}
-	.shuwuLink{ padding: 0 20rpx;
-		image{border-radius: 30rpx;}
+
+	.contentButton {
+		margin: 50rpx 0;
 	}
-	.contentButton{margin:50rpx 0;}
-	
-	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91;}
-	.bookName{	 margin-top:10rpx;	display: block;  
-		white-space: nowrap;	 font-weight: bold;				
+
+	.quesheng {
+		text-align: center;
+		margin-top: 100rpx;
+		color: #8b8a91;
+	}
+
+	.bookName {
+		margin-top: 10rpx;
+		display: block;
+		white-space: nowrap;
+		// font-weight: bold;
 		overflow-x: hidden;
 		text-overflow: ellipsis;
-		font-size: 30rpx; color: #333; padding: 10rpx 0;
+		font-size: 30rpx;
+		color: #333;
+		padding: 10rpx 0;
 	}
+
 	// .videoBox{position: relative;}
-	
-	.playButton{position: absolute; z-index: 1; right: 4px; bottom: 4px;  padding: 5px; border-radius: 100%;  }
-	uni-image {
-	    width:auto !important;
-	    height: 350rpx;
+
+	.playButton {
+		position: absolute;
+		z-index: 1;
+		right: 4px;
+		bottom: 4px;
+		padding: 5px;
+		border-radius: 100%;
 	}
-	.u-row{flex-wrap: wrap;}
-	.u-col{overflow: hidden;  margin-bottom: 30rpx; overflow: hidden;}
-	.listenList{padding: 10rpx; box-sizing: border-box; width: calc(100% - 10rpx);}
-	.flexbox{display: flex;}
+
+	uni-image {
+		width: auto !important;
+		height: 350rpx;
+	}
+
+	.u-row {
+		flex-wrap: wrap;
+	}
+
+	.u-col {
+		overflow: hidden;
+		margin-bottom: 30rpx;
+		overflow: hidden;
+	}
+
+	.listenList {
+		padding: 10rpx;
+		box-sizing: border-box;
+		width: calc(100% - 10rpx);
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
 	.scroll-Y {
-			height: 300rpx;
-		}
-		.scroll-view_H {
-			white-space: nowrap;
-			width: 100%;
-		}
-		.scroll-view-item {
-			height: 300rpx;
-			line-height: 300rpx;
-			text-align: center;
-			font-size: 36rpx;
-		}
-		.scroll-view-item_H {
-			display: inline-block;
-			width: 60%;
-			height: 300rpx;
-			line-height: 300rpx;
-			text-align: center;
-			font-size: 36rpx;
-		}
+		height: 300rpx;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+	}
+
+	.scroll-view-item {
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+
+	.scroll-view-item_H {
+		display: inline-block;
+		width: 60%;
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+
 	.head_line {
 		margin: 50rpx 0;
-	
-	
+
+
 		b {
 			display: inline-block;
 			width: 12rpx;
@@ -421,12 +453,12 @@
 			vertical-align: bottom;
 			margin: 0 20rpx 0 0;
 		}
-	
+
 		text {
 			font-size: 32rpx;
 			font-weight: bold;
 		}
-	
+
 		i {
 			float: right;
 			font-style: normal;
@@ -435,54 +467,82 @@
 			margin: 5rpx 35rpx 0 0;
 		}
 	}
+
 	.home_bg {
-			background-image: url('@/static/icon/home_bg.jpg'); 
-			background-position: center center;
-			background-repeat: no-repeat;
-			background-size: cover;
-			padding: 20rpx;
-			position: relative; margin-bottom:60rpx;
-		    // height: 400rpx; margin-bottom: 130rpx;
-			.icon_hua_1 {
-				// margin: 0 auto;
-				width: 100%; text-align: center;
+		background-image: url('@/static/icon/home_bg.jpg');
+		background-position: center center;
+		background-repeat: no-repeat;
+		background-size: cover;
+		padding: 20rpx;
+		position: relative;
+		margin-bottom: 30rpx;
+
+		// height: 400rpx; margin-bottom: 130rpx;
+		.icon_hua_1 {
+			// margin: 0 auto;
+			width: 100%;
+			text-align: center;
+			height: 150rpx;
+
+			image {
+				width: 150rpx;
 				height: 150rpx;
-				image{width: 150rpx; height: 150rpx;}
 			}
-			.icon_hua{width: 100%; text-align: center; display: block;
-			image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
+		}
+
+		.icon_hua {
+			width: 100%;
+			text-align: center;
+			display: block;
+
+			image {
+				width: 150rpx;
+				height: 150rpx;
+				margin: 0 auto;
 			}
-			.search_box { margin: 0 auto; margin-top: 20rpx;  align-items: center;
-				width: calc(100% - 30rpx);  margin-top: 0;
-    margin-bottom: 20rpx;
-				
-				.search{height: 80upx; 
-					display: flex;
-					width: 100%;
-					align-items: center;
-					padding: 0upx 40upx;
-					background-color: #fff;
-					border-radius: 20upx;
-					box-shadow: 0 0px 10px 1px #54a96633;
-				}
-				.prompt {
-					color: #838383; font-size: 24rpx;
-		
-				}
-		
-				.icon_search {
-					background-image: url('@/static/icon/map_ic_search.png');
-					background-position: center center;
-					background-repeat: no-repeat;
-					background-size: cover;
-					width:36upx;
-					height: 36upx;
-					margin-right: 20upx;
-				}
+		}
+
+		.search_box {
+			margin: 0 auto;
+			margin-top: 20rpx;
+			align-items: center;
+			width: calc(100% - 30rpx);
+			margin-top: 0;
+			margin-bottom: 20rpx;
+
+			.search {
+				height: 56upx; 
+				display: flex;
+				width: 100%;
+				align-items: center;
+				padding: 0upx 40upx;
+				background-color: #fff;
+				border-radius: 20upx;
+				box-shadow: 0 0px 10px 1px #54a96633;
 			}
-			.searBtn{
-				width: 80rpx; align-items: center;
-				font-size: 30rpx; color: #fff; 
+
+			.prompt {
+				color: #838383;
+				font-size: 24rpx;
+
 			}
+
+			.icon_search {
+				background-image: url('@/static/icon/map_ic_search.png');
+				background-position: center center;
+				background-repeat: no-repeat;
+				background-size: cover;
+				width: 36upx;
+				height: 36upx;
+				margin-right: 20upx;
+			}
+		}
+
+		.searBtn {
+			width: 80rpx;
+			align-items: center;
+			font-size: 30rpx;
+			color: #fff;
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index d96c793..a1d09fc 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -28,23 +28,23 @@
 		<view class="home_nar">	
 				<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
 					<image src="../../static/icon/home1.png" mode="aspectFit"></image>
-					<text>打卡</text>
+					<text>打 卡</text>
 				</view>	
 						
 			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
 				<image src="../../static/icon/home2.png" mode="aspectFit"></image>
-				<text>听书</text>
+				<text>听 书</text>
 			</view>			
 			
 			<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->			
 			<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
 				<image src="../../static/icon/home3.png" mode="aspectFit"></image>
-				<text>书评</text>
+				<text>书 评</text>
 			</view>
 			
 			<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
 				<image src="../../static/icon/home4.png" mode="aspectFit"></image>
-				<text>讲书</text>
+				<text>讲 书</text>
 			</view>		
 		</view>
 
@@ -198,7 +198,8 @@
 		<view class="goods">
 			<!-- 精选 -->
 			<view class="" >
-				<view class="" v-if="tjProList.length > 0">
+				<view  v-if="tjProList.length > 0" >
+				<view class="flexbox" style="flex-wrap: wrap;">
 				<view class="goodsItem" v-for="(item,index) in tjProList" :key="index"
 					@click="goDetail(item.shopproudicts[0].productId)">
 					<image :src="item.shopproudicts[0].productImages" mode="" class="goodsImg"></image>
@@ -213,14 +214,16 @@
 						</view>
 					</view>
 				</view>
-				<br clear="both">
-				<view v-if="status==0" style="text-align: center;">
-					<u-loading-icon style="display: inline-block;"></u-loading-icon>
-					<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-				</view>
-				<view v-if="status==1">
-					<u-divider text="全部加载完成"></u-divider>
-				</view>
+				</view>				
+				<view class="">
+					<view v-if="status==0" style="text-align: center;">
+						<u-loading-icon style="display: inline-block;"></u-loading-icon>
+						<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+					</view>
+					<view v-if="status==1">
+						<u-divider text="全部加载完成"></u-divider>
+					</view>
+				</view>				
 				</view>
 				<u-divider v-else text="暂无数据哦~"></u-divider>
 				
@@ -301,6 +304,10 @@
 			uni.hideTabBar();
 		    // this.requestIapOrder()			
 		},
+		onHide() {
+			this.page = 1
+			this.tjProList = []
+		},
 		//页面显示
 		onShow() {
 			// 隐藏原生的tabbar
@@ -692,7 +699,9 @@
 		.price{color: #9b9b9b !important; font-size: inherit; font-weight: normal !important; display: block;}
 	}
 	.ProTabs{margin: 20rpx 0; padding:0 20rpx;
-		text{padding: 4rpx 8rpx; font-size: 32rpx;  border-radius: 10rpx; overflow: hidden; background-color: #eee; color: #55aa7f; margin-right: 10rpx;}
+		text{padding: 12rpx 14rpx; font-size: 32rpx;  border-radius: 10rpx; overflow: hidden; 
+		// background-color: #eee;
+		 color: #55aa7f; margin-right: 10rpx;}
 		text.cur{background-color:#55aa7f ; color: #fff;}
 	}
 	.newBook{margin-top: 20rpx;}
@@ -812,8 +821,8 @@
 			align-content: center;
 			justify-content: center;
 			image {				
-				width: 110upx;
-				height:110upx;
+				width:90%;
+				height:156rpx;
 				display: block;
 				margin: 0 auto;
 				// margin: 0 20rpx;
@@ -1104,7 +1113,7 @@
 				.goodsName {
 					margin-top: 10rpx;
 					font-size: 30rpx;
-					font-weight: bold;
+					// font-weight: bold;
 				}
 
 				.goodsPrice {
@@ -1113,7 +1122,7 @@
 					display: flex; justify-content: space-between;
 					.price{
 						font-weight: bold;
-						color: #bf0c0c;
+						color: #ff0000;
 					}
 					.Salesnum{color: #9b9b9b;}
 				}
diff --git a/static/icon/home1.png b/static/icon/home1.png
index 88bc882..3b1d456 100644
Binary files a/static/icon/home1.png and b/static/icon/home1.png differ
diff --git a/static/icon/home2.png b/static/icon/home2.png
index d7eecb7..6b1e174 100644
Binary files a/static/icon/home2.png and b/static/icon/home2.png differ
diff --git a/static/icon/home3.png b/static/icon/home3.png
index b81bec5..90179b9 100644
Binary files a/static/icon/home3.png and b/static/icon/home3.png differ
diff --git a/static/icon/home4.png b/static/icon/home4.png
index 192cbce..dc6ba64 100644
Binary files a/static/icon/home4.png and b/static/icon/home4.png differ