From 4ff143ab2944c1d516c663ccb4ee4b831dd71335 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Tue, 28 Oct 2025 00:23:42 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=97=85=E5=B1=85=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E9=80=BB=E8=BE=91=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DateRangePicker/DateRangePicker.vue       | 18 ++++++------
 pkg_product/views/groupBuyDetails.vue         | 29 +++++++++++++++----
 pkg_product/views/healthSanctum.vue           |  2 ++
 pkg_product/views/sojoumStore.vue             | 27 ++++++++++-------
 pkg_product/views/submitOrder.vue             |  3 +-
 pkg_user/views/giftList.vue                   |  2 +-
 6 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/components/DateRangePicker/DateRangePicker.vue b/components/DateRangePicker/DateRangePicker.vue
index 2db4873..e128c2e 100644
--- a/components/DateRangePicker/DateRangePicker.vue
+++ b/components/DateRangePicker/DateRangePicker.vue
@@ -345,13 +345,13 @@ export default {
       const currentDate = new Date(this.tempStartDate)
       while (currentDate <= this.tempEndDate) {
         const day = currentDate.getDate()
-        if (this.isDisabled(day)) {
-          uni.showToast({
-            title: '所选日期范围包含不可预约日期，请重新选择',
-            icon: 'none'
-          })
-          return
-        }
+        // if (this.isDisabled(day)) {
+        //   uni.showToast({
+        //     title: '所选日期范围包含不可预约日期，请重新选择',
+        //     icon: 'none'
+        //   })
+        //   return
+        // }
         currentDate.setDate(currentDate.getDate() + 1)
       }
   
@@ -362,7 +362,7 @@ export default {
         this.startDate ? this.formatDate(this.startDate) : null,
         this.endDate ? this.formatDate(this.endDate) : null
       ])
-      this.handleClose(false)
+      this.handleClose(true)
     },
 
     handleClose(shouldClear = true) {
@@ -370,7 +370,7 @@ export default {
         this.clearDates()
         this.startDate = null
         this.endDate = null
-        this.$emit('input', [null, null])
+        // this.$emit('input', [null, null])
       }
       this.$emit('update:show', false)
       this.$emit('close')
diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index c17bd6e..a6b05bf 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -1,5 +1,14 @@
 <template>
   <view class="group-detail">
+    <!-- 头部 -->
+     <hx-navbar
+      :fixed="true"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
+      statusBarFontColor="#ffffff"
+      barPlaceholder="hidden"
+      transparent="auto"
+      color='#ffffff'
+    />
     <scroll-view scroll-y class="page-scroll">
       <!-- 顶部大图/轮播 -->
       <swiper class="hero-swiper" indicator-dots autoplay interval="3000">
@@ -18,7 +27,7 @@
         
       </view>
       <!-- 礼物 -->
-      <view class="v12-px-3">
+      <view class="v12-px-3" v-if="detail.isGift">
         <view  
           @click="toGift"
           class=" v12-white-text v12-px-2 v12-py-1 v12-mt-2 v12-radius-20 v12-font-bold v12-justify-between v12-align-center gift-wrap"
@@ -72,8 +81,10 @@
                 <view class="v12-px-2 v12-py-1"><u-icon name="home"></u-icon></view>
                 <view class="v12-px-2 v12-py-1 v12-white v12-radius-100">{{ c.title }}</view>
               </view>
-              <view v-for="(img, idx) in c.images" :key="idx" class="v12-justify-start v12-align-center">
-                <image :src="img" class="grid-img" mode="aspectFill" />
+              <view class="v12-justify-start v12-align-center" style="display: flex; flex-wrap: wrap;">
+                <view v-for="(img, idx) in c.images" :key="idx" class="v12-mr-2 v12-mb-2 v12-align-center" style="width: calc(33.33% - 16rpx);">
+                  <image :src="img" class="grid-img" mode="aspectFill" style="width: 100%; height: 200rpx;" />
+                </view>
               </view>
               <view v-if="c.description" class="v12-font-26 v12-mt-2">{{ c.description }}</view>
             </view>
@@ -88,7 +99,7 @@
             <rich-text :nodes="rules"></rich-text>
           </view>
           <!-- 表格 -->
-          <view class="simple-table">
+          <!-- <view class="simple-table">
             <view class="table-row">
               <view class="table-cell">申请退款时间</view>
               <view class="table-cell">费用</view>
@@ -105,7 +116,7 @@
               <view class="table-cell">入住前x天</view>
               <view class="table-cell"></view>
             </view>
-          </view>
+          </view> -->
         </view>
       </view>
       <view class="v12-px-3 v12-mt-3">
@@ -139,7 +150,6 @@
     ></Calendar> -->
     <DateRangePicker
       ref="dateRangePicker"
-      v-model="dateRange"
       :show="showDatePicker"
       :minBookingDays="detail.minBookingDays"
       :travelGroupProductId="detail.id"
@@ -294,6 +304,13 @@ export default {
       })
     },
     bookNow() {
+      if(!this.dateRange[0] || !this.dateRange[1]){
+        uni.showToast({
+          title: '请选择预约日期',
+          icon: 'none'
+        })
+        return
+      }
       uni.navigateTo({ url: '/pkg_product/views/submitOrder?id=' + this.id + '&orderStartDate=' + this.dateRange[0] + '&orderEndDate=' + this.dateRange[1] })
     },
     /**
diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 6a1e1f0..9b7afd2 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -126,6 +126,7 @@ export default {
     getList() {
       const params = {
         // countyId: this.cityId,
+        // cityId: this.cityId,
         wellnessPlaceCateId : this.categoryId,
         shopType: 'wellness',
         page: 1,
@@ -143,6 +144,7 @@ export default {
     },
     getTop() {
       const params = {
+        // cityId: this.cityId,
         shopType: 'wellness',
         page: 1,
         limit: 9999
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index bee1488..4fa277f 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -23,8 +23,8 @@
       <view class="v12-pa-3 v12-justify-between v12-align-center">
         <view class="sojum-title">{{ store.name }}</view>
         <view class="v12-align-center v12-radius-100 v12-primary v12-primary-border" style="height:38rpx">
-          <view class="v12-align-center v12-font-22 v12-white-text v12-px-2" style="height: 100%;">营业时间</view>
-          <view class="v12-align-center v12-primary-border v12-font-22 v12-ml-1 v12-px-2 v12-radius-100 v12-white" style="height: 100%;">{{ store.serviceTime }} - {{ store.serviceEndTime }}</view>
+          <view class="v12-align-center v12-font-22 v12-white-text v12-px-2" style=" white-space: nowrap;height: 100%;">营业时间</view>
+          <view class="v12-align-center v12-primary-border v12-font-22 v12-ml-1 v12-px-2 v12-radius-100 v12-white" style=" white-space: nowrap;height: 100%;">{{ store.serviceTime }} - {{ store.serviceEndTime }}</view>
         </view>
       </view>
       <!-- <view class="v12-pa-3">
@@ -223,14 +223,14 @@
           v-if="activeIndex === 2"
           class="qualifications-section"
         >
-          <view v-if="store.qualification !== []">
-          <image
-            v-for="(item, index) in store.qualification || []"
-            :key="index"
-            :src="item"
-            class="store-img"
-            mode="widthFix"
-          />
+          <view v-if="store.qualification.length === 0">
+            <image
+              v-for="(item, index) in store.qualification || []"
+              :key="index"
+              :src="item"
+              class="store-img"
+              mode="widthFix"
+            />
           </view>
           
           <view v-else class="tab-no-data">
@@ -265,6 +265,9 @@
               </view>
             </view>
           </view>
+          <view v-if="jiaLouProductArr.length === 0" class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
         </view>
         <!-- 管家 -->
          <view v-if="activeIndex === 4" class="v12-pa-3" style="background: #F5F5F5;">
@@ -290,6 +293,9 @@
               </view>
             </view>
           </view>  
+          <view v-if="jiaLouStewardArr.length === 0" class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
          </view>
       </view>
       <!-- 分享 -->
@@ -708,6 +714,7 @@ export default {
   font-size: 32rpx;
   color: #999;
   line-height: 200rpx;
+  width: 100%;
 }
 .btLine {
   width: 100%;
diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index 6a5aec6..d2c7772 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -103,7 +103,7 @@
       </view>
       <view class="bar-actions">
         <view class="mini-btn" @click="contactMerchant">联系商家</view>
-        <view class="buy-btn" @click="subscribePay">立即购买</view>
+        <view class="buy-btn"  @click="subscribePay()">立即购买</view>
       </view>
     </view>
 
@@ -417,4 +417,5 @@ export default {
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { padding: 16rpx 22rpx; border: 1rpx solid #ccc; border-radius: 32rpx; font-size: 26rpx; color: #333; }
 .buy-btn { padding: 16rpx 28rpx; border-radius: 32rpx; background: #C52733; color: #fff; font-size: 26rpx; }
+.buy-btn.disabled { background: #ccc; pointer-events: none; }
 </style>
\ No newline at end of file
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index d0b1490..a153ed7 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -283,7 +283,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}&isTravelGroup=${this.giftItem.isTravelGroup}`,
       imageUrl: this.giftItem.templateInfo.image
     }
   },