songzhen преди 1 месец
родител
ревизия
cfde4db2f1

+ 1 - 0
src/components/Profile/TravelOrders/ShareModal/ProjectInfo.vue

@@ -6,6 +6,7 @@
       height="120px"
       fit="cover"
       class="shrink-0"
+      radius="4px"
     ></van-image>
     <div class="flex-1">
       <div class="text-sm">

+ 6 - 1
src/components/TravelProjectDetail/BookInfoCalendar.vue

@@ -22,7 +22,8 @@
           <div class="text-base font-semibold">{{ day.day }}</div>
           <div v-if="isAvailableDate(day.id)" class="scale-90 text-sm">
             <template v-if="calendarData[day.id]?.adultPrice"
-              >¥{{ calendarData[day.id]?.adultPrice }}</template
+              >{{ projectData.priceUnit
+              }}{{ calendarData[day.id]?.adultPrice }}</template
             >
             <template v-else>¥????</template>
           </div>
@@ -38,6 +39,10 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  projectData: {
+    type: Object,
+    default: () => ({}),
+  },
 });
 
 const emit = defineEmits(["onClose"]);

+ 2 - 1
src/components/TravelProjectDetail/BottomBar.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="fixed bottom-0 px-15 left-0 right-0 h-70 z-50 bg-white shadow-[0px_2px_14px_1px_rgba(0,0,0,0.12)] flex items-center"
+    class="fixed bottom-0 px-15 left-0 right-0 h-80 z-50 bg-white shadow-[0px_2px_14px_1px_rgba(0,0,0,0.12)] flex items-center"
   >
     <div
       @click="handleBook"
@@ -16,6 +16,7 @@
     </div>
     <TravelProjectDetailNomalBookModal
       v-model:show="nomalBookModalOptions.show"
+      :project-data="detailData"
     />
     <TravelProjectDetailPinTuanKaiTuanApplyBottomModal
       v-model:show="kaiTuanApplyModalOptions.show"

+ 5 - 0
src/components/TravelProjectDetail/NomalBookModal.vue

@@ -125,6 +125,7 @@
         v-model:date="bookInfo.startDate"
         :calendar-data="calendarData"
         @on-close="showCalendarPicker = false"
+        :project-data="projectData"
       />
     </van-popup>
   </div>
@@ -144,6 +145,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  projectData: {
+    type: Object,
+    default: () => ({}),
+  },
 });
 
 const show = defineModel("show", false);

+ 6 - 7
src/components/TravelProjectDetail/PinTuan/Button.vue

@@ -1,16 +1,15 @@
 <template>
-  <div>
-    <van-button
+  <div class="shrink-0">
+    <div
       v-if="pinTuanData.nowCount != pinTuanData.maxCount"
       @click="handlePinTuan"
-      type="primary"
-      size="small"
-      style="font-size: 14px"
-      >直接拼</van-button
+      class="h-32 w-60 box-border flex items-center justify-center rounded bg-primary text-base text-white"
     >
+      直接拼
+    </div>
     <div
       v-else
-      class="h-32 w-60 flex items-center justify-center rounded bg-[#E7E7E7] text-base text-black-6"
+      class="h-32 w-60 box-border flex items-center justify-center rounded bg-[#E7E7E7] text-base text-black-6"
     >
       拼成功
     </div>

+ 1 - 0
src/components/TravelProjectDetail/PinTuan/KaiTuanApplyBottomModal.vue

@@ -23,6 +23,7 @@
             width="120px"
             height="120px"
             fit="cover"
+            radius="4px"
             class="shrink-0"
           ></van-image>
           <div class="flex-1">

+ 1 - 1
src/components/TravelProjectDetail/PinTuan/SharedBottomBar.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="fixed bottom-0 px-15 left-0 right-0 h-70 z-50 bg-white shadow-[0px_2px_14px_1px_rgba(0,0,0,0.12)] flex items-center"
+    class="fixed bottom-0 px-15 left-0 right-0 h-80 z-50 bg-white shadow-[0px_2px_14px_1px_rgba(0,0,0,0.12)] flex items-center"
   >
     <NuxtLink
       :to="`/t/${id}`"