From 2ed4373a8f15564139021d6d7880b5913075d2cb Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Thu, 26 Mar 2026 22:45:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E6=94=B9=E5=8A=A8commodityTypeCode=E6=94=B9=E4=B8=BAo?=
 =?UTF-8?q?rderType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages-booking/index.vue                    | 10 +++++-----
 .../order/components/GoodsInfo/index.vue       | 10 +++++-----
 src/pages-order/order/detail.vue               |  2 +-
 .../components/DateSelector/styles/index.scss  |  4 ++--
 .../goods/components/GoodConfirm/index.vue     | 18 +++++++++---------
 src/pages/goods/index.vue                      | 11 ++++++-----
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/pages-booking/index.vue b/src/pages-booking/index.vue
index f6ce226..ba98143 100644
--- a/src/pages-booking/index.vue
+++ b/src/pages-booking/index.vue
@@ -7,7 +7,7 @@
       :shadow="false"
     >
       <template #title>
-        {{ GOODS_TYPE[orderData.commodityTypeCode] }}
+        {{ GOODS_TYPE[orderData.orderType] }}
       </template>
     </TopNavBar>
 
@@ -18,7 +18,7 @@
       <view class="border-box bg-white p-12 rounded-12 mb-12">
         <!-- 酒店类型入住离店日期部分 -->
         <DateRangeSection
-          v-if="orderData.commodityTypeCode === '0'"
+          v-if="orderData.orderType === 0"
           :selectedDate="selectedDate"
           :showBtn="true"
           @click="navigateToDetail(orderData)"
@@ -64,7 +64,7 @@
 
       <!-- 非酒店类型 -->
       <ContactSection
-        v-if="orderData.commodityTypeCode !== '0'"
+        v-if="orderData.orderType !== 0"
         v-model="quantity"
         :userFormList="userFormList"
         v-model:reservationDate="selectedReservationDate"
@@ -72,7 +72,7 @@
 
       <!-- 酒店类型 -->
       <UserSection
-        v-if="orderData.commodityTypeCode === '0'"
+        v-if="orderData.orderType === 0"
         v-model="quantity"
         :userFormList="userFormList"
       />
@@ -253,7 +253,7 @@ const handlePayClick = ThrottleUtils.createThrottle(async (goodsData) => {
     };
 
     //酒店类型添加入住时间、离店时间
-    if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
+    if (goodsData.orderType === 0 && selectedDate.value) {
       const { startDate, endDate } = selectedDate.value;
       // 入住时间
       params.checkInData = startDate;
diff --git a/src/pages-order/order/components/GoodsInfo/index.vue b/src/pages-order/order/components/GoodsInfo/index.vue
index bd495a7..15f83af 100644
--- a/src/pages-order/order/components/GoodsInfo/index.vue
+++ b/src/pages-order/order/components/GoodsInfo/index.vue
@@ -1,11 +1,11 @@
 <template>
   <view
-    v-if="commodityTypeCode === '0'"
+    v-if="orderType === '0'"
     class="border-box bg-white p-12 rounded-12 mb-12"
   >
     <!-- 酒店类型入住离店日期部分 -->
     <DateRangeSection
-      v-if="orderData.commodityTypeCode === '0'"
+      v-if="orderData.orderType === 0"
       :selectedDate="selectedDate"
     />
 
@@ -32,7 +32,7 @@
   </view>
 
   <view
-    v-if="commodityTypeCode !== '0'"
+    v-if="orderType !== '0'"
     class="border-box bg-white p-12 rounded-12 mb-12"
   >
     <view
@@ -80,12 +80,12 @@ const selectedDate = computed(() => {
   };
 });
 
-const commodityTypeCode = computed(() => props.orderData.commodityTypeCode);
+const orderType = computed(() => props.orderData.orderType);
 
 const commodityAmount = computed(() => {
   // 门票单位：张、餐饮单位：份
   const { commodityAmount } = props.orderData;
-  return commodityTypeCode.value === "2"
+  return orderType.value === "2"
     ? `${parseInt(commodityAmount)}张`
     : `${parseInt(commodityAmount)}份`;
 });
diff --git a/src/pages-order/order/detail.vue b/src/pages-order/order/detail.vue
index f2bcdc0..d98d704 100644
--- a/src/pages-order/order/detail.vue
+++ b/src/pages-order/order/detail.vue
@@ -11,7 +11,7 @@
 
       <GoodsInfo :orderData="orderData" />
 
-      <UserInfo v-if="orderData.commodityTypeCode === '0'" :orderData="orderData" />
+      <UserInfo v-if="orderData.orderType === 0" :orderData="orderData" />
 
       <OrderInfo :orderData="orderData" />
     </view>
diff --git a/src/pages/goods/components/DateSelector/styles/index.scss b/src/pages/goods/components/DateSelector/styles/index.scss
index 0aa5175..ab0aaa5 100644
--- a/src/pages/goods/components/DateSelector/styles/index.scss
+++ b/src/pages/goods/components/DateSelector/styles/index.scss
@@ -2,8 +2,8 @@
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
-  margin: 24rpx 0 12rpx;
-  padding: 12rpx 0;
+  margin: 12px 0;
+  padding: 0 12px;
 }
 
 .date-item {
diff --git a/src/pages/goods/components/GoodConfirm/index.vue b/src/pages/goods/components/GoodConfirm/index.vue
index b8ea00a..d1f0e06 100644
--- a/src/pages/goods/components/GoodConfirm/index.vue
+++ b/src/pages/goods/components/GoodConfirm/index.vue
@@ -39,7 +39,7 @@
                 }}</view>
                 <view class="goods-price">
                   <text class="currency">¥</text>
-                  <template v-if="goodsData.commodityTypeCode === '0'">
+                  <template v-if="goodsData.orderType === 0">
                     <text class="price">
                       {{ goodsData.calculatedTotalPrice || 0 }}
                     </text>
@@ -106,7 +106,7 @@
           <!-- 总价区域 -->
           <SumCard
             :referencePrice="
-              goodsData.commodityTypeCode === '0'
+              goodsData.orderType === 0
                 ? goodsData.calculatedTotalPrice
                 : goodsData.specificationPrice
             "
@@ -153,9 +153,9 @@ const isValidUserForm = (user) => {
 
 // 常量定义
 const COMMODITY_TYPES = {
-  HOTEL: "0",
-  TICKET: "1",
-  DINING: "2",
+  HOTEL: 0,
+  TICKET: 1,
+  DINING: 2,
 };
 
 const DEFAULT_PRICE = 399;
@@ -166,7 +166,7 @@ const props = defineProps({
   goodsData: {
     type: Object,
     default: () => ({
-      commodityTypeCode: "0",
+      orderType: "0",
       specificationPrice: "",
       commodityName: "",
       commodityPhotoList: [],
@@ -195,14 +195,14 @@ const isDeleting = ref(false); // 标志位，防止删除时watch冲突
 // 计算属性
 const totalPrice = computed(() => {
   const price =
-    props.goodsData?.commodityTypeCode === "0"
+    props.goodsData?.orderType === 0
       ? props.goodsData?.calculatedTotalPrice
       : props.goodsData?.specificationPrice || 0;
   return (price * quantity.value).toFixed(0);
 });
 
 const isHotelType = computed(() => {
-  return props.goodsData?.commodityTypeCode === COMMODITY_TYPES.HOTEL;
+  return props.goodsData?.orderType === COMMODITY_TYPES.HOTEL;
 });
 
 const sectionTitle = computed(() => {
@@ -332,7 +332,7 @@ const confirmOrder = () => {
         visitorName: user.visitorName.trim(),
         contactPhone: user.contactPhone.trim(),
       })),
-      commodityType: props.goodsData?.commodityTypeCode,
+      commodityType: props.goodsData?.orderType,
       timestamp: Date.now(),
     };
 
diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index c7a4273..14b240f 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -25,7 +25,7 @@
 
         <!-- 日期选择区域 -->
         <DateSelector
-          v-if="goodsData.commodityTypeCode === '0'"
+          v-if="goodsData.orderType === 0"
           @showCalendar="showCalendar"
           :checkInDate="selectedDate.startDate"
           :checkOutDate="selectedDate.endDate"
@@ -34,10 +34,11 @@
           :nights="selectedDate.totalDays"
         />
 
-        <GoodPackage v-if="goodsData.commodityPackageConfig && goodsData.commodityPackageConfig.length > 0" :goodsData="goodsData" />
+        <!-- 商品套餐组件 -->
+        <GoodPackage v-if="goodsData.orderType !== 0 && goodsData.commodityPackageConfig && goodsData.commodityPackageConfig.length > 0" :goodsData="goodsData" />
 
         <!-- 商品设施组件 -->
-        <GoodFacility :goodsData="goodsData" />
+        <GoodFacility v-if="goodsData.commodityEquipment && goodsData.commodityEquipment.length > 0" :goodsData="goodsData" />
 
         <!-- 商品详情组件 -->
         <GoodDetail :goodsData="goodsData" />
@@ -127,7 +128,7 @@ const goodsInfo = async (params) => {
   calculatedTotalPrice.value = goodsData.value.specificationPrice || 0;
 
   // 判断是酒店类型订单再获取获取商品日价格及库存
-  if (goodsData.value.commodityTypeCode === "0") {
+  if (goodsData.value.orderType === 0) {
     configGoodsData();
     getGoodsDailyPrice({
       commodityId: goodsData.value.commodityId,
@@ -188,7 +189,7 @@ const handleDateSelect = (data) => {
   selectedDateStore.setData(selectedDate.value);
 
   // 根据商品类型计算价格
-  if (goodsData.value.commodityTypeCode === "0") {
+  if (goodsData.value.orderType === 0) {
     // 酒店类型：计算dateRange总价格，排除最后一天（同一天除外）
     if (data.dateRange && Array.isArray(data.dateRange)) {
       // 获取默认价格作为回退值