diff --git a/pages/book/photoProductsOrder/photoProductsOrder.vue b/pages/book/photoProductsOrder/photoProductsOrder.vue index 113fcd0..6bc733f 100644 --- a/pages/book/photoProductsOrder/photoProductsOrder.vue +++ b/pages/book/photoProductsOrder/photoProductsOrder.vue @@ -77,7 +77,9 @@ 定金: ¥{{ totalPrice.toFixed(2) }} - 确定 + + 确定 + @@ -114,6 +116,8 @@ import { bookUrl } from '../../../common/globalImagesUrl'; import { getFonts } from '../../../common/globalFont'; import { publicPath } from '../../../common/globalImagesUrl'; +import { JudgeIsNullity } from '../../../common/globalFunction'; +import { columnTransformDependencies } from 'mathjs'; const cookie = wx.getStorageSync("cookie") //请求头 @@ -146,7 +150,7 @@ const isShow = ref(false) let loading = false; - const contactTemplateString = ref('请选择') + const contactTemplateString = ref('请选择联系人') const bkgUrl = ref(bookUrl + '/photoProductsOrder/bkg.png') function showLoading() { @@ -176,14 +180,14 @@ } const confirm = () => { - if (contactTemplateString.value === null || contactTemplateString.value === undefined || contactTemplateString.value === '请选择联系人') { + if (JudgeIsNullity(contactTemplateString.value) || JudgeIsNullity(contactInfo.value.id) || contactTemplateString.value === '请选择联系人') { uni.showToast({ title: '请选择联系人', icon: 'error' - }) + }) return ; - } - if (bookingTime.value === null || bookingTime.value == undefined || bookingTime.value === '请选择联系人') { + } + if (JudgeIsNullity(bookingTime.value) || bookingTime.value === '请选择' || JudgeIsNullity(bookingTimeId) || bookingTimeId.value === 0) { uni.showToast({ title: '请填写预约时间', icon: 'error'