酒店

@@ -6,23 +6,23 @@
     </div>
     <div class="box">
       <div class="searchBar">
-        <el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
+        <el-input v-model="query.name" :placeholder="language==0?'请输入关键字搜索':'Search'" class="no-border">
         </el-input>
-        <el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
+        <el-button class="btn-lineG" icon="search" size="large" type="primary" @click="getList">
           {{ language == 0 ? '搜索' : 'Search' }}
         </el-button>
       </div>
     </div>
     
-    <div class="box" v-loading="loading">
+    <div v-loading="loading" class="box">
       <el-row :gutter="20">
-        <el-col :lg="24" :md="24" :sm="24" :xs="24" :xl="24" v-for="(h,index) in list" class="mb20">
+        <el-col v-for="(h,index) in list" :lg="24" :md="24" :sm="24" :xl="24" :xs="24" class="mb20">
           <el-card @click="goDetail(h)">
             <!--        酒店列表-->
-            <el-row class="hotel" align="middle" :gutter="20">
+            <el-row :gutter="20" align="middle" class="hotel">
               <el-col :lg="6" :md="6">
                 <div class="imgbox">
-                  <img class="w100" :src="fillImgUrl(h.photos?.split(',')[0])"/>
+                  <img :src="fillImgUrl(h.photos?.split(',')[0])" class="w100"/>
                 </div>
               </el-col>
               <el-col :lg="12" :md="12">
@@ -35,7 +35,7 @@
                   <a v-show="h.label?.split('，').length>4">{{ language == 0 ? '更多' : 'MORE' }} ></a>
                 </div>
                 <p class="esp addr mt20">
-                  <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
+                  <el-icon color="#929AA0" size="16" style="position: relative;top: 2px">
                     <LocationFilled/>
                   </el-icon>
                   {{ h.address }}
@@ -74,7 +74,7 @@ const route = useRoute()
 const useStore = useUserStore()
 const user = useStore.user
 
-const flag = useRouteQuery('flag')
+// const flag = useRouteQuery('flag')
 
 const language = useStorage('language', 0)
 const query = ref({
@@ -90,9 +90,7 @@ onMounted(() => {
 
 function getList() {
   loading.value = true
-  booking.getHotelList(Object.assign({
-    meeting: flag.value,
-  },query.value)).then(res => {
+  booking.getHotelList(Object.assign({}, query.value)).then(res => {
     list.value = res.rows
     loading.value = false
     console.log(list.value)
@@ -107,24 +105,7 @@ function goDetail(item) {
     useStore.setVisitor()
     return
   }
-  if (item.meeting == '1') {
-    ElMessageBox.confirm(item.meetText, '', {
-      cancelButtonText: language.value == 1 ? 'Close ' : '关闭',
-      confirmButtonText: language.value == 1 ? 'Continue to book' : '继续预订',
-      dangerouslyUseHTMLString: true,
-      type: 'warning',
-    }).then((res) => {
-      router.push({
-        name: 'hotelDetail',
-        params: {
-          hotelId: item.hotelId,
-        },
-        query: {
-          id: item.id
-        }
-      })
-    })
-  } else {
+  
   router.push({
     name: 'hotelDetail',
     params: {
@@ -134,11 +115,39 @@ function goDetail(item) {
       id: item.id
     }
   })
-  }
+  
+  // if (item.meeting == '1') {
+  //   ElMessageBox.confirm(item.meetText, '', {
+  //     cancelButtonText: language.value == 1 ? 'Close ' : '关闭',
+  //     confirmButtonText: language.value == 1 ? 'Continue to book' : '继续预订',
+  //     dangerouslyUseHTMLString: true,
+  //     type: 'warning',
+  //   }).then((res) => {
+  //     router.push({
+  //       name: 'hotelDetail',
+  //       params: {
+  //         hotelId: item.hotelId,
+  //       },
+  //       query: {
+  //         id: item.id
+  //       }
+  //     })
+  //   })
+  // } else {
+  //   router.push({
+  //     name: 'hotelDetail',
+  //     params: {
+  //       hotelId: item.hotelId,
+  //     },
+  //     query: {
+  //       id: item.id
+  //     }
+  //   })
+  // }
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .hotel {
   h3 {
     margin: 0 0 10px;

@@ -216,13 +216,15 @@ function popRemark(type) {
   }
   
   
-  const params = {
-    matchId: props.matchId,
-    title: language.value == 0 ? '预订说明' : 'Booking Instructions',
-    type: type,
-    cptName: props.cptName
-  }
-  proxy.$refs['orderRemarkRef'].open(params)
+  // const params = {
+  //   matchId: props.matchId,
+  //   title: language.value == 0 ? '预订说明' : 'Booking Instructions',
+  //   type: type,
+  //   cptName: props.cptName
+  // }
+  // proxy.$refs['orderRemarkRef'].open(params)
+  
+  goBooking(type)
 }
 
 function goBooking(n, f) {
@@ -238,7 +240,10 @@ function goBooking(n, f) {
       break;
     case 1:
       //酒店
-      router.push({path: `/booking/hotel/${props.matchId}`, query: {flag: f}})
+      router.push({
+        path: `/booking/hotel/${props.matchId}`
+        // , query: {flag: f}
+      })
       break;
     case 2:
       //车辆

@@ -76,8 +76,8 @@ export default defineConfig(({mode, command}) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
         },
         '/dev-api/ztx-webSite': {
-          target: 'http://192.168.1.118:8082/',
-          // target: 'https://ces.2025wtcwuxi.com/stage-api/',
+          // target: 'http://192.168.1.118:8082/',
+          target: 'https://ces.2025wtcwuxi.com/stage-api/',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
@@ -86,7 +86,7 @@ export default defineConfig(({mode, command}) => {
           // target: 'http://192.168.1.131:8081/',
           // target: 'https://ces.2025wtcwuxi.com/stage-api/',
           // target: 'http://124.70.181.90:1880/stage-api',
-          // target: 'https://wdsfwuxicenter.com/stage-api/',
+          target: 'https://sys.2025wtcwuxi.com/stage-api/',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },