Merge branch 'dev' of http://gitlab.yidooplanet.com/gitlab-instance-0a899031/nomadyt into dev
This commit is contained in:
@@ -12,7 +12,14 @@ import Taro from "@tarojs/taro";
|
|||||||
import { AtAvatar } from "taro-ui";
|
import { AtAvatar } from "taro-ui";
|
||||||
import { AtTag } from "taro-ui";
|
import { AtTag } from "taro-ui";
|
||||||
import { AtList, AtListItem } from "taro-ui";
|
import { AtList, AtListItem } from "taro-ui";
|
||||||
import { AtForm, AtMessage, AtDrawer, AtIcon } from "taro-ui";
|
import {
|
||||||
|
AtForm,
|
||||||
|
AtMessage,
|
||||||
|
AtDrawer,
|
||||||
|
AtIcon,
|
||||||
|
AtTimeline,
|
||||||
|
AtDivider,
|
||||||
|
} from "taro-ui";
|
||||||
import { marked } from "marked";
|
import { marked } from "marked";
|
||||||
import infoText from "./info.md";
|
import infoText from "./info.md";
|
||||||
import bookText from "./book.md";
|
import bookText from "./book.md";
|
||||||
@@ -149,8 +156,8 @@ const Book = () => {
|
|||||||
className="book_header_left"
|
className="book_header_left"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
Taro.redirectTo({
|
Taro.redirectTo({
|
||||||
url: `/`
|
url: `/`,
|
||||||
})
|
});
|
||||||
// Taro.navigateBack({
|
// Taro.navigateBack({
|
||||||
// delta: 1, // 表示返回的页面数,默认是 1,表示返回上一页
|
// delta: 1, // 表示返回的页面数,默认是 1,表示返回上一页
|
||||||
// });
|
// });
|
||||||
@@ -178,6 +185,7 @@ const Book = () => {
|
|||||||
}}
|
}}
|
||||||
></View>
|
></View>
|
||||||
|
|
||||||
|
{/* 目录 */}
|
||||||
<AtDrawer
|
<AtDrawer
|
||||||
className="book_AtDrawer"
|
className="book_AtDrawer"
|
||||||
show={show}
|
show={show}
|
||||||
@@ -190,12 +198,48 @@ const Book = () => {
|
|||||||
setshow(false);
|
setshow(false);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<View className="drawer-item">优先展示items里的数据</View>
|
<View className="drawer-item"></View>
|
||||||
{/* <View className="drawer-item">如果items没有数据就会展示children</View> */}
|
{/* <View className="drawer-item">如果items没有数据就会展示children</View> */}
|
||||||
{/* <View className="drawer-item">
|
{/* <View className="drawer-item">
|
||||||
这是自定义内容 <AtIcon value="home" size="20" />
|
这是自定义内容 <AtIcon value="home" size="20" />
|
||||||
</View> */}
|
</View> */}
|
||||||
</AtDrawer>
|
</AtDrawer>
|
||||||
|
|
||||||
|
{/* 分割线 */}
|
||||||
|
<AtDivider>
|
||||||
|
<AtIcon value="check-circle"></AtIcon>
|
||||||
|
<span> 更新日志</span>
|
||||||
|
<AtIcon value="check-circle"></AtIcon>
|
||||||
|
</AtDivider>
|
||||||
|
|
||||||
|
{/* 更新日志 */}
|
||||||
|
<View className="log">
|
||||||
|
<AtTimeline
|
||||||
|
pending
|
||||||
|
items={[
|
||||||
|
{
|
||||||
|
title: "新建电子书",
|
||||||
|
content: ["2025年4月4日"],
|
||||||
|
icon: "check-circle",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "目录大纲",
|
||||||
|
content: ["2025年4月5日"],
|
||||||
|
icon: "clock",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "核心内容",
|
||||||
|
content: ["2025年4月6日"],
|
||||||
|
icon: "clock",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "新增日志log",
|
||||||
|
content: ["2025年4月7日"],
|
||||||
|
icon: "clock",
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
></AtTimeline>
|
||||||
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user