no message

杨炀
Showing 6 changed files with 80 additions and 29 deletions
src/apiPc/common.js
src/viewsPc/booking/serverSearch.vue
src/viewsPc/components/homeQuick.vue
src/viewsPc/index.vue
src/viewsPc/match/components/quick-row.vue
vite.config.js
--- a/src/apiPc/common.js
View file @85dd58c
+++ b/src/apiPc/common.js
View file @85dd58c
@@ -169,4 +169,25 @@ export function queryTicket(qy) {
    params: qy
  })
 }
+export function getHomeInviteQuery(params) {
+  return request({
+    url: `/league/person/getHomeInviteQuery`,
+    method: 'get',
+    params: params
+  })
+}
+export function getHomeCarQuery(params) {
+  return request({
+    url: `/league/person/getHomeCarQuery`,
+    method: 'get',
+    params: params
+  })
+}
+export function getHomeRoomQuery(params) {
+  return request({
+    url: `/league/person/getHomeRoomQuery`,
+    method: 'get',
+    params: params
+  })
+}
--- a/src/viewsPc/booking/serverSearch.vue
View file @85dd58c
+++ b/src/viewsPc/booking/serverSearch.vue
View file @85dd58c
@@ -8,9 +8,9 @@
        <div class="pd20">
          <div class="topsearch">
            <el-input v-if="activeTab==0" :placeholder="language==0?'请输入护照号搜索':'Please enter passport number to search'"
-                      v-model="query.idCard"/>
+                      v-model="query.passportNo"/>
            <el-input v-else :placeholder="language==0?'请输入姓名搜索':'Please enter name to search'"
-                      v-model="query.name"/>
+                      v-model="query.contacts"/>
            <el-button class="btn-lineG" type="primary" @click="search">
              <el-icon class="mr20">
                <Search/>
@@ -20,25 +20,26 @@
          </div>
          <div class="stab">
-            <div :class="activeTab==0?'active':''" @click="activeTab=0">
+            <div :class="activeTab==0?'active':''" @click="changeActiveTab(0)">
              <img v-show="activeTab!=0" src="@/assets/img/tag01@2x.png"/>
              <img v-show="activeTab==0" src="@/assets/img/tag01_dwn@2x.png"/>
              {{language==0?'签证服务':'Visa Services'}}
            </div>
-            <div :class="activeTab==1?'active':''" @click="activeTab=1">
+            <div :class="activeTab==1?'active':''" @click="changeActiveTab(1)">
              <img v-show="activeTab!=1" src="@/assets/img/tag02@2x.png"/>
              <img v-show="activeTab==1" src="@/assets/img/tag02_dwn@2x.png"/>
              {{language==0?'酒店预定':'Hotel Reservation'}}
            </div>
-            <div :class="activeTab==2?'active':''" @click="activeTab=2">
+            <div :class="activeTab==2?'active':''" @click="changeActiveTab(2)">
              <img v-show="activeTab!=2" src="@/assets/img/tag03@2x.png"/>
              <img v-show="activeTab==2" src="@/assets/img/tag03_dwn@2x.png"/>
              {{language==0?'接送服务':'Pick-up Service'}}
            </div>
          </div>
          <div>
-            <div v-for="item in list"></div>
+            <div v-for="item in list">
+              {{item}}
+            </div>
          </div>
          <el-empty v-if="list.length==0"/>
@@ -50,7 +51,7 @@
 <script setup>
 import {ref, computed, onMounted} from 'vue'
-import {queryTicket} from "@/apiPc/common";
+import {getHomeCarQuery, getHomeInviteQuery, getHomeRoomQuery} from "@/apiPc/common";
 import {ElMessage} from "element-plus";
 import {useStorage} from "@vueuse/core/index";
@@ -62,27 +63,54 @@ const query = ref({
  status: 1
 })
 const loading = ref(false)
+function changeActiveTab(n) {
+  activeTab.value = n
+  query.value.passportNo = ''
+  query.value.contacts = ''
+}
 function search() {
-  if (!query.value.idCard && activeTab.value == 0) {
+  if (!query.value.passportNo && activeTab.value == 0) {
-    ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
+    ElMessage.warning(language.value==0?'请输入护照号搜索':'Please enter keyword to search')
    return
  }
-  if (!query.value.name && activeTab.value != 0) {
+  if (!query.value.contacts && activeTab.value != 0) {
-    ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
+    ElMessage.warning(language.value==0?'请输入关键字搜索':'Please enter keyword to search')
    return
  }
  loading.value = true
-  queryTicket(query.value).then(res => {
+  if(activeTab.value == 0){
-    list.value = res.data
+    // 签证服务
-    for (let bill of list.value) {
+    getHomeInviteQuery(query.value).then(res=>{
-      // p.idCard = p.idCard.substring(0,4)+'****'+p.idCard.substring(8,p.idCard.length)
+      if (!res.data||res.data.length==0) {
-      const pattern = new RegExp(query.value.idCard, 'gi')
+        list.value = []
-      bill.idCard = bill.idCard.replace(pattern, `<span class="highlight">$&</span>`)
+        ElMessage.warning(language.value==0?'未找到结果，请重新查询':'No result')
+        return
-    }
+      }
-    loading.value = false
+      list.value = res.data
-  })
+    })
+  }
+  if(activeTab.value == 1){
+    // 酒店预定
+    getHomeRoomQuery(query.value).then(res=>{
+      if (!res.data||res.data.length==0) {
+        list.value = []
+        ElMessage.warning(language.value==0?'未找到结果，请重新查询':'No result')
+        return
+      }
+      list.value = res.data
+    })
+  }
+  if(activeTab.value == 2){
+    // 接送服务
+    getHomeCarQuery(query.value).then(res=>{
+      if (!res.data||res.data.length==0) {
+        list.value = []
+        ElMessage.warning(language.value==0?'未找到结果，请重新查询':'No result')
+        return
+      }
+      list.value = res.data
+    })
+  }
 }
 </script>
--- a/src/viewsPc/components/homeQuick.vue
View file @85dd58c
+++ b/src/viewsPc/components/homeQuick.vue
View file @85dd58c
@@ -136,7 +136,6 @@ function popRemark(type) {
      || (form.value.isFoodView == 0 && type == '3')
      || (form.value.isMealView == 0 && type == '4')
      || (form.value.isPhotoView == 0 && type == '5')
-      || (form.value.isTicket==0&&type == '0')
  ) {
    building()
    return
--- a/src/viewsPc/index.vue
View file @85dd58c
+++ b/src/viewsPc/index.vue
View file @85dd58c
@@ -226,7 +226,7 @@
                  <img :src="fillImgUrl_webSite(n.picUrl)"></div>
                <div class="info">
                  <div class="small-size text-gray">
-                    <span v-if="n.subName">{{ n.subName + ' | ' }}</span>
+<!--                    <span v-if="n.subName">{{ n.subName + ' | ' }}</span>-->
                    {{ n.belongTime }}
                  </div>
                  <h2 class="esp_2">{{ n.name }}</h2>
--- a/src/viewsPc/match/components/quick-row.vue
View file @85dd58c
+++ b/src/viewsPc/match/components/quick-row.vue
View file @85dd58c
@@ -20,7 +20,7 @@
        </div>
      </el-col>
      <el-col :lg="4" :md="7" :sm="11" :xs="11">
-        <div class="funcBtn" @click="popRemark(6)">
+        <div class="funcBtn" @click="goAbout">
          <img src="@/assets/dance/btn04.png"/>
          <h4>场馆介绍</h4>
        </div>
@@ -52,7 +52,7 @@
        </div>
      </el-col>
      <el-col :lg="4" :md="7" :sm="11" :xs="11">
-        <div class="funcBtn" @click="popRemark(6)">
+        <div class="funcBtn" @click="goAbout">
          <img src="@/assets/dance/btn04.png"/>
          <h4>Venue Introduction</h4>
        </div>
@@ -206,6 +206,9 @@ function addInvoice() {
    }
  })
 }
+function goAbout() {
+  router.push({path: `/about/wuDao`})
+}
 </script>
 <style lang="scss" scoped>
--- a/vite.config.js
View file @85dd58c
+++ b/vite.config.js
View file @85dd58c
@@ -83,9 +83,9 @@ export default defineConfig(({ mode, command }) => {
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
          // target: 'http://192.168.1.131:8081/',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'https://www.2025wtcwuxi.com/stage-api/',
          // target: 'http://124.70.181.90:1880/stage-api',
-          target: 'https://wdsfwuxicenter.com/stage-api/',
+          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
        },