Merge branch 'dev_huanmoxiaoshuoge_dy_240528' of...

Merge branch 'dev_huanmoxiaoshuoge_dy_240528' of http://gitlab.mints-id.com/android/uniapp_vedio into dev_huanmoxiaoshuoge_dy_240528

vedio/components/bookshelf/bookshelf.vue

 <template>
-	<view>
+	<z-paging style="height: 100%;">
 		<c-navi id='navi'></c-navi>
 		<book-search-box id='search' :searchType='searchType'></book-search-box>
 		<read-time-count-row id='count' ref='timeCount' @resize='resizeTimeCount'></read-time-count-row>
 		<BookshelfList ref='bookList' :height='listHeight'></BookshelfList>
 		<c-login></c-login>
-	</view>
+	</z-paging>
 </template>
 
 <script>
@@ -45,12 +45,6 @@
 			watchCollectionChange(() => {
 				this.refreshList();
 			}, this);
-		},
-		show(){
-			
-		},
-		hide(){
-			
 		},
 		onShow() {
 			// 更新阅读时间统计
@@ -62,6 +56,22 @@
 			removeCollectionChangeWatch(this);
 		},
 		methods: {
+			show() {
+			this.initHeight();
+			// 监听用户变动
+			watchUserInfoChange((info) => {
+				if (info.userInfo) {
+					this.initData();
+				}
+			}, this)
+			// 监听收藏变动
+			watchCollectionChange(() => {
+				this.refreshList();
+			}, this);
+			},
+			hide() {
+			
+			},
 			resizeTimeCount() {
 				this.initHeight();
 			},

vedio/components/warehouse/warehouse.vue

 <template>
-	<view>
+	<z-paging style="height: 100%;">
 		<c-navi id='navi'></c-navi>
 		<book-search-box id='search'></book-search-box>
 		<CategoryBar id='category' :range='categorys' :current='currentIndex' @change='changeCategory'
@@ -16,7 +16,7 @@
 			</swiper>
 		</view>
 		<c-login></c-login>
-	</view>
+	</z-paging>
 </template>
 
 <script>
@@ -50,23 +50,8 @@
 			};
 		},
 		onLoad(options) {
-			setTimeout(() => {
-				// 匹配用户直接跳转小说
-				if (options.bookId != '' && options.bookId != undefined) {
-					gotoBookContentPage(options.bookId);
-				}
-			}, 800);
-			this.getCategoryData();
-			
-			if(wx.setVisualEffectOnCapture){
-			    wx.setVisualEffectOnCapture({
-			        visualEffect: 'hidden',
-			        success:(res) => {
 
 		},
-			    })
-			}
-		},
 		computed: {
 			showEmpty: function() {
 				return isEmpty(this.categorys);
@@ -101,10 +86,25 @@
 			}
 		},
 		methods: {
-			show(){
+			show() {
+				setTimeout(() => {
+					// 匹配用户直接跳转小说
+					if (options.bookId != '' && options.bookId != undefined) {
+						gotoBookContentPage(options.bookId);
+					}
+				}, 800);
+				this.getCategoryData();
 
+				if (wx.setVisualEffectOnCapture) {
+					wx.setVisualEffectOnCapture({
+						visualEffect: 'hidden',
+						success: (res) => {
+
+						},
+					})
+				}
 			},
-			hide(){
+			hide() {
 
 			},
 			readyCategory() {

vedio/pages/home.vue

@@ -97,15 +97,9 @@
 			loadComponentData() {
 				if (this.currentPage == 0) {
 					this.$refs.index.show();
-					this.$refs.recommend.hide();
-					this.$refs.user.hide();
 				} else if (this.currentPage == 1) {
-					this.$refs.index.hide();
 					this.$refs.recommend.show();
-					this.$refs.user.hide();
 				} else if (this.currentPage == 2) {
-					this.$refs.index.hide();
-					this.$refs.recommend.hide();
 					this.$refs.user.show();
 				}
 			}