hookehuyr

fix

<!--
* @Date: 2023-06-13 13:26:46
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-08-24 15:03:44
* @FilePath: /front/src/App.vue
* @LastEditTime: 2023-08-25 16:04:15
* @FilePath: /bieyuan/src/App.vue
* @Description: 文件描述
-->
<template>
......@@ -56,7 +56,16 @@ onMounted(async () => {
wx.error((err) => {
console.warn(err);
});*/
// TODO: 进入后先查询有没有订单,有订单直接跳转最终页面
// 进入后先查询有没有订单,有订单直接跳转最终页面
const { data } = await orderInfoAPI()
if (data?.id) {
$router.push({
path: '/result',
query: {
id: data.id
}
})
}
})
</script>
......
<!--
* @Date: 2023-08-22 14:13:07
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-08-24 17:02:52
* @LastEditTime: 2023-08-25 15:15:29
* @FilePath: /bieyuan/src/views/next.vue
* @Description: 文件描述
-->
......@@ -22,8 +22,10 @@
</van-radio-group>
</template>
</van-field>
<van-field v-model="item.id_number" label="身份证:" type="text" placeholder="请输入身份证号" :border="false"
<van-field v-if="item.id_type === 'id_card'" v-model="item.id_number" label="身份证:" type="text" placeholder="请输入身份证号" :border="false"
:rules="[{ validator: validatorId, message: '请填写正确身份证号' }]" label-width="4em" class="input-text" />
<van-field v-else v-model="item.id_number" label="护照:" type="text" placeholder="请输入护照号" :border="false"
:rules="[{ required: true, message: '请填写正确护照号' }]" label-width="4em" class="input-text" />
</div>
<div style="padding: 2rem;">
<van-button block type="primary" color="#93663D" native-type="submit">
......
......@@ -81,7 +81,10 @@ function getDaysInMonth(year, month) {
}
onMounted(async () => {
const dates = $route.query.dates && JSON.parse($route.query.dates);
let dates = $route.query.dates && JSON.parse($route.query.dates);
if (localStorage.getItem('save_selected_dates')) { // 如果缓存过以缓存为先
dates = JSON.parse(localStorage.getItem('save_selected_dates'));
}
const { data } = await orderRestCountAPI({ dates: dates.join(',')});
shortcut.value = data;
// 上一页选择的预约人数
......@@ -105,6 +108,13 @@ const shortcut = ref([]);
const handleCheck = (value) => {
value.checked = !value.checked;
// 同步日历显示
defaultDate.value = [];
shortcut.value.forEach((item) => {
if (item.checked) {
defaultDate.value.push(dayjs(item.date).toDate())
}
});
}
const num = ref(1);
......@@ -219,14 +229,18 @@ const clickNext = () => { // 点击下一步按钮
// 选中的日期集合
const selected_dates = selected_item.map(item => item.date);
// 跳转更多确认页
$router.push({
path: '/next',
query: {
dates: JSON.stringify(selected_dates),
count: num.value,
page: 'multiple'
}
});
localStorage.setItem('save_selected_dates', JSON.stringify(selected_dates));
setTimeout(() => {
$router.push({
path: '/next',
query: {
dates: JSON.stringify(selected_dates),
count: num.value,
page: 'multiple'
}
});
}, 100);
}
</script>
......
......@@ -116,6 +116,7 @@ const onConfirm = async () => {
$router.push('/');
// 取消预约成功 清理预约信息列表缓存
store.changeUserInfo([]);
localStorage.setItem('save_selected_dates', '');
}
}
......