Merge branch 'master' of http://gitlab.oytour.com/viitto/million

5822d395 · 吴春 · 968436aa · 05843d8d · 5822d395 · 5822d395
Commit 5822d395 authored Nov 27, 2024 by 吴春
9 changed files
--- a/src/assets/css/home.css
+++ b/src/assets/css/home.css
@@ -163,8 +163,8 @@ ul,li{
  }
  .swipercomSubEn{
    left: 0;
-    top: -1.8rem;
-    font-size: 1.5rem;
+    top: -2rem;
+    font-size: 2rem;
  }
  .indexRoll1Hst{
    font-size: 1rem;
@@ -188,7 +188,9 @@ ul,li{
    padding: 0 0 0 20px;
  }
  .swipercomTvR2Bj{
+    width: 100%;
    top: 0;
+    right: 0;
    bottom: 0;
    opacity: 1;
  }
@@ -198,6 +200,7 @@ ul,li{
  }
  .swipercomTvR2{
    top: 0;
+    right: 0;
    bottom: 0;
    opacity: 1;
  }
@@ -211,6 +214,9 @@ ul,li{
    padding-bottom: 0;
    padding-top: 55px;
  }
+  .indexRoll1Hd{
+    width: 90%;
+  }
 }
 @media (min-width: 768px) {
  .gap-1{
@@ -250,8 +256,8 @@ ul,li{
  }
  .swipercomSubEn{
    top: -.2rem;
-    left: -1rem;
-    font-size: 2rem;
+    left: -1.5rem;
+    font-size: 3rem;
  }
  .indexRoll1Hd{
    width: 55%;
@@ -259,18 +265,40 @@ ul,li{
  .swipercomSubEnLen{
    padding: 4px 13px 4px 17px;
  }
+  .swipercomTvR2Bj{
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    opacity: 1;
+  }
+  .swipercomTvR2{
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    opacity: 1;
+  }
+  .indexRoll1Hd{
+    width: 90%;
+  }
+}
+@media (min-width: 992px) {
  .swipercomTvR2Bj{
    top: 100%;
+    left: 0;
    bottom: 0;
+    right: 0;
    opacity: 0;
  }
  .swipercomTvR2{
    top: 100%;
    bottom: 0;
+    left: 0;
+    right: 0;
    opacity: 0;
+
  }
-}
-@media (min-width: 992px) {
  .swipercomR2{
    padding: 0;
  }
@@ -306,7 +334,7 @@ ul,li{
    border-top-left-radius: 10px;
  }
  .swipercomSubEn{
-    left: -1.2rem;
+    left: -1.5rem;
    font-size: 2.6rem;
  }
  .swipercomTitleL{
@@ -316,7 +344,10 @@ ul,li{
    font-size: 1.1rem;
  }
  .indexRoll1Hd{
-    width: 41%;
+    width: 47%;
+  }
+  .indexRoll1Hd.indexRoll1Hd2{
+    width: 55%;
  }
  .containerRoll2{
    padding-left: 130px;
@@ -351,6 +382,9 @@ ul,li{
  .indexRoll1Hd{
    width: 40%;
  }
+  .swipercomSubEn{
+    left: -1.5rem;
+  }
 }
 @media (min-width: 1440px) {
  .swipercomSubEnLenR2{
@@ -405,10 +439,16 @@ ul,li{
  .indexRoll1Hd{
    width: 40%;
  }
+  .indexRoll1Hd.indexRoll1Hd2{
+    width: 35%;
+  }
  .containerRoll2{
    padding-left: 280px;
    padding-right: 40px;
  }
+  .swipercomSubEn{
+    left: -1.5rem;
+  }
 }
 @media (min-width: 1800px) {
  .swipercomSubEnLenR2{
@@ -450,7 +490,14 @@ ul,li{
    font-size: 1.2rem;
  }
  .indexRoll1Hd{
-    width: 35%;
+    width:35%;
+  }
+  .indexRoll1Hd.indexRoll1Hd2{
+    width: 29%;
+  }
+  .swipercomSubEn{
+    left: -2rem;
+    font-size: 3.5rem;
  }

 }

--- a/src/components/home/indexNav.vue
+++ b/src/components/home/indexNav.vue
@@ -57,7 +57,7 @@
          </div>
        </div>
        <div class="carousel1-right overflow-hidden relative"
-        :class="[windowWidth>1280?'col-7':'col-12']" @mouseenter="ClearData">
+        :class="[windowWidth>1280?'col':'col-12']" @mouseenter="ClearData">
          <template v-if="windowWidth>=768">
            <q-img class="carousel1-rightImg animate__animated" @mouseenter="ClearData"
            :class="[oldCoverImg!=coverImg?'active animate__bounceInUp':'animate__bounceOutUp']"

--- a/src/components/home/indexRoll1.vue
+++ b/src/components/home/indexRoll1.vue
@@ -95,10 +95,12 @@
        </div>

      </div>
-      <div class="absolute" style="width: 25%;left: 0;top: 0;bottom: 0;z-index: 2;" @mousemove="handleMouseMove"></div>
-      <div class="absolute" style="width: 25%;right: 0;top: 0;bottom: 0;z-index: 2;" @mousemove="handleMouseMove"></div>
-      <div class="absolute" style="width: 50%;right: 25%;top: 0;z-index: 2;height: 35vh;" @mousemove="handleMouseMove"></div>
-      <div class="absolute" style="width: 50%;right: 25%;bottom: 0;z-index: 2;height: 23vh;" @mousemove="handleMouseMove"></div>
+      <template v-if="windowWidth>=992">
+        <div class="absolute" style="width: 25%;left: 0;top: 0;bottom: 0;z-index: 2;" @mousemove="handleMouseMove"></div>
+        <div class="absolute" style="width: 25%;right: 0;top: 0;bottom: 0;z-index: 2;" @mousemove="handleMouseMove"></div>
+        <div class="absolute" style="width: 50%;right: 25%;top: 0;z-index: 2;height: 35vh;" @mousemove="handleMouseMove"></div>
+        <div class="absolute" style="width: 50%;right: 25%;bottom: 0;z-index: 2;height: 23vh;" @mousemove="handleMouseMove"></div>
+      </template>
    </div>

    <mouse v-if="windowWidth>=992" :X="X" :Y="Y" :isRight="isRight" :Current="Current"></mouse>
@@ -262,7 +264,6 @@
  color: rgb(17,17,17);
 }
 .indexRoll1Hd{
-  width: 33.33%;
  margin: auto;
  line-height: 2.18rem;
  letter-spacing: .29rem;
@@ -345,9 +346,6 @@
    top: -5rem;
  }
 .swipercomSubEn{
-    left: -1.9rem;
-    top: -2px;
-    font-size: 3.5rem;
    color: $secondary;
  }
 .swipercomSubEnLen::before{

--- a/src/components/home/indexRoll2.vue
+++ b/src/components/home/indexRoll2.vue
@@ -15,7 +15,7 @@
                <span class="inline-block tracking-2">{{plugData.Title}}</span>
              </div>
            </div>
-            <div class="indexRoll1Hd">
+            <div class="indexRoll1Hd indexRoll1Hd2">
              {{plugData.Describe}}
            </div>
          </div>
@@ -235,7 +235,6 @@
  color: rgb(17,17,17);
 }
 .indexRoll1Hd{
-  width: 33.33%;
  margin: auto;
  line-height: 2.18rem;
  letter-spacing: .29rem;
@@ -317,9 +316,6 @@
    /* top: -5rem; */
  }
 .swipercomSubEn{
-    left: -1.9rem;
-    top: -2px;
-    font-size: 3.5rem;
    color: $secondary;
  }
 .swipercomSubEnLen::before{
@@ -391,26 +387,16 @@
 }
 .swipercomTvR2Bj{
  background: linear-gradient(0deg,#000,transparent);
-  top: 100%;
-  left: 0;
-  bottom: 0;
-  right: 0;
  z-index: 333;
  opacity: .7;
  border-radius: 10px;
  z-index: 1;
-  opacity: 0;
  transition: all .3s;
 }
 .swipercomTvR2{
-  top: 100%;
-  bottom: 0;
-  left: 0;
-  right: 0;
  color: #fff;
  z-index: 2;
  padding: 0 20px 40px 20px;
-  opacity: 0;
  transition: all .3s;
 }
 .swipercomTitleLR2{
@@ -428,12 +414,12 @@
  padding: 5px 20px 8px 20px;
  font-size: 1.1rem;
 }
-.swiperR2W:hover .swipercomTvR2Bj{
+.swiperR2W>div:hover .swipercomTvR2Bj{
  top: 0;
  bottom: 0;
  opacity: 1;
 }
-.swiperR2W:hover .swipercomTvR2{
+.swiperR2W>div:hover .swipercomTvR2{
  top: 0;
  bottom: 0;
  opacity: 1;

--- a/src/components/navs/city-category.vue
+++ b/src/components/navs/city-category.vue
@@ -298,7 +298,7 @@
                <div
                  class="category-item font-16"
                  :key="i"
-                  v-for="(x, i) in dataList.CategoryList"
+                  v-for="(x, i) in categoryList"
                >
                  <template v-if="i <= 3">
                    <img
@@ -318,11 +318,11 @@
                <div
                  class="category-item"
                  :key="i"
-                  v-for="(x, i) in dataList.CategoryList"
+                  v-for="(x, i) in categoryList"
                >
-                  <div :key="item.Id" v-for="item in x.SubList">
+                  <div :key="i" v-for="item in x.SubList">
                    <div
-                      @click="handleCategoryChage(item)"
+                      @click="x.CategoryName=='行程线路'?OpenNewUrl(item.LinkUrl):handleCategoryChage(item)"
                      class="category-l2"
                      :class="{
                        'category-l2-select': selectCategory === item.Id,
@@ -330,15 +330,15 @@
                    >
                      {{ item.CategoryName }}
                    </div>
-                    <div v-if="item.SubList.length">
+                    <div v-if="item.SubList&&item.SubList.length">
                      <div
-                        @click="handleCategoryChage(item2)"
+                        @click="x.CategoryName=='行程线路'?OpenNewUrl(item2.LinkUrl):handleCategoryChage(item2)"
                        class="category-l3"
                        :class="{
                          'category-l3-select': selectCategory === item2.Id,
                        }"
-                        :key="item2.Id"
-                        v-for="item2 in item.SubList"
+                        :key="index"
+                        v-for="(item2,index) in item.SubList"
                      >
                        <div>{{ item2.CategoryName }}</div>
                      </div>
@@ -349,7 +349,7 @@
            </div>
          </q-menu>
        </div>
-        <template v-for="(x, i) in dataList.CategoryList">
+        <template v-for="(x, i) in categoryList">
          <div
            class="category-btn"
            :key="i"
@@ -368,9 +368,9 @@
              @mouseleave="menuLeave(i)"
            >
              <div class="category-box">
-                <div :key="item.Id" v-for="item in x.SubList">
+                <div :key="index" v-for="(item,index) in x.SubList">
                  <div
-                    @click="handleCategoryChage(item)"
+                    @click="x.CategoryName=='行程线路'?OpenNewUrl(item.LinkUrl):handleCategoryChage(item)"
                    class="category-l2"
                    :class="{
                      'category-l2-select': selectCategory === item.Id,
@@ -378,15 +378,15 @@
                  >
                    {{ item.CategoryName }}
                  </div>
-                  <div v-if="item.SubList.length">
+                  <div v-if="item.SubList&&item.SubList.length">
                    <div
-                      @click="handleCategoryChage(item2)"
+                      @click="x.CategoryName=='行程线路'?OpenNewUrl(item2.LinkUrl):handleCategoryChage(item2)"
                      class="category-l3"
                      :class="{
                        'category-l3-select': selectCategory === item2.Id,
                      }"
-                      :key="item2.Id"
-                      v-for="item2 in item.SubList"
+                      :key="index"
+                      v-for="(item2,index) in item.SubList"
                    >
                      <div>{{ item2.CategoryName }}</div>
                    </div>
@@ -433,6 +433,7 @@ export default {
      selectedArea: [],
      selectedAreaId: "",
      isHome: false,
+      HomeData: [],
    };
  },
  watch: {
@@ -448,11 +449,51 @@ export default {
    },
    $route: {
      handler: function (val, oldVal) {
-        this.isHome = val.path === "/" || val.path === "/index";
+        this.isHome = val.path === "/searchProduct" || val.path === "/search";
      },
      // 深度观察监听
      deep: true,
    },
+    dataList: {
+      handler(n, o) {
+        var jObj = JSON.parse(window.localStorage.getItem('HomeData'));
+        this.HomeData = jObj.filter(x=>{ return x.Id == 'index_nav' })
+        if(this.HomeData.length>0) {
+          let obj = {
+            BackgroundImage: "",
+            CategoryName: "行程线路",
+            Icon: "",
+            Id: 9999999,
+            IsHot: '',
+            IsSelfGuidedTour: '',
+            Level: 0,
+            LinkUrl: '',
+            ParentId: 0,
+            Sort: 0,
+            SubList: []
+          }
+          let obj2 = {
+            CategoryName: '',
+            LinkUrl: '',
+            Id: 0,
+          }
+          this.categoryList = n.CategoryList
+          this.HomeData[0].plugData.MenuList.forEach(x=>{
+            obj.CategoryName = '行程线路'//x.MenuName
+            obj.LinkUrl = x.LinkUrl
+            x.SubMenuList.forEach((y,index)=>{
+              obj2 = {
+                CategoryName: y.MenuName,
+                LinkUrl: y.LinkUrl,
+                Id: 9999999+index,
+              }
+              obj.SubList.push(obj2)
+            })
+          })
+          this.categoryList[0] = obj
+        }
+      }
+    }
  },
  meta() {
    return {
@@ -464,8 +505,8 @@ export default {
  },
  mounted() {
    this.isHome =
-      this.$router.history.current.path === "/" ||
-      this.$router.history.current.path === "/index";
+      this.$router.history.current.path === "/searchProduct" ||
+      this.$router.history.current.path === "/search";

    if (localStorage.b2bUser) {
      this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser"));
@@ -484,6 +525,8 @@ export default {
    );
    this.searchDate = newStartDateStr;
    this.searchEndDate = newEndDateStr;
+
+
  },
  methods: {
    avatarClick() {

--- a/src/components/navs/hor-big-one.vue
+++ b/src/components/navs/hor-big-one.vue
@@ -221,7 +221,7 @@
                :src="LoginUser.photo"
              />
              <img class="avatar" v-else src="../../assets/img/avatar.png" />
-              
+
              <!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
            </template>
            <div class="row no-wrap">
@@ -456,7 +456,7 @@ export default {
        "body"
      ).style = `position: fixed; top: -${this.scrollTop}px`;
    },
-    
+
    handleDialogClose() {
      document.querySelector(
        "body"

--- a/src/components/navs/newHor-btm.vue
+++ b/src/components/navs/newHor-btm.vue
@@ -214,8 +214,9 @@
        <div class="hidden icon-slash icon-slash-white">
          <a href=""></a>
        </div>
-        <div class="text-center">
-          <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank" class="text-grey-8" style="text-decoration: none;">蜀ICP备13000760号 ©</a> 2010-{{year}} {{ dataList.Config.Name }}. All Rights Reserved. 旅行社业务经营许可证 {{ dataList.Config.UnifyCode }}
+        <div :class="[$q.platform.is.desktop?'text-center':'text-left q-px-md']">
+          <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank"
+          style="text-decoration: none;">蜀ICP备13000760号 ©</a> 2010-{{year}} {{ dataList.Config.Name }}. All Rights Reserved. 旅行社业务经营许可证 {{ dataList.Config.UnifyCode }}
        </div>
      </div>
    </div>

--- a/src/layouts/HomeLayout.vue
+++ b/src/layouts/HomeLayout.vue
@@ -90,7 +90,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
    },
    watch: {
      '$route': function() {
-      this.showUserInfo = Boolean(this.$route.meta.isUserCenter)
+        this.showUserInfo = Boolean(this.$route.meta.isUserCenter)
      }
    },
    created() {
@@ -102,7 +102,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
      })
    },
    mounted() {
-      this.isSearch = this.$router.history.current.path != "/index"&&this.$router.history.current.path != "/"
+      this.isSearch = this.$router.history.current.path === "/searchProduct"||this.$router.history.current.path === "/search"
      window.addEventListener('scroll', this.getScrollHeight, false);
      //判断是不是同一天
      if (localStorage.ToDay) {

--- a/src/pages/city/cityDetail.vue
+++ b/src/pages/city/cityDetail.vue
@@ -202,7 +202,7 @@
          </div>
        </div>
        <!-- <div v-for="item in navList" :key="item.img" class="nav-item" @click="navClick(item)">
-          
+
          <img
            class="nav-img"
            :src="require(`../../assets/img/${item.img}.png`)"
@@ -386,7 +386,7 @@ export default {
      newPageCount: 2,
      navList: [
        {
-          title: "观光行程",
+          title: "行程线路",
          img: "nav-map",
        },
        {
@@ -427,6 +427,15 @@ export default {
  },
  methods: {
    navClick(item) {
+      if(item.title=='行程线路'){
+        this.CommonJump("/searchProduct", {
+          areaId: this.detail.Id,
+          qsearchDate: this.searchDate,
+          qsearchEndDate: this.searchEndDate,
+          CategoryName: item.title,
+        });
+        return
+      }
      this.CommonJump("/search", {
        areaId: this.detail.Id,
        qsearchDate: this.searchDate,