酒店

zhangmeng
Showing 3 changed files with 85 additions and 71 deletions
src/viewsPc/booking/hotel.vue
src/viewsPc/components/homeQuick.vue
vite.config.js
--- a/src/viewsPc/booking/hotel.vue
View file @780a5ae
+++ b/src/viewsPc/booking/hotel.vue
View file @780a5ae
@@ -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 }}
@@ -55,7 +55,7 @@
      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/>
      <div style="height: 50px"></div>
    </div>
  </div>
 </template>
@@ -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,13 +90,11 @@ onMounted(() => {
 function getList() {
  loading.value = true
-  booking.getHotelList(Object.assign({
+  booking.getHotelList(Object.assign({}, query.value)).then(res => {
-    meeting: flag.value,
-  },query.value)).then(res => {
    list.value = res.rows
    loading.value = false
    console.log(list.value)
  }).catch(e => {
    loading.value = false
  })
@@ -107,73 +105,84 @@ function goDetail(item) {
    useStore.setVisitor()
    return
  }
-  if (item.meeting == '1') {
-    ElMessageBox.confirm(item.meetText, '', {
+  router.push({
-      cancelButtonText: language.value == 1 ? 'Close ' : '关闭',
+    name: 'hotelDetail',
-      confirmButtonText: language.value == 1 ? 'Continue to book' : '继续预订',
+    params: {
-      dangerouslyUseHTMLString: true,
+      hotelId: item.hotelId,
-      type: 'warning',
+    },
-    }).then((res) => {
+    query: {
-      router.push({
+      id: item.id
-        name: 'hotelDetail',
+    }
-        params: {
+  })
-          hotelId: item.hotelId,
-        },
+  // if (item.meeting == '1') {
-        query: {
+  //   ElMessageBox.confirm(item.meetText, '', {
-          id: item.id
+  //     cancelButtonText: language.value == 1 ? 'Close ' : '关闭',
-        }
+  //     confirmButtonText: language.value == 1 ? 'Continue to book' : '继续预订',
-      })
+  //     dangerouslyUseHTMLString: true,
-    })
+  //     type: 'warning',
-  } else {
+  //   }).then((res) => {
-    router.push({
+  //     router.push({
-      name: 'hotelDetail',
+  //       name: 'hotelDetail',
-      params: {
+  //       params: {
-        hotelId: item.hotelId,
+  //         hotelId: item.hotelId,
-      },
+  //       },
-      query: {
+  //       query: {
-        id: item.id
+  //         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;
  }
  img.w100 {
    object-fit: cover;
    aspect-ratio: 16/9
  }
  .addr {
    font-size: 14px;
    color: #929AA0;
    font-weight: 400;
    margin: 0 0 10px;
  }
  .price {
    margin: 0 0 8px;
    color: #FF8124;
    font-size: 18px;
    span {
      font-size: 36px;
      margin: 0 8px;
      font-family: 'DINAlternate-Bold';
      font-weight: 600;
    }
    i {
      font-style: normal;
      color: #929AA0;
    }
  }
  .blackBtn {
    background: #000;
    border: #000;
@@ -188,7 +197,7 @@ function goDetail(item) {
  display: flex;
  align-items: center;
  justify-content: center;
  img {
    display: block;
    margin: -30px auto 0;
@@ -208,7 +217,7 @@ function goDetail(item) {
 .no-border {
  border: none;
  background: #F5F7F9;
  :deep(.el-input__wrapper) {
    border: none;
    box-shadow: none;
@@ -220,12 +229,12 @@ function goDetail(item) {
  width: 100%;
  height: 100%;
  position: relative;
  img {
    width: 100%;
    height: 100%;
  }
  .starBox {
    position: absolute;
    bottom: 0;
@@ -240,7 +249,7 @@ function goDetail(item) {
 .starBox {
  border-radius: 14px 0 0 0;
  img {
    display: inline-block;
    margin-right: 4px;
@@ -250,12 +259,12 @@ function goDetail(item) {
 .tagbox {
  margin: 10px 0;
  a {
    color: #AFB5B9;
    font-size: 12px;
  }
  span {
    border-radius: 13px;
    font-size: 12px;
@@ -263,22 +272,22 @@ function goDetail(item) {
    margin-right: 10px;
    font-weight: 400;
  }
  span:nth-child(4n) {
    background: rgba(50, 177, 108, 0.2);
    color: rgba(50, 177, 108, 1);
  }
  span:nth-child(4n+1) {
    background: rgba(243, 152, 0, 0.2);
    color: rgba(243, 152, 0, 1);
  }
  span:nth-child(4n+2) {
    background: rgba(0, 160, 233, 0.2);
    color: rgba(0, 160, 233, 1);
  }
  span:nth-child(4n+3) {
    background: rgba(247, 64, 166, 0.2);
    color: rgba(247, 64, 166, 1);
--- a/src/viewsPc/components/homeQuick.vue
View file @780a5ae
+++ b/src/viewsPc/components/homeQuick.vue
View file @780a5ae
@@ -216,13 +216,15 @@ function popRemark(type) {
  }
-  const params = {
+  // const params = {
-    matchId: props.matchId,
+  //   matchId: props.matchId,
-    title: language.value == 0 ? '预订说明' : 'Booking Instructions',
+  //   title: language.value == 0 ? '预订说明' : 'Booking Instructions',
-    type: type,
+  //   type: type,
-    cptName: props.cptName
+  //   cptName: props.cptName
-  }
+  // }
-  proxy.$refs['orderRemarkRef'].open(params)
+  // 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:
      //车辆
--- a/vite.config.js
View file @780a5ae
+++ b/vite.config.js
View file @780a5ae
@@ -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: 'http://192.168.1.118:8082/',
-          // target: 'https://ces.2025wtcwuxi.com/stage-api/',
+          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/, '')
        },