fix

hookehuyr
Commit e25e700df583cc5b7f152d79028b7f36441b3a0c e25e700d 1 parent bab6ed66
Showing 3 changed files with 58 additions and 16 deletions
publish.sh
src/views/booking.vue
src/views/success.vue
--- a/publish.sh
View file @e25e700
+++ b/publish.sh
View file @e25e700
@@ -37,4 +37,4 @@ git commit -m '西园寺预约前端网页更新'
 git push
 # 更新SSH服务器上文件
-ssh -p 22 itomix@ipadbiz.cn 'cd /opt/space-dev/ && git pull origin develop'
+# ssh -p 22 itomix@ipadbiz.cn 'cd /opt/space-dev/ && git pull origin develop'
--- a/src/views/booking.vue
View file @e25e700
+++ b/src/views/booking.vue
View file @e25e700
 <!--
  * @Date: 2024-01-15 13:35:51
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-01-18 10:40:58
+ * @LastEditTime: 2024-01-18 13:47:50
  * @FilePath: /xysBooking/src/views/booking.vue
  * @Description: 预约页面
  * @Version: 1.0.0
@@ -109,11 +109,10 @@ onMounted(async () => {
   const { code, data } = await canReserveDateListAPI({ month: `${raw_date.getFullYear()}-${raw_date.getMonth() + 1}` });
   if (code) {
     // 日期列表
-    const current = dayjs().format('YYYY-MM-DD'); // 当日
     dates_list.value = data;
     // 今日之前都不可约
     dates_list.value.forEach((date) => {
-      if (dayjs(date.month_date).isBefore(dayjs()) && date.month_date !== current) {
+      if (dayjs(date.month_date).isBefore(dayjs())) {
         date.reserve_full = 1;
       }
     });
@@ -218,12 +217,11 @@ const onConfirm = async ({ selectedValues, selectedOptions }) => { // é€‰æ‹©æ—¥æ
   // 选择日期后，查询月份信息
   const { code, data } = await canReserveDateListAPI({ month: `${selectedValues[0]}-${selectedValues[1]}` });
   if (code) {
-    const current = dayjs().format('YYYY-MM-DD'); // 当日
     // 日期列表
     dates_list.value = data;
     // 今日之前都不可约
     dates_list.value.forEach((date) => {
-      if (dayjs(date.month_date).isBefore(dayjs()) && date.month_date !== current) {
+      if (dayjs(date.month_date).isBefore(dayjs())) {
         date.reserve_full = 1;
       }
     });
--- a/src/views/success.vue
View file @e25e700
+++ b/src/views/success.vue
View file @e25e700
 <!--
  * @Date: 2024-01-15 18:28:25
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-01-16 15:49:07
+ * @LastEditTime: 2024-01-18 14:19:42
  * @FilePath: /xysBooking/src/views/success.vue
- * @Description: 文件描述
+ * @Description: 预约成功提示页面
 -->
 <template>
   <div class="success-page">
-    <div style="display: flex; align-items: center; justify-content: center; height: 35vh; flex-direction: column;">
+    <div style="">
-      <img src="https://cdn.ipadbiz.cn/xys/booking/%E6%88%90%E5%8A%9F@2x.png" style="width: 60vw;">
+      <div class="text-prompts">
-      <div style="color: #A67939; font-size: 1.25rem;">预约成功</div>
+        <img src="https://cdn.ipadbiz.cn/xys/booking/%E6%88%90%E5%8A%9F@2x.png">
+        <div class="text">预约成功</div>
       </div>
-    <div style="padding: 2rem 1rem; border-bottom: 1px dashed #A67939; line-height: 2;">
+      <div class="appointment-information">
-      <div>参观人数：<span style="color: #A67939;">2人</span></div>
+        <div class="number-of-visitors">参观人数：<span>2人</span></div>
-      <div>参访时间：<span style="color: #A67939;">2024-01-10 05:00-08:00</span></div>
+        <div class="visit-time">参访时间：<span>2024-01-10 05:00-08:00</span></div>
-      <div>支付金额：<span style="color: #FF1919;">¥50</span></div>
+        <div class="payment-amount">支付金额：<span>¥50</span></div>
       </div>
-    <div style="color: #A67939; padding: 1rem; line-height: 2;">
+      <div class="appointment-notice">
         <p style="margin-bottom: 0.25rem;"><van-icon name="info-o" />&nbsp;温馨提示</p>
         <p style="font-size: 0.85rem;">1. 一人一码，或拿身份证，扫码或识别身份证成功后进入</p>
         <p style="font-size: 0.85rem;">2. 若您无法按时参观，请提前在预约记录中取消您的预约</p>
       </div>
+    </div>
     <div class="success-btn">
       <div @click="goToHome" class="btn-item btn-left">首页</div>
       <div @click="goToDetail" class="btn-item btn-right">详情</div>
@@ -54,6 +56,48 @@ const goToDetail = () => {
 .success-page {
   position: relative;
   background-color: #FFF;
+  // margin: 0.8rem;
+  // margin-bottom: 0;
+  // border-radius: 8px;
+  .text-prompts {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 35vh;
+    flex-direction: column;
+    img {
+      width: 60vw;
+    }
+    .text {
+      color: #A67939;
+      font-size: 1.25rem;
+    }
+  }
+  .appointment-information {
+    padding: 2rem 1rem;
+    border-bottom: 1px dashed #A67939;
+    line-height: 2;
+    .number-of-visitors {
+      span {
+        color: #A67939;
+      }
+    }
+    .visit-time {
+      span {
+        color: #A67939;
+      }
+    }
+    .payment-amount {
+      span {
+        color: #FF1919;
+      }
+    }
+  }
+  .appointment-notice {
+    color: #A67939;
+    padding: 1rem;
+    line-height: 2;
+  }
   .success-btn {
     background-color: #FFF;
     position: fixed;