Merge branch 'master' of http://120.79.128.142:3000/904118851/xs

xs-app/framework/tools.ts

@@ -19,14 +19,30 @@ export class tools {
 	public static getCurPlatform(){
 		return tools.platform
 	}
-	
-	public static setNavigationBar() {
-		if(tools.getCurPlatform()==config.Platform.TOUTIAO) {
-			uni.setNavigationBarTitle({
-				title:'卿卿小屋'
+		
+	// 进入书详情
+	public static gotoBookdetails(book_id:number, cb:Function=null) {
+		if(book_id) {
+			uni.navigateTo({
+				url:'/pages/bookdetails/bookdetails?book_id='+book_id,
+				success: () => {
+					cb && cb()
+				}
 			})
+		} else {
+			log.Error('书详情id错误')
 		}
 	}
+	
+	// 添加书架
+	public static addBookshelf(book_id:number) {
+		
+	}
+	
+	// 删除书架
+	public static deleteBookshelf(book_list:number[]) {
+		
+	}
 		
 	public static getChapterList(chapter_path:string,cb:Function){
 		http.StaticRequest(chapter_path,(err,data)=>{

xs-app/pages.json

@@ -51,6 +51,12 @@
 				"navigationBarTitleText": "搜索",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/bookdetails/bookdetails",
+			"style" : {
+				"navigationBarTitleText" : "书详情"
+			}
 		}
 	],
 	"tabBar": {

xs-app/pages/bookdetails/bookdetails.vue

@@ -0,0 +1,18 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { onLoad} from '@dcloudio/uni-app'
+	
+	onLoad((options)=>{
+		console.log('bookdetails book_id=',options.book_id)
+	})
+	
+</script>
+
+<style lang="scss"> 
+
+</style>

xs-app/pages/bookstore/bookstore.vue

@@ -22,7 +22,6 @@
 		
 	onLoad((options)=>{
 		console.log('bookstore-options=',options)
-		tools.setNavigationBar()
 		requestData(bool)
 	})
 		
@@ -58,9 +57,8 @@
     }
 	
 	function onClickNav() {
-		uni.navigateTo({
-			url:'/pages/search/search' + '?' + 'id=123',
-		})
+		tools.gotoBookdetails(1)
+		return
 	}
 		
 </script>

xs-app/pages/readbook/read.vue

@@ -15,7 +15,7 @@
 
 <script setup lang="ts">
 	import { ref } from 'vue';
-	import { book_data, book_item_data, book_read_data, chapter_item_data } from '../../data/data';
+	import { book_item_data, book_read_data, chapter_item_data } from '../../data/data';
 	import { tools } from '../../framework/tools';
 	import { UserStatus } from '../../stores/userStatusManager';
 	import { log } from '../../framework/log';

xs-app/pages/search/search.vue

@@ -14,7 +14,7 @@
 	let search_content = ref('')
 		
 	onLoad((options)=>{
-		console.log('search-options',options)
+		// console.log('search-options',options)
 	})
 	
 	function searchNavClickSearch(r:string) {