From a5420e5914499c9ce55157b8aefd54169efe7e90 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Tue, 6 May 2025 08:50:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0API=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在api-models.ts中为订单模型添加备注字段
- 在PointOrderCard.vue中新增备注列并调整显示逻辑
- 在PointOrderManage.vue中导出数据时包含备注信息
- 在PointGoodsView.vue中添加备注输入框以供用户填写
---
 src/api/api-models.ts                       |  3 +-
 src/components/manage/PointOrderCard.vue    | 71 +++++++++++++--------
 src/views/manage/point/PointOrderManage.vue |  1 +
 src/views/pointViews/PointGoodsView.vue     | 16 ++++-
 4 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 2620e8e..561183a 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -777,7 +777,7 @@ export interface ResponsePointOrder2OwnerModel {
   createAt: number
   updateAt: number
   status: PointOrderStatus
-
+  remark?: string
   trackingNumber?: string
   expressCompany?: string
 }
@@ -791,6 +791,7 @@ export interface ResponsePointOrder2UserModel {
   goods: ResponsePointGoodModel
   status: PointOrderStatus
   createAt: number
+  remark?: string
 
   trackingNumber?: string
   expressCompany?: string
diff --git a/src/components/manage/PointOrderCard.vue b/src/components/manage/PointOrderCard.vue
index c044590..990fb3c 100644
--- a/src/components/manage/PointOrderCard.vue
+++ b/src/components/manage/PointOrderCard.vue
@@ -239,6 +239,17 @@ const orderColumn: DataTableColumns<OrderType> = [
       }, () => row.type === GoodsTypes.Physical ? '实体礼物' : '虚拟礼物')
     },
   },
+  {
+    title: '备注',
+    key: 'remark',
+    minWidth: 100,
+    render: (row: OrderType) => {
+      if (!row.remark) {
+        return h(NText, { depth: 3, italic: true }, () => '无')
+      }
+      return h(NEllipsis, { style: { maxWidth: '100px' } }, () => row.remark)
+    },
+  },
   {
     title: '地址',
     key: 'address',
@@ -281,6 +292,7 @@ const orderColumn: DataTableColumns<OrderType> = [
   {
     title: '操作',
     key: 'action',
+    fixed: 'right',
     render: (row: OrderType) => {
       return h(
         NButton,
@@ -462,26 +474,41 @@ onMounted(() => {
         trigger="none"
       >
         <div class="order-detail-content">
+          <NDivider style="margin-top: 0">
+            礼物快照
+            <NTooltip>
+              <template #trigger>
+                <NIcon :component="Info24Filled" />
+              </template>
+              兑换成功时生成的礼物快照, 即使主播对礼物内容进行了修改这个地方也不会变化
+            </NTooltip>
+          </NDivider>
+
+          <NFlex justify="center">
+            <PointGoodsItem
+              v-if="currentGoods"
+              class="goods-item"
+              :goods="currentGoods"
+            />
+          </NFlex>
+
+          <!-- 移动并修改备注信息 -->
+          <template v-if="orderDetail.remark">
+            <NAlert
+              title="备注信息"
+              type="info"
+              style="margin-top: 16px; margin-bottom: 16px;"
+              closable
+            >
+              <template #icon>
+                <NIcon :component="Info24Filled" />
+              </template>
+              <NText>{{ orderDetail.remark }}</NText>
+            </NAlert>
+          </template>
+
           <!-- 用户视图 -->
           <template v-if="orderDetail.instanceOf === 'user'">
-            <NDivider style="margin-top: 0">
-              礼物快照
-              <NTooltip>
-                <template #trigger>
-                  <NIcon :component="Info24Filled" />
-                </template>
-                兑换成功时生成的礼物快照, 即使主播对礼物内容进行了修改这个地方也不会变化
-              </NTooltip>
-            </NDivider>
-
-            <NFlex justify="center">
-              <PointGoodsItem
-                v-if="currentGoods"
-                class="goods-item"
-                :goods="currentGoods"
-              />
-            </NFlex>
-
             <!-- 虚拟礼物内容 -->
             <template v-if="orderDetail.type === GoodsTypes.Virtual">
               <NDivider>虚拟礼物内容</NDivider>
@@ -531,14 +558,6 @@ onMounted(() => {
 
           <!-- 主播视图 -->
           <template v-else-if="orderDetail.instanceOf === 'owner'">
-            <NFlex justify="center">
-              <PointGoodsItem
-                v-if="currentGoods"
-                class="goods-item"
-                :goods="currentGoods"
-              />
-            </NFlex>
-
             <NDivider>订单状态管理</NDivider>
 
             <!-- 虚拟礼物提示 -->
diff --git a/src/views/manage/point/PointOrderManage.vue b/src/views/manage/point/PointOrderManage.vue
index 44cb620..6c6a625 100644
--- a/src/views/manage/point/PointOrderManage.vue
+++ b/src/views/manage/point/PointOrderManage.vue
@@ -188,6 +188,7 @@ function exportData() {
           礼物总价: s.point,
           快递公司: s.expressCompany,
           快递单号: s.trackingNumber,
+          备注: s.remark ?? '',
           创建时间: format(s.createAt, 'yyyy-MM-dd HH:mm:ss'),
           更新时间: s.updateAt ? format(s.updateAt, 'yyyy-MM-dd HH:mm:ss') : '未更新',
         }
diff --git a/src/views/pointViews/PointGoodsView.vue b/src/views/pointViews/PointGoodsView.vue
index 6af3043..85c5fe3 100644
--- a/src/views/pointViews/PointGoodsView.vue
+++ b/src/views/pointViews/PointGoodsView.vue
@@ -62,6 +62,7 @@ const showAddressSelect = ref(false)
 const currentGoods = ref<ResponsePointGoodModel>() // 当前选中的礼物
 const buyCount = ref(1) // 购买数量
 const selectedAddress = ref<AddressInfo>() // 选中的地址
+const remark = ref('') // 新增：用于存储用户备注
 
 // 筛选相关状态
 const selectedTag = ref<string>() // 选中的标签
@@ -217,6 +218,7 @@ function resetBuyModalState() {
   selectedAddress.value = undefined
   buyCount.value = 1
   currentGoods.value = undefined
+  remark.value = '' // 新增：重置备注
 }
 
 // 处理模态框显示状态变化
@@ -260,6 +262,7 @@ async function buyGoods() {
           goodsId: currentGoods.value?.id,
           count: buyCount.value,
           addressId: selectedAddress.value?.id ?? null, // 如果地址未选择，则传 null
+          remark: remark.value, // 新增：将备注添加到请求中
         })
 
         if (data.code === 200) {
@@ -638,7 +641,7 @@ onMounted(async () => {
       />
 
       <!-- 兑换选项 (仅对实物或需要数量选择的礼物显示) -->
-      <template v-if="currentGoods.type === GoodsTypes.Physical || (currentGoods.maxBuyCount ?? 1) > 1">
+      <template v-if="currentGoods.type === GoodsTypes.Physical || (currentGoods.maxBuyCount ?? 1) > 1 || true">
         <NDivider style="margin-top: 12px; margin-bottom: 12px;">
           兑换选项
         </NDivider>
@@ -689,6 +692,17 @@ onMounted(async () => {
               管理地址
             </NButton>
           </NFormItem>
+          <!-- 备注输入 -->
+          <NFormItem label="备注">
+            <NInput
+              v-model:value="remark"
+              type="textarea"
+              placeholder="可以在这里留下备注信息（可选）"
+              :autosize="{ minRows: 2, maxRows: 4 }"
+              maxlength="100"
+              show-count
+            />
+          </NFormItem>
         </NForm>
       </template>