Compare commits

..

No commits in common. "main" and "wwt" have entirely different histories.
main ... wwt

View File

@ -81,7 +81,7 @@
color="#1936C9">确认预约</van-button> color="#1936C9">确认预约</van-button>
<van-button v-else color="#464646" style="width: 92%;min-height: 40px;">确认预约</van-button> <van-button v-else color="#464646" style="width: 92%;min-height: 40px;">确认预约</van-button>
<div style="margin-top: 20px;color: #959595; font-size: 14px;"> <div style="margin-top: 20px;color: #959595; font-size: 14px;">
<!-- 到预约时间未消费则餐券作废 --> 到预约时间未消费则餐券作废
</div> </div>
</div> </div>
<van-dialog v-model:show="showsuccess" :show-confirm-button="false"> <van-dialog v-model:show="showsuccess" :show-confirm-button="false">
@ -144,9 +144,9 @@ const columns = ref([
value: 600 value: 600
} }
]) ])
let userInfo = JSON.parse(localStorage.getItem('accountInfo'))
const balance = ref('') const balance = ref('')
balance.value = userInfo ? userInfo.balance : '';
const onYSConfirm = (value) => { const onYSConfirm = (value) => {
console.log(value) console.log(value)
@ -221,7 +221,6 @@ const router = useRouter()
const geYYtUserInfo = async () => { const geYYtUserInfo = async () => {
const res = await getUserInfo({}) const res = await getUserInfo({})
if (res.status === 0) { if (res.status === 0) {
balance.value = res.data.balance
if (res.data.isExist) { if (res.data.isExist) {
// showsuccess.value = true // showsuccess.value = true
router.push('/success') router.push('/success')
@ -232,6 +231,7 @@ const geYYtUserInfo = async () => {
remark.value = res.data.remark remark.value = res.data.remark
userName.value = res.data.userName userName.value = res.data.userName
standard.value = res.data.standard standard.value = res.data.standard
} else { } else {
if (res.data.isOver) { if (res.data.isOver) {
showfail.value = true showfail.value = true