From 5546e6ccbb57f5ccd6418e25d1dd1e8d61aab215 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 17 Dec 2025 18:42:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/components/modal.vue          |   97 +
 pages/product/components/shoppingCartes.vue | 1778 ++++++++++---------
 pages/product/index.vue                     |    2 +-
 3 files changed, 993 insertions(+), 884 deletions(-)
 create mode 100644 pages/product/components/modal.vue

diff --git a/pages/product/components/modal.vue b/pages/product/components/modal.vue
new file mode 100644
index 0000000..5d90202
--- /dev/null
+++ b/pages/product/components/modal.vue
@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      mode="center"
+      :safeAreaInsetBottom="mode === 'bottom' ? true : false"
+    >
+      <view class="popup-content">
+        <view class="top u-flex u-row-between">
+          <text class="font-bold u-font-32 color-333">{{ title }}</text>
+          <up-icon size="18" name="close" @click="show = false"></up-icon>
+        </view>
+        <up-line></up-line>
+        <scroll-view style="max-height: 50vh" :scroll-y="true">
+          <slot></slot>
+        </scroll-view>
+        <template v-if="showBottom">
+          <up-line></up-line>
+
+          <view class="bottom">
+            <view class="btn cancel" @click="close">{{ cancelText }}</view>
+            <view class="btn success" @click="confirm">{{ confirmText }}</view>
+          </view>
+        </template>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+const props = defineProps({
+  mode: {
+    type: String,
+    default: "center",
+  },
+  title: {
+    type: String,
+    default: "标题",
+  },
+  confirmText: {
+    type: String,
+    default: "确认",
+  },
+  cancelText: {
+    type: String,
+    default: "取消",
+  },
+  showBottom: {
+    type: Boolean,
+    default: true,
+  },
+});
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emits = defineEmits(["close", "confirm"]);
+function close() {
+  show.value = false;
+  emits("close");
+}
+function confirm() {
+  emits("confirm");
+}
+</script>
+<style lang="scss">
+.popup-content {
+  background: #fff;
+  width: 640rpx;
+  border-radius: 18rpx;
+}
+.top {
+  padding: 40rpx 48rpx;
+}
+.bottom {
+  padding: 48rpx 52rpx;
+  display: flex;
+  justify-content: space-between;
+  gap: 50rpx;
+  .btn {
+    flex: 1;
+    text-align: center;
+    padding: 18rpx 60rpx;
+    border-radius: 100rpx;
+    font-size: 32rpx;
+    border: 2rpx solid transparent;
+    &.success {
+      background-color: $my-main-color;
+      color: #fff;
+    }
+    &.cancel {
+      border-color: $my-main-color;
+      color: $my-main-color;
+    }
+  }
+}
+</style>
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index 646991c..fe4bac1 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -1,922 +1,934 @@
 <template>
-  <view>
-    <up-popup
-      :show="showCart"
-      :round="20"
-      :safeAreaInsetBottom="false"
-      :zIndex="98"
-      :overlayStyle="{ zIndex: 98 }"
-      @close="close"
-    >
-      <view class="cart-list-wrap">
-        <!-- 	<view class="cart-header flex-between">
+	<view>
+		<up-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
+			@close="close">
+			<view class="cart-list-wrap">
+				<!-- 	<view class="cart-header flex-between">
 					<view class="num">已点 {{ cartLists_count }} 份</view>
 					<view class="clear" @click="cartclear">
 						<up-icon name="trash" color="#999"></up-icon>
 						<text class="t">清空</text>
 					</view>
 				</view> -->
-        <scroll-view scroll-y class="scroll-view">
-          <view class="list-wrap" :class="[nextFullAmountActivty?'pb-20': '']">
-            <view v-if="cartList.length > 0">
-              <view class="ShoppingCart flex-between">
-                <view> 购物车 </view>
-                <view class="flex-between" @click="cartclear">
-                  <up-icon name="trash" color="#999" size="20"></up-icon>
-                  <text class="clear-btn">清空购物车</text>
-                </view>
-              </view>
-              <view
-                class="shop-item"
-                v-for="(item, index) in cartList"
-                :key="item.id"
-              >
-                <view class="shop-item-content">
-                  <view class="cover" v-if="item.productId != -999">
-                    <view class="limit-discount" v-if="showLimitDiscount(item)">
-                      限时折扣
-                    </view>
-                    <up-image
-                      :src="item.coverImg"
-                      width="124rpx"
-                      height="124rpx"
-                      mode="aspectFill"
-                      radius="10"
-                    ></up-image>
-                  </view>
-                  <view class="info">
-                    <view class="name">
-                      {{
+				<scroll-view scroll-y class="scroll-view">
+					<view class="list-wrap" :class="[nextFullAmountActivty?'pb-20': '']">
+						<view v-if="cartList.length > 0">
+							<view class="ShoppingCart flex-between">
+								<view> 购物车 </view>
+								<view class="flex-between" @click="cartclear">
+									<up-icon name="trash" color="#999" size="20"></up-icon>
+									<text class="clear-btn">清空购物车</text>
+								</view>
+							</view>
+							<view class="shop-item" v-for="(item, index) in cartList" :key="item.id">
+								<view class="shop-item-content">
+									<view class="cover" v-if="item.productId != -999">
+										<view class="limit-discount" v-if="showLimitDiscount(item)">
+											限时折扣
+										</view>
+										<up-image :src="item.coverImg" width="124rpx" height="124rpx" mode="aspectFill"
+											radius="10"></up-image>
+									</view>
+									<view class="info">
+										<view class="name">
+											{{
                         item.cartListinfo.is_temporary == 1
                           ? "临时菜"
                           : item.name
                       }}
-                    </view>
-                    <view class="select-sku-wrap" v-if="item.type == 'sku'">
-                      <text v-for="i in item.skuList" :key="i.id">
-                        {{ item.cartListinfo.sku_id == i.id ? i.name : "" }}
-                      </text>
-                    </view>
-                    <view class="select-sku-wrap" v-if="item.type == 'package'">
-                      <view
-                        v-for="(a, b) in dataprocessing(item.cartListinfo)"
-                        :key="b"
-                      >
-                        <!-- <view>{{a.title}}</view> -->
-                        <text
-                          v-for="i in a.goods"
-                          :key="i.proId"
-                          style="margin-left: 4rpx"
-                        >
-                          {{ i.proName }}
-                        </text>
-                      </view>
-                    </view>
-                    <view class="price-wrap" style="padding-top: 0">
-                      <view class="price">
-                        <text class="i">¥</text>
-                        <goodsPrice
-                          :limitDiscount="limitDiscount"
-                          :cart="item"
-                          :shopUserInfo="shopUserInfo"
-                          :shopInfo="shopInfo"
-                        ></goodsPrice>
+										</view>
+										<view class="select-sku-wrap" v-if="item.type == 'sku'">
+											<text v-for="i in item.skuList" :key="i.id">
+												{{ item.cartListinfo.sku_id == i.id ? i.name : "" }}
+											</text>
+										</view>
+										<view class="select-sku-wrap" v-if="item.type == 'package'">
+											<view v-for="(a, b) in dataprocessing(item.cartListinfo)" :key="b">
+												<!-- <view>{{a.title}}</view> -->
+												<text v-for="i in a.goods" :key="i.proId" style="margin-left: 4rpx">
+													{{ i.proName }}
+												</text>
+											</view>
+										</view>
+										<view class="u-font-24 color-666 u-flex">
+											<text style="max-width: 296rpx;" class="u-line-1">备注：</text>
+											<image @click="editRemark(item)"
+												src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/9fe4df7c6c8b4290aa5f78282b143900.png"
+												style="width: 34rpx;height: 34rpx;"></image>
+										</view>
+										<view class="price-wrap" style="padding-top: 0">
+											<view class="price">
+												<text class="i">¥</text>
+												<goodsPrice :limitDiscount="limitDiscount" :cart="item"
+													:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></goodsPrice>
 
-                        <text
-                          class="originalprice" v-if="showLimitDiscount(item)"
-                          >{{ item.salePrice }}</text
-                        >
+												<text class="originalprice"
+													v-if="showLimitDiscount(item)">{{ item.salePrice }}</text>
 
-                        <!-- <text class="originalprice"
+												<!-- <text class="originalprice"
 													v-if="item.originPrice">¥{{item.originPrice}}</text>
 												<text class="unit" v-if="item.unitName">/{{item.unitName}}</text> -->
-                      </view>
+											</view>
 
-                      <view class="operation-wrap">
-                        <view class="btn">
-                          <up-icon
-                            color="#E8AD7B"
-                            name="minus-circle"
-                            size="18"
-                          ></up-icon>
-                          <view
-                            class="btnClick"
-                            @click="cartListadd(item, '-')"
-                          ></view>
-                        </view>
-                        <text class="num">{{ ifcartNumber(item) }}</text>
-                        <view class="btn" v-if="item.type != 'package'">
-                          <!-- <up-icon name="plus-circle-fill"
+											<view class="operation-wrap">
+												<view class="btn">
+													<up-icon color="#E8AD7B" name="minus-circle" size="18"></up-icon>
+													<view class="btnClick" @click="cartListadd(item, '-')"></view>
+												</view>
+												<text class="num">{{ ifcartNumber(item) }}</text>
+												<view class="btn" v-if="item.type != 'package'">
+													<!-- <up-icon name="plus-circle-fill"
 														:color="{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? '#CECECE' : '#E9AB7A'"
 														size="25"></up-icon> -->
-                          <up-icon
-                            name="plus-circle-fill"
-                            color="#E8AD7B"
-                            size="18"
-                          ></up-icon>
-                          <view
-                            class="btnClick"
-                            @click="cartListadd(item, '+')"
-                          ></view>
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </up-popup>
-  </view>
+													<up-icon name="plus-circle-fill" color="#E8AD7B"
+														size="18"></up-icon>
+													<view class="btnClick" @click="cartListadd(item, '+')"></view>
+												</view>
+											</view>
+										</view>
+
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</up-popup>
+
+
+		<model v-model="modelData.show" title="单品备注" @confirm="modelDataConfirm">
+			<view class="u-p-40">
+				<up-input v-model="modelData.item.cartListinfo.remark" placeholder="备注"></up-input>
+			</view>
+		</model>
+	</view>
 </template>
 
 <script setup>
-import { ref, defineProps, computed, defineEmits, watch } from "vue";
-import { productStore } from "@/stores/user.js";
-import goodsPrice from "@/components/goods-price.vue";
-import * as orderUtils from "@/utils/order-utils.js";
+	import {
+		ref,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		reactive
+	} from "vue";
+	import {
+		productStore
+	} from "@/stores/user.js";
+	import goodsPrice from "@/components/goods-price.vue";
+	import * as orderUtils from "@/utils/order-utils.js";
+	import model from './modal.vue'
+	const modelData = reactive({
+		show: false,
+		item: {
+			cartListinfo:{
+				remark: ''
+			}
+		}
+	})
 
-// 定义自定义事件
-const emits = defineEmits(["customevent", "close", "clickcancelOrder"]);
+	function editRemark(item) {
+		console.log('editRemark', item)
+		modelData.item = item
+		modelData.show = true
+	}
 
-const props = defineProps({
-  nextFullAmountActivty: {
-    type: Object,
-  },
-  cartList: {
-    type: Array,
-  },
-  cartLists_count: {
-    type: Number,
-    default: 0,
-  },
-  showCart: {
-    type: Boolean,
-  },
-  orderinfo: {
-    type: Object,
-    default: {
-      detailMap: {},
-    },
-  },
-  //限时折扣
-  limitDiscount: {
-    type: Object,
-    default: {},
-  },
-});
+	function modelDataConfirm() {
+		emits('customevent', {
+			id: modelData.item.cartListinfo.id,
+			product_id: modelData.item.cartListinfo.product_id,
+			sku_id: modelData.item.cartListinfo.sku_id,
+			number: modelData.item.cartListinfo.number,
+			type: "shopping",
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId'),
+			operate_type: "edit",
+			remark:modelData.item.cartListinfo.remark
+		})
+		modelData.show = false
+	}
+
+	// 定义自定义事件
+	const emits = defineEmits(["customevent", "close", "clickcancelOrder", 'updateRemark']);
+
+	const props = defineProps({
+		nextFullAmountActivty: {
+			type: Object,
+		},
+		cartList: {
+			type: Array,
+		},
+		cartLists_count: {
+			type: Number,
+			default: 0,
+		},
+		showCart: {
+			type: Boolean,
+		},
+		orderinfo: {
+			type: Object,
+			default: {
+				detailMap: {},
+			},
+		},
+		//限时折扣
+		limitDiscount: {
+			type: Object,
+			default: {},
+		},
+	});
 
 
-function showLimitDiscount(item){
-  if (!props.limitDiscount||!props.limitDiscount.id) {
-    return false;
-  }
-  return orderUtils.canUseLimitTimeDiscount(
-    item,
-    props.limitDiscount,
-    shopInfo.value,
-    shopUserInfo.value,
-    "id"
-  );
-}
+	function showLimitDiscount(item) {
+		if (!props.limitDiscount || !props.limitDiscount.id) {
+			return false;
+		}
+		return orderUtils.canUseLimitTimeDiscount(
+			item,
+			props.limitDiscount,
+			shopInfo.value,
+			shopUserInfo.value,
+			"id"
+		);
+	}
 
-watch(
-  () => props.cartList,
-  (newCartList) => {
-    console.log("购物车数据变化", newCartList);
-  },
-  {
-    deep: true,
-  }
-);
-const shopInfo = ref(uni.cache.get("shopInfo"));
-const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
+	watch(
+		() => props.cartList,
+		(newCartList) => {
+			console.log("购物车数据变化", newCartList);
+		}, {
+			deep: true,
+		}
+	);
+	const shopInfo = ref(uni.cache.get("shopInfo"));
+	const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
 
-function returnRealPrice(cart) {
-  const price = orderUtils.returnPrice({
-    goods: cart,
-    shopInfo: shopInfo,
-    limitDiscount: props.limitDiscount.id ? props.limitDiscount : null,
-    shopUserInfo: shopUserInfo,
-  });
-  if (goods.name == "纯生纯生纯生") {
-    console.log("returnRealPrice", price);
-  }
-  return price;
-}
+	function returnRealPrice(cart) {
+		const price = orderUtils.returnPrice({
+			goods: cart,
+			shopInfo: shopInfo,
+			limitDiscount: props.limitDiscount.id ? props.limitDiscount : null,
+			shopUserInfo: shopUserInfo,
+		});
+		if (goods.name == "纯生纯生纯生") {
+			console.log("returnRealPrice", price);
+		}
+		return price;
+	}
 
-// 定义 ifcartNumber 计算属性方法
-const ifcartNumber = computed(() => {
-  return (item) => {
-    // 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-    if (!item || typeof item.cartNumber !== "string") {
-      return 0;
-    }
-    let numValue = parseFloat(item.cartNumber);
-    if (isNaN(numValue)) {
-      // 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-      return 0;
-    }
-    // type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-    if (item.type === "weight") {
-      // 如果类型是称重重量，将值保留两位小数
-      return parseFloat(numValue.toFixed(2));
-    } else {
-      // 如果类型是整数，将值转换为整数
-      return Math.round(numValue);
-    }
-    // 如果类型不匹配，返回原始值
-    return item.cartNumber;
-  };
-});
+	// 定义 ifcartNumber 计算属性方法
+	const ifcartNumber = computed(() => {
+		return (item) => {
+			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+			if (!item || typeof item.cartNumber !== "string") {
+				return 0;
+			}
+			let numValue = parseFloat(item.cartNumber);
+			if (isNaN(numValue)) {
+				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+				return 0;
+			}
+			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+			if (item.type === "weight") {
+				// 如果类型是称重重量，将值保留两位小数
+				return parseFloat(numValue.toFixed(2));
+			} else {
+				// 如果类型是整数，将值转换为整数
+				return Math.round(numValue);
+			}
+			// 如果类型不匹配，返回原始值
+			return item.cartNumber;
+		};
+	});
 
-const close = () => {
-  emits("close", false);
-};
-// 购物车加减
-const cartListadd = async (item, i) => {
-  // 是否起售 如果小于或者大于都是1
-  const cartNumberFloat = parseFloat(item.cartNumber);
-  const suitNum =
-    item.suitNum >= cartNumberFloat && i == "-" ? item.cartNumber : 1;
+	const close = () => {
+		emits("close", false);
+	};
+	// 购物车加减
+	const cartListadd = async (item, i) => {
+		// 是否起售 如果小于或者大于都是1
+		const cartNumberFloat = parseFloat(item.cartNumber);
+		const suitNum =
+			item.suitNum >= cartNumberFloat && i == "-" ? item.cartNumber : 1;
 
-  emits("customevent", {
-    id: item.cartListId ? item.cartListId : "",
-    type: "shopping",
-    table_code: uni.cache.get("tableCode"),
-    shop_id: uni.cache.get("shopId"),
-    operate_type:
-      calculateValue(item.cartNumber, i, suitNum) == "del"
-        ? "del"
-        : item.cartListId && item.cartNumber > 0
-        ? "edit"
-        : "add",
-    product_id: item.id,
-    sku_id: item.skuId,
-    number: await calculateValue(item.cartNumber, i, suitNum),
-    is_print: 1,
-    suitNum: item.suitNum,
-  });
-};
+		emits("customevent", {
+			id: item.cartListId ? item.cartListId : "",
+			type: "shopping",
+			table_code: uni.cache.get("tableCode"),
+			shop_id: uni.cache.get("shopId"),
+			operate_type: calculateValue(item.cartNumber, i, suitNum) == "del" ?
+				"del" : item.cartListId && item.cartNumber > 0 ?
+				"edit" : "add",
+			product_id: item.id,
+			sku_id: item.skuId,
+			number: await calculateValue(item.cartNumber, i, suitNum),
+			is_print: 1,
+			suitNum: item.suitNum,
+		});
+	};
 
-const dataprocessing = computed(() => {
-  return (item) => {
-    let res = null;
-    try {
-      res = JSON.parse(item.pro_group_info);
-    } catch (error) {
-      //TODO handle the exception
-    }
-    return res;
-  };
-});
+	const dataprocessing = computed(() => {
+		return (item) => {
+			let res = null;
+			try {
+				res = JSON.parse(item.pro_group_info);
+			} catch (error) {
+				//TODO handle the exception
+			}
+			return res;
+		};
+	});
 
-const clickcancelOrder = (i, key) => {
-  emits("clickcancelOrder", {
-    i,
-    key,
-  });
-  emits("customevent", {
-    type: "shopping",
-    table_code: uni.cache.get("tableCode"),
-    shop_id: uni.cache.get("shopId"),
-    operate_type: "clearOrder",
-  });
-};
+	const clickcancelOrder = (i, key) => {
+		emits("clickcancelOrder", {
+			i,
+			key,
+		});
+		emits("customevent", {
+			type: "shopping",
+			table_code: uni.cache.get("tableCode"),
+			shop_id: uni.cache.get("shopId"),
+			operate_type: "clearOrder",
+		});
+	};
 
-const calculateValue = (cartNumber, i, step = 1) => {
-  if (i == "+") {
-    const result = parseFloat(cartNumber) + parseFloat(step);
-    return result.toFixed(2);
-  } else {
-    // 当减到0返回del
-    const result = parseFloat(cartNumber) - parseFloat(step);
-    return result == 0 ? "del" : result.toFixed(2);
-  }
-};
+	const calculateValue = (cartNumber, i, step = 1) => {
+		if (i == "+") {
+			const result = parseFloat(cartNumber) + parseFloat(step);
+			return result.toFixed(2);
+		} else {
+			// 当减到0返回del
+			const result = parseFloat(cartNumber) - parseFloat(step);
+			return result == 0 ? "del" : result.toFixed(2);
+		}
+	};
 
-// 菜品备注修改
-const productBlur = (item) => {
-  let params = {
-    skuId: item.skuId,
-    num: item.number, //数量
-    type: item.type,
-    isVip: item.isVip,
-    productId: item.productId, //商品id
-    note: item.note,
-    shopId: this.shopId,
-    userId: uni.cache.get("userInfo").id,
-    tableId: this.tableCode,
-  };
-  this.$emit("addCart", params);
-};
+	// 菜品备注修改
+	const productBlur = (item) => {
+		let params = {
+			skuId: item.skuId,
+			num: item.number, //数量
+			type: item.type,
+			isVip: item.isVip,
+			productId: item.productId, //商品id
+			note: item.note,
+			shopId: this.shopId,
+			userId: uni.cache.get("userInfo").id,
+			tableId: this.tableCode,
+		};
+		this.$emit("addCart", params);
+	};
 
-// 清空购物车
-const cartclear = () => {
-  emits("customevent", {
-    type: "shopping",
-    table_code: uni.cache.get("tableCode"),
-    shop_id: uni.cache.get("shopId"),
-    operate_type: "cleanup",
-  });
-};
+	// 清空购物车
+	const cartclear = () => {
+		emits("customevent", {
+			type: "shopping",
+			table_code: uni.cache.get("tableCode"),
+			shop_id: uni.cache.get("shopId"),
+			operate_type: "cleanup",
+		});
+	};
 </script>
 
 <style lang="scss">
-.clear-btn {
-  color: #333;
-  font-size: 24rpx;
-  font-weight: 500;
-}
-.cart-list-wrap {
-  .cart-header {
-    display: flex;
-    height: 72rpx;
-    background-color: #f2f2f2;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20upx 28rpx;
-    border-radius: 20upx 20upx 0 0;
-
-    .num {
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #333333;
-    }
-
-    .clear {
-      display: flex;
-      align-items: center;
-
-      .t {
-        font-size: 24upx;
-        color: #999;
-        margin-left: 4upx;
-      }
-    }
-  }
-
-  .scroll-view {
-    max-height: 60vh;
-    margin-bottom: 190rpx;
-
-    .list-wrap {
-      padding: 0 28rpx;
-      &.pb-20{
-        padding-bottom: 20px;
-      }
-      .ShoppingCart {
-        font-size: 30rpx;
-        text-align: left;
-        padding: 20rpx 0;
-        font-weight: 700;
-        border-bottom: 1rpx solid #cecece;
-        color: #000;
-      }
-
-      .shop-item:last-child {
-        border-bottom: 1rpx solid #cecece;
-        padding-bottom: 20rpx;
-      }
-
-      .shop-item {
-        margin-top: 15rpx;
-        display: flex;
-        flex-direction: column;
-
-        .shop-item-content {
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          .cover {
-            position: relative;
-            .limit-discount {
-              position: absolute;
-              background: #cc5617;
-              font-size: 24rpx;
-              color: #fff;
-              border-radius: 20rpx 0 20rpx 0;
-              padding: 2rpx 10rpx;
-              z-index: 1;
-            }
-          }
-        }
-
-        .shop-item-remark {
-          display: flex;
-          align-items: center;
-          padding-right: 180rpx;
-          margin-top: 10rpx;
-
-          .label {
-            font-size: 28rpx;
-            color: #666;
-            margin-right: 20rpx;
-          }
-        }
-
-        .langcover {
-          position: relative;
-        }
-
-        .langcover::after {
-          content: "加载中..";
-          position: absolute;
-          top: 0;
-          left: 0;
-          height: 100%;
-          width: 100%;
-          background-color: #e8e8e8;
-          color: #6b6b6b;
-          border-radius: 10rpx;
-          text-align: center;
-          line-height: 180rpx;
-          z-index: 1;
-        }
-
-        .info {
-          flex: 1;
-          padding-left: 20rpx;
-
-          .name {
-            font-size: 28upx;
-            font-weight: bold;
-            color: #333;
-            margin-bottom: 5rpx;
-          }
-
-          .select-sku-wrap {
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #999999;
-          }
-
-          .price-wrap {
-            margin-top: 16rpx;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-
-            .price {
-              display: flex;
-              align-items: baseline;
-
-              .i,
-              .num {
-                font-weight: bold;
-                font-size: 32rpx;
-                color: #333333;
-              }
-
-              .i {
-              }
-
-              .price {
-                font-family: Source Han Sans CN, Source Han Sans CN;
-                font-weight: bold;
-                font-size: 32rpx;
-                color: #333333;
-              }
-
-              .originalprice {
-                color: #999;
-                margin-left: 10rpx;
-                font-weight: 400;
-                font-size: 24rpx;
-                text-decoration: line-through;
-              }
-
-              .unit {
-                font-family: Source Han Sans CN, Source Han Sans CN;
-                font-weight: 400;
-                font-size: 36rpx;
-                color: #333333;
-              }
-
-              .lineThrough {
-                font-weight: normal;
-                text-decoration: line-through;
-                color: #999 !important;
-                font-size: 24rpx !important;
-              }
-            }
-
-            .sku-wrap {
-              padding: 6upx 16upx;
-              background-color: #ffd100;
-              border-radius: 12upx;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              position: relative;
-
-              .t {
-                font-size: 24upx;
-                font-weight: bold;
-              }
-
-              .dot {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: 20upx;
-                position: absolute;
-                padding: 2upx 12upx;
-                border-radius: 8upx;
-                background-color: #eb5232;
-                color: #fff;
-                position: absolute;
-                top: -14upx;
-                right: -8upx;
-              }
-            }
-
-            .operation-wrap {
-              display: flex;
-              align-items: center;
-
-              .num {
-                font-size: 32upx;
-                padding: 0 16upx;
-              }
-
-              .btn {
-                position: relative;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                position: relative;
-
-                .btnClick {
-                  width: 100rpx;
-                  height: 100rpx;
-                  position: absolute;
-                  // bottom: 0;
-                }
-
-                .btnClick.l {
-                  right: 0;
-                }
-
-                .btnClick.r {
-                  left: 0;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .card {
-    position: relative;
-
-    .cardcalorders {
-      position: relative;
-      padding: 20rpx 0;
-      font-size: 35rpx;
-      font-weight: bold;
-      border-bottom: 1rpx solid #cecece;
-      color: #000;
-
-      .absolute {
-        position: absolute;
-        right: 0;
-        top: 2rpx;
-        font-size: 24rpx;
-      }
-    }
-
-    .card_item {
-      display: flex;
-      flex-direction: column;
-      position: relative;
-
-      .head {
-        display: flex;
-        justify-content: space-between;
-
-        .head_left {
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          padding: 20rpx 0;
-          border-bottom: 1rpx solid #cecece;
-
-          .placeNum {
-            font-weight: 700;
-            font-size: 27rpx;
-            color: #3e3d3d;
-          }
-
-          .placeTime {
-            font-weight: 400;
-            font-size: 32rpx;
-            color: #999;
-
-            .t {
-              margin-left: 4rpx;
-              font-size: 24rpx;
-            }
-          }
-        }
-      }
-
-      .shop-info {
-        border-bottom: 2rpx dashed #e5e5e5;
-
-        .item {
-          margin: 30rpx 0;
-          display: flex;
-
-          .info {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            padding-left: 16upx;
-
-            .productName {
-              font-weight: bold;
-              font-size: 28rpx;
-              color: #333333;
-              margin-top: 20rpx;
-            }
-
-            .productSkuName {
-              font-weight: 400;
-              font-size: 24rpx;
-              color: #999999;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 3;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            }
-
-            .n {
-              font-size: 24upx;
-              color: #999;
-            }
-          }
-
-          .price {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-end;
-
-            .priceAmount {
-              font-weight: 500;
-              font-size: 28rpx;
-              color: #333333;
-              margin-top: 26rpx;
-            }
-
-            .num {
-              font-weight: 400;
-              font-size: 24rpx;
-              color: #999999;
-              margin-top: 22rpx;
-            }
-          }
-        }
-      }
-
-      .status {
-        align-self: flex-end;
-        width: 92rpx;
-        height: 40rpx;
-        line-height: 40rpx;
-        text-align: center;
-        background: #999999;
-        border-radius: 10rpx 10rpx 10rpx 10rpx;
-        font-weight: 400;
-        font-size: 22rpx;
-        color: #ffffff;
-        margin-top: 32rpx;
-      }
-
-      .totalAmount {
-        width: 100%;
-        display: flex;
-        justify-content: flex-end;
-        align-items: flex-end;
-        padding: 32rpx 0;
-        border-bottom: 2rpx dashed #e5e5e5;
-
-        .label {
-          font-weight: bold;
-          font-size: 28rpx;
-          color: #333333;
-        }
-
-        .price {
-          font-weight: bold;
-          font-size: 36rpx;
-          color: #333333;
-        }
-      }
-
-      .semicircle_icon {
-        width: 100%;
-        position: absolute;
-        top: -22.5rpx;
-        left: 0;
-        display: flex;
-        justify-content: space-between;
-
-        .semicircle_left_icon {
-          width: 45rpx;
-          height: 45rpx;
-          margin-left: -22.5rpx;
-          background-color: #f9f9f9;
-          border-radius: 50%;
-          // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-        }
-
-        .semicircle_right_icon {
-          width: 45rpx;
-          height: 45rpx;
-          margin-right: -22.5rpx;
-          background-color: #f9f9f9;
-          border-radius: 50%;
-          // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-        }
-      }
-    }
-
-    .cell-item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 32rpx 34rpx 0 34rpx;
-
-      .label {
-        font-weight: bold;
-        font-size: 32rpx;
-        color: #333333;
-        padding-bottom: 32rpx;
-      }
-
-      .val {
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 32rpx;
-        border-bottom: 2rpx dashed #e5e5e5;
-
-        view:nth-child(1) {
-          font-weight: 400;
-          font-size: 24rpx;
-          color: #999999;
-          margin-right: 42rpx;
-        }
-
-        view:nth-child(2) {
-          display: flex;
-          align-items: flex-end;
-          font-weight: bold;
-          font-size: 36rpx;
-          color: #333333;
-        }
-      }
-
-      .val.column {
-        display: flex;
-        flex-direction: column;
-
-        .productCoupon {
-          display: flex;
-          align-items: flex-end;
-          margin: 0 0 10rpx 0;
-
-          .name {
-            font-weight: 400;
-            font-size: 26rpx;
-            color: #999;
-            margin: 0;
-          }
-
-          .num {
-            font-weight: 400;
-            font-size: 26rpx;
-            color: #999;
-            margin: 0 30rpx;
-            line-height: 20rpx;
-          }
-
-          .amount {
-            font-weight: bold;
-            font-size: 26rpx;
-            color: #333;
-          }
-        }
-      }
-    }
-
-    .favorable {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0 30rpx;
-      box-sizing: border-box;
-      padding-bottom: 26rpx;
-      padding-top: 26rpx;
-      border-bottom: 2rpx solid #e5e5e5;
-
-      .favorable_left {
-        display: flex;
-        align-items: center;
-
-        .icon {
-          width: 40rpx;
-          height: 40rpx;
-          margin-right: 16rpx;
-        }
-
-        .name {
-          font-size: 28rpx;
-          font-weight: 400rpx;
-          color: #333;
-        }
-      }
-
-      .favorable_right {
-        display: flex;
-        align-items: center;
-
-        .favorable_right_text {
-          font-size: 24rpx;
-          color: #999;
-          font-weight: 400rpx;
-        }
-      }
-
-      .favorable_right {
-        .column {
-          display: flex;
-          flex-direction: column;
-          align-items: flex-end;
-
-          .favorable_right_text {
-            margin-bottom: 10rpx;
-
-            text:nth-child(1) {
-              font-size: 26rpx;
-              color: #999;
-            }
-
-            text:nth-child(2) {
-              font-size: 26rpx;
-              color: #999;
-              margin: 0 30rpx;
-            }
-
-            text:nth-child(3) {
-              font-size: 26rpx;
-              color: #333;
-            }
-          }
-        }
-      }
-
-      .favorable_right.column {
-        align-items: flex-start;
-      }
-    }
-
-    .favorable.column {
-      align-items: flex-start;
-    }
-
-    .cell-item.column {
-      align-items: flex-start;
-    }
-
-    .total-wrap {
-      width: 100%;
-      display: flex;
-      justify-content: flex-end;
-      align-items: flex-end;
-      padding: 0 34rpx;
-      font-weight: bold;
-      font-size: 28rpx;
-      color: #333333;
-      margin-top: 64rpx;
-
-      .price {
-        font-weight: bold;
-        font-size: 36rpx;
-      }
-    }
-
-    .order_footer {
-      display: flex;
-      flex-direction: column;
-      padding: 34rpx;
-      position: relative;
-    }
-  }
-}
+	.clear-btn {
+		color: #333;
+		font-size: 24rpx;
+		font-weight: 500;
+	}
+
+	.cart-list-wrap {
+		.cart-header {
+			display: flex;
+			height: 72rpx;
+			background-color: #f2f2f2;
+			align-items: center;
+			justify-content: space-between;
+			padding: 20upx 28rpx;
+			border-radius: 20upx 20upx 0 0;
+
+			.num {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+			}
+
+			.clear {
+				display: flex;
+				align-items: center;
+
+				.t {
+					font-size: 24upx;
+					color: #999;
+					margin-left: 4upx;
+				}
+			}
+		}
+
+		.scroll-view {
+			max-height: 60vh;
+			margin-bottom: 190rpx;
+
+			.list-wrap {
+				padding: 0 28rpx;
+
+				&.pb-20 {
+					padding-bottom: 20px;
+				}
+
+				.ShoppingCart {
+					font-size: 30rpx;
+					text-align: left;
+					padding: 20rpx 0;
+					font-weight: 700;
+					border-bottom: 1rpx solid #cecece;
+					color: #000;
+				}
+
+				.shop-item:last-child {
+					border-bottom: 1rpx solid #cecece;
+					padding-bottom: 20rpx;
+				}
+
+				.shop-item {
+					margin-top: 15rpx;
+					display: flex;
+					flex-direction: column;
+
+					.shop-item-content {
+						display: flex;
+						justify-content: center;
+						align-items: center;
+
+						.cover {
+							position: relative;
+
+							.limit-discount {
+								position: absolute;
+								background: #cc5617;
+								font-size: 24rpx;
+								color: #fff;
+								border-radius: 20rpx 0 20rpx 0;
+								padding: 2rpx 10rpx;
+								z-index: 1;
+							}
+						}
+					}
+
+					.shop-item-remark {
+						display: flex;
+						align-items: center;
+						padding-right: 180rpx;
+						margin-top: 10rpx;
+
+						.label {
+							font-size: 28rpx;
+							color: #666;
+							margin-right: 20rpx;
+						}
+					}
+
+					.langcover {
+						position: relative;
+					}
+
+					.langcover::after {
+						content: "加载中..";
+						position: absolute;
+						top: 0;
+						left: 0;
+						height: 100%;
+						width: 100%;
+						background-color: #e8e8e8;
+						color: #6b6b6b;
+						border-radius: 10rpx;
+						text-align: center;
+						line-height: 180rpx;
+						z-index: 1;
+					}
+
+					.info {
+						flex: 1;
+						padding-left: 20rpx;
+
+						.name {
+							font-size: 28upx;
+							font-weight: bold;
+							color: #333;
+							margin-bottom: 5rpx;
+						}
+
+						.select-sku-wrap {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #999999;
+						}
+
+						.price-wrap {
+							margin-top: 8rpx;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+
+							.price {
+								display: flex;
+								align-items: baseline;
+
+								.i,
+								.num {
+									font-weight: bold;
+									font-size: 32rpx;
+									color: #333333;
+								}
+
+								.i {}
+
+								.price {
+									font-family: Source Han Sans CN, Source Han Sans CN;
+									font-weight: bold;
+									font-size: 32rpx;
+									color: #333333;
+								}
+
+								.originalprice {
+									color: #999;
+									margin-left: 10rpx;
+									font-weight: 400;
+									font-size: 24rpx;
+									text-decoration: line-through;
+								}
+
+								.unit {
+									font-family: Source Han Sans CN, Source Han Sans CN;
+									font-weight: 400;
+									font-size: 36rpx;
+									color: #333333;
+								}
+
+								.lineThrough {
+									font-weight: normal;
+									text-decoration: line-through;
+									color: #999 !important;
+									font-size: 24rpx !important;
+								}
+							}
+
+							.sku-wrap {
+								padding: 6upx 16upx;
+								background-color: #ffd100;
+								border-radius: 12upx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								position: relative;
+
+								.t {
+									font-size: 24upx;
+									font-weight: bold;
+								}
+
+								.dot {
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									font-size: 20upx;
+									position: absolute;
+									padding: 2upx 12upx;
+									border-radius: 8upx;
+									background-color: #eb5232;
+									color: #fff;
+									position: absolute;
+									top: -14upx;
+									right: -8upx;
+								}
+							}
+
+							.operation-wrap {
+								display: flex;
+								align-items: center;
+
+								.num {
+									font-size: 32upx;
+									padding: 0 16upx;
+								}
+
+								.btn {
+									position: relative;
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									position: relative;
+
+									.btnClick {
+										width: 100rpx;
+										height: 100rpx;
+										position: absolute;
+										// bottom: 0;
+									}
+
+									.btnClick.l {
+										right: 0;
+									}
+
+									.btnClick.r {
+										left: 0;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.card {
+			position: relative;
+
+			.cardcalorders {
+				position: relative;
+				padding: 20rpx 0;
+				font-size: 35rpx;
+				font-weight: bold;
+				border-bottom: 1rpx solid #cecece;
+				color: #000;
+
+				.absolute {
+					position: absolute;
+					right: 0;
+					top: 2rpx;
+					font-size: 24rpx;
+				}
+			}
+
+			.card_item {
+				display: flex;
+				flex-direction: column;
+				position: relative;
+
+				.head {
+					display: flex;
+					justify-content: space-between;
+
+					.head_left {
+						width: 100%;
+						display: flex;
+						justify-content: space-between;
+						padding: 20rpx 0;
+						border-bottom: 1rpx solid #cecece;
+
+						.placeNum {
+							font-weight: 700;
+							font-size: 27rpx;
+							color: #3e3d3d;
+						}
+
+						.placeTime {
+							font-weight: 400;
+							font-size: 32rpx;
+							color: #999;
+
+							.t {
+								margin-left: 4rpx;
+								font-size: 24rpx;
+							}
+						}
+					}
+				}
+
+				.shop-info {
+					border-bottom: 2rpx dashed #e5e5e5;
+
+					.item {
+						margin: 30rpx 0;
+						display: flex;
+
+						.info {
+							flex: 1;
+							display: flex;
+							flex-direction: column;
+							padding-left: 16upx;
+
+							.productName {
+								font-weight: bold;
+								font-size: 28rpx;
+								color: #333333;
+								margin-top: 20rpx;
+							}
+
+							.productSkuName {
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #999999;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 3;
+								overflow: hidden;
+								text-overflow: ellipsis;
+							}
+
+							.n {
+								font-size: 24upx;
+								color: #999;
+							}
+						}
+
+						.price {
+							display: flex;
+							flex-direction: column;
+							align-items: flex-end;
+
+							.priceAmount {
+								font-weight: 500;
+								font-size: 28rpx;
+								color: #333333;
+								margin-top: 26rpx;
+							}
+
+							.num {
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #999999;
+								margin-top: 22rpx;
+							}
+						}
+					}
+				}
+
+				.status {
+					align-self: flex-end;
+					width: 92rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					text-align: center;
+					background: #999999;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					font-weight: 400;
+					font-size: 22rpx;
+					color: #ffffff;
+					margin-top: 32rpx;
+				}
+
+				.totalAmount {
+					width: 100%;
+					display: flex;
+					justify-content: flex-end;
+					align-items: flex-end;
+					padding: 32rpx 0;
+					border-bottom: 2rpx dashed #e5e5e5;
+
+					.label {
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #333333;
+					}
+
+					.price {
+						font-weight: bold;
+						font-size: 36rpx;
+						color: #333333;
+					}
+				}
+
+				.semicircle_icon {
+					width: 100%;
+					position: absolute;
+					top: -22.5rpx;
+					left: 0;
+					display: flex;
+					justify-content: space-between;
+
+					.semicircle_left_icon {
+						width: 45rpx;
+						height: 45rpx;
+						margin-left: -22.5rpx;
+						background-color: #f9f9f9;
+						border-radius: 50%;
+						// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+					}
+
+					.semicircle_right_icon {
+						width: 45rpx;
+						height: 45rpx;
+						margin-right: -22.5rpx;
+						background-color: #f9f9f9;
+						border-radius: 50%;
+						// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+					}
+				}
+			}
+
+			.cell-item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 32rpx 34rpx 0 34rpx;
+
+				.label {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+					padding-bottom: 32rpx;
+				}
+
+				.val {
+					display: flex;
+					align-items: flex-end;
+					padding-bottom: 32rpx;
+					border-bottom: 2rpx dashed #e5e5e5;
+
+					view:nth-child(1) {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+						margin-right: 42rpx;
+					}
+
+					view:nth-child(2) {
+						display: flex;
+						align-items: flex-end;
+						font-weight: bold;
+						font-size: 36rpx;
+						color: #333333;
+					}
+				}
+
+				.val.column {
+					display: flex;
+					flex-direction: column;
+
+					.productCoupon {
+						display: flex;
+						align-items: flex-end;
+						margin: 0 0 10rpx 0;
+
+						.name {
+							font-weight: 400;
+							font-size: 26rpx;
+							color: #999;
+							margin: 0;
+						}
+
+						.num {
+							font-weight: 400;
+							font-size: 26rpx;
+							color: #999;
+							margin: 0 30rpx;
+							line-height: 20rpx;
+						}
+
+						.amount {
+							font-weight: bold;
+							font-size: 26rpx;
+							color: #333;
+						}
+					}
+				}
+			}
+
+			.favorable {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+				padding-bottom: 26rpx;
+				padding-top: 26rpx;
+				border-bottom: 2rpx solid #e5e5e5;
+
+				.favorable_left {
+					display: flex;
+					align-items: center;
+
+					.icon {
+						width: 40rpx;
+						height: 40rpx;
+						margin-right: 16rpx;
+					}
+
+					.name {
+						font-size: 28rpx;
+						font-weight: 400rpx;
+						color: #333;
+					}
+				}
+
+				.favorable_right {
+					display: flex;
+					align-items: center;
+
+					.favorable_right_text {
+						font-size: 24rpx;
+						color: #999;
+						font-weight: 400rpx;
+					}
+				}
+
+				.favorable_right {
+					.column {
+						display: flex;
+						flex-direction: column;
+						align-items: flex-end;
+
+						.favorable_right_text {
+							margin-bottom: 10rpx;
+
+							text:nth-child(1) {
+								font-size: 26rpx;
+								color: #999;
+							}
+
+							text:nth-child(2) {
+								font-size: 26rpx;
+								color: #999;
+								margin: 0 30rpx;
+							}
+
+							text:nth-child(3) {
+								font-size: 26rpx;
+								color: #333;
+							}
+						}
+					}
+				}
+
+				.favorable_right.column {
+					align-items: flex-start;
+				}
+			}
+
+			.favorable.column {
+				align-items: flex-start;
+			}
+
+			.cell-item.column {
+				align-items: flex-start;
+			}
+
+			.total-wrap {
+				width: 100%;
+				display: flex;
+				justify-content: flex-end;
+				align-items: flex-end;
+				padding: 0 34rpx;
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				margin-top: 64rpx;
+
+				.price {
+					font-weight: bold;
+					font-size: 36rpx;
+				}
+			}
+
+			.order_footer {
+				display: flex;
+				flex-direction: column;
+				padding: 34rpx;
+				position: relative;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 50796cb..86b51b7 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -318,7 +318,7 @@
 		<shopindex ref="showShopInfoRef"></shopindex>
 		<!-- 购物车 -->
 		<shoppingCartes :cartLists_count="cartLists_count" :cartList="matchedProducts" :showCart="showCart"
-			:limitDiscount="limitTimeDiscountRes" @customevent="websocketsendMessage" @close="showCart = !showCart"
+			:limitDiscount="limitTimeDiscountRes" @customevent="websocketsendMessage" @close="showCart = !showCart"  
 			:orderinfo="orderinfo" @clickcancelOrder="clickcancelOrder" v-if="cartLists_count > 0"
 			:nextFullAmountActivty="nextFullAmountActivty"></shoppingCartes>
 

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 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=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;
 

From ecff4204e4f27e87c79d78b2f3cc3b6db0bbf981 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 18 Dec 2025 10:38:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=A4=87=E6=B3=A8=E5=8A=9F=E8=83=BD,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98,?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=80=89=E6=8B=A9=E6=95=B0=E9=87=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/paymentMethod.vue                | 355 ++++++++++----------
 pages/order/components/order-item.vue       |   2 +-
 pages/product/components/shoppingCartes.vue |   2 +-
 3 files changed, 175 insertions(+), 184 deletions(-)

diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue
index 7b3aad7..6196bc2 100644
--- a/components/paymentMethod.vue
+++ b/components/paymentMethod.vue
@@ -1,49 +1,35 @@
 <template>
-  <!-- 支付方式 -->
-  <view class="paymentMethod">
-    <view class="paymentMethod_content">
-      <view class="paymentMethod_title">支付方式</view>
-      <up-radio-group
-        v-model="radiovalue.type"
-        iconPlacement="right"
-        @change="groupChanges"
-        :size="28"
-        placement="column"
-      >
-        <block v-for="(item, index) in paymentMethodList" :key="index">
-          <view
-            class="method_list"
-            @click="groupChanges(item.type)"
-            :class="{ disabled: returnDisabled(item) }"
-          >
-            <view class="method_list_top">
-              <view class="method_list_top_left">
-                <image class="icon" :src="item.url" mode="aspectFill" />
-                <view class="method_list_top_cen">
-                  <view class="name"> {{ item.name }} </view>
-                  <view class="method_list_bom" v-if="item.name == '余额支付'">
-                    <text class="balance">
-                      当前余额￥{{ orderVIP ? orderVIP.amount || 0 : 0 }}</text
-                    >
-                    <text class="topUpNow" @click="goRecharge">去充值</text>
-                  </view>
-                </view>
-              </view>
-              <up-radio
-                :disabled="returnDisabled(item)"
-                activeColor="#E8AD7B"
-                icon-size="18"
-                size="18"
-                :name="item.type"
-              >
-              </up-radio>
-            </view>
-          </view>
-        </block>
-      </up-radio-group>
-    </view>
-    <slot name="bottom"></slot>
-  </view>
+	<!-- 支付方式 -->
+	<view class="paymentMethod">
+		<view class="paymentMethod_content">
+			<view class="paymentMethod_title">支付方式</view>
+			<up-radio-group v-model="radiovalue.type" iconPlacement="right" @change="groupChanges" :size="28"
+				placement="column">
+				<block v-for="(item, index) in paymentMethodList" :key="index">
+					<view class="method_list" @click="groupChanges(item.type)"
+						:class="{ disabled: returnDisabled(item) }">
+						<view class="method_list_top">
+							<view class="method_list_top_left">
+								<image class="icon" :src="item.url" mode="aspectFill" />
+								<view class="method_list_top_cen">
+									<view class="name"> {{ item.name }} </view>
+									<view class="method_list_bom" v-if="item.name == '余额支付'">
+										<text class="balance">
+											当前余额￥{{ orderVIP ? orderVIP.amount || 0 : 0 }}</text>
+										<text class="topUpNow" @click="goRecharge">去充值</text>
+									</view>
+								</view>
+							</view>
+							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18"
+								:name="item.type">
+							</up-radio>
+						</view>
+					</view>
+				</block>
+			</up-radio-group>
+		</view>
+		<slot name="bottom"></slot>
+	</view>
 </template>
 
 <script setup>
@@ -56,6 +42,7 @@ import {
   watch,
   watchEffect,
   defineExpose,
+  onMounted // 新增：用于初始化默认值
 } from "vue";
 
 const props = defineProps({
@@ -77,18 +64,17 @@ const props = defineProps({
   },
   disablePayType: {
     type: Array,
-    default: () => {
-      return [];
-    },
+    default: () => [],
   },
 });
 
+// 工具函数 - 深拷贝对象（切断引用）
+const deepClone = (obj) => {
+  return JSON.parse(JSON.stringify(obj));
+};
+
 function returnDisabled(item) {
-  if (props.disablePayType.includes(item.name)) {
-    return true;
-  } else {
-    return false;
-  }
+  return props.disablePayType.includes(item.name);
 }
 
 const orderVIP = ref(null);
@@ -101,6 +87,7 @@ const orderVIPfun = (data) => {
   orderVIP.value = data;
 };
 
+// 支付方式列表（保持不变）
 const paymentMethodList = ref([
   // #ifdef MP-WEIXIN
   {
@@ -126,80 +113,94 @@ const paymentMethodList = ref([
   },
 ]);
 
-const paymentMethodName = ref([
-  {
-    name: "余额支付",
-    type: 1,
-    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-    payType: "accountPay",
-  },
-  {
-    name: "微信支付",
-    type: 2,
-    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-    payType: "wechatPay",
-  },
-  {
-    name: "支付宝支付",
-    type: 3,
-    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-    payType: "aliPay",
-  },
-]);
-
-// const radiovalue = ref(2); // 支付方式
+// 修复核心：defineModel 先声明为空对象（无本地变量依赖）
 const radiovalue = defineModel({
   type: Object,
-  default: () => {
-    return {
-      name: "微信支付",
-      type: 2,
-      url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-      payType: "wechatPay",
-    };
-  },
+  default: () => ({}), // 基础默认值，不引用任何本地变量
 });
 
+// 新增：在 onMounted 中初始化 defineModel 的真实默认值
+onMounted(() => {
+  // 1. 找到默认的微信支付项（兼容不同平台）
+  let defaultItem = paymentMethodList.value.find(item => item.type === 2);
+  // 兜底：如果没有微信支付（如支付宝平台），取第一个可用项
+  if (!defaultItem) {
+    defaultItem = paymentMethodList.value[0];
+  }
+  // 2. 深拷贝后赋值，避免引用污染
+  if (defaultItem) {
+    radiovalue.value = deepClone(defaultItem);
+  }
+
+  // 3. 触发一次 disablePayType 的监听逻辑（确保初始值符合禁用规则）
+  const canUsePayType = paymentMethodList.value.filter((item) => {
+    return !props.disablePayType.includes(item.name);
+  });
+  if (canUsePayType.length > 0 && !canUsePayType.find(v => v.type === radiovalue.value.type)) {
+    radiovalue.value = deepClone(canUsePayType[0]);
+  }
+});
+
+// 修复：watch 监听 disablePayType（调整逻辑，依赖 radiovalue 已初始化）
 watch(
   () => props.disablePayType,
   (newval) => {
-	console.log('props.disablePayType',newval)
+    console.log('props.disablePayType', newval);
+    // 加兜底：radiovalue 未初始化时不处理
+    if (Object.keys(radiovalue.value).length === 0) return;
+
     const canUsePayType = paymentMethodList.value.filter((item) => {
-      return  !newval.includes(item.name);
+      return !newval.includes(item.name);
     });
-    if (canUsePayType.find((v) => v.type == radiovalue.value.type)) {
-      return;
+    if (canUsePayType.length === 0) return;
+
+    const currentValid = canUsePayType.find((v) => v.type === radiovalue.value.type);
+    if (!currentValid) {
+      radiovalue.value = deepClone(canUsePayType[0]);
     }
-    radiovalue.value = canUsePayType[0];
   },
   {
-    immediate: true,
+    immediate: false, // 改为 false，避免在 radiovalue 初始化前执行
+    deep: true,
   }
 );
 
-// * 监听支付方式切换
+// 支付方式切换逻辑（保持之前的修复）
 const groupChanges = (type) => {
-  if (props.freeCheck && type == 1) {
+  console.log('type（原始入参）', type);
+  const typeNum = Number(type);
+  if (isNaN(typeNum)) {
+    uni.showToast({ title: "支付方式选择异常", icon: "none" });
     return;
   }
-  const item = paymentMethodList.value.find((v) => v.type == type);
 
-  if (item && returnDisabled(item)) {
-    uni.showToast({
-      title: "当前支付方式不可用",
-      icon: "none",
-    });
+  if (props.freeCheck && typeNum === 1) {
     return;
   }
-  // if (props.payAmount <= 0 && type != 1) {
-  // 	return;
-  // }
-  radiovalue.value = item;
+
+  console.log('paymentMethodList', paymentMethodList.value);
+  const item = paymentMethodList.value.find((v) => v.type === typeNum);
+  console.log('匹配到的item', item);
+
+  if (!item) {
+    uni.showToast({ title: "当前支付方式不存在", icon: "none" });
+    return;
+  }
+
+  if (returnDisabled(item)) {
+    uni.showToast({ title: "当前支付方式不可用", icon: "none" });
+    return;
+  }
+
+  radiovalue.value = deepClone(item);
 };
 
-watch(()=> radiovalue.value.type,(newval)=>{
-	emits("groupChange", radiovalue.value);
-})
+// 监听 radiovalue 变化触发事件
+watch(() => radiovalue.value.type, (newval) => {
+  if (newval) { // 加兜底：避免初始值为空时触发
+    emits("groupChange", radiovalue.value);
+  }
+});
 
 // 去充值
 const goRecharge = () => {
@@ -207,23 +208,10 @@ const goRecharge = () => {
     return;
   }
   uni.navigateTo({
-    url: "/pages/user/member/czzx?shopId=" + orderVIP.value.shopId,
+    url: `/pages/user/member/czzx?shopId=${orderVIP.value?.shopId || ''}`,
   });
-  // if (orderVIP.value.isVip) {
-  //   uni.navigateTo({
-  //     url: "/pages/user/member/czzx?shopId=" + orderVIP.value.shopId,
-  //   });
-  //   return;
-  // }
-  // uni.navigateTo({
-  //   url: "/user/vip/buy-vip?shopId=" + orderVIP.value.shopId,
-  // });
-
-  // uni.pro.navigateTo('user/member/index', {
-  // 	shopId: orderVIP.value.shopId
-  // })
 };
-// 将方法暴露给父组件
+
 defineExpose({
   groupChanges,
   orderVIPfun,
@@ -231,79 +219,82 @@ defineExpose({
 </script>
 
 <style lang="scss">
-.paymentMethod {
-  box-sizing: border-box;
-  margin-top: 30rpx;
-  background-color: #fff;
-  border-radius: 20rpx;
+	.paymentMethod {
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
 
 
-  .paymentMethod_content {
-    padding: 30rpx 30rpx 0 30rpx;
-    box-sizing: border-box;
+		.paymentMethod_content {
+			padding: 30rpx 30rpx 0 30rpx;
+			box-sizing: border-box;
 
-    .paymentMethod_title {
-      font-weight: 500;
-      font-size: 32rpx;
-      color: #333333;
-      box-sizing: border-box;
-    }
+			.paymentMethod_title {
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				box-sizing: border-box;
+			}
 
-    .method_list {
-      padding: 40rpx 0;
-      box-sizing: border-box;
-      &.disabled {
-        opacity: 0.6;
-      }
-      .method_list_top {
-        display: flex;
-        justify-content: space-between;
+			.method_list {
+				padding: 40rpx 0;
+				box-sizing: border-box;
 
-        .method_list_top_left {
-          display: flex;
-          align-items: center;
+				&.disabled {
+					opacity: 0.6;
+				}
 
-          .icon {
-            width: 54.67rpx !important;
-            height: 48rpx !important;
-            margin-right: 22rpx;
-          }
+				.method_list_top {
+					display: flex;
+					justify-content: space-between;
 
-          .name {
-            font-size: 32rpx;
-            font-weight: 500;
-            color: #333;
-          }
+					.method_list_top_left {
+						display: flex;
+						align-items: center;
 
-          .method_list_top_cen {
-            display: flex;
-            flex-direction: column;
-          }
-        }
-      }
+						.icon {
+							width: 54.67rpx !important;
+							height: 48rpx !important;
+							margin-right: 22rpx;
+						}
 
-      .method_list_bom {
-        display: flex;
-        align-items: center;
+						.name {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #333;
+						}
 
-        .balance {
-          margin-right: 20rpx;
-          font-size: 24rpx;
-        }
+						.method_list_top_cen {
+							display: flex;
+							flex-direction: column;
+						}
+					}
+				}
 
-        .topUpNow {
-          color: #ff803d;
-          font-size: 28rpx;
-        }
-      }
-    }
+				.method_list_bom {
+					display: flex;
+					align-items: center;
 
-    .method_list:nth-child(odd) {
-      border-bottom: 2rpx solid #e5e5e5;
-    }
-    .method_list:nth-child(2) {
-      padding-bottom: 22rpx;
-    }
-  }
-}
+					.balance {
+						margin-right: 20rpx;
+						font-size: 24rpx;
+					}
+
+					.topUpNow {
+						color: #ff803d;
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.method_list:nth-child(odd) {
+				border-bottom: 2rpx solid #e5e5e5;
+			}
+
+			.method_list:nth-child(2) {
+				padding-bottom: 22rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
index 067d2da..b0b67be 100644
--- a/pages/order/components/order-item.vue
+++ b/pages/order/components/order-item.vue
@@ -29,7 +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>
+		  <view class="color-666 u-font-24 u-m-t-4" style="max-width: 328rpx;word-break: break-all;" v-if="item.remark">备注：{{item.remark}}</view>
           <template v-if="showLimitDiscount(item)">
             <text
               class="limitDiscount-time"
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index 27ff0c2..a2c52f0 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -99,7 +99,7 @@
 
 		<model v-model="modelData.show" title="单品备注" @confirm="modelDataConfirm">
 			<view class="u-p-40">
-				<up-input v-model="modelData.item.cartListinfo.remark" placeholder="备注"></up-input>
+				<up-input v-model="modelData.item.cartListinfo.remark" placeholder="备注(50字以内)" :maxlength="50"></up-input>
 			</view>
 		</model>
 	</view>