8.21 酒店增加会议非会议筛选

@@ -86,6 +86,7 @@ const list = ref([])
 const loading = ref(false)
 onMounted(() => {
   query.value.activityId = route.params.cptId
+  query.value.meeting = route.query.flag
   getList()
 })
 
@@ -113,7 +114,8 @@ function goDetail(item) {
       hotelId: item.hotelId,
     },
     query: {
-      id: item.id
+      id: item.id,
+      meeting: query.value.meeting,
     }
   })
 

@@ -213,11 +213,14 @@ const roomList = ref([])
 const map = ref(null)
 const formTime = ref({})
 const labelObj = ref({})
+const meeting = ref()
 
 let baseHotTime;
 
 onMounted(() => {
-  console.log(route.params)
+  if (route.query.meeting) {
+    meeting.value = route.query.meeting
+  }
   getBaseInfoByActiveId(route.params.cptId).then(res => {
     formTime.value = res.data || null
   }).catch(err => {
@@ -372,6 +375,7 @@ function goNext(room) {
       checkInTime: form.value.checkInTime,
       start: hotTime.value[0],
       end: hotTime.value[1],
+      meeting:meeting.value,
     }
   })
 }

@@ -176,6 +176,7 @@ const router = useRouter()
 const route = useRoute()
 const room = ref({})
 const hotelName = ref('')
+const meeting = ref()
 const canOrderNum = ref(0)
 const lform = ref({})
 const form = ref({
@@ -285,6 +286,7 @@ onMounted(() => {
   room.value = JSON.parse(decodeURIComponent(route.query.room))
   console.log(room.value)
   hotelName.value = route.query.hotelName
+  meeting.value = route.query.meeting ? route.query.meeting : ''
   money.value = 0
   rzRange.value = []
   rzRange.value = [route.query.start, route.query.end]
@@ -507,7 +509,8 @@ function submit() {
               matchId:room.value.activityId,
               orderId: res.data.orderId,
               money: res.data.total,
-              type: 'hotel'
+              type: 'hotel',
+              meeting: meeting.value,
             }
           })
         }

@@ -653,6 +653,7 @@ const wePayCodeUrl = ref('')
 const form = ref({})
 const formInfo = ref({})
 const type = ref('')
+const meeting = ref()
 const errorBox = ref(false)
 const hideconfirmbtn = ref(false)
 const remark = ref('')
@@ -675,6 +676,9 @@ onMounted(() => {
   if (route.query.type) {
     type.value = route.query.type
   }
+  if (route.query.meeting) {
+    meeting.value = route.query.meeting
+  }
   if (route.query.orderType) {
     switch (route.query.orderType) {
       case '0':
@@ -1063,7 +1067,10 @@ const downOfflineInvoice = () => {
 
 const toContinue = () => {
   router.push({
-    path: `/booking/hotel/${matchIdHistory.value}`
+    path: `/booking/hotel/${matchIdHistory.value}`,
+    query: {
+      meeting: meeting.value,
+    }
   })
 }
 

@@ -286,7 +286,7 @@ function goBooking(n, f) {
       //酒店
       router.push({
         path: `/booking/hotel/${props.matchId}`
-        // , query: {flag: f}
+        , query: {flag: f}
       })
       break;
     case 2:

@@ -11,12 +11,12 @@
       <div v-if="type==10" class="plr20" v-html="form.reserveDesTitck"></div>
       
       
-      <!--     <el-row v-if="type==1" justify="center">-->
-      <!--       <el-radio-group v-model="hotelType">-->
-      <!--         <el-radio label="0">{{language==0?'运动队酒店':'Team Hotel Reservation'}}</el-radio>-->
-      <!--         <el-radio label="1">{{language==0?'执委大会酒店':'Conference Hotel Reservation'}}</el-radio>-->
-      <!--       </el-radio-group>-->
-      <!--     </el-row>-->
+           <el-row v-if="type==1" justify="center">
+             <el-radio-group v-model="hotelType">
+               <el-radio label="0">{{language==0?'运动队酒店':'Team Hotel Reservation'}}</el-radio>
+               <el-radio label="1">{{language==0?'执委大会酒店':'Conference Hotel Reservation'}}</el-radio>
+             </el-radio-group>
+           </el-row>
     
     </div>
     <template #footer>