From e5e7d345b78db007d72dc4fe77139ea3b4c5d602 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 23 May 2025 17:31:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B9=A6=E7=B1=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=A4=9A=E9=A1=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增书籍列表页面 `/pages_order/novel/bookList.vue`
- 优化书籍项组件 `novelItem.vue` 的样式和逻辑
- 新增删除作品章节和批量删除作品的功能接口
- 调整登录页面样式和交互
- 修复书籍管理页面中的删除逻辑和样式问题
---
 api/model/my_book.js                   |  12 ++
 components/novel/bookshelfItem.vue     | 211 +++++++++++++++++++++++++++++++++
 components/novel/novelItem.vue         |  28 ++---
 components/novel/workItem.vue          |   8 +-
 pages.json                             |   3 +
 pages/chapter/index.vue                | 160 -------------------------
 pages/index/bookshelf.vue              |  85 ++++++++++---
 pages/index/category.vue               |  64 +++++-----
 pages/index/center.vue                 |  32 +++--
 pages/index/index.vue                  |  28 ++---
 pages_order/auth/Modifyinformation.vue |  19 ++-
 pages_order/auth/wxLogin.vue           |  10 +-
 pages_order/auth/wxUserInfo.vue        |  10 +-
 pages_order/author/chapterList.vue     |  97 ++++++++++++---
 pages_order/author/createNovel.vue     | 107 +++++++++++++----
 pages_order/novel/bookList.vue         |  58 +++++++++
 static/image/center/headImage.png      | Bin 0 -> 8465 bytes
 17 files changed, 618 insertions(+), 314 deletions(-)
 create mode 100644 components/novel/bookshelfItem.vue
 delete mode 100644 pages/chapter/index.vue
 create mode 100644 pages_order/novel/bookList.vue
 create mode 100644 static/image/center/headImage.png

diff --git a/api/model/my_book.js b/api/model/my_book.js
index d46fae7..9348b5a 100644
--- a/api/model/my_book.js
+++ b/api/model/my_book.js
@@ -28,6 +28,18 @@ const api = {
 		method: 'POST',
 		auth: true,
 	},
+	// 删除作品章节
+	deleteMyNovel : {
+		url: '/my_book/deleteMyNovel',
+		method: 'POST',
+		auth: true,
+	},
+	// 多选删除我的作品
+	deleteMyShopList : {
+		url: '/my_book/deleteMyShopList',
+		method: 'POST',
+		auth: true,
+	},
 }
 
 export default api 
\ No newline at end of file
diff --git a/components/novel/bookshelfItem.vue b/components/novel/bookshelfItem.vue
new file mode 100644
index 0000000..5af1517
--- /dev/null
+++ b/components/novel/bookshelfItem.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="book-item" :class="{'horizontal': horizontal}" @click="$emit('click')">
+		<image class="book-cover" :src="book.image
+		&& book.image.split(',')[0]" mode="aspectFill"></image>
+		<view class="book-info">
+			<view class="book-title">{{book.name}}</view>
+			<view class="book-author" v-if="book.author && !horizontal">{{book.author}}</view>
+			<view class="book-desc" v-if="!horizontal">{{book.details || '暂无简介'}}</view>
+            
+			<view class="content-row" v-if="!horizontal">
+                <view class="book-tags" v-if="book.tags && book.tags.length">
+                    <text class="tag" v-for="(tag, index) in book.tags" :key="index">{{tag}}</text>
+                </view>
+            </view>
+
+            <view class="content-row" v-if="!horizontal">
+
+                <view class="book-status">
+                    <text>{{ statusText }}</text>
+                </view>
+                <view class="book-text">
+                    {{ item.service || '大家都在读' }}
+                </view>
+            </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			book: {
+				type: Object,
+				default: {}
+			},
+			// 是否显示为水平布局（默认垂直布局）
+			horizontal: {
+				type: Boolean,
+				default: false
+			},
+		},
+		computed: {
+			statusClass() {
+				const statusMap = {
+					'draft': 'new',
+					'0': 'ongoing',
+					'1': 'completed'
+				};
+				return statusMap[this.book.status] || 'ongoing';
+			},
+			statusText() {
+				const textMap = {
+					// '0': '新建',
+					'0': '连载中',
+					'1': '已完结'
+				};
+				return textMap[this.book.status] || '连载中';
+			},
+		},
+		data() {
+			return {}
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.book-item {
+	display: flex;
+	padding: 20rpx 0;
+	border-bottom: 1px solid #eee;
+	
+	&:last-child {
+		border-bottom: none;
+	}
+	
+	.book-cover {
+		width: 160rpx;
+		height: 210rpx;
+		border-radius: 16rpx;
+		margin-right: 20rpx;
+		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+	}
+	
+	.book-info {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		
+		.book-title {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			flex: 1;
+			margin-right: 10rpx;
+		}
+		
+		.book-author {
+			font-size: 24rpx;
+			color: #666;
+			margin-bottom: 10rpx;
+		}
+		
+		.book-desc {
+			font-size: 24rpx;
+			color: #999;
+			line-height: 1.5;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			margin-bottom: 10rpx;
+		}
+		
+		.content-row {
+			display: flex;
+			align-items: center;
+			margin-bottom: 10rpx;
+		}
+		
+		.book-tags {
+			display: flex;
+			flex-wrap: wrap;
+			
+			.tag {
+				font-size: 20rpx;
+				color: #666;
+				background-color: #f5f5f5;
+				padding: 4rpx 12rpx;
+				border-radius: 20rpx;
+				margin-right: 10rpx;
+			}
+		}
+		
+		.book-status {
+			flex-shrink: 0;
+			
+			text {
+				font-size: 20rpx;
+				color: #67C23A;
+				background-color: rgba(103, 194, 58, 0.1);
+				border-radius: 20rpx;
+				padding: 4rpx 12rpx;
+			}
+		}
+        .book-text{
+            font-size: 20rpx;
+        }
+	}
+}
+
+/* 水平布局样式 - 用于网格展示 */
+.book-item.horizontal {
+	flex-direction: column;
+	width: 220rpx;
+	padding: 10rpx;
+	border: none;
+	
+	.book-cover {
+		width: 100%;
+		height: 300rpx;
+		margin-right: 0;
+		margin-bottom: 10rpx;
+	}
+	
+	.book-info {
+		.title-row {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		
+		.book-title {
+			font-size: 26rpx;
+			white-space: wrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			flex: 1;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			margin-right: 5rpx;
+		}
+		
+		.book-author {
+			font-size: 22rpx;
+		}
+		
+		.book-desc {
+			display: none;
+		}
+		
+		.book-tags {
+			display: none;
+		}
+		
+		.book-status {
+			flex-shrink: 0;
+			
+			text {
+				font-size: 18rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/components/novel/novelItem.vue b/components/novel/novelItem.vue
index 527c756..1ec5345 100644
--- a/components/novel/novelItem.vue
+++ b/components/novel/novelItem.vue
@@ -4,14 +4,14 @@
 		&& book.image.split(',')[0]" mode="aspectFill"></image>
 		<view class="book-info">
 			<view class="book-title">{{book.name}}</view>
-			<view class="book-author" v-if="book.author && !horizontal">{{book.author}}</view>
-			<view class="book-desc" v-if="!horizontal">{{book.desc || '暂无简介'}}</view>
+			<view class="book-author" v-if="!horizontal">{{book.author || '暂无作者昵称'}}</view>
+			<view class="book-desc" v-if="!horizontal">{{book.details || '暂无简介'}}</view>
             
-			<view class="content-row" v-if="!horizontal">
+			<!-- <view class="content-row" v-if="!horizontal">
                 <view class="book-tags" v-if="book.tags && book.tags.length">
                     <text class="tag" v-for="(tag, index) in book.tags" :key="index">{{tag}}</text>
                 </view>
-            </view>
+            </view> -->
 
             <view class="content-row" v-if="!horizontal">
 
@@ -37,7 +37,7 @@
 			horizontal: {
 				type: Boolean,
 				default: false
-			}
+			},
 		},
 		computed: {
 			statusClass() {
@@ -76,9 +76,9 @@
 	}
 	
 	.book-cover {
-		width: 160rpx;
-		height: 210rpx;
-		border-radius: 8rpx;
+		width: 150rpx;
+		height: 196rpx;
+		border-radius: 16rpx;
 		margin-right: 20rpx;
 		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
 	}
@@ -96,14 +96,14 @@
 			white-space: nowrap;
 			overflow: hidden;
 			text-overflow: ellipsis;
-			flex: 1;
-			margin-right: 10rpx;
+			margin-bottom: 6rpx;
 		}
 		
 		.book-author {
 			font-size: 24rpx;
-			color: #666;
-			margin-bottom: 10rpx;
+			color: #999;
+			margin-bottom: 6rpx;
+			flex: 1;
 		}
 		
 		.book-desc {
@@ -114,13 +114,13 @@
 			-webkit-box-orient: vertical;
 			-webkit-line-clamp: 2;
 			overflow: hidden;
-			margin-bottom: 10rpx;
+			margin-bottom: 6rpx;
 		}
 		
 		.content-row {
 			display: flex;
 			align-items: center;
-			margin-bottom: 10rpx;
+			margin-bottom: 6rpx;
 		}
 		
 		.book-tags {
diff --git a/components/novel/workItem.vue b/components/novel/workItem.vue
index 18f4698..64fd837 100644
--- a/components/novel/workItem.vue
+++ b/components/novel/workItem.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="work-item" @click="handleClick">
+	<view class="work-item" @click.stop="handleClick">
 		<view class="cover-wrapper">
 			<image class="cover" :src="work.image && work.image.split(',')[0]" mode="aspectFill"></image>
 			<view class="tag original" v-if="work.isOriginal">原创</view>
@@ -63,7 +63,6 @@
 			},
 			statusText() {
 				const textMap = {
-					// '0': '新建',
 					'0': '连载中',
 					'1': '已完结'
 				};
@@ -104,11 +103,14 @@
 		},
 		methods: {
 			handleClick() {
+				console.log('handleClick called, isManaging:', this.isManaging);
+				// 在编辑模式下，只触发选中事件
 				if (this.isManaging) {
 					this.$emit('click');
 					return;
 				}
-				// 跳转到章节列表页面
+				
+				// 非编辑模式下，跳转到章节列表页面
 				uni.navigateTo({
 					url: '/pages_order/author/chapterList?id=' + this.work.id
 				});
diff --git a/pages.json b/pages.json
index 824dfcf..d436db1 100644
--- a/pages.json
+++ b/pages.json
@@ -109,6 +109,9 @@
 			{
 				"path": "novel/Translation"
 			},
+			{
+				"path": "novel/bookList"
+			},
 			{
 				"path": "auth/Modifyinformation"
 			}
diff --git a/pages/chapter/index.vue b/pages/chapter/index.vue
deleted file mode 100644
index 52c8b4d..0000000
--- a/pages/chapter/index.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-  <view class="chapter-container">
-    <view class="header">
-      <view class="nav-bar">
-        <view class="back" @click="goBack">
-          <text class="iconfont icon-back">&#xe60e;</text>
-        </view>
-        <view class="tabs">
-          <view class="tab active">草稿箱</view>
-          <view class="tab">已发布</view>
-        </view>
-        <view class="more">
-          <text class="iconfont">&#xe612;</text>
-        </view>
-      </view>
-    </view>
-    
-    <view class="chapter-list">
-      <view class="chapter-item" v-for="(chapter, index) in chapters" :key="index">
-        <view class="chapter-info">
-          <text class="chapter-title">章节名</text>
-          <text class="chapter-number">第{{index + 1}}章</text>
-        </view>
-        <text class="iconfont icon-arrow">&#xe65f;</text>
-      </view>
-    </view>
-    
-    <view class="bottom-actions">
-      <button class="btn-settings">设置作品</button>
-      <button class="btn-new" @click="addNewChapter">新建章节</button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      chapters: Array(8).fill({}) // 模拟8个章节数据
-    }
-  },
-  methods: {
-    goBack() {
-      uni.navigateBack()
-    },
-    addNewChapter() {
-      // 添加新章节的逻辑
-      uni.showToast({
-        title: '新建章节',
-        icon: 'none'
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.chapter-container {
-  min-height: 100vh;
-  background-color: #fff;
-  
-  .header {
-    background: #fff;
-    padding-top: var(--status-bar-height);
-    
-    .nav-bar {
-      height: 44px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0 15px;
-      
-      .back {
-        padding: 5px;
-        .icon-back {
-          font-size: 20px;
-        }
-      }
-      
-      .tabs {
-        display: flex;
-        .tab {
-          padding: 0 15px;
-          font-size: 16px;
-          color: #666;
-          &.active {
-            color: #000;
-            font-weight: bold;
-          }
-        }
-      }
-      
-      .more {
-        padding: 5px;
-      }
-    }
-  }
-  
-  .chapter-list {
-    padding: 0 15px;
-    
-    .chapter-item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 15px 0;
-      border-bottom: 1px solid #eee;
-      
-      .chapter-info {
-        .chapter-title {
-          font-size: 14px;
-          color: #999;
-          margin-bottom: 5px;
-        }
-        
-        .chapter-number {
-          font-size: 16px;
-          color: #333;
-        }
-      }
-      
-      .icon-arrow {
-        color: #999;
-        font-size: 16px;
-      }
-    }
-  }
-  
-  .bottom-actions {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    display: flex;
-    padding: 10px 15px;
-    background: #fff;
-    box-shadow: 0 -2px 6px rgba(0,0,0,0.05);
-    
-    button {
-      flex: 1;
-      height: 40px;
-      border-radius: 20px;
-      font-size: 16px;
-      margin: 0 5px;
-      
-      &.btn-settings {
-        background: #fff;
-        border: 1px solid #ddd;
-        color: #333;
-      }
-      
-      &.btn-new {
-        background: #2b4acb;
-        color: #fff;
-        border: none;
-      }
-    }
-  }
-}
-</style> 
\ No newline at end of file
diff --git a/pages/index/bookshelf.vue b/pages/index/bookshelf.vue
index 662f076..d103946 100644
--- a/pages/index/bookshelf.vue
+++ b/pages/index/bookshelf.vue
@@ -51,7 +51,8 @@
 					v-for="work in list" 
 					:key="work.id" 
 					:work="work"
-					@click="toWorkDetail(work.id)"
+					:isManaging="isEditMode"
+					@click="toggleSelect(work, 'work')"
 					@longpress="enterEditMode"
 				/>
 				
@@ -101,10 +102,22 @@
 					class="work-item-wrapper" 
 					v-for="work in list" 
 					:key="work.id"
-					@click="toggleSelect(work, 'work')"
 				>
+					<!-- 选中框 -->
+					<view class="item-checkbox-work" v-if="selectedItems.includes(work.id)">
+						<view class="checkbox-inner">
+							<uv-icon name="checkmark" size="28" color="#ffffff"></uv-icon>
+						</view>
+					</view>
+					<view class="item-checkbox-work" v-else>
+						<view class="checkbox-inner-no">
+						</view>
+					</view>
+					
 					<work-item 
 						:work="work"
+						:isManaging="true"
+						@click="toggleSelect(work)"
 						:style="{ opacity: selectedItems.includes(work.id) ? '0.8' : '1' }"
 					/>
 				</view>
@@ -139,7 +152,7 @@
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
-	import novelItem from '@/components/novel/novelItem.vue'
+	import novelItem from '@/components/novel/bookshelfItem.vue'
 	import workItem from '@/components/novel/workItem.vue'
 	import newWorkItem from '@/components/novel/newWorkItem.vue'
     import mixinsList from '@/mixins/list.js'
@@ -194,12 +207,15 @@
 			// 	this.activeTab = 'work'
 			// })
 			
+			if(this.isLogin){
+				this.mixinsListApi = this.apiMap[this.activeTab]
+			}
 		},
 		onShow() {
 			// this.isEditMode = false;
 			// this.selectedItems = [];
 			if(this.isLogin){
-				this.mixinsListApi = this.apiMap[tab]
+				this.mixinsListApi = this.apiMap[this.activeTab]
 			}
 		},
 		onUnload() {
@@ -265,7 +281,7 @@
 			},
 			
 			// 切换选择状态
-			toggleSelect(item, type) {
+			toggleSelect(item) {
 				const index = this.selectedItems.indexOf(item.id);
 				if (index === -1) {
 					this.selectedItems.push(item.id);
@@ -317,8 +333,6 @@
 						if (res.confirm) {
 							if (this.activeTab === 'read') {
 								// 移除选中的小说
-								// this.novels = this.novels.filter(novel => !this.selectedItems.includes(novel.id));
-								
 								await this.$fetch('batchRemoveReadBook', {
 									bookIds : this.selectedItems.join(',')
 								})
@@ -331,13 +345,17 @@
 								this.getData()
 							} else {
 								// 删除选中的作品
-								this.list = this.list.filter(work => !this.selectedItems.includes(work.id));
-								// 保存更新后的作品列表
-								uni.setStorageSync('list', this.list)
+								await this.$fetch('deleteMyShopList', {
+									bookIds: this.selectedItems.join(',')
+								})
+								
 								uni.showToast({
 									title: '删除成功',
 									icon: 'success'
 								});
+								
+								// 重新获取列表数据
+								this.getData()
 							}
 							
 							this.selectedItems = [];
@@ -467,7 +485,7 @@
 			margin-bottom: 40rpx;
 			
 			.novel-item {
-				width: 31%;
+				width: 33%;
 				position: relative;
 				
 				.novel-tag {
@@ -556,8 +574,8 @@
 	.edit-mode {
 		.item-checkbox {
 			position: absolute;
-			top: 10rpx;
-			left: 10rpx;
+			right: 20rpx;
+			top: 230rpx;
 			z-index: 10;
 			background-color: rgba(255,255,255,0.8);
 			border-radius: 50%;
@@ -570,7 +588,7 @@
 			.checkbox-inner {
 				width: 40rpx;
 				height: 40rpx;
-				background-color: #1989fa;
+				background-color: $uni-color;
 				border-radius: 50%;
 				display: flex;
 				align-items: center;
@@ -587,5 +605,44 @@
 				justify-content: center;
 			}
 		}
+		
+		.item-checkbox-work {
+			position: absolute;
+			right: 20rpx;
+			top: 20rpx;
+			z-index: 10;
+			background-color: rgba(255,255,255,0.8);
+			border-radius: 50%;
+			width: 40rpx;
+			height: 40rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			
+			.checkbox-inner {
+				width: 40rpx;
+				height: 40rpx;
+				background-color: $uni-color;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			
+			.checkbox-inner-no {
+				width: 40rpx;
+				height: 40rpx;
+				background-color: #fff;
+				border: 2rpx solid #ddd;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		
+		.work-item-wrapper {
+			position: relative;
+		}
 	}
 </style>
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 62d419e..a6a1c55 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -13,9 +13,9 @@
 			<view class="tabs">
 				<uv-tabs 
 				:list="category" 
-				:activeStyle="{color : '#0A2463', fontWeight : 600}" 
-				lineColor="#0A2463"
-				:inactiveStyle="{color: 'rgba(0,0,0,.8)'}" 
+				:activeStyle="{color : '#000', fontWeight : 600}" 
+				lineColor="#000"
+				:inactiveStyle="{color: '#000'}" 
 				lineHeight="8rpx" 
 				lineWidth="50rpx" 
 				:current="current"
@@ -66,7 +66,7 @@
 		},
 		data() {
 			return {
-				mixinsListApi: 'getRecommendList',
+				mixinsListApi: '',
 				current : 0,
 				currentChildren : 0,
 				categoryList: [],
@@ -83,30 +83,6 @@
 				this.queryParams.title = search
 			}
 			
-			// 初始化默认分类的书籍列表
-			if (this.category.length > 0) {
-				if (cid) {
-					// 如果有指定分类ID，则显示对应分类
-					let foundCategory = false
-					this.category.forEach((n, i) => {
-						if (n.id == cid) {
-							this.current = i
-							foundCategory = true
-						}
-					})
-					
-					if (foundCategory) {
-						this.updateBookList(this.category[this.current].children[0].id)
-					} else {
-						// 如果未找到指定分类，显示第一个分类
-						this.updateBookList(this.category[0].children[0].id)
-					}
-				} else {
-					// 没有指定分类ID，显示第一个分类
-					this.updateBookList(this.category[0].children[0].id)
-				}
-			}
-			
 			// this.$store.commit('getCategoryList')
 			// if(this.category.length > 0 && cid){
 			// 	this.category.forEach((n, i) => {
@@ -121,27 +97,43 @@
 		},
         onShow() {
             this.getCategoryList()
-            this.getBookAreaList()
+            // this.getBookAreaList()
         },
 		methods: {
 			change(e) {
 				// this.queryParams.classId = this.category[e].id
 				this.currentChildren = e
 				// 更新对应分类的书籍列表
-				this.getData(this.category[this.current].children[e].id)
+				this.getData()
 			},
 			clickTabs({index}){
 				this.current = index
 				this.currentChildren = 0
 				// 更新对应分类的书籍列表
-				this.getData(this.category[index].children[0].id)
+				this.getData()
 			},
 			search(){
 				this.getData()
 			},
+			beforeGetData(){
+				return {
+					shopCion : this.categoryList[this.currentChildren].id,
+					shopClass : this.category[this.current].id,
+				}
+			},
             async getCategoryList() {
-                const data = await this.$fetch('getCategoryList')
-                this.category = data
+                // const data = await this.$fetch('getCategoryList')
+                // this.category = data
+				
+				let [data1, data2] = await Promise.all([this.$fetch('getCategoryList'), this.$fetch('getBookAreaList')])
+				this.category = data1
+				this.categoryList = data2
+				
+				this.mixinsListApi = 'getRecommendList'
+				
+				this.queryParams.pageSize = 999999
+				
+				this.getData()
             },
             async getBookAreaList() {
                 const data = await this.$fetch('getBookAreaList')
@@ -154,15 +146,15 @@
 <style scoped lang="scss">
 	.page {
 		/deep/ .uv-vtabs {
-			height: calc(100vh - 600rpx) !important;
+			height: calc(100vh - 460rpx) !important;
 		}
 
 		/deep/ .uv-vtabs__bar {
-			height: calc(100vh - 600rpx) !important;
+			height: calc(100vh - 460rpx) !important;
 		}
 
 		/deep/ .uv-vtabs__content {
-			height: calc(100vh - 600rpx) !important;
+			height: calc(100vh - 460rpx) !important;
 		}
 
 		.search {
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 5e0a98c..2726ddd 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -76,13 +76,17 @@
 							</view>
 							<uv-icon name="arrow-right" size="36rpx" color="#999"></uv-icon>
 						</view>
-						<view class="section-item" @click="$utils.navigateTo('/pages/customer-service')">
-							<view class="section-item-left">
-								<uv-icon name="star" size="40rpx" color="#333"></uv-icon>
-								<text>联系客服</text>
+						
+						<button open-type="contact" class="share">
+							<view class="section-item">
+								<view class="section-item-left">
+									<uv-icon name="star" size="40rpx" color="#333"></uv-icon>
+									<text>联系客服</text>
+								</view>
+								<uv-icon name="arrow-right" size="36rpx" color="#999"></uv-icon>
 							</view>
-							<uv-icon name="arrow-right" size="36rpx" color="#999"></uv-icon>
-						</view>
+						</button>
+						
 						<view class="section-item" @click="$utils.navigateTo('/pages_order/auth/Modifyinformation')">
 							<view class="section-item-left">
 								<uv-icon name="edit-pen" size="40rpx" color="#333"></uv-icon>
@@ -107,7 +111,7 @@
 		<view v-else-if="!isLogin" class="nologin-page">
 			<view class="nologin-top-bg">
 				<view class="nologin-header">
-					<image class="nologin-avatar" mode="aspectFill" @click="$utils.toLogin" />
+					<image class="nologin-avatar" src="/static/image/center/headImage.png" mode="aspectFill" @click="$utils.toLogin" />
 					<view class="nologin-text" @click="$utils.toLogin">点击登录</view>
 				</view>
 				<view class="nologin-header-right">
@@ -116,6 +120,7 @@
 			</view>
 			<view class="nologin-content-center">
 				<button class="nologin-btn" @click="$utils.toLogin">立即登录</button>
+				<view style="font-size: 24rpx;color: #999;">暂未登录，请先登录</view>
 			</view>
 		</view>
 		
@@ -263,8 +268,8 @@
 	}
 	.nologin-top-bg {
 		width: 100vw;
-		height: 220rpx;
-		background: linear-gradient(180deg, #f3eafe 0%, #fff 100%);
+		height: 580rpx;
+		background: linear-gradient(180deg, #f3eafe 0%, #f5f5f5 100%);
 		position: relative;
 		display: flex;
 		flex-direction: row;
@@ -288,7 +293,8 @@
 	}
 	.nologin-text {
 		font-size: 28rpx;
-		color: #333;
+		color: #000;
+		font-weight: 900;
 	}
 	.nologin-header-right {
 		position: absolute;
@@ -307,12 +313,12 @@
 		z-index: 2;
 	}
 	.nologin-btn {
-		width: 320rpx;
-		height: 64rpx;
+		width: 380rpx;
+		height: 74rpx;
 		background: #132a57;
 		color: #fff;
 		font-size: 28rpx;
-		border-radius: 32rpx;
+		border-radius: 38rpx;
 		margin-bottom: 18rpx;
 		font-weight: bold;
 		display: flex;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 11cbfab..2d4eed2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,9 +2,10 @@
 	<view class="page">
 		<!-- 自定义导航栏 -->
 		<view class="custom-navbar">
-			<view class="navbar-left">
+			<view class="navbar-left"
+			@click="$utils.navigateTo('/pages_order/novel/Translation')">
 				<view class="calendar-icon">
-					<uv-icon name="calendar" color="#ffffff" size="44rpx"></uv-icon>
+					<uv-icon name="calendar" color="#ffffff" size="54rpx"></uv-icon>
 				</view>
 			</view>
 			<view class="navbar-center" @click="toSearch">
@@ -14,12 +15,7 @@
 				</view>
 			</view>
 			<view class="navbar-right">
-				<view class="function-btn">
-					<uv-icon name="more-dot-fill" color="#ffffff" size="44rpx"></uv-icon>
-				</view>
-				<view class="function-btn">
-					<uv-icon name="chat-fill" color="#ffffff" size="44rpx"></uv-icon>
-				</view>
+				
 			</view>
 		</view>
 
@@ -32,8 +28,8 @@
 					:autoplay="true"
 					:circular="true"
 					:interval="3000"
-					radius="10"
-					:height="400"
+					radius="30rpx"
+					height="250rpx"
 					indicatorActiveColor="#ffffff"
 					indicatorInactiveColor="rgba(255, 255, 255, 0.5)"
 					@click="clickBanner"
@@ -143,7 +139,7 @@
 		methods: {
 			// 跳转到搜索页面
 			toSearch() {
-				this.$utils.navigateTo('/pages/search/index')
+				this.$utils.navigateTo('/pages_order/novel/bookList')
 			},
 			// 点击轮播图
 			clickBanner(index) {
@@ -196,14 +192,13 @@
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			padding: 0 20rpx 20rpx 20rpx;
+			padding: 0 20rpx 30rpx 20rpx;
+			padding-top: calc(var(--status-bar-height) + 50rpx);
 			background-color: #001351; /* 深蓝色背景 */
-			height: 160rpx;
 			box-sizing: border-box;
 			position: sticky;
 			top: 0;
 			z-index: 99;
-			padding-top: calc(var(--status-bar-height) + 20rpx);
 			
 			.navbar-left {
 				width: 80rpx;
@@ -223,12 +218,13 @@
 				margin: 0 20rpx;
 				
 				.search-box {
+					width: 420rpx;
 					display: flex;
 					align-items: center;
-					background-color: rgba(255, 255, 255, 0.95);
+					background-color: rgba(255, 255, 255, 0.2);
 					border-radius: 40rpx;
 					padding: 0 30rpx;
-					height: 70rpx;
+					height: 60rpx;
 					box-sizing: border-box;
 					
 					.search-placeholder {
diff --git a/pages_order/auth/Modifyinformation.vue b/pages_order/auth/Modifyinformation.vue
index ba5bd32..1082d10 100644
--- a/pages_order/auth/Modifyinformation.vue
+++ b/pages_order/auth/Modifyinformation.vue
@@ -89,9 +89,9 @@
 						if (phoneObj.errmsg == 'ok') {
 							this.userInfoForm.phone = phoneObj.phone_info.phoneNumber
 						} else {
-							uni.showModal({
-								title: phoneObj.errmsg
-							})
+							// uni.showModal({
+							// 	title: phoneObj.errmsg
+							// })
 						}
 					}
 				})
@@ -122,9 +122,18 @@
 							phone: self.userInfoForm.phone,
 						}, res => {
 							if (res.code == 200) {
-								uni.reLaunch({
-									url: '/pages/index/index'
+								// uni.reLaunch({
+								// 	url: '/pages/index/index'
+								// })
+								
+								uni.showToast({
+									title: '修改成功',
+									icon: 'none',
+									success() {
+										uni.navigateBack(-1)
+									}
 								})
+								
 							}
 						})
 					})
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 851cda2..adc11a3 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -33,7 +33,7 @@
 						<uv-checkbox
 							size="40rpx"
 							icon-size="30rpx"
-							activeColor="#E3441A"
+							activeColor="#0A2463"
 							:name="1"
 						></uv-checkbox>
 						阅读并同意我们的<text @click="$refs.popup.open('user_xy')">“用户协议”</text>
@@ -100,9 +100,10 @@
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	height: 80vh;
 	flex-direction: column;
 	position: relative;
+	background-color: #e5eaf9;
+	min-height: 100vh;
 	.logo{
 		height: 140rpx;
 		width: 140rpx;
@@ -138,7 +139,7 @@
 		justify-content: center;
 		align-items: center;
 		margin: 20rpx 0;
-		border-radius: 20rpx;
+		border-radius: 60rpx;
 		border: none;
 		&::after{
 			
@@ -160,8 +161,7 @@
 	}
 	
 	.config{
-		position: absolute;
-		bottom: 0;
+		margin-top: 30rpx;
 		font-size: 24rpx;
 		text-align: center;
 		line-height: 40rpx;
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 8133c4e..bfad38e 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="login">
-		<!-- <view class="logo">
+		<view class="logo">
 			<image :src="configList.logo_image" mode=""></image>
-		</view> -->
+		</view>
 		<view class="title">
 			{{ configList.logo_name }}
 		</view>
@@ -97,9 +97,9 @@
 						if(phoneObj.errmsg == 'ok'){
 							this.userInfoForm.phone = phoneObj.phone_info.phoneNumber
 						}else{
-							uni.showModal({
-								title: phoneObj.errmsg
-							})
+							// uni.showModal({
+							// 	title: ''
+							// })
 						}
 					}
 				})
diff --git a/pages_order/author/chapterList.vue b/pages_order/author/chapterList.vue
index fc293eb..8925a9a 100644
--- a/pages_order/author/chapterList.vue
+++ b/pages_order/author/chapterList.vue
@@ -16,22 +16,46 @@
 		</view>
 
 		<view class="box">
-			<view class="chapter-list" >
-				<view class="draft-header">
-					<text class="draft-title">{{ activeTab === 0 ? '草稿箱章节' : '已发布章节' }}</text>
-					<text class="delete-btn" @click="reverseList">{{ queryParams.reverse ? '正序' : '倒序' }}</text>
-				</view>
-				<view 
-                class="chapter-item" 
-                v-for="(chapter, index) in list" 
-                :key="chapter.id" 
-                @click="editChapter(chapter)">
-					<view class="chapter-info">
-						<text class="chapter-title">章节名</text>
-						<text class="chapter-number">{{ chapter.title }}</text>
-					</view>
-					<uv-icon name="arrow-right" color="#999" size="28"></uv-icon>
-				</view>
+            <view class="draft-header">
+                <text class="draft-title">{{ activeTab === 0 ? '草稿箱章节' : '已发布章节' }}</text>
+                <text class="delete-btn" @click="reverseList">{{ queryParams.reverse ? '正序' : '倒序' }}</text>
+            </view>
+			<view class="chapter-list">
+				
+				<!-- 章节列表 -->
+				<uv-swipe-action>
+					<uv-swipe-action-item 
+						v-for="(chapter, index) in list" 
+						:key="chapter.id"
+						:options="swipeOptions"
+						@click="deleteChapter(chapter, index)"
+					>
+						<view 
+							class="chapter-item" 
+							@click="editChapter(chapter)"
+						>
+							<view class="chapter-info">
+								<text class="chapter-title">章节名</text>
+								<text class="chapter-number">{{ chapter.title }}</text>
+							</view>
+							<uv-icon name="arrow-right" color="#999" size="28"></uv-icon>
+						</view>
+					</uv-swipe-action-item>
+				</uv-swipe-action>
+				
+				<!-- 空状态 -->
+				<view style="padding-bottom: 60rpx;"
+                v-if="list.length === 0" >
+                    <uv-empty 
+                        :text="activeTab === 0 ? '还没有草稿章节' : '还没有发布章节'"
+                        :icon="activeTab === 0 ? 'edit-pen' : 'list'"
+                        iconSize="60"
+                        iconColor="#ccc"
+                        textColor="#999"
+                        textSize="28"
+                        mode="data"
+                    />
+                </view>
 			</view>
         </view>
 
@@ -63,6 +87,12 @@
 				activeTab: 0,
                 mixinsListApi : 'getMyShopNovelPage',
 				id : 0,
+				swipeOptions: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#f56c6c'
+					}
+				}]
 			}
 		},
 		onLoad(options) {
@@ -103,7 +133,36 @@
 			},
 			handleSettings() {
 				uni.navigateTo({
-					url: '/pages_order/novel/createNovel?id=' + this.id
+					url: '/pages_order/author/createNovel?id=' + this.id
+				})
+			},
+			// 删除章节
+			deleteChapter(chapter, index) {
+				uni.showModal({
+					title: '提示',
+					content: `确定要删除章节"${chapter.title}"吗？`,
+					success: async (res) => {
+						if (res.confirm) {
+							try {
+								await this.$fetch('deleteMyNovel', {
+									id: chapter.id
+								})
+								
+								uni.showToast({
+									title: '删除成功',
+									icon: 'success'
+								})
+								
+								// 重新获取列表数据
+								this.getData()
+							} catch (error) {
+								uni.showToast({
+									title: '删除失败',
+									icon: 'none'
+								})
+							}
+						}
+					}
 				})
 			},
 			deleteAll() {
@@ -138,12 +197,12 @@
 		}
 
         .box{
-			padding: 20rpx 40rpx;
 			background-color: #fff;
 			margin: 50rpx 40rpx;
 			border-radius: 20rpx;
 			
 			.draft-header {
+                padding: 20rpx 40rpx;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
@@ -165,10 +224,10 @@
 			
             .chapter-list {
                 .chapter-item {
+                    padding: 20rpx 40rpx;
                     display: flex;
                     justify-content: space-between;
                     align-items: center;
-                    padding: 15px 0;
                     border-bottom: 1px solid #eee;
 
                     .chapter-info {
diff --git a/pages_order/author/createNovel.vue b/pages_order/author/createNovel.vue
index 7156ef4..e01ec45 100644
--- a/pages_order/author/createNovel.vue
+++ b/pages_order/author/createNovel.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 新建作品页面 -->
 	<view class="create-novel">
-		<navbar title="新建作品" leftClick @leftClick="$utils.navigateBack" />
+		<navbar :title="id ? '设置作品' : '新建作品'" leftClick @leftClick="$utils.navigateBack" />
 
 		<view class="form-container">
 			<!-- 封面信息 -->
@@ -10,7 +10,7 @@
 				<view class="upload-cover">
 					<view class="sub-title">上传封面</view>
 					<view class="cover-box" @click="chooseCover">
-						<image v-if="formData.Image" :src="formData.Image" mode="aspectFill" class="cover-image">
+						<image v-if="formData.image" :src="formData.image" mode="aspectFill" class="cover-image">
 						</image>
 						<view v-else class="upload-placeholder">
 							<text class="plus">+</text>
@@ -27,19 +27,42 @@
 						<text class="required">*</text>
 						<text class="label">作品名称</text>
 					</view>
-					<input type="text" v-model="formData.name" placeholder="请输入"
+					<input shopClass="text" v-model="formData.name" placeholder="请输入"
 						placeholder-class="input-placeholder" />
 				</view>
 
 				<view class="form-item">
 					<view style="display: flex;">
 						<text class="required">*</text>
-						<text class="label">作品类型</text>
+						<text class="label">作品分类</text>
+					</view>
+					<view class="">
+						<!-- 原有的picker方案 -->
+						<!-- <view class="category-select" @click="showCategoryPicker = true">
+							<text v-if="formData.shopClass" class="selected-category">{{selectedCategoryName}}</text>
+							<text v-else class="placeholder">请选择</text>
+						</view>
+						
+						<uv-picker
+							:show="showCategoryPicker"
+							:columns="[categoryList]"
+							@confirm="confirmCategory"
+							@cancel="showCategoryPicker = false"
+						></uv-picker> -->
+
+						<!-- 新的标签选择方案 -->
+						<view class="category-tags">
+							<view 
+								v-for="(item, index) in categoryList" 
+								:key="index"
+								class="category-tag"
+								:class="{ active: formData.shopClass == item.id }"
+								@click="selectCategory(item)"
+							>
+								{{item.title}}
+							</view>
+						</view>
 					</view>
-					<input type="text" 
-					disabled
-					v-model="formData.type" placeholder="请输入"
-					placeholder-class="input-placeholder" />
 				</view>
 
 				<view class="form-item">
@@ -72,20 +95,20 @@
 			</view>
 
 			<!-- 书籍信息 -->
-			<view class="section" v-if="formData.id">
+			<view class="section">
 				<view class="section-title">书籍信息</view>
 				<view class="form-item">
 					<text class="label">书号</text>
-					<text class="value">9999993339393</text>
+					<text class="value">{{ formData.id || '_' }}</text>
 				</view>
 				<view class="form-item">
 					<text class="label">总字数</text>
-					<text class="value">99999999</text>
+					<text class="value">{{ formData.num || '_' }}</text>
 				</view>
 			</view>
 
 			<!-- 提交按钮 -->
-			<view class="submit-btn" @click="submitForm">提交申请</view>
+			<view class="submit-btn" @click="submitForm">{{ id ? '保存' : "提交申请" }}</view>
 		</view>
 	</view>
 </template>
@@ -95,13 +118,16 @@
 		data() {
 			return {
 				formData: {
-					Image: '',
-					title: '',
-					type: '1',
+					image: '',
+					name: '',
+					shopClass: '',
 					details: '',
 					status: '0' // 默认连载
 				},
-				id: 0
+				id: 0,
+				// showCategoryPicker: false,
+				categoryList: [],
+				// selectedCategoryName: ''
 			}
 		},
         onLoad(options) {
@@ -109,6 +135,9 @@
                 this.id = options.id
                 this.getBookInfo()
             }
+        },
+        onShow() {
+            this.getCategoryList()
         },
 		methods: {
 
@@ -128,13 +157,24 @@
 						
 						this.$Oss.ossUpload(res.tempFilePaths[0])
 						.then(url => {
-							this.formData.Image = url
+							this.formData.image = url
 						})
 						
 					}
 				})
 			},
 
+			// 获取分类列表
+			async getCategoryList() {
+				const data = await this.$fetch('getCategoryList')
+				this.categoryList = data
+			},
+			
+			// 选择分类
+			selectCategory(item) {
+				this.formData.shopClass = item.id
+			},
+
 			// 提交表单
 			async submitForm() {
 				if (!this.formData.name) {
@@ -144,9 +184,9 @@
 					})
 					return
 				}
-				if (!this.formData.type) {
+				if (!this.formData.shopClass) {
 					uni.showToast({
-						title: '请输入作品类型',
+						title: '请选择作品分类',
 						icon: 'none'
 					})
 					return
@@ -162,12 +202,16 @@
 				// 构建作品数据
 				const workData = {
 					name: this.formData.name,
-					Image: this.formData.Image,
-					type: this.formData.type,
+					image: this.formData.image,
+					shopClass: this.formData.shopClass,
 					details: this.formData.details,
 					status: this.formData.status || 0,
 				}
 				
+				if(this.id){
+					workData.id = this.id
+				}
+				
 				await this.$fetch('saveOrUpdateBook', workData)
 
 				// 延迟返回上一页
@@ -240,6 +284,8 @@
 				.form-item {
 					margin-bottom: 30rpx;
 					position: relative;
+					border-bottom: 1rpx solid #00000012;
+					padding-bottom: 10rpx;
 
 					&:last-child {
 						margin-bottom: 0;
@@ -260,13 +306,10 @@
 					input,
 					textarea {
 						width: 100%;
-						height: 80rpx;
-						background-color: #F5F5F5;
 						border-radius: 8rpx;
 						padding: 20rpx;
 						font-size: 28rpx;
 						color: #333;
-						box-sizing: border-box;
 						position: relative;
 						z-index: 1;
 					}
@@ -323,6 +366,22 @@
 						font-size: 28rpx;
 						color: #999;
 					}
+
+					.category-tags {
+						display: flex;
+						gap: 10rpx;
+
+						.category-tag {
+							padding: 8rpx 16rpx;
+							background-color: #F5F5F5;
+							border-radius: 8rpx;
+
+							&.active {
+								background-color: #001351;
+								color: #FFFFFF;
+							}
+						}
+					}
 				}
 			}
 
diff --git a/pages_order/novel/bookList.vue b/pages_order/novel/bookList.vue
new file mode 100644
index 0000000..cd5f7c8
--- /dev/null
+++ b/pages_order/novel/bookList.vue
@@ -0,0 +1,58 @@
+<template>
+	<view class="page">
+		<navbar title="搜素" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="search">
+		    <uv-search bgColor="#ffffff" 
+			placeholder="搜索" 
+			inputAlign="left" 
+			@search="handleSearch"
+			v-model="keyword"
+			@change="searchChange"
+		    showAction="false"></uv-search>
+		</view>
+		
+		
+		<view class="novel-list">
+			<novel-item v-for="(item, index) in list" 
+		    @click="navigateToDetail(item.id)"
+		    :key="index" :book="item" />
+		</view>
+		
+	</view>
+</template>
+
+<script>
+    import novelItem from '@/components/novel/novelItem.vue'
+    import mixinsList from '@/mixins/list.js'
+	export default {
+        mixins: [mixinsList],
+		components: {
+            novelItem,
+		},
+		data() {
+			return {
+                mixinsListApi : 'getRecommendList',
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.search {
+		background-color: #fff;
+		border-radius: 40rpx;
+		display: flex;
+		padding: 20rpx;
+		margin: 20rpx;
+	    :deep(.uv-search__content) {
+	        box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.1);
+	    }
+	}
+	.novel-list{
+		padding: 20rpx;
+	}
+</style>
diff --git a/static/image/center/headImage.png b/static/image/center/headImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d23e628a32aa6b8205f0930ed3bb14cb749e68
GIT binary patch
literal 8465
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

literal 0
HcmV?d00001