From aabe680071bf0e258c58aa973289c18ed9e5bdb9 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 18 Dec 2025 10:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=A4=87=E6=B3=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/order-item.vue       | 1 +
 pages/order/coupon.vue                      | 4 ++--
 pages/product/components/shoppingCartes.vue | 5 +++--
 pages/product/index.vue                     | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
index 4e25a80..067d2da 100644
--- a/pages/order/components/order-item.vue
+++ b/pages/order/components/order-item.vue
@@ -29,6 +29,7 @@
           <text class="productSkuName" v-if="item.skuName">{{
             item.skuName
           }}</text>
+		  <text class="color-666 u-font-24 u-m-t-4" v-if="item.remark">备注：{{item.remark}}</text>
           <template v-if="showLimitDiscount(item)">
             <text
               class="limitDiscount-time"
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 8fd69fb..7198243 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -17,10 +17,10 @@
 			</view> -->
 			<view class="status-wrap">
 				<view class="item" :class="{ active: querForm.statusActiveIndex == 0 }" @click="tabChange(0)">
-					<text class="t">商品兑换券 {{ returnSelNumber(0) }}</text>
+					<text class="t">商品兑换券</text>
 				</view>
 				<view class="item" :class="{ active: querForm.statusActiveIndex == 1 }" @click="tabChange(1)">
-					<text class="t">折扣优惠券{{ returnSelNumber(1) }}</text>
+					<text class="t">折扣优惠券</text>
 				</view>
 
 				<view class="icon-wrap" :style="{
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index fe4bac1..27ff0c2 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -51,7 +51,7 @@
 											</view>
 										</view>
 										<view class="u-font-24 color-666 u-flex">
-											<text style="max-width: 296rpx;" class="u-line-1">备注：</text>
+											<text style="max-width: 296rpx;" class="u-line-1">备注：{{item.cartListinfo.remark||''}}</text>
 											<image @click="editRemark(item)"
 												src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/9fe4df7c6c8b4290aa5f78282b143900.png"
 												style="width: 34rpx;height: 34rpx;"></image>
@@ -120,6 +120,7 @@
 	import goodsPrice from "@/components/goods-price.vue";
 	import * as orderUtils from "@/utils/order-utils.js";
 	import model from './modal.vue'
+	import _ from 'lodash'
 	const modelData = reactive({
 		show: false,
 		item: {
@@ -131,7 +132,7 @@
 
 	function editRemark(item) {
 		console.log('editRemark', item)
-		modelData.item = item
+		modelData.item = _.cloneDeep(item) 
 		modelData.show = true
 	}
 
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 86b51b7..2cc6f57 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1154,7 +1154,7 @@
 			return;
 		}
 		let res = await shoppingcart();
-
+		
 		if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type ==
 				'sku' && canSubmit.value)) {
 			// 是否是套餐 有就传
@@ -1181,7 +1181,7 @@
 				memberPrice: specifications.item.memberPrice,
 				is_print: 1,
 				product_type: specifications.item.type,
-				is_time_discount: specifications.item.is_time_discount
+				is_time_discount: specifications.item.is_time_discount,
 			});
 			// 清空套餐选中
 			selectedGroupSnap.value = [];
@@ -1201,7 +1201,7 @@
 				memberPrice: specifications.item.memberPrice,
 				is_print: 1,
 				product_type: specifications.item.type,
-				is_time_discount: specifications.item.is_time_discount
+				is_time_discount: specifications.item.is_time_discount,
 			});
 			showShopsku.value = false;