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

src/components/navs/hor-big-one.vue

@@ -158,7 +158,7 @@
 .category-btn {
   width: 100px;
 }
-.mobile-logo{
+.mobile-logo {
   max-height: 35px;
   max-width: 120px;
   object-fit: contain;
@@ -178,23 +178,25 @@
       class="zk_toolbar flex justify-between"
       :class="{ 'q-px-none': $q.platform.is.desktop }"
     >
-      <div class="flex"><div class="f24" v-if="$q.platform.is.mobile && isHome" @click="handleShowDialog">
-        <i class="iconfont iconmore1" style="font-size: 24px;"></i>
+      <div class="flex">
+        <div class="f24" v-if="$q.platform.is.mobile && isHome" @click="handleShowDialog">
+          <i class="iconfont iconmore1" style="font-size: 24px"></i>
+        </div>
+        <img
+          :src="baseData.logo"
+          style="
+            cursor: pointer;
+            height: 35px;
+            filter: drop-shadow(0px 0px var(--q-color-primary));
+          "
+          class="q-mr-lg q-ml-sm"
+          :class="{ 'mobile-logo': $q.platform.is.mobile }"
+          @click="CommonJump('/index', {})"
+        />
       </div>
-      <img
-        :src="baseData.logo"
-        style="
-          cursor: pointer;
-          height: 35px;
-          filter: drop-shadow(0px 0px var(--q-color-primary));
-        "
-        class="q-mr-lg q-ml-sm"
-        :class="{'mobile-logo':$q.platform.is.mobile}"
-        @click="CommonJump('/index', {})"
-      /></div>
-      <!-- <div style="transform:scale(0.6,0.6)"> -->
-          <searchSf2 v-if="!isHome" :plugData="plugData"></searchSf2>
-          <!-- </div> -->
+      <!--HK 2024-11-22 去掉 搜索接口有调整-->
+      <searchSf2 v-if="!isHome" :plugData="plugData"></searchSf2>
+
       <!-- pc -->
       <div v-if="$q.platform.is.desktop">
         <q-btn label="繁體中文" flat>
@@ -215,11 +217,7 @@
             unelevated
           >
             <template v-slot:label>
-              <img
-                class="avatar"
-                v-if="LoginUser.photo"
-                :src="LoginUser.photo"
-              />
+              <img class="avatar" v-if="LoginUser.photo" :src="LoginUser.photo" />
               <img class="avatar" v-else src="../../assets/img/avatar.png" />
 
               <!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
@@ -229,7 +227,7 @@
                 <q-list class="text-grey-8" dense>
                   <q-item clickable v-close-popup to="/setUserInfo">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconpeople1"/>
+                      <q-avatar icon="iconfont iconpeople1" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>個人信息</q-item-label>
@@ -237,7 +235,7 @@
                   </q-item>
                   <q-item clickable v-close-popup to="/coupon">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconqianbao"/>
+                      <q-avatar icon="iconfont iconqianbao" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>優惠券</q-item-label>
@@ -245,7 +243,7 @@
                   </q-item>
                   <q-item clickable v-close-popup to="/order">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconorder"/>
+                      <q-avatar icon="iconfont iconorder" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>訂單</q-item-label>
@@ -254,7 +252,7 @@
                   <q-separator inset class="q-mx-lg" />
                   <q-item clickable v-close-popup to="/setUsersList">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconpeople"/>
+                      <q-avatar icon="iconfont iconpeople" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>出行人信息管理</q-item-label>
@@ -262,7 +260,7 @@
                   </q-item>
                   <q-item clickable v-close-popup to="/setAddress">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconemail"/>
+                      <q-avatar icon="iconfont iconemail" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>管理邮寄地址</q-item-label>
@@ -270,7 +268,7 @@
                   </q-item>
                   <q-item clickable v-close-popup to="/setInfo">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconset"/>
+                      <q-avatar icon="iconfont iconset" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>賬戶設置</q-item-label>
@@ -278,7 +276,7 @@
                   </q-item>
                   <q-item clickable v-close-popup @click="loginOut">
                     <q-item-section avatar>
-                      <q-avatar icon="iconfont iconlog-in"/>
+                      <q-avatar icon="iconfont iconlog-in" />
                     </q-item-section>
                     <q-item-section>
                       <q-item-label>登出</q-item-label>
@@ -337,8 +335,15 @@
       :baseData="baseData"
       :dataList="dataList"
     ></city-category>
-    <popup @mousemove.prevent id="city-category" v-model="showDialog" mode="bottom" @close="handleDialogClose">
-      <city-category-mobile @close="showDialog = false"
+    <popup
+      @mousemove.prevent
+      id="city-category"
+      v-model="showDialog"
+      mode="bottom"
+      @close="handleDialogClose"
+    >
+      <city-category-mobile
+        @close="showDialog = false"
         :baseData="baseData"
         :dataList="dataList"
       ></city-category-mobile
@@ -350,9 +355,9 @@
 import popup from "../props/index";
 import CityCategoryMobile from "./city-category-mobile.vue";
 import cityCategory from "./city-category.vue";
-import searchSf2 from '../search_sf/search-top.vue'
+import searchSf2 from "../search_sf/search-top.vue";
 export default {
-  components: { cityCategory, CityCategoryMobile, popup,searchSf2 },
+  components: { cityCategory, CityCategoryMobile, popup, searchSf2 },
   props: {
     baseData: {
       type: Object,
@@ -369,7 +374,7 @@ export default {
   },
   data() {
     return {
-      plugData: {details: [], Title: ''},
+      plugData: { details: [], Title: "" },
       showDialog: false,
       searchDate: "",
       searchEndDate: "",
@@ -401,7 +406,7 @@ export default {
     },
     $route: {
       handler: function (val, oldVal) {
-        console.log('val', val, oldVal)
+        console.log("val", val, oldVal);
         this.isHome = val.path === "/" || val.path === "/index";
         // this.isSearch = val.path === "/search";
       },
@@ -421,7 +426,7 @@ export default {
     this.isHome =
       this.$router.history.current.path === "/" ||
       this.$router.history.current.path === "/index";
-        // this.isSearch = this.$router.history.current.path === "/search";
+    // this.isSearch = this.$router.history.current.path === "/search";
     console.log(
       'JSON.parse(window.localStorage.getItem("b2bUser"))',
       JSON.parse(window.localStorage.getItem("b2bUser"))
@@ -448,19 +453,18 @@ export default {
     // this.getCategoryList();
   },
   methods: {
-    handler(event) {event.preventDefault();},
+    handler(event) {
+      event.preventDefault();
+    },
     handleShowDialog() {
       this.showDialog = true;
-      this.scrollTop = document.querySelector('body').scrollTop;
-      document.querySelector(
-        "body"
-      ).style = `position: fixed; top: -${this.scrollTop}px`;
+      this.scrollTop = document.querySelector("body").scrollTop;
+      document.querySelector("body").style = `position: fixed; top: -${this.scrollTop}px`;
     },
 
     handleDialogClose() {
-      document.querySelector(
-        "body"
-      ).style = '';},
+      document.querySelector("body").style = "";
+    },
     avatarClick() {
       if (this.LoginUser.token) {
         this.CommonJump("/userCenter");