更新版本号，优化样式

d083c50c · jyx · 6383f35a · d083c50c · d083c50c · d083c50c
Commit d083c50c authored Aug 13, 2024 by jyx
15 changed files
--- a/vedio/components/banner/banner.vue
+++ b/vedio/components/banner/banner.vue
 <template>
 	<view class="banneritem">
 		<swiper :autoplay="true" :interval="2000" :duration="500">
-			<swiper-item @click="handleBanner" v-for='(item, index) in bannerList' :key='index'>
+			<swiper-item @click="handleBanner(item)" v-for='(item, index) in bannerList' :key='index'>
 				<image class="banner-img" :src="item.carouselUrl" mode="scaleToFill"></image>
 			</swiper-item>
 		</swiper>
@@ -9,6 +9,9 @@
 </template>

 <script>
+	import {
+		gotoBookContentPage
+	} from '../../common/services/page-route.js';
 	import {
 		getRecommendV1
 	} from "../../common/services/index.js"
@@ -49,7 +52,9 @@
 					}
 				}, this)
 			},
-			handleBanner() {},
+			handleBanner(e) {
+				gotoBookContentPage(e.id, e.shortis)
+			},
 			hide() {

 			},
@@ -75,10 +80,11 @@

 <style lang="scss">
 	.banneritem {
-		margin: 20rpx 20rpx 0 20rpx;
+		margin: 30rpx 30rpx 0 30rpx;
 		height: 310rpx;

 		.banner-img {
+			border-radius: 20rpx;
 			height: 310rpx;
 		}
 	}

--- a/vedio/components/book-list-item/book-list-item.vue
+++ b/vedio/components/book-list-item/book-list-item.vue
@@ -5,7 +5,7 @@
 			<image class="cover" :src="item.avatar" mode="aspectFill"></image>
 		</view>
 		<view class="c-flex_column">
-			<view class="c-flex_row row" style="justify-content: space-between;padding-left:20rpx;">
+			<view class="c-flex_row row" style="justify-content: space-between;">
 				<view class="c-flex_column c-justify_center item">
 					<view class="title">
 						{{item.title?item.title:''}}
@@ -17,7 +17,7 @@
 				</view>
 			</view>
 			<view class="c-flex_row row">
-				<view class="c-flex_column c-justify_between content c-flex_1 item">
+				<view class="c-flex_column c-justify_between c-flex_1 item">
 					<view class="desc row">
 						{{item.summary?item.summary:''}}
 					</view>
@@ -154,7 +154,7 @@
 			overflow: hidden;
 			text-overflow: ellipsis;
 			display: -webkit-box;
-			-webkit-line-clamp: 2;
+			-webkit-line-clamp: 3;
 			-webkit-box-orient: vertical;

 			font-size: 26rpx;

--- a/vedio/components/book-search-box/book-search-box.vue
+++ b/vedio/components/book-search-box/book-search-box.vue
@@ -39,10 +39,10 @@
 <style lang="scss" scoped>
 	.search-box {
 		background: transparent;
-		padding: 10rpx 20rpx;
+		padding: 10rpx 30rpx;

 		.search-zone {
-			width: 100%;
+			// width: 100%;
 			border: solid 1rpx #FFE2E2;
 			border-radius: 35rpx;
 			background: #fff;

--- a/vedio/components/bookcity/bookcity.vue
+++ b/vedio/components/bookcity/bookcity.vue
 <template>
 	<scroll-view scroll-y style="height: 100%;">
 		<book-search-box id='search'></book-search-box>
-		<Banner  ref='banner' ></Banner>
+		<Banner ref='banner'></Banner>
 		<RecommendList ref='recommendList1' :listType="1"></RecommendList>
 		<RecommendList ref='recommendList2' :listType="2"></RecommendList>
 		<view style="height: 20rpx;"></view>
@@ -45,12 +45,7 @@
 		},
 		methods: {
 			show() {
-				// 监听用户变动
-				watchUserInfoChange((info) => {
-					if (info.userInfo) {
-						this.initData();
-					}
-				}, this)
+
 			},
 			hide() {


--- a/vedio/components/bookshelf/bookshelf.vue
+++ b/vedio/components/bookshelf/bookshelf.vue
@@ -51,8 +51,7 @@
 			removeUserInfoChangeWatch(this);
 			removeCollectionChangeWatch(this);
 		},
-		methods: {
-			show() {
+		onReady() {
 			// this.initHeight();
 			// 监听用户变动
 			watchUserInfoChange((info) => {
@@ -64,6 +63,10 @@
 			watchCollectionChange(() => {
 				this.refreshList();
 			}, this);
+		},
+		methods: {
+			show() {
+
 			},
 			hide() {


--- a/vedio/components/bookshelf/components/bookshelf-list.vue
+++ b/vedio/components/bookshelf/components/bookshelf-list.vue
@@ -61,8 +61,10 @@
 				this.dataList = e.records.map(item => {
 					return new BookshelfBookItem(item)
 				})
+				if (this.dataList.length > 0) {
 					this.dataList.push(
 						new BookshelfBookItem({}))
+				}
 			},
 			tapItem(e, index) {
 				if (index >= this.dataList.length - 1) {
@@ -101,6 +103,7 @@
 		flex-direction: column;
 		border-radius: 20rpx;
 		background-color: white;
+		box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
 		margin: 30rpx;

 		.bookitem {
@@ -116,8 +119,8 @@
 			}

 			.item:last-child {
-				margin-bottom: 0;
-				margin-right: 0;
+				// margin-bottom: 0;
+				// margin-right: 0;
 			}
 		}
 	}

--- a/vedio/components/home/my.vue
+++ b/vedio/components/home/my.vue
@@ -27,8 +27,7 @@
 		</view>

 		<view class="vip-label">
-			<image style="width: 100%;position: absolute;z-index: 1;" mode="widthFix"
-				src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/bg_book_my.png"></image>
+			<image style="width: 100%;position: absolute;z-index: 1;" mode="widthFix" src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/bg_book_my.png"></image>
 			<view class="flex-v" style="z-index: 10;margin-left: 180rpx;">
 				<view style="font-size: 34rpx;color: #FFE5BA;">
 					{{ isVip() ? '开通VIP会员' : 'VIP会员'}}
@@ -242,6 +241,7 @@
 	}

 	.wrap-bg {
+		box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
 		display: flex;
 		flex-direction: row;
 		flex-wrap: wrap;

--- a/vedio/components/read-time-count-row/read-time-count-row.vue
+++ b/vedio/components/read-time-count-row/read-time-count-row.vue
@@ -8,15 +8,15 @@
 			<view class="value">
 				<view class="count">
 					<view class="count-value">{{count.hour ?count.hour:'00'}}</view>
-					<view class="count-unit">h</view>
+					<view class="count-unit">小时</view>
 				</view>
 				<view class="count">
 					<view class="count-value">{{count.minute?count.minute:'00'}}</view>
-					<view class="count-unit">m</view>
+					<view class="count-unit">分</view>
 				</view>
 				<view class="count">
 					<view class="count-value">{{count.second?count.second:'00'}}</view>
-					<view class="count-unit">s</view>
+					<view class="count-unit">秒</view>
 				</view>
 			</view>
 			<!-- <view class="value" v-else>
@@ -77,6 +77,7 @@
 		.title {
 			width: 80rpx;
 			font-size: 30rpx;
+			font-weight: 600;
 			color: #000000;
 			margin-right: 15rpx;
 			letter-spacing: 6rpx;
@@ -98,7 +99,7 @@

 				.count-value {
 					position: absolute;
-					top: 46%;
+					top: 42%;
 					left: 50%;
 					transform: translate(-50%, -50%);
 					color: #000000;
@@ -107,9 +108,11 @@
 				}

 				.count-unit {
+					font-size: 20rpx;
 					position: absolute;
-					right: 8rpx;
-					bottom: 8rpx;
+					left: 50%;
+					transform: translate(-50%);
+					bottom: 4rpx;
 				}
 			}
 		}

--- a/vedio/components/recommend-list/recommend-list.vue
+++ b/vedio/components/recommend-list/recommend-list.vue
@@ -13,7 +13,7 @@
 			</book-list-item2>
 		</view>
 		<view class="columnitem" v-else-if="listType==1">
-			<book-list-item :item='dataList[0]' :showClose='false'>
+			<book-list-item :item='dataList[0]' :showClose='false' @tapItem='tapItem($event, index)'>
 			</book-list-item>
 			<view class="rowitem">
 				<book-list-item2 class="item" :item='item' v-if="index!=0" v-for='(item, index) in dataList'
@@ -120,6 +120,7 @@
 		display: flex;
 		flex-direction: column;
 		border-radius: 20rpx;
+		box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
 		background-color: white;
 		margin: 30rpx;
 		margin-bottom: 0;
@@ -169,7 +170,7 @@
 			}

 			.item:last-child {
-				margin-bottom: 0;
+				// margin-bottom: 0;
 				margin-right: 0;
 			}
 		}

--- a/vedio/components/warehouse/warehouse.vue
+++ b/vedio/components/warehouse/warehouse.vue
@@ -74,9 +74,9 @@
 		watch: {
 			categroyChange: {
 				handler: function(n, o) {
-					setTimeout(() => {
+					this.$nextTick(() => {
 						this.$refs[`bookList${n.currentIndex}`][0].initRefresh();
-					}, 500)
+					})
 					// this.$nextTick(() => {
 					// 	// this.$refs[`bookList${n.currentIndex}`][0].initRefresh();
 					// 	let ref = this.$refs.bookList;

--- a/vedio/page-subs/sub_A/book-content/book-content.vue
+++ b/vedio/page-subs/sub_A/book-content/book-content.vue
@@ -134,17 +134,11 @@
 				if (this.isVip() && this.bookData) {
 					this.unlockBook()
 				}
-
-				// this.showVipOpen = data.openVips
-				// // 用户变动，需要刷新数据
-				// this.$nextTick(() => {
-				// 	uni.startPullDownRefresh({})
-				// })
-			}, this)
 				// 用户变动，需要刷新数据
 				this.$nextTick(() => {
-				uni.startPullDownRefresh({})
+					this.refreshBookData(this.bookId)
 				})
+			}, this)

 			// 绑定分享参数
 			// #ifdef MP-WEIXIN
@@ -176,9 +170,7 @@
 			wx.offCopyUrl()
 			// #endif
 		},
-		onPullDownRefresh() {
-			this.refreshBookData(this.bookId)
-		},
+		onPullDownRefresh() {},
 		// 文章分享
 		onShareAppMessage() {
 			let result = {
@@ -254,18 +246,14 @@
 			},
 			// 文章数据刷新
 			refreshBookData(bookId) {
-				// getOpens((success, data) => {
-				// 	// this.showBeanOpen = data.openBeans
-				// 	this.showVipOpen = data.openVips
-				// })
 				getBookDetailData(bookId, (success, data) => {
-					setTimeout(() => {
-						uni.stopPullDownRefresh();
+					// setTimeout(() => {
+					// uni.stopPullDownRefresh();
 					if (success) {
 						this.bookData = new BookDetail(data);
 						// console.log('bookData=' + JSON.stringify(this.bookData));
 					}
-					}, 1000)
+					// }, 100)
 				})
 			},
 			paySuccess() {

--- a/vedio/pages/home.vue
+++ b/vedio/pages/home.vue
 <template>
 	<view v-if="localActiviteFlag==1" class="body">
 		<view style="height: 92%;">
-			<bookshelf v-show="currentPage==0" ref="index" />
+			<bookshelf v-show=" currentPage==0" ref="index" />
 			<bookcity v-show="currentPage==1" ref="city" />
 			<warehouse v-show="currentPage==2" ref="recommend" />
 			<userPage v-show="currentPage==3" ref="user" />
 		</view>
-		<view class="tabs-bar" style="z-index: 999;">
+		<view class="tabs-bar" :style="'z-index: 999;height: 8%;padding-bottom:' + bottomSafeHeight + 'px'">
 			<view :class="currentPage==0?'tab active': 'tab'" @click="tabChange(0)">
-				<view style="margin: 16rpx 0 11rpx;">
+				<view class="tab-home">
 					<image v-if="currentPage==0" class="tabs-image" src="/static/tab/bookshelf_s.png" mode="heightFix">
 					</image>
 					<image v-else class="tabs-image" src="/static/tab/bookshelf.png" mode="heightFix"></image>
@@ -16,7 +16,7 @@
 				书架
 			</view>
 			<view :class="currentPage == 1?'tab active': 'tab'" @click="tabChange(1)">
-				<view style="margin: 16rpx 0 11rpx;">
+				<view class="tab-home">
 					<image v-if="currentPage==1" class="tabs-image" src="/static/tab/bookcity_s.png" mode="heightFix">
 					</image>
 					<image v-else class="tabs-image" src="/static/tab/bookcity.png" mode="heightFix"></image>
@@ -24,7 +24,7 @@
 				书城
 			</view>
 			<view :class="currentPage == 2?'tab active': 'tab'" @click="tabChange(2)">
-				<view style="margin: 16rpx 0 11rpx;">
+				<view class="tab-home">
 					<image v-if="currentPage==2" class="tabs-image" src="/static/tab/bookstore_s.png" mode="heightFix">
 					</image>
 					<image v-else class="tabs-image" src="/static/tab/bookstore.png" mode="heightFix"></image>
@@ -32,7 +32,7 @@
 				书库
 			</view>
 			<view :class="currentPage == 3?'tab active': 'tab'" @click="tabChange(3)">
-				<view style="margin: 16rpx 0 11rpx;">
+				<view class="tab-home">
 					<image v-if="currentPage==3" class="tabs-image" src="/static/tab/my_s.png" mode="heightFix">
 					</image>
 					<image v-else class="tabs-image" src="/static/tab/my.png" mode="heightFix"></image>
@@ -54,7 +54,7 @@
 		</view>

 		<view style="height: 92%;">
-			<warehouse v-show="currentPage==1" ref="recommend" />
+			<warehouse ref="recommend2" />
 		</view>
 	</view>
 </template>
@@ -84,13 +84,13 @@
 		data() {
 			return {
 				currentPage: 1,
-				localActiviteFlag: 1,
+				localActiviteFlag: 0,
 				localIdcode: 0,
 			}
 		},
 		onLoad(options) {
 			let index = options.index ?? ''
-			// this.localActiviteFlag = options.activiteFlag;
+			this.localActiviteFlag = options.activiteFlag;
 			this.localIdcode = options.idcode;
 			if (index != '' && index != undefined) {
 				this.currentPage = index
@@ -144,9 +144,7 @@
 						this.$refs.user.show();
 					}
 				} else {
-					if (this.currentPage == 1) {
-						this.$refs.city.show();
-					}
+					this.$refs.recommend2.show();
 				}
 			}
 		}
@@ -167,4 +165,8 @@
 		overflow: hidden;
 		//box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
 	}
+
+	.tab-home {
+		padding-top: 16rpx;
+	}
 </style>
\ No newline at end of file
--- a/vedio/pagesD/readerRecord/readerRecord.vue
+++ b/vedio/pagesD/readerRecord/readerRecord.vue
@@ -5,7 +5,7 @@
 			<view style="font-size: 30rpx;font-weight: 777;margin-left: 12rpx;margin-top: 10rpx;">最近阅读</view>
 			<view v-for="(item, i) in dataList" :key="i">
 				<view
-					style="display: flex;flex-direction: row;background-color:white;border-radius:10rpx;justify-content:space-between;margin: 20rpx;padding-bottom: 20rpx;">
+					style="display: flex;flex-direction: row;background-color:white;border-radius:10rpx;justify-content:space-between;margin: 20rpx;padding-bottom: 20rpx;box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);">
 					<view style="display: flex;align-items: center;" @click="handleInfo(item)">
 						<view style="display: flex;flex-direction: column;margin-left: 20rpx;margin-top: 20rpx;">
 							<view style="font-size: 30rpx;color: black;">{{item.title}}</view>

--- a/vedio/static/images/logo.png
+++ b/vedio/static/images/logo.png
--- a/vedio/utils/utils.js
+++ b/vedio/utils/utils.js

 export const PAKEAGE_NAME = 'com.mingce.wxhelibook'
-export const VERSION_CODE = '1.0.4'
+export const VERSION_CODE = '1.0.5'
 // export const PAKEAGE_NAME = 'com.test.test'
 
 export function trim(str) {