456

xs-app/pages.json

@@ -4,6 +4,7 @@
 			"path": "pages/bookshelf/bookshelf",
 			"style": {
 				"navigationBarTitleText": "书架",
+				"navigationStyle": "custom",
 				"app-plus": {
 					"bounce": "none"
 				}

xs-app/pages/bookshelf/bookshelf-bookList.vue

@@ -182,8 +182,8 @@
 					align-items: center;
 					margin-left: 15rpx;
 					flex-shrink: 0;
-					width: 160rpx;
-					height: 70rpx;
+					width: 145rpx;
+					height: 60rpx;
 					// background-color: red;
 					&__image{
 						width: 100%;
@@ -191,7 +191,7 @@
 					}
 					&__name{
 						position: absolute;
-						font-size: 18px;
+						font-size: 16px;
 						color: #fff;
 					}
 				}

xs-app/pages/bookshelf/bookshelf-readHistory.vue

@@ -186,8 +186,8 @@
 	.readHistory_content{
 		display: flex;
 		flex-direction: column;
-		// background-color: purple;
-		
+		// background-color: purple;	
+			
 		.top{
 			display: flex;
 			flex-direction: row;
@@ -204,8 +204,8 @@
 					align-items: center;
 					margin-left: 15rpx;
 					flex-shrink: 0;
-					width: 160rpx;
-					height: 70rpx;
+					width: 145rpx;
+					height: 60rpx;
 					// background-color: red;
 					&__image{
 						width: 100%;
@@ -213,7 +213,7 @@
 					}
 					&__name{
 						position: absolute;
-						font-size: 18px;
+						font-size: 16px;
 						color: #fff;
 					}
 				}

xs-app/pages/bookshelf/bookshelf.vue

@@ -1,22 +1,27 @@
 <template>
 	<view class="bookshelf-content">
-		<view style="position: fixed; z-index: 10; width: 100%; ">
-			<z-tabs 
-			ref="tabs"
-			:tabs-style="{height:tab_height + 'rpx'}"
-			bg-color="#fff"
-			bar-height="0"
-			active-color="#FF8EBB"
-			:active-style="{'font-size': '60rpx', 'font-weight': '500'}"
-			inactive-color="#3D3D3D"
-			:inactive-style="{'font-size': '30rpx', 'font-weight': '500'}"
-			scroll-count="1" 
-			:bottomLineIsShow="false" 
-			:list="tab_list"  
-			:current="tab_current"
-			@change="tabsChange" />	
+		<view class="bookshelf-content__top" :style="{height:top_height+'px'}">
+			<view class="bookshelf-content__top__bg">
+				<image class="image" src="../../static/imgs/public/img_bg_1.png"></image>
+			</view>
+			<view :style="{marginTop: safeArea_top+'px'}">
+				<z-tabs 
+				ref="tabs"
+				:tabs-style="{height:tab_height + 'px'}"
+				bg-color="transparent"
+				bar-height="0"
+				active-color="#FF8EBB"
+				:active-style="{'font-size': '60rpx', 'font-weight': '500'}"
+				inactive-color="#3D3D3D"
+				:inactive-style="{'font-size': '30rpx', 'font-weight': '500'}"
+				scroll-count="1" 
+				:bottomLineIsShow="false" 
+				:list="tab_list"  
+				:current="tab_current"
+				@change="tabsChange" />	
+			</view>
 		</view>
-		<view :style="{marginTop: tab_height + 'rpx'}">
+		<view :style="{marginTop: top_height + 'px'}">
 			<bookList :class="tab_current==0?'style_show':'style_hide'" 
 			:book_list='data_book_list' 
 			@clickBook='gotoReadBook' 
@@ -43,10 +48,17 @@
     import { ReadRecord } from '../../stores/readRecordManager';
     import { util } from '../../framework/util';
 	
-	let tab_height = ref(100)
+	let tab_height = ref(50)
 	let tab_list = ref(['书架','阅读历史'])
 	let tab_current = ref(0)  //0:书架 1:阅读历史
 	
+	let safeArea_top = ref(0)
+	let top_height = ref(0)
+	if(tools.platform == config.Platform.WEIXIN) {
+		safeArea_top.value = uni.getSystemInfoSync().safeArea.top
+	}
+	top_height.value = safeArea_top.value + tab_height.value
+	
 	let data_book_list = ref<Array<book_item_data>>([])
 	let data_read_history_list = ref<Array<book_item_data>>([])
 	
@@ -260,7 +272,23 @@
 <style lang="scss">
 	.bookshelf-content{
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;	
+		&__top{
+			position: fixed; 
+			z-index: 9; 
+			top: 0; 
+			width: 100%;
+			&__bg{
+				position: absolute; 
+				flex-shrink: 0;
+				width:100%;
+				height: 100%;
+				.image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
 	}
 	.style_show{
 		display: flex;

xs-app/pages/bookstore/template/template-book-H-3.vue

@@ -4,7 +4,7 @@
 			<view class="title-content">
 				<view class="title-content__title" >{{templateData.name}}</view>
 				<view class="title-content__change" @click="clickChange">
-					<image src="../../../static/imgs/bookstore/img_change.png" mode="aspectFit"></image>
+					<image src="../../../static/imgs/public/img_change.png" mode="aspectFit"></image>
 				</view>
 			</view>
 			<view class="book-content">
@@ -70,6 +70,7 @@
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
+			margin: 20rpx 0;
 			margin-left: 30rpx;
 			// background-color: red;
 			
@@ -80,8 +81,8 @@
 			&__change {
 				display: flex;
 				flex-shrink: 0;
-				width: 134px;
-				height: 54px;
+				width: 114px;
+				height: 34px;
 				align-items: center;
 				// background-color: green;
 				.image{

xs-app/pages/bookstore/template/template-book-V-3.vue

@@ -78,6 +78,7 @@
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
+			margin: 20rpx 0;
 			margin-left: 30rpx;
 			
 			&__title {
@@ -87,8 +88,8 @@
 			&__look-more{
 				display: flex;
 				flex-shrink: 0;
-				width: 134px;
-				height: 54px;
+				width: 128px;
+				height: 48px;
 				align-items: center;
 				// background-color: green;
 				.image{

xs-app/pages/mine/mine-info.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="mine-info_content">
 		<view class="bg">
-			<image class="image" src="../../static/imgs/mine/img_mine_bg.png" mode="aspectFill"></image>
+			<image class="image" src="../../static/imgs/public/img_bg_1.png" mode="aspectFill"></image>
 		</view>
 		<view class="container">
 			<view class="container__avatar">

xs-app/pages/mine/mine-wealth.vue

@@ -29,7 +29,7 @@
     import { config } from '../../config/config';
 	let data_list = [
 		{'id':config.mine_goto_type.SHUBI,'name':'书币','icon':'../../static/imgs/public/img_coin.png'},
-	    {'id':config.mine_goto_type.VIP,'name':'VIP','icon':'../../static/imgs/mine/img_mine_icon2.png'},
+	    {'id':config.mine_goto_type.VIP,'name':'VIP','icon':'../../static/imgs/public/img_crown.png'},
 	] 
 	let user_data = UserData().getData()
 	

xs-app/pagesA/aboutMine/aboutMine.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="aboutMine_content">
 		<view class="bg">
-			<image class="bg__image" src="../../static/imgs/mine/img_mine_bg.png" mode="aspectFill"></image>
+			<image class="bg__image" src="../../static/imgs/public/img_bg_1.png" mode="aspectFill"></image>
 			<view class="bg__logo">
 				<image class="image" src="../../static/logo.png" mode="aspectFill"></image>
 			</view>

xs-app/pagesA/bookdetails/bookdetails-recommend.vue

@@ -6,7 +6,7 @@
 		<view class="top">
 			<view class="top__title">同类推荐</view>
 			<view class="top__change" @click="clickChangeBook()">
-				<image class="image" src="../../static/imgs/bookstore/img_change.png" mode="aspectFill"></image>
+				<image class="image" src="../../static/imgs/public/img_change.png" mode="aspectFill"></image>
 			</view>
 		</view>
 		<view class="book-content">