Hooke / xysBooking

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
3c0762ce 1 parent 74c78d48

日历过期日期显示逻辑调整，新增参观者信息时只登记身份证信息

Inline Side-by-side
Showing 2 changed files with 12 additions and 9 deletions
1 <!-- 1 <!--
2 * @Date: 2024-01-15 17:39:29 2 * @Date: 2024-01-15 17:39:29
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-18 11:14:49 4 + * @LastEditTime: 2024-01-22 16:53:57
5 * @FilePath: /xysBooking/src/views/addVisitor.vue 5 * @FilePath: /xysBooking/src/views/addVisitor.vue
6 * @Description: 添加参观者页面 6 * @Description: 添加参观者页面
7 --> 7 -->
...@@ -15,8 +15,11 @@ ...@@ -15,8 +15,11 @@
15 </div> 15 </div>
16 <div class="input-item"> 16 <div class="input-item">
17 <div>证件类型</div> 17 <div>证件类型</div>
18 - <div @click="idTypeChange"> 18 + <!-- <div @click="idTypeChange">
19 {{ fieldValue }}&nbsp;<van-icon name="arrow-down" /> 19 {{ fieldValue }}&nbsp;<van-icon name="arrow-down" />
20 + </div> -->
21 + <div>
22 + {{ fieldValue }}
20 </div> 23 </div>
21 </div> 24 </div>
22 <div class="input-item"> 25 <div class="input-item">
......
1 <!-- 1 <!--
2 * @Date: 2024-01-15 13:35:51 2 * @Date: 2024-01-15 13:35:51
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-22 15:35:03 4 + * @LastEditTime: 2024-01-22 16:48:55
5 * @FilePath: /xysBooking/src/views/booking.vue 5 * @FilePath: /xysBooking/src/views/booking.vue
6 * @Description: 预约页面 6 * @Description: 预约页面
7 --> 7 -->
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
19 <div v-for="(week, index) in weeks" :key="week" class="weeks"> 19 <div v-for="(week, index) in weeks" :key="week" class="weeks">
20 <div v-for="date in week" :key="date" 20 <div v-for="date in week" :key="date"
21 @click="chooseDay(date)" 21 @click="chooseDay(date)"
22 - :class="['item', checked_day === findDatesInfo(date).date ? 'checked' : '', findDatesInfo(date).reserve_full === 0 ? 'disabled' : '']" 22 + :class="['item', checked_day === findDatesInfo(date).date ? 'checked' : '', findDatesInfo(date).reserve_full === 0 || findDatesInfo(date).reserve_full === 'overdue' ? 'disabled' : '']"
23 > 23 >
24 <div v-if="findDatesInfo(date).date"> 24 <div v-if="findDatesInfo(date).date">
25 <p class="day-text">{{ findDatesInfo(date).text }}</p> 25 <p class="day-text">{{ findDatesInfo(date).text }}</p>
26 <p v-if="findDatesInfo(date).reserve_full === 1" class="day-price">¥{{ findDatesInfo(date).price }}</p> 26 <p v-if="findDatesInfo(date).reserve_full === 1" class="day-price">¥{{ findDatesInfo(date).price }}</p>
27 - <p v-else-if="findDatesInfo(date).reserve_full === -1" class="day-price"></p> 27 + <p v-else-if="findDatesInfo(date).reserve_full === -1 || findDatesInfo(date).reserve_full === 'overdue'" class="day-price"></p>
28 <p v-else-if="findDatesInfo(date).reserve_full === 0" class="day-no-booking">约满</p> 28 <p v-else-if="findDatesInfo(date).reserve_full === 0" class="day-no-booking">约满</p>
29 <!-- <p v-else class="day-no-booking">¥{{ findDatesInfo(date).price }}</p> --> 29 <!-- <p v-else class="day-no-booking">¥{{ findDatesInfo(date).price }}</p> -->
30 </div> 30 </div>
...@@ -119,7 +119,7 @@ onMounted(async () => { ...@@ -119,7 +119,7 @@ onMounted(async () => {
119 // 今日之前都不可约 119 // 今日之前都不可约
120 dates_list.value.forEach((date) => { 120 dates_list.value.forEach((date) => {
121 if (dayjs(date.month_date).isBefore(dayjs())) { 121 if (dayjs(date.month_date).isBefore(dayjs())) {
122 - date.reserve_full = 0; 122 + date.reserve_full = 'overdue';
123 } 123 }
124 }); 124 });
125 dates.value = dates_list.value.map(item => item.month_date); 125 dates.value = dates_list.value.map(item => item.month_date);
...@@ -129,7 +129,7 @@ onMounted(async () => { ...@@ -129,7 +129,7 @@ onMounted(async () => {
129 /** 129 /**
130 * @description: 根据日期获取信息 130 * @description: 根据日期获取信息
131 * @param {string} date 131 * @param {string} date
132 - * @return {object} {text: 日期, date: 日期, price: 价格, reserve_full: 是否可约 1=可约，0=约满，-1=无需预约 } 132 + * @return {object} {text: 日期, date: 日期, price: 价格, reserve_full: 是否可约 1=可约，0=约满，-1=无需预约 overdue=过期日期 }
133 */ 133 */
134 const findDatesInfo = (date) => { 134 const findDatesInfo = (date) => {
135 const result = dates_list.value.find((item) => item.month_date === date); 135 const result = dates_list.value.find((item) => item.month_date === date);
...@@ -197,7 +197,7 @@ const chooseTime = (item, index) => { // 畾萄 ...@@ -197,7 +197,7 @@ const chooseTime = (item, index) => { // 畾萄
197 }; 197 };
198 198
199 const chooseDay = async (date) => { // 点击日期回调 199 const chooseDay = async (date) => { // 点击日期回调
200 - if (findDatesInfo(date).reserve_full !== 0) { // 状态 1可约 || -1不限制 200 + if (findDatesInfo(date).reserve_full === 1 || findDatesInfo(date).reserve_full === -1) { // 状态 1可约 || -1不限制
201 checked_day.value = date; // 当前日期 201 checked_day.value = date; // 当前日期
202 checked_day_price.value = findDatesInfo(date).price; // 当前价格 202 checked_day_price.value = findDatesInfo(date).price; // 当前价格
203 checked_day_reserve_full.value = findDatesInfo(date).reserve_full; // 当前状态 203 checked_day_reserve_full.value = findDatesInfo(date).reserve_full; // 当前状态
...@@ -240,7 +240,7 @@ const onConfirm = async ({ selectedValues, selectedOptions }) => { // ...@@ -240,7 +240,7 @@ const onConfirm = async ({ selectedValues, selectedOptions }) => { //
240 // 今日之前都不可约 240 // 今日之前都不可约
241 dates_list.value.forEach((date) => { 241 dates_list.value.forEach((date) => {
242 if (dayjs(date.month_date).isBefore(dayjs())) { 242 if (dayjs(date.month_date).isBefore(dayjs())) {
243 - date.reserve_full = 0; 243 + date.reserve_full = 'overdue';
244 } 244 }
245 }); 245 });
246 dates.value = dates_list.value.map(item => item.month_date); 246 dates.value = dates_list.value.map(item => item.month_date);
......