From ca3b0eddbc014e28a2d3448e650853173ca6b735 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 24 Apr 2025 10:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E5=93=81=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/add.vue                 |  4 +--
 src/views/home/components/cartItem.vue   | 40 ++++++++++++++++++++++--
 src/views/home/components/settleItem.vue |  3 ++
 src/views/order/index.vue                |  3 ++
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/views/device/add.vue b/src/views/device/add.vue
index 7b3db09..1bb65b2 100644
--- a/src/views/device/add.vue
+++ b/src/views/device/add.vue
@@ -182,8 +182,8 @@ const printData = reactive({
       totalAmount: "10",
     },
   ],
-  amount: "30.00",
-  originAmount: '30.00',
+  amount: "10.00",
+  originAmount: '10.00',
   discountAmount: "0.00",
   discount: 0,
   remark: "给我多放点辣椒，谢谢老板",
diff --git a/src/views/home/components/cartItem.vue b/src/views/home/components/cartItem.vue
index f8af408..08e4d06 100644
--- a/src/views/home/components/cartItem.vue
+++ b/src/views/home/components/cartItem.vue
@@ -27,7 +27,8 @@
                 <div class="price" v-else>
                     <template v-if="+props.item.discount_sale_amount">
                         <span class="dis">
-                            ￥{{ formatDecimal(goodsStore.showVipPrice ? +props.item.memberPrice || +props.item.lowPrice : +props.item.lowPrice,
+                            ￥{{ formatDecimal(goodsStore.showVipPrice ? +props.item.memberPrice || +props.item.lowPrice
+                                : +props.item.lowPrice,
                                 2, true) }}
                         </span>
                         <span>
@@ -41,7 +42,9 @@
                             </span>
                         </template>
                         <span>
-                            ￥{{ formatDecimal(goodsStore.showVipPrice ? +props.item.memberPrice || +props.item.lowPrice : +props.item.lowPrice,
+                            ￥{{ formatDecimal(goodsStore.showVipPrice ? +props.item.memberPrice || +props.item.lowPrice
+                                :
+                                +props.item.lowPrice,
                                 2,
                                 true) }}
                         </span>
@@ -49,6 +52,11 @@
                 </div>
             </template>
         </div>
+        <div class="remark_wrap" @click="showRemark(props.item)">
+            备注：<span class="t">{{ props.item.remark }}</span><el-icon class="icon" v-if="props.type == 'cart'">
+                <EditPen />
+            </el-icon>
+        </div>
         <div class="sku_list" v-if="props.item.sku_name">
             <div class="tag" v-for="item in item.sku_name.split(',')">
                 {{ item }}
@@ -82,10 +90,13 @@
             <el-text class="t">x{{ formatDecimal(+props.item.number, 2, true) }}</el-text>
         </div>
     </div>
+    <!-- 备注 -->
+    <remarkModal ref="remarkRef" @success="remarkSuccess" />
 </template>
 
 <script setup>
 import { ref } from 'vue'
+import remarkModal from "@/components/remarkModal.vue";
 import { useGoods } from '@/store/goods.js'
 import { formatDecimal } from '@/utils/index.js'
 
@@ -122,9 +133,34 @@ function selectCartItemHandle() {
         goodsStore.selectOrderItem(props.index, props.i)
     }
 }
+
+// 添加单品备注
+const remarkRef = ref(null)
+function showRemark() {
+    if (props.type == 'cart') {
+        remarkRef.value.show()
+    }
+}
+
+// 修改备注
+function remarkSuccess(e) {
+    goodsStore.operateCart({ ...props.item, remark: e }, 'edit')
+}
 </script>
 
 <style scoped lang="scss">
+.remark_wrap {
+    font-size: 14px;
+    color: #999;
+    padding-top: 10px;
+
+    .icon {
+        position: relative;
+        top: 2px;
+        margin-left: 4px;
+    }
+}
+
 .cart_item {
     padding: var(--el-font-size-base);
 
diff --git a/src/views/home/components/settleItem.vue b/src/views/home/components/settleItem.vue
index ed84755..9555386 100644
--- a/src/views/home/components/settleItem.vue
+++ b/src/views/home/components/settleItem.vue
@@ -37,6 +37,9 @@
                 </template>
             </div>
         </div>
+        <div class="gift_wrap" style="padding-bottom: 10px;">
+            <div class="name">备注：{{ item.remark || '无' }}</div>
+        </div>
         <div class="tag_wrap" v-if="item.sku_name">
             <div class="tag" v-for="item in item.sku_name.split(',')">
                 {{ item }}
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 9fe521b..216161e 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -35,6 +35,9 @@
                       <span>{{ item.productName }}</span>
                       <span class="amount">￥{{ formatDecimal(+item.payAmount) }}</span>
                     </div>
+                    <div class="num">
+                      备注: {{ item.remark || "无" }}
+                    </div>
                     <div class="num">
                       <span>￥{{ formatDecimal(+item.unitPrice) }}</span>
                       <span>x{{ item.num }}</span>