From d765a35a341f66b143f78fcf36d8f50a6c27baa9 Mon Sep 17 00:00:00 2001
From: "1054425342@qq.com" <1054425342@qq.com>
Date: Tue, 23 Sep 2025 14:11:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/WaterfallLayout.vue                |  669 +++++----
 pages.json                                    |    6 +
 pages/index/iSoul.vue                         |   18 +-
 pages/index/timeShopBank.vue                  |  290 ++--
 pages/notes/detail.vue                        |  404 +++--
 pages/notes/publish.vue                       |  397 ++---
 static/js/CommonFunction.js                   |    2 +-
 static/js/request.js                          |    4 +-
 subPackages/haveFeeling/detail.vue            |   72 +-
 subPackages/haveFeeling/detailAll.vue         | 1113 ++++++++++++++
 subPackages/haveFeeling/list.vue              |   47 +-
 .../uni-file-picker/uni-file-picker.vue       | 1295 +++++++++--------
 12 files changed, 2891 insertions(+), 1426 deletions(-)
 create mode 100644 subPackages/haveFeeling/detailAll.vue

diff --git a/components/WaterfallLayout.vue b/components/WaterfallLayout.vue
index 808376d..b5cee8b 100644
--- a/components/WaterfallLayout.vue
+++ b/components/WaterfallLayout.vue
@@ -1,299 +1,384 @@
 <template>
-	<view class="waterfall-layout">
-		<view class="waterfall-container">
-			<!-- 左列 -->
-			<view class="column">
-				<view v-for="(item, index) in leftItems" :key="item.id || index" class="waterfall-item"
-					@click="handleItemClick(item)">
-					<image v-if="item.image" :src="showImg(item.image)" class="item-image" mode="aspectFill" />
-					<view class="item-content">
-						<text v-if="item.title" class="item-title">{{ item.title }}</text>
-						<view class="item-footer">
-							<view class="user-info">
-								<image
-									src="https://images.unsplash.com/photo-1535713875002-d1d0cf377fde?auto=format&fit=crop&w=100"
-									class="user-avatar" mode="aspectFill" />
-								<text class="username">风景之旅</text>
-							</view>
-							<view class="like-info">
-								<image :src="showImg('/uploads/20250731/0260884d7a44a483885a026da524e0b8.png')"
-									style="height: 22rpx;width: 25rpx;"></image>
-								<text class="like-count">100</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 右列 -->
-			<view class="column">
-				<view v-for="(item, index) in rightItems" :key="item.id || index" class="waterfall-item"
-					@click="handleItemClick(item)">
-					<image v-if="item.image" :src="showImg(item.image)" class="item-image" mode="aspectFill" />
-					<view class="item-content">
-						<text v-if="item.title" class="item-title">{{ item.title }}</text>
-						<view class="item-footer">
-							<view class="user-info">
-								<image
-									src="https://images.unsplash.com/photo-1535713875002-d1d0cf377fde?auto=format&fit=crop&w=100"
-									class="user-avatar" mode="aspectFill" />
-								<text class="username">风景之旅</text>
-							</view>
-							<view class="like-info">
-								<image :src="showImg('/uploads/20250731/0260884d7a44a483885a026da524e0b8.png')"
-									style="height: 22rpx;width: 25rpx;"></image>
-								<text class="like-count">120</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="waterfall-layout">
+    <!-- 空状态 -->
+    <view v-if="!leftItems.length && !rightItems.length" class="empty-state">
+      <text class="empty-title">暂无内容</text>
+      <text class="empty-desc">快来发布第一篇笔记吧～</text>
+    </view>
+
+    <!-- 瀑布流内容 -->
+    <view v-else class="waterfall-container">
+      <!-- 左列 -->
+      <view class="column">
+        <view
+          v-for="(item, index) in leftItems"
+          :key="item.id || index"
+          class="waterfall-item"
+          @click="handleItemClick(index, leftItems)"
+        >
+          <image
+            v-if="item.coverImage"
+            :src="item.coverImage && item.coverImage.split(',')[0]"
+            class="item-image"
+            mode="aspectFill"
+          />
+          <view class="item-content">
+            <text v-if="item.title" class="item-title">{{ item.title }}</text>
+            <view class="item-footer">
+              <view class="user-info">
+                <image
+                  :src="item.headImg"
+                  class="user-avatar"
+                  mode="aspectFill"
+                />
+                <text class="username">{{ item.nickname }}</text>
+              </view>
+              <view class="like-info">
+                <image
+                  v-if="!item.userLiked"
+                  src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png"
+                  style="height: 22rpx; width: 25rpx"
+                ></image>
+                <image
+                  v-else
+                  src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png"
+                  style="height: 22rpx; width: 25rpx"
+                ></image>
+                <text class="like-count">{{ item.likeCount || 0 }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 右列 -->
+      <view class="column">
+        <view
+          v-for="(item, index) in rightItems"
+          :key="item.id || index"
+          class="waterfall-item"
+          @click="handleItemClick(index, rightItems)"
+        >
+          <image
+            v-if="item.coverImage"
+            :src="item.coverImage && item.coverImage.split(',')[0]"
+            class="item-image"
+            mode="aspectFill"
+          />
+          <view class="item-content">
+            <text v-if="item.title" class="item-title">{{ item.title }}</text>
+            <view class="item-footer">
+              <view class="user-info">
+                <image
+                  :src="item.headImg"
+                  class="user-avatar"
+                  mode="aspectFill"
+                />
+                <text class="username"
+                  >{{ item.nickname }}{{ item.nickname
+                  }}{{ item.nickname }}</text
+                >
+              </view>
+              <view class="like-info">
+                <image
+                  v-if="!item.userLiked"
+                  src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png"
+                  style="height: 22rpx; width: 25rpx"
+                ></image>
+                <image
+                  v-else
+                  src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png"
+                  style="height: 22rpx; width: 25rpx"
+                ></image>
+                <text class="like-count">{{ item.likeCount || 0 }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		name: "WaterfallLayout",
-		props: {
-			// 数据源
-			items: {
-				type: Array,
-				default: () => [],
-			},
-			// 列数（固定为2列）
-			columnCount: {
-				type: Number,
-				default: 2,
-			},
-			// 列间距（rpx）
-			columnGap: {
-				type: Number,
-				default: 16,
-			},
-			// 项目间距（rpx）
-			itemGap: {
-				type: Number,
-				default: 16,
-			},
-		},
-		data() {
-			return {
-				leftItems: [],
-				rightItems: [],
-			};
-		},
-		watch: {
-			items: {
-				handler(newItems) {
-					this.calculateLayout(newItems);
-				},
-				immediate: true,
-				deep: true,
-			},
-		},
-		mounted() {
-			this.calculateLayout(this.items);
-		},
-		methods: {
-			// 获取列的实际高度（通过DOM查询）
-			getColumnHeight(columnRef) {
-				if (!columnRef) return 0;
-				const query = uni.createSelectorQuery().in(this);
-				return new Promise((resolve) => {
-					query.select(columnRef).boundingClientRect((data) => {
-						resolve(data ? data.height : 0);
-					}).exec();
-				});
-			},
-
-			// 计算布局
-			calculateLayout(items) {
-				if (!items || !items.length) {
-					this.leftItems = [];
-					this.rightItems = [];
-					return;
-				}
-
-				// 清空现有数据
-				this.leftItems = [];
-				this.rightItems = [];
-
-				// 逐个添加项目
-				for (let i = 0; i < items.length; i++) {
-					this.addItem(items[i]);
-				}
-			},
-
-			// 添加单个项目到合适的列
-			addItem(item) {
-				// 简单的交替分配逻辑：比较两列的项目数量
-				if (this.leftItems.length <= this.rightItems.length) {
-					this.leftItems.push(item);
-				} else {
-					this.rightItems.push(item);
-				}
-			},
-
-			// 清空所有项目
-			clearItems() {
-				this.leftItems = [];
-				this.rightItems = [];
-				this.$emit("items-cleared");
-			},
-
-			// 处理项目点击
-			handleItemClick(item) {
-				this.$emit("item-click", item);
-			},
-
-			// 获取所有项目
-			getAllItems() {
-				return [...this.leftItems, ...this.rightItems];
-			},
-
-			// 移除项目
-			removeItem(itemId) {
-				// 从左列移除
-				let index = this.leftItems.findIndex(item => item.id === itemId);
-				if (index !== -1) {
-					this.leftItems.splice(index, 1);
-					this.$emit("item-removed", itemId);
-					return;
-				}
-
-				// 从右列移除
-				index = this.rightItems.findIndex(item => item.id === itemId);
-				if (index !== -1) {
-					this.rightItems.splice(index, 1);
-					this.$emit("item-removed", itemId);
-				}
-			},
-		},
-	};
+export default {
+  name: "WaterfallLayout",
+  props: {
+    // 数据源
+    items: {
+      type: Array,
+      default: () => [],
+    },
+    // 列数（固定为2列）
+    columnCount: {
+      type: Number,
+      default: 2,
+    },
+    // 列间距（rpx）
+    columnGap: {
+      type: Number,
+      default: 16,
+    },
+    // 项目间距（rpx）
+    itemGap: {
+      type: Number,
+      default: 16,
+    },
+  },
+  data() {
+    return {
+      leftItems: [],
+      rightItems: [],
+    };
+  },
+  watch: {
+    items: {
+      handler(newItems) {
+        this.calculateLayout(newItems);
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  mounted() {
+    this.calculateLayout(this.items);
+  },
+  methods: {
+    // 获取列的实际高度（通过DOM查询）
+    getColumnHeight(columnRef) {
+      if (!columnRef) return 0;
+      const query = uni.createSelectorQuery().in(this);
+      return new Promise((resolve) => {
+        query
+          .select(columnRef)
+          .boundingClientRect((data) => {
+            resolve(data ? data.height : 0);
+          })
+          .exec();
+      });
+    },
+
+    // 计算布局
+    calculateLayout(items) {
+      if (!items || !items.length) {
+        this.leftItems = [];
+        this.rightItems = [];
+        return;
+      }
+
+      // 清空现有数据
+      this.leftItems = [];
+      this.rightItems = [];
+
+      // 逐个添加项目
+      for (let i = 0; i < items.length; i++) {
+        this.addItem(items[i]);
+      }
+    },
+
+    // 添加单个项目到合适的列
+    addItem(item) {
+      // 简单的交替分配逻辑：比较两列的项目数量
+      if (this.leftItems.length <= this.rightItems.length) {
+        this.leftItems.push(item);
+      } else {
+        this.rightItems.push(item);
+      }
+    },
+
+    // 清空所有项目
+    clearItems() {
+      this.leftItems = [];
+      this.rightItems = [];
+      this.$emit("items-cleared");
+    },
+
+    // 处理项目点击
+    handleItemClick(index, list) {
+      this.$emit("item-click", list[index]);
+    },
+
+    // 获取所有项目
+    getAllItems() {
+      return [...this.leftItems, ...this.rightItems];
+    },
+
+    // 移除项目
+    removeItem(itemId) {
+      // 从左列移除
+      let index = this.leftItems.findIndex((item) => item.id === itemId);
+      if (index !== -1) {
+        this.leftItems.splice(index, 1);
+        this.$emit("item-removed", itemId);
+        return;
+      }
+
+      // 从右列移除
+      index = this.rightItems.findIndex((item) => item.id === itemId);
+      if (index !== -1) {
+        this.rightItems.splice(index, 1);
+        this.$emit("item-removed", itemId);
+      }
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.waterfall-layout {
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.waterfall-container {
-		display: flex;
-		gap: 16rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-	}
-
-	.column {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		gap: 16rpx;
-	}
-
-	.waterfall-item {
-		box-sizing: border-box;
-		border-radius: 12rpx;
-		background: #fff;
-		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-		overflow: hidden;
-		transition: transform 0.2s ease;
-	}
-
-	.waterfall-item:active {
-		transform: scale(0.98);
-	}
-
-	.item-image {
-		width: 100%;
-		height: 476rpx;
-		object-fit: cover;
-	}
-
-	.item-content {
-		padding: 16rpx;
-	}
-
-	.item-title {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-		line-height: 1.3;
-		margin-bottom: 12rpx;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.item-desc {
-		font-size: 24rpx;
-		color: #666;
-		line-height: 1.4;
-		margin-bottom: 16rpx;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.item-tags {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 8rpx;
-		margin-bottom: 16rpx;
-	}
-
-	.tag {
-		padding: 4rpx 12rpx;
-		background: #f5f5f5;
-		color: #666;
-		font-size: 20rpx;
-		border-radius: 12rpx;
-		white-space: nowrap;
-	}
-
-	.item-footer {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 16rpx;
-	}
-
-	.user-info {
-		display: flex;
-		align-items: center;
-		gap: 12rpx;
-	}
-
-	.user-avatar {
-		width: 32rpx;
-		height: 32rpx;
-		border-radius: 50%;
-	}
-
-	.username {
-		font-size: 22rpx;
-		color: #666;
-	}
-
-	.like-info {
-		display: flex;
-		align-items: center;
-		gap: 6rpx;
-	}
-
-	.like-icon {
-		font-size: 24rpx;
-		color: #ff6b6b;
-	}
-
-	.like-count {
-		font-size: 22rpx;
-		color: #666;
-	}
-</style>
\ No newline at end of file
+.waterfall-layout {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* 空状态样式 */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 160rpx 40rpx;
+  text-align: center;
+}
+
+.empty-icon {
+  width: 240rpx;
+  height: 240rpx;
+  margin-bottom: 40rpx;
+  opacity: 0.6;
+}
+
+.empty-title {
+  font-size: 32rpx;
+  color: #666;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+}
+
+.empty-desc {
+  font-size: 28rpx;
+  color: #999;
+  line-height: 1.4;
+}
+
+.waterfall-container {
+  display: flex;
+  gap: 16rpx;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+}
+
+.column {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.waterfall-item {
+  box-sizing: border-box;
+  border-radius: 12rpx;
+  background: #fff;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: transform 0.2s ease;
+}
+
+.waterfall-item:active {
+  transform: scale(0.98);
+}
+
+.item-image {
+  width: 100%;
+  height: 476rpx;
+  object-fit: cover;
+}
+
+.item-content {
+  padding: 16rpx;
+}
+
+.item-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  line-height: 1.3;
+  margin-bottom: 12rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.item-desc {
+  font-size: 24rpx;
+  color: #666;
+  line-height: 1.4;
+  margin-bottom: 16rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.item-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8rpx;
+  margin-bottom: 16rpx;
+}
+
+.tag {
+  padding: 4rpx 12rpx;
+  background: #f5f5f5;
+  color: #666;
+  font-size: 20rpx;
+  border-radius: 12rpx;
+  white-space: nowrap;
+}
+
+.item-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 16rpx;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.user-avatar {
+  width: 32rpx;
+  height: 32rpx;
+  border-radius: 50%;
+}
+
+.username {
+  font-size: 22rpx;
+  color: #666;
+  width: 160rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.like-info {
+  display: flex;
+  align-items: center;
+  gap: 6rpx;
+}
+
+.like-icon {
+  font-size: 24rpx;
+  color: #ff6b6b;
+}
+
+.like-count {
+  font-size: 22rpx;
+  color: #666;
+}
+</style>
diff --git a/pages.json b/pages.json
index 4bd0e80..82d6ffe 100644
--- a/pages.json
+++ b/pages.json
@@ -272,6 +272,12 @@
             "navigationBarTitleText": "订单详情"
           }
         },
+		{
+		  "path": "haveFeeling/detailAll",
+		  "style": {
+		    "navigationBarTitleText": "订单详情"
+		  }
+		},
         {
           "path": "haveFeeling/logistics",
           "style": {
diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue
index b4c3c1a..abae9eb 100644
--- a/pages/index/iSoul.vue
+++ b/pages/index/iSoul.vue
@@ -234,6 +234,7 @@
 		</view>
       <view class="goods-card">
         <image
+		@click="gotoPath('/subPackages/haveFeeling/list')"
           :src="
             showImg('/uploads/20250729/a010feb51e3f195563fb440f9235cc8b.png')
           "
@@ -716,19 +717,14 @@ export default {
           break;
         case "待发货":
           uni.navigateTo({
-            url: "/subPackages/order/trades?status=POST",
-          });
-          break;
-        case "退货/退款":
-          uni.navigateTo({
-            url: "/subPackages/order/trades?status=WAIT_REFUND",
-          });
-          break;
-        case "评价":
-          uni.navigateTo({
-            url: "/subPackages/order/trades?status=WAIT_COMMENT",
+            url: "/subPackages/haveFeeling/list?status=2",
           });
           break;
+        default:
+		uni.showToast({
+			title:'功能暂未开放',
+			icon:'none'
+		})
       }
     },
     // 纪念册卡片点击
diff --git a/pages/index/timeShopBank.vue b/pages/index/timeShopBank.vue
index 0acce89..ca8346c 100644
--- a/pages/index/timeShopBank.vue
+++ b/pages/index/timeShopBank.vue
@@ -9,22 +9,21 @@
       :page-id="'timeShopBank_page'"
       :style-type="'timeShop'"
     />
-	<view class="desc-box">
-		<view class="">
-		欢迎来到「旅行时间行」，你的精神财富储蓄所。	
-		</view>
-		<view class="">
-			  在这里，你的每一次人文漫游、每一次灵感闪现，都值得被郑重记录。我们鼓励你分享高质量的图文笔记，将旅途中的美与感动，化为这座精神星球上的璀璨星辰。
-		</view>
-		<view class="">
-			 为他人的美好驻足、点赞、留言，每一次真诚的互动，都是在为你的时间银行存入一笔宝贵的「精神货币」。这些资产不仅可以兑换独家福利与实体好物，更能为你解锁专属的荣誉身份，让你成为这座星球上最闪耀的共创者。
-		</view>
-		<view class="">
-			 即刻发布你的第一篇笔记，开启你的财富积累之旅吧！
-		</view>
-	</view>
-	
-	<image style="width: 700rpx;height: 14rpx;margin: 20rpx auto;display: block;" :src="showImg('/uploads/20250829/f7214bc2a4f4e236561de893ca7b9113.png')"></image>
+    <view class="desc-box">
+      <view class=""> 欢迎来到「旅行时间行」，你的精神财富储蓄所。 </view>
+      <view class="">
+        在这里，你的每一次人文漫游、每一次灵感闪现，都值得被郑重记录。我们鼓励你分享高质量的图文笔记，将旅途中的美与感动，化为这座精神星球上的璀璨星辰。
+      </view>
+      <view class="">
+        为他人的美好驻足、点赞、留言，每一次真诚的互动，都是在为你的时间银行存入一笔宝贵的「精神货币」。这些资产不仅可以兑换独家福利与实体好物，更能为你解锁专属的荣誉身份，让你成为这座星球上最闪耀的共创者。
+      </view>
+      <view class=""> 即刻发布你的第一篇笔记，开启你的财富积累之旅吧！ </view>
+    </view>
+
+    <image
+      style="width: 700rpx; height: 14rpx; margin: 20rpx auto; display: block"
+      :src="showImg('/uploads/20250829/f7214bc2a4f4e236561de893ca7b9113.png')"
+    ></image>
 
     <!-- Tab切换组件 -->
     <view class="tab-container">
@@ -44,7 +43,7 @@
 
     <!-- 内容区域 -->
     <view class="content-area">
-     <view v-if="currentTab == 0" class="notes-content">
+      <view v-if="currentTab == 0" class="notes-content">
         <view class="fab-container">
           <image
             :src="
@@ -62,34 +61,35 @@
           style="margin-top: 20rpx"
         />
       </view>
-<!-- <view v-if="currentTab === 0" class="follow-content recommend-content">
+      <!-- <view v-if="currentTab === 0" class="follow-content recommend-content">
 		<text class="coming-soon">笔记功能开发中...</text>
       </view> -->
       <!-- 关注tab内容 -->
-      <view v-if="currentTab == 1" class="follow-content ">
+      <view v-if="currentTab == 1" class="follow-content">
         <FollowTab />
-		<!-- <text class="coming-soon">关注功能开发中...</text> -->
+        <!-- <text class="coming-soon">关注功能开发中...</text> -->
       </view>
 
       <!-- 推荐tab内容 -->
-    <view v-if="currentTab == 2" class="notes-content">
-            <view class="fab-container">
-              <image
-                :src="
-                  showImg('/uploads/20250825/7ea7864b8abb89c3dd7834f025e49b3f.png')
-                "
-                style="width: 91rpx; height: 91rpx"
-              ></image>
-            </view>
-            <WaterfallLayout
-              :items="waterfallItems"
-              :column-count="2"
-              :column-gap="16"
-              :item-gap="16"
-              @item-click="handleItemClick"
-              style="margin-top: 20rpx"
-            />
-          </view>
+      <view v-if="currentTab == 2" class="notes-content">
+        <view class="fab-container">
+          <image
+            @click="goToPublish"
+            :src="
+              showImg('/uploads/20250825/7ea7864b8abb89c3dd7834f025e49b3f.png')
+            "
+            style="width: 91rpx; height: 91rpx"
+          ></image>
+        </view>
+        <WaterfallLayout
+          :items="waterfallItems"
+          :column-count="2"
+          :column-gap="16"
+          :item-gap="16"
+          @item-click="handleItemClick"
+          style="margin-top: 20rpx"
+        />
+      </view>
     </view>
 
     <!-- 控制按钮 -->
@@ -126,94 +126,29 @@ export default {
   },
   data() {
     return {
-      currentTab: 0, // 默认选中"笔记"
+      currentTab: 2, // 默认选中"笔记"
       tabs: [
         { name: "笔记", id: "notes" },
         { name: "关注", id: "follow" },
         { name: "推荐", id: "recommend" },
       ],
-      waterfallItems: [
-        {
-          title: "生命的扶持|风景之旅",
-          image: "/uploads/20250824/2cf1f49920b911c9d14e4abf3b67a59c.png",
-        },
-        {
-          title: "苏州丨园林之美 鱼戏莲叶间心随鱼鸟闲",
-          image: "/uploads/20250824/c209044a821630158f6e6771805682a7.png",
-        },
-        {
-          title: "蘇州｜你一句春不晚，我便出现在真江南",
-          image: "/uploads/20250824/74101a77233375625282209392dc69e3.png",
-        },
-        {
-          title: "收好这天然氧吧",
-          image: "/uploads/20250824/e0ab7fd0483d05742451e8f10ab3ce24.png",
-        },
-      ],
+      waterfallItems: [],
+      // 分页相关数据
+      pageNum: 1,
+      pageSize: 10,
+      loading: false,
+      hasMore: true,
       autoAddEnabled: false,
-      // 图片URL数组
-      images: [
-        "/uploads/20250824/2cf1f49920b911c9d14e4abf3b67a59c.png",
-        "https://images.unsplash.com/photo-1470071459604-3b5ec3a7fe05?auto=format&fit=crop&w=800",
-        "https://images.unsplash.com/photo-1441974231531-c6227db76b6e?auto=format&fit=crop&w=800",
-        "https://images.unsplash.com/photo-1469474968028-56623f02e42e?auto=format&fit=crop&w=800",
-        "https://images.unsplash.com/photo-1418065460487-3e41a6c84dc5?auto=format&fit=crop&w=800",
-      ],
-      // 用户头像数组
-      avatars: [
-        "https://images.unsplash.com/photo-1535713875002-d1d0cf377fde?auto=format&fit=crop&w=100",
-        "https://images.unsplash.com/photo-1438761681033-6461ffad8d80?auto=format&fit=crop&w=100",
-        "https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?auto=format&fit=crop&w=100",
-        "https://images.unsplash.com/photo-1438761681033-6461ffad8d80?auto=format&fit=crop&w=100",
-        "https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?auto=format&fit=crop&w=100",
-      ],
-      // 用户名数组
-      usernames: [
-        "杨璐摄影",
-        "旅行者小王",
-        "风景猎人",
-        "自然探索者",
-        "摄影师阿明",
-      ],
-      // 不同长度的标题
-      shortTitles: ["城市风光", "自然美景", "湖光山色", "森林小径", "日出东方"],
-      mediumTitles: [
-        "繁华都市的夜景与灯光",
-        "壮丽的山脉与蓝天白云",
-        "宁静的湖泊与秋日树木",
-        "蜿蜒的小路穿过金色森林",
-        "清晨第一缕阳光照亮大地",
-      ],
-      longTitles: [
-        "现代都市天际线在黄昏时分展现出迷人的轮廓，灯火辉煌的建筑倒映在水面上",
-        "雄伟的山脉在云雾缭绕中若隐若现，展现出大自然的壮丽与神秘",
-        "平静如镜的湖面倒映着五彩斑斓的秋叶，构成一幅完美的自然画卷",
-        "阳光透过茂密的树叶，在铺满落叶的林间小路上投下斑驳的光影",
-        "清晨的太阳从地平线缓缓升起，金色的光芒洒满整个大地，带来新的一天",
-      ],
-      descriptions: [
-        "探索城市中隐藏的美丽角落，发现不为人知的风景",
-        "大自然的鬼斧神工创造了无数令人惊叹的景观",
-        "水与山的完美结合，创造出宁静致远的意境",
-        "漫步在森林中，感受大自然的清新与宁静",
-        "日出时分的美景总能带给人们希望和力量",
-      ],
-      tagsList: [
-        ["城市", "摄影", "旅行"],
-        ["自然", "山脉", "探险"],
-        ["湖泊", "秋天", "风景"],
-        ["森林", "小路", "自然"],
-        ["日出", "早晨", "美景"],
-      ],
     };
   },
   onLoad() {
-    this.initializeData();
     this.userInfo =
       (uni.getStorageSync("userInfo") &&
         JSON.parse(uni.getStorageSync("userInfo"))) ||
       this.$store.state.user.userInfo ||
       {};
+    // 加载推荐列表数据
+    this.getRecommendList(1);
   },
   onShow() {
     if (this.userInfo && this.userInfo.id) {
@@ -242,50 +177,46 @@ export default {
         });
       });
     },
-    // 获取随机数据项
-    getRandomItem() {
-      const titleType =
-        Math.random() > 0.5
-          ? Math.random() > 0.5
-            ? this.longTitles
-            : this.mediumTitles
-          : this.shortTitles;
-
-      return {
-        id: Date.now() + Math.floor(Math.random() * 1000),
-        title: titleType[Math.floor(Math.random() * titleType.length)],
-        image: this.images[Math.floor(Math.random() * this.images.length)],
-        // description:
-        //   this.descriptions[
-        //     Math.floor(Math.random() * this.descriptions.length)
-        //   ],
-        // tags: this.tagsList[Math.floor(Math.random() * this.tagsList.length)],
-        // 新增用户信息
-        user: {
-          avatar: this.avatars[Math.floor(Math.random() * this.avatars.length)],
-          name: this.usernames[
-            Math.floor(Math.random() * this.usernames.length)
-          ],
-        },
-        likes: Math.floor(Math.random() * 999) + 1, // 1-999的随机点赞数
-      };
-    },
 
-    // 初始化数据
-    initializeData() {
-      const initialItems = [];
-      for (let i = 0; i < 20; i++) {
-        initialItems.push(this.getRandomItem());
-      }
-      // this.waterfallItems = initialItems;
-    },
+    // 获取推荐列表数据
+    getRecommendList(type = 1) {
+      if (this.loading) return;
 
-    // 添加随机项目
-    addRandomItem() {
-      const newItem = this.getRandomItem();
-      // this.waterfallItems.push(newItem);
-    },
+      this.loading = true;
+      const params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        type: type, // 0: 笔记tab, 1: 推荐tab
+      };
 
+      this.Post(params, "/framework/note/list", "DES")
+        .then((res) => {
+          if (res.code === 200 && res.rows) {
+            const newItems = res.rows || [];
+
+            if (this.pageNum === 1) {
+              // 首次加载或刷新
+              this.waterfallItems = newItems;
+            } else {
+              // 加载更多
+              this.waterfallItems.push(...newItems);
+            }
+
+            // 判断是否还有更多数据
+            this.hasMore = newItems.length === this.pageSize;
+          }
+        })
+        .catch((error) => {
+          console.error("获取推荐列表失败:", error);
+          uni.showToast({
+            title: "加载失败，请重试",
+            icon: "none",
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     // 清空所有项目
     clearAllItems() {
       uni.showModal({
@@ -301,9 +232,10 @@ export default {
 
     // 处理项目点击
     handleItemClick(item) {
+      console.log(item);
       // 跳转到笔记详情页面
       uni.navigateTo({
-        url: `/pages/notes/detail`,
+        url: `/pages/notes/detail?id=${item.id}`,
       });
     },
 
@@ -319,16 +251,17 @@ export default {
 
     // 处理自动添加请求
     handleAutoAddRequest() {
-      this.addRandomItem();
+      this.loadMoreItems();
     },
 
     // 加载更多项目（到达底部时调用）
     loadMoreItems() {
-      const newItems = [];
-      for (let i = 0; i < 10; i++) {
-        newItems.push(this.getRandomItem());
+      if (!this.loading && this.hasMore) {
+        this.pageNum++;
+        // 根据当前tab传递不同的type: 0-笔记, 1-推荐
+        const type = this.currentTab === 0 ? 0 : 1;
+        this.getRecommendList(type);
       }
-      // this.waterfallItems.push(...newItems);
     },
 
     // Tab切换方法
@@ -341,8 +274,14 @@ export default {
     // 加载tab对应的内容
     loadTabContent(tabId) {
       // 这里可以根据不同的tabId加载不同的数据
-      // 重新初始化数据
-      this.initializeData();
+      if (tabId === "notes") {
+        // 笔记tab: 重置分页数据并加载笔记列表
+        this.pageNum = 1;
+        this.waterfallItems = [];
+        this.hasMore = true;
+        this.getRecommendList(0);
+      }
+      // 推荐tab不需要重新加载数据，保持现有数据
     },
   },
 };
@@ -498,6 +437,7 @@ page {
 .content-area {
   flex: 1;
   overflow: hidden;
+  padding: 10rpx 0;
 }
 
 .notes-content {
@@ -521,20 +461,20 @@ page {
     color: #999;
   }
 }
-.desc-box{
-	padding: 0 20rpx;
-	color: #616161;
-	margin: 30rpx 0;
-	font-size: 24rpx;
-	padding: 0 40rpx;
-	view{
-		margin-bottom: 20rpx;
-		&:nth-child(1){
-			font-size: 24rpx;
-			font-weight: bold;
-			margin-bottom: 20rpx;
-		}
-	}
+.desc-box {
+  padding: 0 20rpx;
+  color: #616161;
+  margin: 30rpx 0;
+  font-size: 24rpx;
+  padding: 0 40rpx;
+  view {
+    margin-bottom: 20rpx;
+    &:nth-child(1) {
+      font-size: 24rpx;
+      font-weight: bold;
+      margin-bottom: 20rpx;
+    }
+  }
 }
 
 /* 自定义样式已移至WaterfallLayout组件内部 */
diff --git a/pages/notes/detail.vue b/pages/notes/detail.vue
index 8684178..29b1cc2 100644
--- a/pages/notes/detail.vue
+++ b/pages/notes/detail.vue
@@ -14,14 +14,10 @@
           @change="swiperChange"
         >
           <swiper-item v-for="(item, index) in topBanner" :key="index">
-            <image
-              class="top-banner"
-              :src="showImg(item)"
-              mode="aspectFill"
-            ></image>
+            <image class="top-banner" :src="item" mode="aspectFill" @click="previewImage(item)"></image>
           </swiper-item>
         </swiper>
-      
+
         <view class="dot-container">
           <view
             :class="['dot-line', index == swiperIndex ? 'active' : '']"
@@ -31,28 +27,26 @@
         </view>
       </view>
 
-     
-
       <!-- 内容卡片 -->
       <view class="content-card">
-		  <!-- 作者信息 -->
-		  <view class="author-section">
-		    <image
-		      class="author-avatar"
-		      :src="showImg(noteDetail.user.avatar)"
-		      mode="aspectFill"
-		    />
-		    <view class="author-info">
-		      <text class="author-name">{{ noteDetail.user.name }}</text>
-		    </view>
-		    <view
-		      class="follow-btn"
-		      :class="{ followed: noteDetail.user.isFollowed }"
-		      @click="toggleFollow"
-		    >
-		      {{ noteDetail.user.isFollowed ? "已关注" : "关注" }}
-		    </view>
-	</view>
+        <!-- 作者信息 -->
+        <view class="author-section">
+          <image
+            class="author-avatar"
+            :src="noteDetail.headImg"
+            mode="aspectFill"
+          />
+          <view class="author-info">
+            <text class="author-name">{{ noteDetail.nickname }}</text>
+          </view>
+          <!-- <view
+            class="follow-btn"
+            :class="{ followed: noteDetail.user.isFollowed }"
+            @click="toggleFollow"
+          >
+            {{ noteDetail.user.isFollowed ? "已关注" : "关注" }}
+          </view> -->
+        </view>
         <!-- 笔记标题 -->
         <view class="note-title">
           {{ noteDetail.title }}
@@ -70,13 +64,29 @@
 
         <!-- 笔记内容 -->
         <view class="note-content">
-          <text class="content-text">{{ noteDetail.content }}</text>
+          <view class="content-text">{{ noteDetail.content }}</view>
+          <!-- 标签名称 -->
+          <view class="tag-names" v-if="noteDetail.tagNames">
+            <text
+              v-for="(tag, index) in noteDetail.tagNames"
+              :key="index"
+              class="tag-link"
+              @click="handleTagClick(tag)"
+              >#{{ tag }}</text
+            >
+          </view>
         </view>
       </view>
-	  <view class="" style="width: auto;height: 1rpx;background-color: #999999;margin: 60rpx 32rpx;">
-	  	
-	  </view>
-
+      <view
+        class=""
+        style="
+          width: auto;
+          height: 1rpx;
+          background-color: #999999;
+          margin: 60rpx 32rpx;
+        "
+      >
+      </view>
       <!-- 评论区域 -->
       <view class="comments-section">
         <view class="comments-header">
@@ -113,31 +123,41 @@
 
     <!-- 底部评论输入框 -->
     <view class="comment-input-section-box">
-     <view class="comment-input-section">
-     	<input
-     	  class="comment-input"
-     	  v-model="commentText"
-     	  placeholder="写下你的想法..."
-     	  @confirm="submitComment"
-     	/>
-     	<button
-     	  class="send-btn"
-     	  @click="submitComment"
-     	  :disabled="!commentText.trim()"
-     	>
-     	  发送
-     	</button>
-     	<view class="like-section">
-			<image class="like-icon" mode="widthFix" :src="showImg('/uploads/20250826/3f4c0ccaaaccbef50bf8c5c27ff6a87b.png')"></image>
-     	 <!-- <text
-     	    class="like-icon"
-     	    :class="{ liked: noteDetail.isLiked }"
-     	    @click="toggleLike"
-     	    >♥</text
-     	  > -->
-     	  <text class="like-count">{{ noteDetail.likes }}</text>
-     	</view>
-     </view>
+      <view class="comment-input-section">
+        <input
+          class="comment-input"
+          v-model="commentText"
+          placeholder="写下你的想法..."
+          @confirm="submitComment"
+        />
+        <button
+          class="send-btn"
+          @click="submitComment"
+          :disabled="!commentText.trim()"
+        >
+          发送
+        </button>
+        <view class="like-section" @click="toggleLike">
+          <image
+            class="like-icon"
+            mode="widthFix"
+            :src="
+              !noteDetail.userLiked
+                ? showImg(
+                    'https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png'
+                  )
+                : showImg(
+                    'https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png'
+                  )
+            "
+          ></image>
+          <text
+            class="like-count"
+            :class="{ 'liked-text': noteDetail.userLiked }"
+            >{{ noteDetail.likeCount }}</text
+          >
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -154,8 +174,8 @@ export default {
     return {
       noteId: "",
       commentText: "",
-	  topBanner: ["/uploads/20250826/17356ed4dcdeedcd13de60ca28909d22.png"],
-	  swiperIndex: 0,
+      topBanner: [],
+      swiperIndex: 0,
       noteDetail: {
         id: "",
         title: "",
@@ -165,12 +185,8 @@ export default {
         likes: 0,
         isLiked: false,
         createTime: "",
-        user: {
-          id: "",
-          name: "",
-          avatar: "",
-          isFollowed: false,
-        },
+        tagNames: [],
+
         comments: [],
       },
     };
@@ -180,20 +196,41 @@ export default {
       this.noteId = options.id;
       this.loadNoteDetail();
     } else {
-      this.loadMockData();
+      uni.showToast({
+        title: "笔记ID不存在",
+        icon: "none",
+      });
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 1500);
     }
   },
   methods: {
-	  swiperChange(e) {
-	    this.swiperIndex = e.detail.current;
-	  },
+    swiperChange(e) {
+      this.swiperIndex = e.detail.current;
+    },
     // 加载笔记详情
     async loadNoteDetail() {
       try {
         uni.showLoading({ title: "加载中..." });
-        // 模拟API调用
-        const res = await this.getNoteDetail(this.noteId);
-        this.noteDetail = res.data;
+        // 调用真实API
+        const res = await this.Post(
+          { noteId: this.noteId },
+          "/framework/note/getInfo/" + this.noteId,
+          "DES"
+        );
+        if (res.code === 200) {
+          this.noteDetail = res.data;
+          this.noteDetail.tagNames = this.noteDetail.tagNames.split(",");
+          console.log(this.noteDetail.tagNames);
+          // 如果有图片，设置轮播图
+          this.topBanner = this.noteDetail.coverImage.split(",");
+        } else {
+          uni.showToast({
+            title: res.msg || "加载失败",
+            icon: "none",
+          });
+        }
       } catch (error) {
         console.error("加载笔记详情失败:", error);
         uni.showToast({
@@ -232,8 +269,7 @@ export default {
             user: {
               id: "user002",
               name: "@小新",
-              avatar:
-                "/uploads/20250826/d68433653e8b8cceba9bc4a6ab2a394d.png",
+              avatar: "/uploads/20250826/d68433653e8b8cceba9bc4a6ab2a394d.png",
             },
           },
           {
@@ -244,8 +280,7 @@ export default {
             user: {
               id: "user003",
               name: "Mr.曾",
-              avatar:
-                "/uploads/20250826/d68433653e8b8cceba9bc4a6ab2a394d.png",
+              avatar: "/uploads/20250826/d68433653e8b8cceba9bc4a6ab2a394d.png",
             },
           },
         ],
@@ -255,24 +290,82 @@ export default {
     // 预览图片
     previewImage(imageUrl) {
       uni.previewImage({
-        urls: [imageUrl],
+        urls: this.topBanner,
         current: imageUrl,
       });
     },
 
     // 切换关注状态
-    toggleFollow() {
-      this.noteDetail.user.isFollowed = !this.noteDetail.user.isFollowed;
-      uni.showToast({
-        title: this.noteDetail.user.isFollowed ? "已关注" : "取消关注",
-        icon: "none",
-      });
+    async toggleFollow() {
+      try {
+        const action = this.noteDetail.user.isFollowed ? "cancel" : "follow";
+        const res = await this.Post(
+          {
+            method: "POST",
+            userId: this.noteDetail.user.id,
+            action: action,
+          },
+          "/framework/user/follow",
+          "DES"
+        );
+
+        if (res.code === 200) {
+          this.noteDetail.user.isFollowed = !this.noteDetail.user.isFollowed;
+          uni.showToast({
+            title: this.noteDetail.user.isFollowed ? "已关注" : "取消关注",
+            icon: "success",
+          });
+        } else {
+          uni.showToast({
+            title:
+              res.msg || (action === "follow" ? "关注失败" : "取消关注失败"),
+            icon: "none",
+          });
+        }
+      } catch (error) {
+        console.error("关注操作失败:", error);
+        uni.showToast({
+          title: "操作失败",
+          icon: "none",
+        });
+      }
     },
 
     // 切换点赞状态
-    toggleLike() {
-      this.noteDetail.isLiked = !this.noteDetail.isLiked;
-      this.noteDetail.likes += this.noteDetail.isLiked ? 1 : -1;
+    async toggleLike() {
+      try {
+        const action = this.noteDetail.isLiked ? "cancel" : "like";
+        const res = await this.Post(
+          {
+            method: "POST",
+            noteId: this.noteId,
+            action: action,
+          },
+          "/framework/note/like",
+          "DES"
+        );
+
+        if (res.code === 200) {
+          this.noteDetail.isLiked = !this.noteDetail.isLiked;
+          this.noteDetail.likes += this.noteDetail.isLiked ? 1 : -1;
+
+          // 可选：更新点赞数为接口返回的准确数值
+          if (res.data && res.data.likeCount !== undefined) {
+            this.noteDetail.likes = res.data.likeCount;
+          }
+        } else {
+          uni.showToast({
+            title: res.msg || (action === "like" ? "点赞失败" : "取消点赞失败"),
+            icon: "none",
+          });
+        }
+      } catch (error) {
+        console.error("点赞操作失败:", error);
+        uni.showToast({
+          title: "操作失败",
+          icon: "none",
+        });
+      }
     },
 
     // 提交评论
@@ -281,25 +374,42 @@ export default {
         return;
       }
 
-      const newComment = {
-        id: "comment" + Date.now(),
-        content: this.commentText,
-        createTime: new Date().toISOString(),
-        user: {
-          id: "current_user",
-          name: "我",
-          avatar:
-            "https://des.dayunyuanjian.cn/epicSoul/avatar-current.png",
-        },
-      };
-
-      this.noteDetail.comments.unshift(newComment);
-      this.commentText = "";
-
-      uni.showToast({
-        title: "评论成功",
-        icon: "success",
-      });
+      try {
+        uni.showLoading({ title: "提交中..." });
+        const res = await this.Post(
+          {
+            method: "POST",
+            noteId: this.noteId,
+            content: this.commentText,
+          },
+          "/framework/note/comment/add",
+          "DES"
+        );
+
+        if (res.code === 200) {
+          // 评论成功后重新加载笔记详情，获取最新评论
+          this.loadNoteDetail();
+          this.commentText = "";
+
+          uni.showToast({
+            title: "评论成功",
+            icon: "success",
+          });
+        } else {
+          uni.showToast({
+            title: res.msg || "评论失败",
+            icon: "none",
+          });
+        }
+      } catch (error) {
+        console.error("提交评论失败:", error);
+        uni.showToast({
+          title: "评论失败",
+          icon: "none",
+        });
+      } finally {
+        uni.hideLoading();
+      }
     },
 
     // 格式化时间
@@ -311,17 +421,29 @@ export default {
       return `${year}/${month}/${day}`;
     },
 
-    // 模拟API - 获取笔记详情
-    async getNoteDetail(noteId) {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          this.loadMockData();
-          resolve({
-            code: 200,
-            data: this.noteDetail,
-          });
-        }, 100);
-      });
+    // 显示图片
+    showImg(img) {
+      if (!img) return "/static/image/default-avatar.png";
+      if (img.indexOf("https://") !== -1 || img.indexOf("http://") !== -1) {
+        return img;
+      } else {
+        return this.NEWAPIURLIMG + img;
+      }
+    },
+
+    // 处理标签点击
+    handleTagClick(tag) {
+      console.log("标签点击:", tag);
+      // 可以根据需求跳转到标签相关页面或执行其他操作
+      // uni.showToast({
+      //   title: `点击了标签: ${tag}`,
+      //   icon: "none",
+      // });
+
+      // 如果需要跳转到标签相关页面，可以使用以下代码
+      // uni.navigateTo({
+      //   url: `/pages/tags/detail?tag=${encodeURIComponent(tag)}`
+      // });
     },
   },
 };
@@ -382,10 +504,10 @@ export default {
     font-size: 28rpx;
     color: #fff;
     font-weight: bold;
-	border: 2rpx solid #02fcfc;
-	color: #333333;
-background-color: white;
-padding: 12rpx 30rpx;
+    border: 2rpx solid #02fcfc;
+    color: #333333;
+    background-color: white;
+    padding: 12rpx 30rpx;
     &.followed {
       background: #ccc;
     }
@@ -433,7 +555,21 @@ padding: 12rpx 30rpx;
     font-size: 30rpx;
     line-height: 1.6;
     color: #333;
-	font-weight: 500;
+    font-weight: 500;
+    word-break: break-all;
+  }
+
+  .tag-names {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    margin-top: 24rpx;
+
+    .tag-link {
+      font-size: 28rpx;
+      color: #0066cc;
+      font-weight: 500;
+    }
   }
 }
 
@@ -491,22 +627,22 @@ padding: 12rpx 30rpx;
     }
   }
 }
-.comment-input-section-box{
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 999;
-	box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
-	border-top: 1rpx solid #f0f0f0;
-	background: #fff;
+.comment-input-section-box {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+  border-top: 1rpx solid #f0f0f0;
+  background: #fff;
 }
 // 底部评论输入
 .comment-input-section {
   display: flex;
   align-items: center;
   padding: 24rpx 32rpx 0;
- padding-bottom: max(env(safe-area-inset-bottom),24rpx);
+  padding-bottom: max(env(safe-area-inset-bottom), 24rpx);
 
   .comment-input {
     flex: 1;
@@ -542,7 +678,7 @@ padding: 12rpx 30rpx;
     gap: 8rpx;
 
     .like-icon {
-     width:36rpx;
+      width: 36rpx;
       transition: color 0.3s;
       &.liked {
         color: #ff4757;
@@ -552,7 +688,11 @@ padding: 12rpx 30rpx;
     .like-count {
       font-size: 30rpx;
       color: #666;
-	  font-weight: bold;
+      font-weight: bold;
+
+      &.liked-text {
+        color: #ff4757;
+      }
     }
   }
 }
diff --git a/pages/notes/publish.vue b/pages/notes/publish.vue
index 24c0223..1abfab8 100644
--- a/pages/notes/publish.vue
+++ b/pages/notes/publish.vue
@@ -4,32 +4,20 @@
     <view class="content-scroll">
       <!-- 图片区域 -->
       <view class="image-section">
-        <view class="image-grid">
-          <!-- 已选图片 -->
-          <view
-            class="image-item"
-            v-for="(image, index) in selectedImages"
-            :key="index"
-          >
-            <image class="image-preview" :src="image" mode="aspectFill" />
-            <view class="image-delete" @click="removeImage(index)">
-              <text class="delete-icon">×</text>
-            </view>
-          </view>
-          <!-- 添加图片按钮 -->
-          <view
-            class="add-image-btn"
-            @click="chooseImage"
-            v-if="selectedImages.length < 9"
-          >
-            <text class="add-icon">+</text>
-          </view>
-        </view>
+        <uni-file-picker
+          v-model="selectedImages"
+          mode="grid"
+          file-mediatype="image"
+          file-extname="png,jpg,jpeg"
+          :auto-upload="false"
+          @select="onImageSelect"
+          @delete="onImageDelete"
+        ></uni-file-picker>
       </view>
 
       <!-- 标题区域 -->
       <view class="title-section">
-        <textarea
+        <input
           class="title-input"
           v-model="noteForm.title"
           placeholder="请输入标题..."
@@ -51,31 +39,44 @@
 
       <!-- 快速标签区域 -->
       <view class="quick-tags-section">
-        <view class="quick-tags-list">
-          <view
-            class="quick-tag-item"
-            v-for="tag in quickTags"
-            :key="tag"
-            @click="insertQuickTag(tag)"
-          >
-            #{{ tag }}
+        <view class="section-title">快速标签</view>
+        <scroll-view
+          class="quick-tags-scroll"
+          scroll-x="true"
+          show-scrollbar="false"
+        >
+          <view class="quick-tags-list">
+            <view
+              class="quick-tag-item"
+              v-for="tag in quickTags"
+              :key="tag"
+              @click="insertQuickTag(tag)"
+            >
+              #{{ tag.name }}
+            </view>
           </view>
-        </view>
+        </scroll-view>
       </view>
 
       <!-- 已添加标签 -->
       <view class="selected-tags-section" v-if="noteForm.tags.length">
-        <view class="selected-tags-list">
-          <view
-            class="selected-tag-item"
-            v-for="(tag, index) in noteForm.tags"
-            :key="index"
-            @click="removeTag(index)"
-          >
-            <text class="tag-text">#{{ tag }}</text>
-            <text class="tag-close">×</text>
+        <scroll-view
+          class="selected-tags-scroll"
+          scroll-x
+          :show-scrollbar="false"
+        >
+          <view class="selected-tags-list">
+            <view
+              class="selected-tag-item"
+              v-for="(tag, index) in noteForm.tags"
+              :key="index"
+              @click="removeTag(index)"
+            >
+              <view class="tag-text">#{{ tag.name }}</view>
+              <view class="tag-close">×</view>
+            </view>
           </view>
-        </view>
+        </scroll-view>
       </view>
 
       <!-- 底部占位 -->
@@ -84,9 +85,7 @@
 
     <!-- 底部发布按钮 -->
     <view class="bottom-publish">
-      <button class="publish-btn" @click="publishNote" :disabled="!canPublish">
-        发布笔记
-      </button>
+      <button class="publish-btn" @click="publishNote">发布笔记</button>
     </view>
   </view>
 </template>
@@ -100,29 +99,48 @@ export default {
       noteForm: {
         title: "",
         content: "",
-        tags: [],
+        tags: [], // 存储选中的标签对象 {id, name}
         images: [],
       },
-      quickTags: [
-        "阅读体验",
-        "时间力",
-        "读书笔记",
-        "生活感悟",
-        "学习心得",
-        "思考",
-      ],
+      quickTags: [], // 从接口获取的标签列表
+      imageStyles: {
+        height: "200rpx", // 边框高度
+        width: "200rpx", // 边框宽度
+      },
     };
   },
   computed: {
     canPublish() {
       return (
-        this.noteForm.title.trim() ||
-        this.noteForm.content.trim() ||
+        (this.noteForm.title.trim() || this.noteForm.content.trim()) &&
+        this.selectedImages &&
         this.selectedImages.length > 0
       );
     },
   },
+  mounted() {
+    this.getTagList();
+  },
   methods: {
+    // 获取标签列表
+    async getTagList() {
+      try {
+        const res = await this.Post({}, "/framework/tag/list", "DES");
+        if (res && res.data) {
+          this.quickTags = res.data;
+        }
+      } catch (error) {
+        console.error("获取标签列表失败:", error);
+        // 如果接口失败，可以设置默认标签
+        this.quickTags = [
+          { id: "1", name: "DES" },
+          { id: "2", name: "AGENT" },
+          { id: "3", name: "时间银行" },
+          { id: "4", name: "阅读体验" },
+          { id: "5", name: "时间力" },
+        ];
+      }
+    },
     // 返回上一页
     goBack() {
       if (this.canPublish) {
@@ -140,33 +158,29 @@ export default {
       }
     },
 
-    // 选择图片
-    chooseImage() {
-      const remainingCount = 9 - this.selectedImages.length;
-      uni.chooseImage({
-        count: remainingCount,
-        sizeType: ["original", "compressed"],
-        sourceType: ["album", "camera"],
-        success: (res) => {
-          this.selectedImages.push(...res.tempFilePaths);
-          this.noteForm.images = [...this.selectedImages];
-        },
-        fail: (err) => {
-          console.error("选择图片失败:", err);
-        },
-      });
+    // 图片选择事件
+    onImageSelect(e) {
+      console.log("选择图片·:", e);
+      // selectedImages已经通过v-model自动更新，立即上传新选择的图片
+      this.uploadNewImages(e.tempFiles || []);
     },
 
-    // 移除图片
-    removeImage(index) {
-      this.selectedImages.splice(index, 1);
-      this.noteForm.images = [...this.selectedImages];
+    // 图片删除事件
+    onImageDelete(e) {
+      let index = e.index;
+      // selectedImages已经通过v-model自动更新，需要同步更新noteForm.images
+      // 根据当前selectedImages的数量来调整noteForm.images
+      if (this.noteForm.images && this.noteForm.images.length > index) {
+        this.noteForm.images.splice(index, 1);
+      }
     },
 
     // 插入快速标签
     insertQuickTag(tag) {
-      if (!this.noteForm.tags.includes(tag)) {
-        this.noteForm.tags.push(tag);
+      // 检查是否已经添加了该标签
+      const existingTag = this.noteForm.tags.find((t) => t.id === tag.id);
+      if (!existingTag) {
+        this.noteForm.tags.unshift(tag);
       }
     },
 
@@ -175,11 +189,100 @@ export default {
       this.noteForm.tags.splice(index, 1);
     },
 
+    // 上传单个图片文件
+    async uploadSingleImage(file) {
+      return new Promise((resolve, reject) => {
+        const token = uni.getStorageSync("userInfo")
+          ? JSON.parse(uni.getStorageSync("userInfo")).token
+          : "";
+        uni.uploadFile({
+          url: this.NEWAPIURL_DES + "/system/oss/upload", // 替换为你的上传接口
+          filePath: file.url || file.path,
+          name: "file",
+          header: {
+            token: token || "",
+            // 添加必要的请求头，如token等
+          },
+          success: (res) => {
+            console.log(res);
+            try {
+              const data = JSON.parse(res.data);
+              if (data.code === 200) {
+                resolve(data.data.url); // 返回服务器返回的图片URL
+              } else {
+                reject(new Error(data.message || "上传失败"));
+              }
+            } catch (e) {
+              reject(new Error("解析响应失败"));
+            }
+          },
+          fail: (err) => {
+            reject(err);
+          },
+        });
+      });
+    },
+
+    // 上传新选择的图片
+    async uploadNewImages(newFiles) {
+      if (!newFiles || newFiles.length === 0) {
+        return;
+      }
+
+      try {
+        uni.showLoading({ title: "上传图片中..." });
+
+        const uploadPromises = newFiles.map((file) =>
+          this.uploadSingleImage(file)
+        );
+        const uploadedUrls = await Promise.all(uploadPromises);
+
+        // 将上传成功的URL添加到noteForm.images中
+        this.noteForm.images = [
+          ...(this.noteForm.images || []),
+          ...uploadedUrls,
+        ];
+        uni.hideLoading();
+      } catch (error) {
+        uni.hideLoading();
+        uni.showToast({
+          title: error.message || "图片上传失败",
+          icon: "none",
+        });
+      }
+    },
+
+    // 批量上传图片（保留原方法，用于其他场景）
+    async uploadImages() {
+      if (!this.selectedImages || this.selectedImages.length === 0) {
+        return [];
+      }
+
+      const uploadPromises = this.selectedImages.map((file) =>
+        this.uploadSingleImage(file)
+      );
+
+      try {
+        const uploadedUrls = await Promise.all(uploadPromises);
+        return uploadedUrls;
+      } catch (error) {
+        throw new Error("图片上传失败: " + error.message);
+      }
+    },
+
     // 发布笔记
     async publishNote() {
-      if (!this.canPublish) {
+      console.log(this.noteForm, "0000");
+      if (!this.noteForm.images || this.noteForm.images.length === 0) {
         uni.showToast({
-          title: "请添加内容",
+          title: "请至少选择一张图片",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.noteForm.title.trim() && !this.noteForm.content.trim()) {
+        uni.showToast({
+          title: "请添加标题或内容",
           icon: "none",
         });
         return;
@@ -187,45 +290,41 @@ export default {
 
       try {
         uni.showLoading({ title: "发布中..." });
-
-        // 模拟发布API调用
+        // 图片已经在选择时上传，直接提交表单
         await this.submitNote(this.noteForm);
 
         uni.hideLoading();
         uni.showToast({
           title: "发布成功",
-          icon: "success",
+          icon: "none",
           duration: 2000,
         });
 
         // 延迟跳转，让用户看到成功提示
         setTimeout(() => {
           uni.navigateBack();
-        }, 1500);
+        }, 800);
       } catch (error) {
         uni.hideLoading();
         uni.showToast({
-          title: "发布失败，请重试",
+          title: error.message || "发布失败，请重试",
           icon: "none",
         });
       }
     },
 
-    // 提交笔记（模拟API）
+    // 提交笔记
     async submitNote(noteData) {
-      return new Promise((resolve, reject) => {
-        setTimeout(() => {
-          console.log("发布笔记数据:", noteData);
-          resolve({
-            code: 200,
-            message: "发布成功",
-            data: {
-              id: "note_" + Date.now(),
-              ...noteData,
-            },
-          });
-        }, 1500);
-      });
+      // 格式化数据以符合API要求
+      const formData = {
+        title: noteData.title,
+        content: noteData.content,
+        tags: noteData.tags.map((tag) => tag.id).join(","), // 标签ID逗号分隔
+        coverImage: noteData.images.join(","), // 图片URL逗号分隔
+        method: "POST",
+      };
+
+      return this.Post(formData, "/framework/note/addNote", "DES");
     },
   },
 };
@@ -243,7 +342,6 @@ export default {
 .content-scroll {
   flex: 1;
   padding: 0 30rpx;
-  width: 690rpx;
 }
 
 // 图片区域
@@ -251,59 +349,6 @@ export default {
   margin: 32rpx 0;
   padding-bottom: 32rpx;
   border-bottom: 1rpx solid #f0f0f0;
-
-  .image-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 16rpx;
-  }
-
-  .image-item {
-    position: relative;
-    width: 100%;
-    aspect-ratio: 1;
-    border-radius: 16rpx;
-    overflow: hidden;
-
-    .image-preview {
-      width: 100%;
-      height: 100%;
-    }
-
-    .image-delete {
-      position: absolute;
-      top: 8rpx;
-      right: 8rpx;
-      width: 48rpx;
-      height: 48rpx;
-      background: rgba(0, 0, 0, 0.6);
-      border-radius: 24rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .delete-icon {
-        font-size: 32rpx;
-        color: #fff;
-      }
-    }
-  }
-
-  .add-image-btn {
-    width: 100%;
-    aspect-ratio: 1;
-    border: 2rpx dashed #ddd;
-    border-radius: 16rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: #fafafa;
-
-    .add-icon {
-      font-size: 48rpx;
-      color: #999;
-    }
-  }
 }
 
 // 标题区域
@@ -334,7 +379,7 @@ export default {
   .content-input {
     width: 100%;
     min-height: 300rpx;
-    font-size: 32rpx;
+    font-size: 28rpx;
     line-height: 1.6;
     color: #333;
     border: none;
@@ -347,20 +392,33 @@ export default {
 .quick-tags-section {
   margin: 24rpx 0;
 
+  .section-title {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 25rpx;
+  }
+
+  .quick-tags-scroll {
+    width: 100%;
+    white-space: nowrap;
+  }
+
   .quick-tags-list {
-    display: flex;
-    flex-wrap: wrap;
+    display: inline-flex;
     gap: 16rpx;
+    padding-right: 32rpx;
+    width: max-content;
 
     .quick-tag-item {
+      flex-shrink: 0;
       padding: 16rpx 24rpx;
       background: #f8f9fa;
-      border: 1rpx solid #e0e0e0;
       border-radius: 32rpx;
       font-size: 28rpx;
       color: #666;
       cursor: pointer;
       transition: all 0.3s ease;
+      white-space: nowrap;
 
       &:active {
         background: #e9ecef;
@@ -376,28 +434,36 @@ export default {
   padding-top: 24rpx;
   border-top: 1rpx solid #f0f0f0;
 
+  .selected-tags-scroll {
+    width: 100%;
+    white-space: nowrap;
+  }
+
   .selected-tags-list {
-    display: flex;
-    flex-wrap: wrap;
+    display: inline-flex;
     gap: 16rpx;
+    padding-right: 32rpx;
+    width: max-content;
 
     .selected-tag-item {
+      flex-shrink: 0;
       display: flex;
       align-items: center;
       gap: 8rpx;
       padding: 12rpx 20rpx;
-      background: #ff4757;
+      background: linear-gradient(135deg, #fffdb7e6 0%, #97fffab5 100%);
       border-radius: 32rpx;
       cursor: pointer;
+      white-space: nowrap;
 
       .tag-text {
         font-size: 26rpx;
-        color: #fff;
+        color: #333;
       }
 
       .tag-close {
         font-size: 24rpx;
-        color: #fff;
+        color: #333;
         opacity: 0.8;
         margin-left: 8rpx;
       }
@@ -410,7 +476,7 @@ export default {
   padding: 24rpx 32rpx;
   background: #fff;
   border-top: 1rpx solid #f0f0f0;
-  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  padding-bottom: max(24rpx, env(safe-area-inset-bottom));
   position: fixed;
   bottom: 0;
   left: 0;
@@ -419,16 +485,15 @@ export default {
   .publish-btn {
     width: 100%;
     height: 88rpx;
-    background: #ff4757;
-    color: #fff;
+    color: #333333;
     border-radius: 44rpx;
     font-size: 32rpx;
     font-weight: 600;
     border: none;
     transition: all 0.3s ease;
-
+    background: linear-gradient(135deg, #fffdb7e6 0%, #97fffab5 100%);
     &:disabled {
-      background: #ccc;
+      background: linear-gradient(135deg, #ccc 0%, #ccc 100%);
     }
 
     &:not(:disabled):active {
@@ -438,7 +503,7 @@ export default {
 }
 
 .bottom-placeholder {
-  height: 140rpx;
+  height: 180rpx;
   padding-bottom: calc(24rpx + constant(safe-area-inset-bottom));
   padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
 }
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index fbc5e6d..d97b798 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -356,7 +356,7 @@ Vue.prototype.getSubscribeMessage = () => {
 		tmplIds: templateIds,
 		complete(res) {
 			uni.navigateTo({
-				url: '/subPackages/order/trades'
+				url: '/subPackages/haveFeeling/list'
 			})
 		}
 	})
diff --git a/static/js/request.js b/static/js/request.js
index 083458a..4584f8d 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -8,9 +8,9 @@ const DEV_API_URL = 'http://1.13.193.49';
 // const PROD_API_URL = 'https://epic.js-dyyj.com';
 const PROD_API_URL = 'http://1.13.193.49';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
-const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
 // const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
-// const DEV_API_URL_DES = 'http://1.13.193.49:8083/xcx';
+// const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
+const DEV_API_URL_DES = 'http://192.168.124.8:8083/xcx';
 // const PROD_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
 const PROD_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
 const NEWAPIURL_DES = process.env.NODE_ENV === 'development' ? DEV_API_URL_DES : PROD_API_URL_DES;
diff --git a/subPackages/haveFeeling/detail.vue b/subPackages/haveFeeling/detail.vue
index eea558b..775237d 100644
--- a/subPackages/haveFeeling/detail.vue
+++ b/subPackages/haveFeeling/detail.vue
@@ -67,7 +67,7 @@
           >
         </view>
         <view class="summary-row">
-          <text class="summary-label">应付金额</text>
+          <text class="summary-label">总金额</text>
           <text class="summary-value"
             >¥{{ orderDetail.totalAmount || "0.00" }}</text
           >
@@ -79,7 +79,7 @@
           >
         </view>
         <view class="summary-row total-row">
-          <text class="summary-label">实付金额</text>
+          <text class="summary-label">应付金额</text>
           <text class="summary-value total-amount"
             >¥{{ orderDetail.payAmount || "0.00" }}</text
           >
@@ -159,6 +159,13 @@
       >
         去支付
       </button>
+      <button
+        class="action-btn-bottom cancel-btn"
+        @click="handleOrderAction('cancel')"
+        v-if="orderDetail.status === 0"
+      >
+        取消订单
+      </button>
       <!-- <button
         class="action-btn-bottom"
         @click="handleOrderAction('logistics')"
@@ -370,9 +377,54 @@ export default {
         case "aftersale":
           this.applyAfterSale();
           break;
+        case "cancel":
+          this.cancelOrder();
+          break;
       }
     },
 
+    // 取消订单
+    cancelOrder() {
+      uni.showModal({
+        title: "取消订单",
+        content: "确定要取消该订单吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.cancelOrderApi();
+          }
+        },
+      });
+    },
+
+    // 取消订单API
+    cancelOrderApi() {
+      uni.showLoading({
+        title: "取消中...",
+      });
+
+      this.Post(
+        { parentOrderNo: this.orderDetail.orderNo },
+        `/framework/ygOrder/cancel`,
+        "DES"
+      ).then((res) => {
+        uni.hideLoading();
+        if (res.code == 200) {
+          uni.showToast({
+            title: "订单已取消",
+            icon: "success",
+          });
+          setTimeout(() => {
+            this.loadOrderDetail();
+          }, 800);
+        } else {
+          uni.showToast({
+            title: res.msg || "取消订单失败",
+            icon: "none",
+          });
+        }
+      });
+    },
+
     // 去支付
     goToPay() {
       let order = this.orderDetail;
@@ -393,7 +445,16 @@ export default {
           signType: res.data.wxInfo.signType,
           timeStamp: res.data.wxInfo.timeStamp,
           success: () => {
-            this.loadOrderDetail();
+            // this.loadOrderDetail();
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+            });
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 800);
           },
           fail() {
             // uni.navigateTo({
@@ -876,6 +937,11 @@ export default {
       color: #ffffff;
     }
 
+    &.cancel-btn {
+      background-color: #ff3b30;
+      color: #ffffff;
+    }
+
     &.contact-btn {
       background-color: #007aff;
       color: #ffffff;
diff --git a/subPackages/haveFeeling/detailAll.vue b/subPackages/haveFeeling/detailAll.vue
new file mode 100644
index 0000000..3624db9
--- /dev/null
+++ b/subPackages/haveFeeling/detailAll.vue
@@ -0,0 +1,1113 @@
+<template>
+  <view class="order-detail-container">
+    <!-- 订单状态头部 -->
+    <view class="status-header">
+      <view class="status-badge" :class="[getStatusClass(orderDetail.status)]">
+        {{ getStatusText(orderDetail.status) }}
+      </view>
+      <view class="order-title">有感商品订单详情</view>
+    </view>
+
+    <!-- 收货地址 -->
+    <view class="address-section" v-if="orderDetail.receiverArea">
+      <view class="section-title">收货地址</view>
+      <view class="address-card">
+        <view class="address-text">
+          {{ orderDetail.receiverProvince }}{{ orderDetail.receiverCity
+          }}{{ orderDetail.receiverArea }}{{ orderDetail.receiverAddress }}
+        </view>
+        <view class="contact-info">
+          <text class="contact-name">{{ orderDetail.receiverName }}</text>
+          <text class="contact-phone">{{ orderDetail.receiverPhone }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 商品列表 -->
+    <view class="goods-section">
+      <view class="section-title">商品信息</view>
+      <view class="goods-list">
+        <view class="goods-item" v-for="goods in orderDetail.orderItems">
+          <view class="goods-image-container">
+            <image
+              mode="aspectFill"
+              :src="goods.specImage"
+              class="goods-image"
+            />
+          </view>
+          <view class="goods-content">
+            <view class="goods-info">
+              <view class="goods-name">{{ goods.goodsName || "-" }}</view>
+              <view class="goods-specs">
+                <view class="spec-tag">
+                  {{ goods.specValueOne }}-{{ goods.specValueTwo }}
+                </view>
+              </view>
+              <view class="goods-quantity-price">
+                <text class="goods-quantity"
+                  >数量：{{ goods.quantity || 1 }}</text
+                >
+                <text class="goods-price">¥{{ goods.price }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 金额汇总 -->
+      <view class="amount-summary">
+        <view class="summary-row">
+          <text class="summary-label">运费</text>
+          <text class="summary-value"
+            >¥{{ orderDetail.shippingFee || "0.00" }}</text
+          >
+        </view>
+        <view class="summary-row">
+          <text class="summary-label">总金额</text>
+          <text class="summary-value"
+            >¥{{ orderDetail.totalAmount || "0.00" }}</text
+          >
+        </view>
+        <view class="summary-row">
+          <text class="summary-label">积分抵扣</text>
+          <text class="summary-value"
+            >-¥{{ orderDetail.pointsDeductAmount || "0.00" }}</text
+          >
+        </view>
+        <view class="summary-row total-row">
+          <text class="summary-label">应付金额</text>
+          <text class="summary-value total-amount"
+            >¥{{ orderDetail.payAmount || "0.00" }}</text
+          >
+        </view>
+      </view>
+    </view>
+
+    <!-- 订单信息 -->
+    <view class="order-info-section">
+      <view class="section-title">订单信息</view>
+      <view class="info-row">
+        <text class="info-label">订单编号</text>
+        <text class="info-value" @longpress="copyOrderNo">{{
+          orderDetail.orderNo
+        }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">下单时间</text>
+        <text class="info-value">{{ orderDetail.createTime }}</text>
+      </view>
+      <view class="info-row" v-if="orderDetail.payTime">
+        <text class="info-label">支付时间</text>
+        <text class="info-value">{{ orderDetail.payTime }}</text>
+      </view>
+      <view class="info-row" v-if="orderDetail.shippingTime">
+        <text class="info-label">发货时间</text>
+        <text class="info-value">{{ orderDetail.shippingTime }}</text>
+      </view>
+      <view class="info-row" v-if="orderDetail.completeTime">
+        <text class="info-label">完成时间</text>
+        <text class="info-value">{{ orderDetail.completeTime }}</text>
+      </view>
+      <!-- <view class="info-row">
+        <text class="info-label">支付方式</text>
+        <text class="info-value">{{
+          orderDetail.payMethod || "在线支付"
+        }}</text>
+      </view> -->
+      <view class="info-row" v-if="orderDetail.remark">
+        <text class="info-label">订单备注</text>
+        <text class="info-value">{{ orderDetail.remark }}</text>
+      </view>
+      <view
+        class="info-row"
+        v-if="orderDetail.delivery && orderDetail.delivery.expressName"
+      >
+        <text class="info-label">快递公司</text>
+        <text class="info-value">{{ orderDetail.delivery.expressName }}</text>
+      </view>
+      <view
+        class="info-row"
+        v-if="orderDetail.delivery && orderDetail.delivery.expressCode"
+      >
+        <text class="info-label">快递单号</text>
+        <text class="info-value" @longpress="copyExpressCode">{{
+          orderDetail.delivery.expressCode
+        }}</text>
+      </view>
+      <view
+        class="info-row"
+        v-if="orderDetail.delivery && orderDetail.delivery.expressTime"
+      >
+        <text class="info-label">发货时间</text>
+        <text class="info-value">{{ orderDetail.delivery.expressTime }}</text>
+      </view>
+    </view>
+
+    <!-- 底部按钮占位div -->
+    <view class="bottom-placeholder"></view>
+
+    <!-- 底部操作 -->
+    <view class="bottom-actions" v-if="showBottomActions">
+      <button
+        class="action-btn-bottom"
+        @click="handleOrderAction('pay')"
+        v-if="orderDetail.status === 0"
+      >
+        去支付
+      </button>
+      <button
+        class="action-btn-bottom cancel-btn"
+        @click="handleOrderAction('cancel')"
+        v-if="orderDetail.status === 0"
+      >
+        取消订单
+      </button>
+      <!-- <button
+        class="action-btn-bottom"
+        @click="handleOrderAction('logistics')"
+        v-if="[2, 3].includes(orderDetail.status)"
+      >
+        查看物流
+      </button> -->
+      <button
+        class="action-btn-bottom confirm-btn"
+        @click="handleOrderAction('confirm')"
+        v-if="orderDetail.status === 2"
+      >
+        确认收货
+      </button>
+      <button
+        class="action-btn-bottom after-sale-btn"
+        @click="handleOrderAction('aftersale')"
+        v-if="orderDetail.status === 3"
+      >
+        申请售后
+      </button>
+    </view>
+
+    <!-- 物流详情弹窗 -->
+    <view
+      class="logistics-popup-mask"
+      v-if="showLogisticsPopup"
+      @click="closeLogisticsPopup"
+    >
+      <view class="logistics-popup" @click.stop>
+        <view class="popup-header">
+          <text class="popup-title">物流详情</text>
+          <text class="popup-close" @click="closeLogisticsPopup">×</text>
+        </view>
+        <view class="popup-content">
+          <!-- 物流状态 -->
+          <view class="logistics-detail-section">
+            <view class="detail-title">物流状态</view>
+            <view class="logistics-status-info">
+              {{ getLogisticsStatusText(orderDetail.logisticsStatus) }}
+            </view>
+          </view>
+
+          <!-- 快递信息 -->
+          <view class="logistics-detail-section">
+            <view class="detail-title">快递信息</view>
+            <view class="info-item">
+              <text class="info-label">快递公司：</text>
+              <text class="info-value">{{
+                orderDetail.expressCompany || "--"
+              }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">快递单号：</text>
+              <text class="info-value" @longpress="copyExpressNo">{{
+                orderDetail.expressNo || "--"
+              }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">发货时间：</text>
+              <text class="info-value">{{
+                orderDetail.shippingTime || "--"
+              }}</text>
+            </view>
+          </view>
+
+          <!-- 物流轨迹 -->
+          <view
+            class="logistics-detail-section"
+            v-if="logisticsTrace && logisticsTrace.length > 0"
+          >
+            <view class="detail-title">物流轨迹</view>
+            <view class="trace-list">
+              <view
+                class="trace-item"
+                v-for="(trace, index) in logisticsTrace"
+                :key="index"
+                :class="{ 'is-current': index === 0 }"
+              >
+                <view class="trace-time">{{ trace.time }}</view>
+                <view class="trace-status">{{ trace.status }}</view>
+                <view class="trace-location" v-if="trace.location">{{
+                  trace.location
+                }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      orderId: "",
+      showLogisticsPopup: false,
+      logisticsTrace: [], // 物流轨迹
+      orderDetail: {
+        orderGoods: [],
+        addressInfo: null,
+      },
+    };
+  },
+  computed: {
+    // 是否显示底部操作按钮
+    showBottomActions() {
+      return [0, 2, 3].includes(this.orderDetail.status);
+    },
+  },
+  onLoad(options) {
+    if (options.id) {
+      this.orderId = options.id;
+    }
+  },
+  onShow() {
+    this.loadOrderDetail();
+  },
+  methods: {
+    showImgJdsz(img) {
+      if (!img) return "/static/images/default-goods.png";
+      if (img.indexOf("https://") != -1 || img.indexOf("http://") != -1) {
+        return img;
+      } else {
+        return this.JDSU_IMG_URL + img;
+      }
+    },
+
+    // 加载订单详情
+    async loadOrderDetail() {
+      try {
+        this.Post(
+          { parentNo: this.orderId },
+          `/framework/ygOrder/parent/getByParentNo`,
+          "DES"
+        ).then((res) => {
+          if (res.code == 200) {
+            let orderItems = [];
+            res.data.orderNo = res.data.parentOrderNo;
+            res.data.orders.forEach((item) => {
+              item.orderItems.forEach((_item) => {
+                orderItems.push(_item);
+              });
+            });
+            this.orderDetail = res.data;
+            this.orderDetail.orderItems = orderItems;
+          } else {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+        });
+      } catch (error) {
+        console.error("加载订单详情失败:", error);
+        uni.showToast({
+          title: "加载失败",
+          icon: "none",
+        });
+      } finally {
+        uni.hideLoading();
+      }
+    },
+
+    // 获取订单状态文本
+    getStatusText(status) {
+      const statusMap = {
+        "-1": "已取消",
+        0: "待支付",
+        1: "已支付",
+        2: "已发货",
+        3: "已完成",
+      };
+      return statusMap[status] || "未知";
+    },
+
+    // 获取状态样式类
+    getStatusClass(status) {
+      const classMap = {
+        "-1": "status-cancelled",
+        0: "status-pending",
+        1: "status-paid",
+        2: "status-shipping",
+        3: "status-completed",
+      };
+      return classMap[status] || "status-default";
+    },
+
+    // 获取物流状态文本
+    getLogisticsStatusText(status) {
+      const statusMap = {
+        0: "待发货",
+        1: "已发货",
+        2: "运输中",
+        3: "派送中",
+        4: "已签收",
+        5: "异常",
+      };
+      return statusMap[status] || "待发货";
+    },
+
+    // 处理订单操作
+    handleOrderAction(action) {
+      switch (action) {
+        case "pay":
+          this.goToPay();
+          break;
+        case "logistics":
+          this.showLogisticsDetail();
+          break;
+        case "confirm":
+          this.confirmReceipt();
+          break;
+        case "contact":
+          this.contactSupplier();
+          break;
+        case "aftersale":
+          this.applyAfterSale();
+          break;
+        case "cancel":
+          this.cancelOrder();
+          break;
+      }
+    },
+
+    // 取消订单
+    cancelOrder() {
+      uni.showModal({
+        title: "取消订单",
+        content: "确定要取消该订单吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.cancelOrderApi();
+          }
+        },
+      });
+    },
+
+    // 取消订单API
+    cancelOrderApi() {
+      uni.showLoading({
+        title: "取消中...",
+      });
+
+      this.Post(
+        { parentOrderNo: this.orderDetail.orderNo },
+        `/framework/ygOrder/cancel`,
+        "DES"
+      ).then((res) => {
+        uni.hideLoading();
+        if (res.code == 200) {
+          uni.showToast({
+            title: "订单已取消",
+            icon: "success",
+          });
+          setTimeout(() => {
+            this.loadOrderDetail();
+          }, 800);
+        } else {
+          uni.showToast({
+            title: res.msg || "取消订单失败",
+            icon: "none",
+          });
+        }
+      });
+    },
+
+    // 去支付
+    goToPay() {
+      let order = this.orderDetail;
+      this.Post(
+        {
+          method: "POST",
+          orderNo: order.orderNo,
+          fromType: 2,
+          payAmount: order.payAmount,
+        },
+        "/framework/wxPay/submitShopPurOrder",
+        "DES"
+      ).then((res) => {
+        uni.requestPayment({
+          nonceStr: res.data.wxInfo.nonceStr,
+          package: res.data.wxInfo.package,
+          paySign: res.data.wxInfo.paySign,
+          signType: res.data.wxInfo.signType,
+          timeStamp: res.data.wxInfo.timeStamp,
+          success: () => {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+            });
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 800);
+          },
+          fail() {
+            // uni.navigateTo({
+            // 	url: '/subPackages/order/trades'
+            // })
+          },
+        });
+      });
+    },
+
+    // 显示物流详情
+    showLogisticsDetail() {
+      if (this.orderDetail.expressNo) {
+        this.loadLogisticsTrace();
+        this.showLogisticsPopup = true;
+      } else {
+        uni.showToast({
+          title: "暂无物流信息",
+          icon: "none",
+        });
+      }
+    },
+
+    // 加载物流轨迹
+    loadLogisticsTrace() {
+      this.Post(
+        {
+          orderId: this.orderId,
+          expressNo: this.orderDetail.expressNo,
+        },
+        "/framework/haveFeeling/order/logistics/trace",
+        "DES"
+      ).then((res) => {
+        if (res.code == 200) {
+          this.logisticsTrace = res.data || [];
+        }
+      });
+    },
+
+    // 关闭物流详情弹窗
+    closeLogisticsPopup() {
+      this.showLogisticsPopup = false;
+    },
+
+    // 确认收货
+    confirmReceipt() {
+      uni.showModal({
+        title: "确认收货",
+        content: "确认已收到所有商品吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.confirmReceiptApi();
+          }
+        },
+      });
+    },
+
+    // 确认收货API
+    confirmReceiptApi() {
+      uni.showLoading({
+        title: "确认中...",
+      });
+
+      this.Post({}, `/framework/ygOrder/finish/${this.orderId}`, "DES").then(
+        (res) => {
+          uni.hideLoading();
+          if (res.code == 200) {
+            uni.showToast({
+              title: "确认收货成功",
+              icon: "success",
+            });
+            setTimeout(() => {
+              this.loadOrderDetail();
+            }, 800);
+          } else {
+            uni.showToast({
+              title: res.msg || "确认收货失败",
+              icon: "none",
+            });
+          }
+        }
+      );
+    },
+
+    // 联系供应商
+    contactSupplier() {
+      uni.showToast({
+        title: "正在联系供应商",
+        icon: "none",
+      });
+      // 这里可以跳转到客服页面或其他联系方式
+    },
+
+    // 申请售后
+    applyAfterSale() {
+      // 参考iSoul页面的客服弹窗
+      uni.showModal({
+        title: "申请售后",
+        content:
+          "客服电话：0515-69186109\n服务时间：周一至周五\n9:00-12:00，13:00-18:00\n\n是否联系客服申请售后？",
+        confirmText: "联系客服",
+        success: (res) => {
+          if (res.confirm) {
+            // 拨打客服电话
+            uni.makePhoneCall({
+              phoneNumber: "0515-69186109",
+            });
+          }
+        },
+      });
+    },
+
+    // 复制订单号
+    copyOrderNo() {
+      uni.setClipboardData({
+        data: this.orderDetail.orderNo,
+        success: () => {
+          uni.showToast({
+            title: "订单号已复制",
+            icon: "success",
+          });
+        },
+      });
+    },
+
+    // 复制快递单号
+    copyExpressCode() {
+      if (this.orderDetail.delivery && this.orderDetail.delivery.expressCode) {
+        uni.setClipboardData({
+          data: this.orderDetail.delivery.expressCode,
+          success: () => {
+            uni.showToast({
+              title: "快递单号已复制",
+              icon: "success",
+            });
+          },
+        });
+      }
+    },
+
+    // 复制快递单号
+    copyExpressNo() {
+      if (this.orderDetail.expressNo) {
+        uni.setClipboardData({
+          data: this.orderDetail.expressNo,
+          success: () => {
+            uni.showToast({
+              title: "快递单号已复制",
+              icon: "success",
+            });
+          },
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.order-detail-container {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+}
+
+// 状态头部
+.status-header {
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.status-badge {
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  color: #fff;
+
+  &.status-pending {
+    background-color: #ff9500;
+  }
+
+  &.status-paid {
+    background-color: #007aff;
+  }
+
+  &.status-cancelled {
+    background-color: #ff3b30;
+  }
+
+  &.status-shipping {
+    background-color: #34c759;
+  }
+
+  &.status-completed {
+    background-color: #48bb78;
+  }
+}
+
+.order-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+// 通用区域样式
+.section-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 24rpx;
+}
+
+// 收货地址区域
+.address-section {
+  background-color: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.address-card {
+  background-color: #f8f9fa;
+  border-radius: 12rpx;
+  padding: 24rpx;
+}
+
+.address-text {
+  font-size: 26rpx;
+  color: #333;
+  line-height: 1.5;
+  margin-bottom: 16rpx;
+}
+
+.contact-info {
+  display: flex;
+  gap: 20rpx;
+}
+
+.contact-name,
+.contact-phone {
+  font-size: 26rpx;
+  color: #666;
+}
+
+// 商品列表
+.goods-section {
+  background-color: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.goods-item {
+  display: flex;
+  align-items: flex-start;
+  padding: 24rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.goods-image-container {
+  margin-right: 20rpx;
+  flex-shrink: 0;
+}
+
+.goods-image {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 10rpx;
+}
+
+.goods-content {
+  flex: 1;
+}
+
+.goods-info {
+  flex: 1;
+}
+
+.goods-name {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 600;
+  margin-bottom: 8rpx;
+  line-height: 1.4;
+}
+
+.goods-quantity-price {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 10rpx;
+}
+
+.goods-quantity {
+  font-size: 22rpx;
+  color: #999;
+  font-weight: 500;
+}
+
+.goods-price {
+  font-size: 26rpx;
+  color: #f56565;
+  font-weight: 600;
+}
+
+// 商品规格样式
+.goods-specs {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8rpx;
+  margin-bottom: 10rpx;
+}
+
+.spec-tag {
+  background: #f0f8ff;
+  border: 1rpx solid #e6f3ff;
+  border-radius: 12rpx;
+  padding: 4rpx 12rpx;
+  display: inline-block;
+  font-size: 22rpx;
+  color: #4a90e2;
+  font-weight: 500;
+}
+
+// 金额汇总
+.amount-summary {
+  padding: 20rpx 0;
+  border-top: 1rpx solid #f0f0f0;
+  margin-top: 20rpx;
+}
+
+.summary-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  &.total-row {
+    padding-top: 12rpx;
+    border-top: 1rpx solid #f0f0f0;
+    margin-top: 12rpx;
+  }
+}
+
+.summary-label {
+  font-size: 26rpx;
+  color: #666;
+  font-weight: 500;
+}
+
+.summary-value {
+  font-size: 26rpx;
+  color: #333;
+  font-weight: 600;
+
+  &.total-amount {
+    font-size: 28rpx;
+    color: #f56565;
+  }
+}
+
+// 物流信息
+.logistics-section {
+  background-color: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.logistics-card {
+  display: flex;
+  align-items: center;
+  background-color: #f8f9fa;
+  border-radius: 12rpx;
+  padding: 24rpx;
+}
+
+.logistics-info {
+  flex: 1;
+}
+
+.logistics-company {
+  margin-bottom: 8rpx;
+}
+
+.company-name {
+  font-size: 26rpx;
+  color: #333;
+  font-weight: 600;
+  margin-right: 12rpx;
+}
+
+.express-no {
+  font-size: 22rpx;
+  color: #666;
+}
+
+.logistics-status {
+  font-size: 24rpx;
+  color: #007aff;
+}
+
+.logistics-arrow {
+  margin-left: 20rpx;
+}
+
+// 订单信息
+.order-info-section {
+  background-color: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.info-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.info-label {
+  font-size: 26rpx;
+  color: #666;
+}
+
+.info-value {
+  font-size: 26rpx;
+  color: #333;
+  text-align: right;
+}
+
+// 底部按钮占位
+.bottom-placeholder {
+  height: 180rpx;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+// 底部操作
+.bottom-actions {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  padding-bottom: calc(20rpx + min(env(safe-area-inset-bottom), 40rpx));
+  border-top: 1rpx solid #eee;
+  display: flex;
+  gap: 16rpx;
+
+  .action-btn-bottom {
+    flex: 1;
+    border-radius: 10rpx;
+    font-size: 26rpx;
+    font-weight: 600;
+    border: none;
+    color: #333333;
+    transition: all 0.3s ease;
+    text-align: center;
+    background-color: #77f3f9;
+    height: 88rpx;
+    align-items: center;
+    display: flex;
+    justify-content: center;
+
+    &.confirm-btn {
+      background-color: #48bb78;
+      color: #ffffff;
+    }
+
+    &.cancel-btn {
+      background-color: #ff3b30;
+      color: #ffffff;
+    }
+
+    &.contact-btn {
+      background-color: #007aff;
+      color: #ffffff;
+    }
+
+    &.after-sale-btn {
+      background-color: #ff4757;
+      color: #ffffff;
+    }
+  }
+}
+
+// 物流详情弹窗
+.logistics-popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.logistics-popup {
+  width: 650rpx;
+  max-height: 80vh;
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.popup-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.popup-close {
+  font-size: 40rpx;
+  color: #999;
+}
+
+.popup-content {
+  padding: 30rpx;
+  flex: 1;
+  overflow-y: auto;
+}
+
+.logistics-detail-section {
+  margin-bottom: 30rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.detail-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 16rpx;
+  border-left: 4rpx solid #007aff;
+  padding-left: 16rpx;
+}
+
+.logistics-status-info {
+  font-size: 26rpx;
+  color: #007aff;
+  font-weight: 500;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.info-label {
+  font-size: 26rpx;
+  color: #666;
+  min-width: 160rpx;
+  flex-shrink: 0;
+}
+
+.info-value {
+  font-size: 26rpx;
+  color: #333;
+  flex: 1;
+}
+
+// 物流轨迹
+.trace-list {
+  .trace-item {
+    padding: 16rpx 0;
+    border-left: 2rpx solid #e2e8f0;
+    padding-left: 24rpx;
+    position: relative;
+    margin-bottom: 16rpx;
+
+    &:before {
+      content: "";
+      position: absolute;
+      left: -6rpx;
+      top: 20rpx;
+      width: 10rpx;
+      height: 10rpx;
+      border-radius: 50%;
+      background-color: #e2e8f0;
+    }
+
+    &.is-current {
+      border-left-color: #007aff;
+
+      &:before {
+        background-color: #007aff;
+      }
+
+      .trace-time,
+      .trace-status {
+        color: #007aff;
+        font-weight: 600;
+      }
+    }
+
+    &:last-child {
+      border-left-color: transparent;
+    }
+  }
+}
+
+.trace-time {
+  font-size: 22rpx;
+  color: #999;
+  margin-bottom: 6rpx;
+}
+
+.trace-status {
+  font-size: 26rpx;
+  color: #333;
+  margin-bottom: 4rpx;
+}
+
+.trace-location {
+  font-size: 22rpx;
+  color: #666;
+}
+</style>
diff --git a/subPackages/haveFeeling/list.vue b/subPackages/haveFeeling/list.vue
index 2d29f87..069294a 100644
--- a/subPackages/haveFeeling/list.vue
+++ b/subPackages/haveFeeling/list.vue
@@ -25,16 +25,16 @@
       <view
         class="order-item"
         v-for="order in orderList"
-        :key="order.id"
         @click="goToOrderDetail(order)"
       >
         <!-- 订单头部 - 供应商信息 -->
         <view class="order-header">
           <view class="supplier-info">
-            <view class="supplier-name">{{
-              order.supplierName || "默认供应商"
-            }}</view>
-            <view class="order-number">订单号：{{ order.orderNo }}</view>
+            <view class="supplier-name" v-if="order.status==0||order.status==-1">有感商品订单</view>
+			<view class="supplier-name" v-else>{{
+			  order.supplierName || "默认供应商"
+			}}</view>
+            <view class="order-number">订单号：{{ ( order.status==0||order.status==-1)?order.parentOrderNo:order.orderNo }}</view>
           </view>
           <view class="order-status-wrapper">
             <text class="status-name" :class="[getStatusClass(order.status)]">{{
@@ -42,7 +42,6 @@
             }}</text>
           </view>
         </view>
-
         <!-- 商品列表 -->
         <view class="goods-section">
           <view class="goods-list">
@@ -78,9 +77,9 @@
 
         <!-- 订单底部 -->
         <view class="order-footer">
-          <view class="order-info">
+          <view class="order-info" >
             <view class="order-total-section">
-              <text class="total-label">实付</text>
+              <!-- <text class="total-label">{{(order.status==0)?'':'实付'}}</text> -->
               <text class="order-total">¥{{ order.payAmount || 0 }}</text>
             </view>
             <view class="order-time">{{ order.createTime }}</view>
@@ -222,15 +221,29 @@ export default {
           pageSize: this.pageSize,
           status: this.tabs[this.currentTab].status,
         };
-
+		let url = ''
+		if(this.currentTab==0||this.currentTab==1){
+			url = "/framework/ygOrder/parent/pageList"
+		}else{
+			url = "/framework/ygOrder/pageList"
+		}
         this.Post(
           {
             ...params,
           },
-          "/framework/ygOrder/pageList",
+          url,
           "DES"
         ).then((res) => {
           if (res.code == 200) {
+			  if(this.currentTab==0||this.currentTab==1){
+				  let orderItems = []
+				  res.rows.forEach(item =>{
+					  item.orderItems = []
+					  item.orders.forEach(_item =>{
+						  item.orderItems.push(..._item.orderItems)
+					  })
+				  })
+			  }
             this.orderList.push(...res.rows);
             console.log(this.orderList);
             this.hasMore = res.rows.length === this.pageSize;
@@ -426,9 +439,17 @@ export default {
 
     // 跳转到订单详情页面
     goToOrderDetail(order) {
-      uni.navigateTo({
-        url: `/subPackages/haveFeeling/detail?id=${order.id}`,
-      });
+		console.log(order)
+		if(order.status==-1||order.status==0){
+			uni.navigateTo({
+			  url: `/subPackages/haveFeeling/detailAll?id=${order.orderNo}`,
+			});
+		}else{
+			uni.navigateTo({
+			  url: `/subPackages/haveFeeling/detail?id=${order.orderNo}`,
+			});
+		}
+     
     },
   },
 };
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 9bb9829..c818c01 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -1,663 +1,696 @@
 <template>
-	<view class="uni-file-picker">
-		<view v-if="title" class="uni-file-picker__header">
-			<text class="file-title">{{ title }}</text>
-			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
-		</view>
-		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
-			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
-			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
-			<slot>
-				<view class="is-add">
-					<view class="icon-add"></view>
-					<view class="icon-add rotate"></view>
-				</view>
-			</slot>
-		</upload-image>
-		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
-			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
-			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
-			<slot><button type="primary" size="mini">选择文件</button></slot>
-		</upload-file>
-	</view>
+  <view class="uni-file-picker">
+    <view v-if="title" class="uni-file-picker__header">
+      <text class="file-title">{{ title }}</text>
+      <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+    </view>
+    <upload-image
+      v-if="fileMediatype === 'image' && showType === 'grid'"
+      :readonly="readonly"
+      :image-styles="imageStyles"
+      :files-list="filesList"
+      :limit="limitLength"
+      :disablePreview="disablePreview"
+      :delIcon="delIcon"
+      @uploadFiles="uploadFiles"
+      @choose="choose"
+      @delFile="delFile"
+    >
+      <slot>
+        <view class="is-add">
+          <view class="icon-add"></view>
+          <view class="icon-add rotate"></view>
+        </view>
+      </slot>
+    </upload-image>
+    <upload-file
+      v-if="fileMediatype !== 'image' || showType !== 'grid'"
+      :readonly="readonly"
+      :list-styles="listStyles"
+      :files-list="filesList"
+      :showType="showType"
+      :delIcon="delIcon"
+      @uploadFiles="uploadFiles"
+      @choose="choose"
+      @delFile="delFile"
+    >
+      <slot><button type="primary" size="mini">选择文件</button></slot>
+    </upload-file>
+  </view>
 </template>
 
 <script>
-	import {
-		chooseAndUploadFile,
-		uploadCloudFiles
-	} from './choose-and-upload-file.js'
-	import {
-		get_file_ext,
-		get_extname,
-		get_files_and_is_max,
-		get_file_info,
-		get_file_data
-	} from './utils.js'
-	import uploadImage from './upload-image.vue'
-	import uploadFile from './upload-file.vue'
-	let fileInput = null
-	/**
-	 * FilePicker 文件选择上传
-	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
-	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
-	 * @property {Boolean}	disabled = [true|false]	组件禁用
-	 * 	@value true 	禁用
-	 * 	@value false 	取消禁用
-	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
-	 * 	@value true 	只读
-	 * 	@value false 	取消只读
-	 * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
-	 * 	@value array	规定 value 属性的类型为数组
-	 * 	@value object	规定 value 属性的类型为对象
-	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
-	 * 	@value true 	禁用图片预览
-	 * 	@value false 	取消禁用图片预览
-	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
-	 * 	@value true 	显示删除按钮
-	 * 	@value false 	不显示删除按钮
-	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
-	 * 	@value true 	自动上传
-	 * 	@value false 	取消自动上传
-	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
-	 * @property {String}	title	组件标题，右侧显示上传计数
-	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
-	 * 	@value list 	列表显示
-	 * 	@value grid 	宫格显示
-	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
-	 * 	@value image	只选择图片
-	 * 	@value video	只选择视频
-	 * 	@value all		选择所有文件
-	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
-	 * @property {Object}	list-style	mode:list 时的样式
-	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
-	 * @event {Function} select 	选择文件后触发
-	 * @event {Function} progress 文件上传时触发
-	 * @event {Function} success 	上传成功触发
-	 * @event {Function} fail 		上传失败触发
-	 * @event {Function} delete 	文件从列表移除时触发
-	 */
-	export default {
-		name: 'uniFilePicker',
-		components: {
-			uploadImage,
-			uploadFile
-		},
-		options: {
-			virtualHost: true
-		},
-		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
-		props: {
-			// #ifdef VUE3
-			modelValue: {
-				type: [Array, Object],
-				default () {
-					return []
-				}
-			},
-			// #endif
+import {
+  chooseAndUploadFile,
+  uploadCloudFiles,
+} from "./choose-and-upload-file.js";
+import {
+  get_file_ext,
+  get_extname,
+  get_files_and_is_max,
+  get_file_info,
+  get_file_data,
+} from "./utils.js";
+import uploadImage from "./upload-image.vue";
+import uploadFile from "./upload-file.vue";
+let fileInput = null;
+/**
+ * FilePicker 文件选择上传
+ * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+ * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+ * @property {Boolean}	disabled = [true|false]	组件禁用
+ * 	@value true 	禁用
+ * 	@value false 	取消禁用
+ * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+ * 	@value true 	只读
+ * 	@value false 	取消只读
+ * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
+ * 	@value array	规定 value 属性的类型为数组
+ * 	@value object	规定 value 属性的类型为对象
+ * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+ * 	@value true 	禁用图片预览
+ * 	@value false 	取消禁用图片预览
+ * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+ * 	@value true 	显示删除按钮
+ * 	@value false 	不显示删除按钮
+ * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+ * 	@value true 	自动上传
+ * 	@value false 	取消自动上传
+ * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+ * @property {String}	title	组件标题，右侧显示上传计数
+ * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+ * 	@value list 	列表显示
+ * 	@value grid 	宫格显示
+ * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+ * 	@value image	只选择图片
+ * 	@value video	只选择视频
+ * 	@value all		选择所有文件
+ * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+ * @property {Object}	list-style	mode:list 时的样式
+ * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+ * @event {Function} select 	选择文件后触发
+ * @event {Function} progress 文件上传时触发
+ * @event {Function} success 	上传成功触发
+ * @event {Function} fail 		上传失败触发
+ * @event {Function} delete 	文件从列表移除时触发
+ */
+export default {
+  name: "uniFilePicker",
+  components: {
+    uploadImage,
+    uploadFile,
+  },
+  options: {
+    virtualHost: true,
+  },
+  emits: [
+    "select",
+    "success",
+    "fail",
+    "progress",
+    "delete",
+    "update:modelValue",
+    "input",
+  ],
+  props: {
+    // #ifdef VUE3
+    modelValue: {
+      type: [Array, Object],
+      default() {
+        return [];
+      },
+    },
+    // #endif
 
-			// #ifndef VUE3
-			value: {
-				type: [Array, Object],
-				default () {
-					return []
-				}
-			},
-			// #endif
+    // #ifndef VUE3
+    value: {
+      type: [Array, Object],
+      default() {
+        return [];
+      },
+    },
+    // #endif
 
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			disablePreview: {
-				type: Boolean,
-				default: false
-			},
-			delIcon: {
-				type: Boolean,
-				default: true
-			},
-			// 自动上传
-			autoUpload: {
-				type: Boolean,
-				default: true
-			},
-			// 最大选择个数 ，h5只能限制单选或是多选
-			limit: {
-				type: [Number, String],
-				default: 9
-			},
-			// 列表样式 grid | list | list-card
-			mode: {
-				type: String,
-				default: 'grid'
-			},
-			// 选择文件类型  image/video/all
-			fileMediatype: {
-				type: String,
-				default: 'image'
-			},
-			// 文件类型筛选
-			fileExtname: {
-				type: [Array, String],
-				default () {
-					return []
-				}
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			listStyles: {
-				type: Object,
-				default () {
-					return {
-						// 是否显示边框
-						border: true,
-						// 是否显示分隔线
-						dividline: true,
-						// 线条样式
-						borderStyle: {}
-					}
-				}
-			},
-			imageStyles: {
-				type: Object,
-				default () {
-					return {
-						width: 'auto',
-						height: 'auto'
-					}
-				}
-			},
-			readonly: {
-				type: Boolean,
-				default: false
-			},
-			returnType: {
-				type: String,
-				default: 'array'
-			},
-			sizeType: {
-				type: Array,
-				default () {
-					return ['original', 'compressed']
-				}
-			},
-			sourceType: {
-				type: Array,
-				default () {
-					return  ['album', 'camera']
-				}
-			}
-		},
-		data() {
-			return {
-				files: [],
-				localValue: []
-			}
-		},
-		watch: {
-			// #ifndef VUE3
-			value: {
-				handler(newVal, oldVal) {
-					this.setValue(newVal, oldVal)
-				},
-				immediate: true
-			},
-			// #endif
-			// #ifdef VUE3
-			modelValue: {
-				handler(newVal, oldVal) {
-					this.setValue(newVal, oldVal)
-				},
-				immediate: true
-			},
-			// #endif
-		},
-		computed: {
-			filesList() {
-				let files = []
-				this.files.forEach(v => {
-					files.push(v)
-				})
-				return files
-			},
-			showType() {
-				if (this.fileMediatype === 'image') {
-					return this.mode
-				}
-				return 'list'
-			},
-			limitLength() {
-				if (this.returnType === 'object') {
-					return 1
-				}
-				if (!this.limit) {
-					return 1
-				}
-				if (this.limit >= 9) {
-					return 9
-				}
-				return this.limit
-			}
-		},
-		created() {
-			// TODO 兼容不开通服务空间的情况
-			if (!(uniCloud.config && uniCloud.config.provider)) {
-				this.noSpace = true
-				uniCloud.chooseAndUploadFile = chooseAndUploadFile
-			}
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-			if (this.form && this.formItem) {
-				if (this.formItem.name) {
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
-		},
-		methods: {
-			/**
-			 * 公开用户使用，清空文件
-			 * @param {Object} index
-			 */
-			clearFiles(index) {
-				if (index !== 0 && !index) {
-					this.files = []
-					this.$nextTick(() => {
-						this.setEmit()
-					})
-				} else {
-					this.files.splice(index, 1)
-				}
-				this.$nextTick(() => {
-					this.setEmit()
-				})
-			},
-			/**
-			 * 公开用户使用，继续上传
-			 */
-			upload() {
-				let files = []
-				this.files.forEach((v, index) => {
-					if (v.status === 'ready' || v.status === 'error') {
-						files.push(Object.assign({}, v))
-					}
-				})
-				return this.uploadFiles(files)
-			},
-			async setValue(newVal, oldVal) {
-				const newData =  async (v) => {
-					const reg = /cloud:\/\/([\w.]+\/?)\S*/
-					let url = ''
-					if(v.fileID){
-						url = v.fileID
-					}else{
-						url = v.url
-					}
-					if (reg.test(url)) {
-						v.fileID = url
-						v.url = await this.getTempFileURL(url)
-					}
-					if(v.url) v.path = v.url
-					return v
-				}
-				if (this.returnType === 'object') {
-					if (newVal) {
-						await newData(newVal)
-					} else {
-						newVal = {}
-					}
-				} else {
-					if (!newVal) newVal = []
-					for(let i =0 ;i < newVal.length ;i++){
-						let v = newVal[i]
-						await newData(v)
-					}
-				}
-				this.localValue = newVal
-				if (this.form && this.formItem &&!this.is_reset) {
-					this.is_reset = false
-					this.formItem.setValue(this.localValue)
-				}
-				let filesData = Object.keys(newVal).length > 0 ? newVal : [];
-				this.files = [].concat(filesData)
-			},
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    disablePreview: {
+      type: Boolean,
+      default: false,
+    },
+    delIcon: {
+      type: Boolean,
+      default: true,
+    },
+    // 自动上传
+    autoUpload: {
+      type: Boolean,
+      default: true,
+    },
+    // 最大选择个数 ，h5只能限制单选或是多选
+    limit: {
+      type: [Number, String],
+      default: 9,
+    },
+    // 列表样式 grid | list | list-card
+    mode: {
+      type: String,
+      default: "grid",
+    },
+    // 选择文件类型  image/video/all
+    fileMediatype: {
+      type: String,
+      default: "image",
+    },
+    // 文件类型筛选
+    fileExtname: {
+      type: [Array, String],
+      default() {
+        return [];
+      },
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    listStyles: {
+      type: Object,
+      default() {
+        return {
+          // 是否显示边框
+          border: true,
+          // 是否显示分隔线
+          dividline: true,
+          // 线条样式
+          borderStyle: {},
+        };
+      },
+    },
+    imageStyles: {
+      type: Object,
+      default() {
+        return {
+          width: "auto",
+          height: "auto",
+        };
+      },
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    returnType: {
+      type: String,
+      default: "array",
+    },
+    sizeType: {
+      type: Array,
+      default() {
+        return ["original", "compressed"];
+      },
+    },
+    sourceType: {
+      type: Array,
+      default() {
+        return ["album", "camera"];
+      },
+    },
+  },
+  data() {
+    return {
+      files: [],
+      localValue: [],
+    };
+  },
+  watch: {
+    // #ifndef VUE3
+    value: {
+      handler(newVal, oldVal) {
+        this.setValue(newVal, oldVal);
+      },
+      immediate: true,
+    },
+    // #endif
+    // #ifdef VUE3
+    modelValue: {
+      handler(newVal, oldVal) {
+        this.setValue(newVal, oldVal);
+      },
+      immediate: true,
+    },
+    // #endif
+  },
+  computed: {
+    filesList() {
+      let files = [];
+      this.files.forEach((v) => {
+        files.push(v);
+      });
+      return files;
+    },
+    showType() {
+      if (this.fileMediatype === "image") {
+        return this.mode;
+      }
+      return "list";
+    },
+    limitLength() {
+      if (this.returnType === "object") {
+        return 1;
+      }
+      if (!this.limit) {
+        return 1;
+      }
+      if (this.limit >= 9) {
+        return 9;
+      }
+      return this.limit;
+    },
+  },
+  created() {
+    // TODO 兼容不开通服务空间的情况
+    if (!(uniCloud.config && uniCloud.config.provider)) {
+      this.noSpace = true;
+      uniCloud.chooseAndUploadFile = chooseAndUploadFile;
+    }
+    this.form = this.getForm("uniForms");
+    this.formItem = this.getForm("uniFormsItem");
+    if (this.form && this.formItem) {
+      if (this.formItem.name) {
+        this.rename = this.formItem.name;
+        this.form.inputChildrens.push(this);
+      }
+    }
+  },
+  methods: {
+    /**
+     * 公开用户使用，清空文件
+     * @param {Object} index
+     */
+    clearFiles(index) {
+      if (index !== 0 && !index) {
+        this.files = [];
+        this.$nextTick(() => {
+          this.setEmit();
+        });
+      } else {
+        this.files.splice(index, 1);
+      }
+      this.$nextTick(() => {
+        this.setEmit();
+      });
+    },
+    /**
+     * 公开用户使用，继续上传
+     */
+    upload() {
+      let files = [];
+      this.files.forEach((v, index) => {
+        if (v.status === "ready" || v.status === "error") {
+          files.push(Object.assign({}, v));
+        }
+      });
+      return this.uploadFiles(files);
+    },
+    async setValue(newVal, oldVal) {
+      const newData = async (v) => {
+        const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+        let url = "";
+        if (v.fileID) {
+          url = v.fileID;
+        } else {
+          url = v.url;
+        }
+        if (reg.test(url)) {
+          v.fileID = url;
+          v.url = await this.getTempFileURL(url);
+        }
+        if (v.url) v.path = v.url;
+        return v;
+      };
+      if (this.returnType === "object") {
+        if (newVal) {
+          await newData(newVal);
+        } else {
+          newVal = {};
+        }
+      } else {
+        if (!newVal) newVal = [];
+        for (let i = 0; i < newVal.length; i++) {
+          let v = newVal[i];
+          await newData(v);
+        }
+      }
+      this.localValue = newVal;
+      if (this.form && this.formItem && !this.is_reset) {
+        this.is_reset = false;
+        this.formItem.setValue(this.localValue);
+      }
+      let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+      this.files = [].concat(filesData);
+    },
 
-			/**
-			 * 选择文件
-			 */
-			choose() {
+    /**
+     * 选择文件
+     */
+    choose() {
+      if (this.disabled) return;
+      if (
+        this.files.length >= Number(this.limitLength) &&
+        this.showType !== "grid" &&
+        this.returnType === "array"
+      ) {
+        uni.showToast({
+          title: `您最多选择 ${this.limitLength} 个文件`,
+          icon: "none",
+        });
+        return;
+      }
+      this.chooseFiles();
+    },
 
-				if (this.disabled) return
-				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
-					'array') {
-					uni.showToast({
-						title: `您最多选择 ${this.limitLength} 个文件`,
-						icon: 'none'
-					})
-					return
-				}
-				this.chooseFiles()
-			},
+    /**
+     * 选择文件并上传
+     */
+    chooseFiles() {
+      const _extname = get_extname(this.fileExtname);
+      // 获取后缀
+      uniCloud
+        .chooseAndUploadFile({
+          type: this.fileMediatype,
+          compressed: false,
+          sizeType: this.sizeType,
+          sourceType: this.sourceType,
+          // TODO 如果为空，video 有问题
+          extension: _extname.length > 0 ? _extname : undefined,
+          count: this.limitLength - this.files.length, //默认9
+          onChooseFile: this.chooseFileCallback,
+          onUploadProgress: (progressEvent) => {
+            this.setProgress(progressEvent, progressEvent.index);
+          },
+        })
+        .then((result) => {
+          this.setSuccessAndError(result.tempFiles);
+        })
+        .catch((err) => {
+          console.log("选择失败", err);
+        });
+    },
 
-			/**
-			 * 选择文件并上传
-			 */
-			chooseFiles() {
-				const _extname = get_extname(this.fileExtname)
-				// 获取后缀
-				uniCloud
-					.chooseAndUploadFile({
-						type: this.fileMediatype,
-						compressed: false,
-						sizeType: this.sizeType,
-						sourceType: this.sourceType,
-						// TODO 如果为空，video 有问题
-						extension: _extname.length > 0 ? _extname : undefined,
-						count: this.limitLength - this.files.length, //默认9
-						onChooseFile: this.chooseFileCallback,
-						onUploadProgress: progressEvent => {
-							this.setProgress(progressEvent, progressEvent.index)
-						}
-					})
-					.then(result => {
-						this.setSuccessAndError(result.tempFiles)
-					})
-					.catch(err => {
-						console.log('选择失败', err)
-					})
-			},
+    /**
+     * 选择文件回调
+     * @param {Object} res
+     */
+    async chooseFileCallback(res) {
+      const _extname = get_extname(this.fileExtname);
+      const is_one =
+        (Number(this.limitLength) === 1 &&
+          this.disablePreview &&
+          !this.disabled) ||
+        this.returnType === "object";
+      // 如果这有一个文件 ，需要清空本地缓存数据
+      if (is_one) {
+        this.files = [];
+      }
 
-			/**
-			 * 选择文件回调
-			 * @param {Object} res
-			 */
-			async chooseFileCallback(res) {
-				const _extname = get_extname(this.fileExtname)
-				const is_one = (Number(this.limitLength) === 1 &&
-						this.disablePreview &&
-						!this.disabled) ||
-					this.returnType === 'object'
-				// 如果这有一个文件 ，需要清空本地缓存数据
-				if (is_one) {
-					this.files = []
-				}
+      let { filePaths, files } = get_files_and_is_max(res, _extname);
+      if (!(_extname && _extname.length > 0)) {
+        filePaths = res.tempFilePaths;
+        files = res.tempFiles;
+      }
 
-				let {
-					filePaths,
-					files
-				} = get_files_and_is_max(res, _extname)
-				if (!(_extname && _extname.length > 0)) {
-					filePaths = res.tempFilePaths
-					files = res.tempFiles
-				}
+      let currentData = [];
+      for (let i = 0; i < files.length; i++) {
+        if (this.limitLength - this.files.length <= 0) break;
+        files[i].uuid = Date.now();
+        let filedata = await get_file_data(files[i], this.fileMediatype);
+        filedata.progress = 0;
+        filedata.status = "ready";
+        this.files.push(filedata);
+        currentData.push({
+          ...filedata,
+          file: files[i],
+        });
+      }
+      this.$emit("select", {
+        tempFiles: currentData,
+        tempFilePaths: filePaths,
+      });
+      res.tempFiles = files;
+      // 停止自动上传
+      if (!this.autoUpload || this.noSpace) {
+        res.tempFiles = [];
+      }
+    },
 
-				let currentData = []
-				for (let i = 0; i < files.length; i++) {
-					if (this.limitLength - this.files.length <= 0) break
-					files[i].uuid = Date.now()
-					let filedata = await get_file_data(files[i], this.fileMediatype)
-					filedata.progress = 0
-					filedata.status = 'ready'
-					this.files.push(filedata)
-					currentData.push({
-						...filedata,
-						file: files[i]
-					})
-				}
-				this.$emit('select', {
-					tempFiles: currentData,
-					tempFilePaths: filePaths
-				})
-				res.tempFiles = files
-				// 停止自动上传
-				if (!this.autoUpload || this.noSpace) {
-					res.tempFiles = []
-				}
-			},
+    /**
+     * 批传
+     * @param {Object} e
+     */
+    uploadFiles(files) {
+      files = [].concat(files);
+      return uploadCloudFiles
+        .call(this, files, 5, (res) => {
+          this.setProgress(res, res.index, true);
+        })
+        .then((result) => {
+          this.setSuccessAndError(result);
+          return result;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
 
-			/**
-			 * 批传
-			 * @param {Object} e
-			 */
-			uploadFiles(files) {
-				files = [].concat(files)
-				return uploadCloudFiles.call(this, files, 5, res => {
-						this.setProgress(res, res.index, true)
-					})
-					.then(result => {
-						this.setSuccessAndError(result)
-						return result;
-					})
-					.catch(err => {
-						console.log(err)
-					})
-			},
+    /**
+     * 成功或失败
+     */
+    async setSuccessAndError(res, fn) {
+      let successData = [];
+      let errorData = [];
+      let tempFilePath = [];
+      let errorTempFilePath = [];
+      for (let i = 0; i < res.length; i++) {
+        const item = res[i];
+        const index = item.uuid
+          ? this.files.findIndex((p) => p.uuid === item.uuid)
+          : item.index;
 
-			/**
-			 * 成功或失败
-			 */
-			async setSuccessAndError(res, fn) {
-				let successData = []
-				let errorData = []
-				let tempFilePath = []
-				let errorTempFilePath = []
-				for (let i = 0; i < res.length; i++) {
-					const item = res[i]
-					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
+        if (index === -1 || !this.files) break;
+        if (item.errMsg === "request:fail") {
+          this.files[index].url = item.path;
+          this.files[index].status = "error";
+          this.files[index].errMsg = item.errMsg;
+          // this.files[index].progress = -1
+          errorData.push(this.files[index]);
+          errorTempFilePath.push(this.files[index].url);
+        } else {
+          this.files[index].errMsg = "";
+          this.files[index].fileID = item.url;
+          const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+          if (reg.test(item.url)) {
+            this.files[index].url = await this.getTempFileURL(item.url);
+          } else {
+            this.files[index].url = item.url;
+          }
 
-					if (index === -1 || !this.files) break
-					if (item.errMsg === 'request:fail') {
-						this.files[index].url = item.path
-						this.files[index].status = 'error'
-						this.files[index].errMsg = item.errMsg
-						// this.files[index].progress = -1
-						errorData.push(this.files[index])
-						errorTempFilePath.push(this.files[index].url)
-					} else {
-						this.files[index].errMsg = ''
-						this.files[index].fileID = item.url
-						const reg = /cloud:\/\/([\w.]+\/?)\S*/
-						if (reg.test(item.url)) {
-							this.files[index].url = await this.getTempFileURL(item.url)
-						}else{
-							this.files[index].url = item.url
-						}
+          this.files[index].status = "success";
+          this.files[index].progress += 1;
+          successData.push(this.files[index]);
+          tempFilePath.push(this.files[index].fileID);
+        }
+      }
 
-						this.files[index].status = 'success'
-						this.files[index].progress += 1
-						successData.push(this.files[index])
-						tempFilePath.push(this.files[index].fileID)
-					}
-				}
+      if (successData.length > 0) {
+        this.setEmit();
+        // 状态改变返回
+        this.$emit("success", {
+          tempFiles: this.backObject(successData),
+          tempFilePaths: tempFilePath,
+        });
+      }
 
-				if (successData.length > 0) {
-					this.setEmit()
-					// 状态改变返回
-					this.$emit('success', {
-						tempFiles: this.backObject(successData),
-						tempFilePaths: tempFilePath
-					})
-				}
+      if (errorData.length > 0) {
+        this.$emit("fail", {
+          tempFiles: this.backObject(errorData),
+          tempFilePaths: errorTempFilePath,
+        });
+      }
+    },
 
-				if (errorData.length > 0) {
-					this.$emit('fail', {
-						tempFiles: this.backObject(errorData),
-						tempFilePaths: errorTempFilePath
-					})
-				}
-			},
+    /**
+     * 获取进度
+     * @param {Object} progressEvent
+     * @param {Object} index
+     * @param {Object} type
+     */
+    setProgress(progressEvent, index, type) {
+      const fileLenth = this.files.length;
+      const percentNum = (index / fileLenth) * 100;
+      const percentCompleted = Math.round(
+        (progressEvent.loaded * 100) / progressEvent.total
+      );
+      let idx = index;
+      if (!type) {
+        idx = this.files.findIndex(
+          (p) => p.uuid === progressEvent.tempFile.uuid
+        );
+      }
+      if (idx === -1 || !this.files[idx]) return;
+      // fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+      this.files[idx].progress = percentCompleted - 1;
+      // 上传中
+      this.$emit("progress", {
+        index: idx,
+        progress: parseInt(percentCompleted),
+        tempFile: this.files[idx],
+      });
+    },
 
-			/**
-			 * 获取进度
-			 * @param {Object} progressEvent
-			 * @param {Object} index
-			 * @param {Object} type
-			 */
-			setProgress(progressEvent, index, type) {
-				const fileLenth = this.files.length
-				const percentNum = (index / fileLenth) * 100
-				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-				let idx = index
-				if (!type) {
-					idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
-				}
-				if (idx === -1 || !this.files[idx]) return
-				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
-				this.files[idx].progress = percentCompleted - 1
-				// 上传中
-				this.$emit('progress', {
-					index: idx,
-					progress: parseInt(percentCompleted),
-					tempFile: this.files[idx]
-				})
-			},
+    /**
+     * 删除文件
+     * @param {Object} index
+     */
+    delFile(index) {
+      this.$emit("delete", {
+        tempFile: this.files[index],
+        tempFilePath: this.files[index].url,
+        index,
+      });
+      this.files.splice(index, 1);
+      this.$nextTick(() => {
+        this.setEmit();
+      });
+    },
 
-			/**
-			 * 删除文件
-			 * @param {Object} index
-			 */
-			delFile(index) {
-				this.$emit('delete', {
-					tempFile: this.files[index],
-					tempFilePath: this.files[index].url
-				})
-				this.files.splice(index, 1)
-				this.$nextTick(() => {
-					this.setEmit()
-				})
-			},
+    /**
+     * 获取文件名和后缀
+     * @param {Object} name
+     */
+    getFileExt(name) {
+      const last_len = name.lastIndexOf(".");
+      const len = name.length;
+      return {
+        name: name.substring(0, last_len),
+        ext: name.substring(last_len + 1, len),
+      };
+    },
 
-			/**
-			 * 获取文件名和后缀
-			 * @param {Object} name
-			 */
-			getFileExt(name) {
-				const last_len = name.lastIndexOf('.')
-				const len = name.length
-				return {
-					name: name.substring(0, last_len),
-					ext: name.substring(last_len + 1, len)
-				}
-			},
+    /**
+     * 处理返回事件
+     */
+    setEmit() {
+      let data = [];
+      if (this.returnType === "object") {
+        data = this.backObject(this.files)[0];
+        this.localValue = data ? data : null;
+      } else {
+        data = this.backObject(this.files);
+        if (!this.localValue) {
+          this.localValue = [];
+        }
+        this.localValue = [...data];
+      }
+      // #ifdef VUE3
+      this.$emit("update:modelValue", this.localValue);
+      // #endif
+      // #ifndef VUE3
+      this.$emit("input", this.localValue);
+      // #endif
+    },
 
-			/**
-			 * 处理返回事件
-			 */
-			setEmit() {
-				let data = []
-				if (this.returnType === 'object') {
-					data = this.backObject(this.files)[0]
-					this.localValue = data?data:null
-				} else {
-					data = this.backObject(this.files)
-					if (!this.localValue) {
-						this.localValue = []
-					}
-					this.localValue = [...data]
-				}
-				// #ifdef VUE3
-				this.$emit('update:modelValue', this.localValue)
-				// #endif
-				// #ifndef VUE3
-				this.$emit('input', this.localValue)
-				// #endif
-			},
-
-			/**
-			 * 处理返回参数
-			 * @param {Object} files
-			 */
-			backObject(files) {
-				let newFilesData = []
-				files.forEach(v => {
-					newFilesData.push({
-						extname: v.extname,
-						fileType: v.fileType,
-						image: v.image,
-						name: v.name,
-						path: v.path,
-						size: v.size,
-						fileID:v.fileID,
-						url: v.url
-					})
-				})
-				return newFilesData
-			},
-			async getTempFileURL(fileList) {
-				fileList = {
-					fileList: [].concat(fileList)
-				}
-				const urls = await uniCloud.getTempFileURL(fileList)
-				return urls.fileList[0].tempFileURL || ''
-			},
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false;
-					parentName = parent.$options.name;
-				}
-				return parent;
-			}
-		}
-	}
+    /**
+     * 处理返回参数
+     * @param {Object} files
+     */
+    backObject(files) {
+      let newFilesData = [];
+      files.forEach((v) => {
+        newFilesData.push({
+          extname: v.extname,
+          fileType: v.fileType,
+          image: v.image,
+          name: v.name,
+          path: v.path,
+          size: v.size,
+          fileID: v.fileID,
+          url: v.url,
+        });
+      });
+      return newFilesData;
+    },
+    async getTempFileURL(fileList) {
+      fileList = {
+        fileList: [].concat(fileList),
+      };
+      const urls = await uniCloud.getTempFileURL(fileList);
+      return urls.fileList[0].tempFileURL || "";
+    },
+    /**
+     * 获取父元素实例
+     */
+    getForm(name = "uniForms") {
+      let parent = this.$parent;
+      let parentName = parent.$options.name;
+      while (parentName !== name) {
+        parent = parent.$parent;
+        if (!parent) return false;
+        parentName = parent.$options.name;
+      }
+      return parent;
+    },
+  },
+};
 </script>
 
 <style>
-	.uni-file-picker {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		overflow: hidden;
-		width: 100%;
-		/* #endif */
-		flex: 1;
-	}
+.uni-file-picker {
+  /* #ifndef APP-NVUE */
+  box-sizing: border-box;
+  overflow: hidden;
+  width: 100%;
+  /* #endif */
+  flex: 1;
+}
 
-	.uni-file-picker__header {
-		padding-top: 5px;
-		padding-bottom: 10px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: space-between;
-	}
+.uni-file-picker__header {
+  padding-top: 5px;
+  padding-bottom: 10px;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: space-between;
+}
 
-	.file-title {
-		font-size: 14px;
-		color: #333;
-	}
+.file-title {
+  font-size: 14px;
+  color: #333;
+}
 
-	.file-count {
-		font-size: 14px;
-		color: #999;
-	}
+.file-count {
+  font-size: 14px;
+  color: #999;
+}
 
-	.is-add {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-	}
+.is-add {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  align-items: center;
+  justify-content: center;
+}
 
-	.icon-add {
-		width: 50px;
-		height: 5px;
-		background-color: #f1f1f1;
-		border-radius: 2px;
-	}
+.icon-add {
+  width: 50px;
+  height: 5px;
+  background-color: #f1f1f1;
+  border-radius: 2px;
+}
 
-	.rotate {
-		position: absolute;
-		transform: rotate(90deg);
-	}
+.rotate {
+  position: absolute;
+  transform: rotate(90deg);
+}
 </style>

From cfd0d1432bbca2214fe9d8940d76b593497c62d2 Mon Sep 17 00:00:00 2001
From: "1054425342@qq.com" <1054425342@qq.com>
Date: Tue, 23 Sep 2025 14:14:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/haveFeeling/list.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/subPackages/haveFeeling/list.vue b/subPackages/haveFeeling/list.vue
index 069294a..6f8bf24 100644
--- a/subPackages/haveFeeling/list.vue
+++ b/subPackages/haveFeeling/list.vue
@@ -589,28 +589,28 @@ $bg-light: #f7fafc;
   letter-spacing: 0.5rpx;
 
   &.status-pending {
-    background: #fff3cd;
-    color: #856404;
+    background: #ff9500;
+    color: #ffffff;
   }
 
   &.status-paid {
-    background: #e6f3ff;
-    color: #0c5460;
+    background: #007aff;
+    color: #ffffff;
   }
 
   &.status-cancelled {
-    background: #f8d7da;
-    color: #721c24;
+    background: #ff3b30;
+    color: #ffffff;
   }
 
   &.status-shipping {
-    background: #d4edda;
-    color: #155724;
+    background: #34c759;
+    color: #ffffff;
   }
 
   &.status-completed {
-    background: #d1ecf1;
-    color: #0c5460;
+    background: #48bb78;
+    color: #ffffff;
   }
 }