bb4313de by zhangmeng

bug修复

1 parent 3737d22c
...@@ -83,11 +83,9 @@ ...@@ -83,11 +83,9 @@
83 </template> 83 </template>
84 84
85 <script setup> 85 <script setup>
86 import {useRouter} from "vue-router"; 86 import {useRouter,useRoute} from "vue-router";
87 import {ref, reactive, onMounted} from "vue"; 87 import {ref, onMounted} from "vue";
88 import {useRoute} from "vue-router"; 88 import { getMenuById} from "@/apiPc/booking"
89 import {getHotelById, getMenuById} from "@/apiPc/booking"
90
91 import {useStorage} from "@vueuse/core/index"; 89 import {useStorage} from "@vueuse/core/index";
92 import useUserStore from "@/store/modules/user"; 90 import useUserStore from "@/store/modules/user";
93 import {fillImgUrl} from "@/utils/ruoyi"; 91 import {fillImgUrl} from "@/utils/ruoyi";
...@@ -98,7 +96,7 @@ const router = useRouter() ...@@ -98,7 +96,7 @@ const router = useRouter()
98 const route = useRoute() 96 const route = useRoute()
99 const form = ref({}) 97 const form = ref({})
100 const query = ref({ 98 const query = ref({
101 larId: route.query.id 99 larId: route.params.id
102 }) 100 })
103 const loading = ref(false) 101 const loading = ref(false)
104 const roomList = ref([]) 102 const roomList = ref([])
...@@ -106,11 +104,13 @@ const map = ref(null) ...@@ -106,11 +104,13 @@ const map = ref(null)
106 onMounted(() => { 104 onMounted(() => {
107 form.value = JSON.parse(decodeURIComponent(route.query.detail)) 105 form.value = JSON.parse(decodeURIComponent(route.query.detail))
108 getData() 106 getData()
107
109 }) 108 })
110 109
111 function getData() { 110 function getData() {
112 loading.value = true 111 loading.value = true
113 query.value.hotelId = route.query.id 112 query.value.hotelId = route.query.id
113 console.log(query.value)
114 getMenuById(query.value).then(res => { 114 getMenuById(query.value).then(res => {
115 loading.value = false 115 loading.value = false
116 roomList.value = res.rows 116 roomList.value = res.rows
......
...@@ -242,6 +242,7 @@ function submit() { ...@@ -242,6 +242,7 @@ function submit() {
242 form.value.foodsList.push(obj) 242 form.value.foodsList.push(obj)
243 form.value.activeId = restaurant.value.activityId 243 form.value.activeId = restaurant.value.activityId
244 form.value.larId = restaurant.value.id 244 form.value.larId = restaurant.value.id
245 form.value.orderName=restaurant.value.name
245 // 提交确认 246 // 提交确认
246 ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗?' : 'Confirm to submit the order?', { 247 ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗?' : 'Confirm to submit the order?', {
247 confirmButtonText: language.value == 0 ? '确定' : 'Confirm', 248 confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
......
...@@ -97,12 +97,12 @@ function building() { ...@@ -97,12 +97,12 @@ function building() {
97 return 97 return
98 } 98 }
99 function popRemark(type){ 99 function popRemark(type){
100 // debugger
100 if(!form.value){ 101 if(!form.value){
101 building() 102 building()
102 return 103 return
103 } 104 }
104 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){ 105 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){
105 //type == '0'
106 building() 106 building()
107 return 107 return
108 } 108 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!