diff --git a/.gitignore b/.gitignore
index 38adffa..27d0004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
# Logs
+# 注意:一个忽略文件名一行
+# 忽略文件规则
+# img/* //忽略img文件下所有文件
+# js/* //忽略js文件下所有文件
+# .gitignore //忽略当前文件
logs
*.log
npm-debug.log*
@@ -8,12 +13,20 @@ pnpm-debug.log*
lerna-debug.log*
node_modules
+index.html
+package-lock.json
+# README.md
+jsconfig.json
+babel.config.js
+.eslintrc.js
+.browserslistrc
.DS_Store
dist
dist-ssr
coverage
*.local
+
/cypress/videos/
/cypress/screenshots/
@@ -25,4 +38,4 @@ coverage
*.ntvs*
*.njsproj
*.sln
-*.sw?
+*.sw?
\ No newline at end of file
diff --git a/README.md b/README.md
index c016445..3f04212 100644
--- a/README.md
+++ b/README.md
@@ -1,80 +1,34 @@
-<<<<<<< HEAD
-# novel
-
-#### 介绍
+# 项目名称与简介
+## 项目名称:香菇巷
+## 项目介绍:
本项目是一个小说网页,采用vue框架搭建,项目的主要页面有首页、小说详情页、观看页、个人中心页、搜索等页面,实现了小说付款、观看小说章节数缓存、未登录拦截、小说搜索、上下章节、小说章节选取、vip及充值等功能
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本仓库
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
-2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
-5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-=======
-# xmks-vue3
-
-This template should help get you started developing with Vue 3 in Vite.
-
-## Recommended IDE Setup
-
-[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
-
-## Type Support for `.vue` Imports in TS
-
-TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin) to make the TypeScript language service aware of `.vue` types.
-
-If the standalone TypeScript plugin doesn't feel fast enough to you, Volar has also implemented a [Take Over Mode](https://github.com/johnsoncodehk/volar/discussions/471#discussioncomment-1361669) that is more performant. You can enable it by the following steps:
-
-1. Disable the built-in TypeScript Extension
- 1) Run `Extensions: Show Built-in Extensions` from VSCode's command palette
- 2) Find `TypeScript and JavaScript Language Features`, right click and select `Disable (Workspace)`
-2. Reload the VSCode window by running `Developer: Reload Window` from the command palette.
-
-## Customize configuration
-
-See [Vite Configuration Reference](https://vitejs.dev/config/).
-
-## Project Setup
-
-```sh
-npm install
-```
-
-### Compile and Hot-Reload for Development
-
-```sh
-npm run dev
-```
-
-### Type-Check, Compile and Minify for Production
-
-```sh
-npm run build
-```
->>>>>>> 516b32f (注释)
+## 具体页面:
+### 登录页
+
+
+
+### 注册页
+
+### 充值页
+
+
+### 个人中心
+
+
+### VIP
+
+### 主页
+
+
+
+### 分类榜单
+
+### 小说详情
+
+### 观看页
+
+
+### 目录页
+
+### 搜索页
+
\ No newline at end of file
diff --git a/image-1.png b/image-1.png
new file mode 100644
index 0000000..0d5ac1c
Binary files /dev/null and b/image-1.png differ
diff --git a/image-10.png b/image-10.png
new file mode 100644
index 0000000..5e8c7c4
Binary files /dev/null and b/image-10.png differ
diff --git a/image-11.png b/image-11.png
new file mode 100644
index 0000000..c532fda
Binary files /dev/null and b/image-11.png differ
diff --git a/image-12.png b/image-12.png
new file mode 100644
index 0000000..535c535
Binary files /dev/null and b/image-12.png differ
diff --git a/image-13.png b/image-13.png
new file mode 100644
index 0000000..52da1cc
Binary files /dev/null and b/image-13.png differ
diff --git a/image-14.png b/image-14.png
new file mode 100644
index 0000000..05832f9
Binary files /dev/null and b/image-14.png differ
diff --git a/image-15.png b/image-15.png
new file mode 100644
index 0000000..13e2ffa
Binary files /dev/null and b/image-15.png differ
diff --git a/image-16.png b/image-16.png
new file mode 100644
index 0000000..ff5e6ef
Binary files /dev/null and b/image-16.png differ
diff --git a/image-17.png b/image-17.png
new file mode 100644
index 0000000..43fed6f
Binary files /dev/null and b/image-17.png differ
diff --git a/image-18.png b/image-18.png
new file mode 100644
index 0000000..c55c833
Binary files /dev/null and b/image-18.png differ
diff --git a/image-2.png b/image-2.png
new file mode 100644
index 0000000..f21dec1
Binary files /dev/null and b/image-2.png differ
diff --git a/image-3.png b/image-3.png
new file mode 100644
index 0000000..dfbd0bd
Binary files /dev/null and b/image-3.png differ
diff --git a/image-4.png b/image-4.png
new file mode 100644
index 0000000..ea6013d
Binary files /dev/null and b/image-4.png differ
diff --git a/image-5.png b/image-5.png
new file mode 100644
index 0000000..58c47a9
Binary files /dev/null and b/image-5.png differ
diff --git a/image-6.png b/image-6.png
new file mode 100644
index 0000000..69d59c6
Binary files /dev/null and b/image-6.png differ
diff --git a/image-7.png b/image-7.png
new file mode 100644
index 0000000..26fb550
Binary files /dev/null and b/image-7.png differ
diff --git a/image-8.png b/image-8.png
new file mode 100644
index 0000000..47a6e90
Binary files /dev/null and b/image-8.png differ
diff --git a/image-9.png b/image-9.png
new file mode 100644
index 0000000..98284c9
Binary files /dev/null and b/image-9.png differ
diff --git a/image.png b/image.png
new file mode 100644
index 0000000..5054131
Binary files /dev/null and b/image.png differ
diff --git a/src/views/Bookshelf/BookshelfvView.vue b/src/views/Bookshelf/BookshelfvView.vue
index 26fe4ff..fd40e39 100644
--- a/src/views/Bookshelf/BookshelfvView.vue
+++ b/src/views/Bookshelf/BookshelfvView.vue
@@ -280,8 +280,8 @@ onActivated(()=>{
diff --git a/src/views/detail/DetailView.vue b/src/views/detail/DetailView.vue
index 9dbf5cc..60a2900 100644
--- a/src/views/detail/DetailView.vue
+++ b/src/views/detail/DetailView.vue
@@ -1,4 +1,4 @@
-