临时提交

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,13 +217,9 @@
             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> -->
             </template>
             <div class="row no-wrap">
@@ -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");

src/components/searchProductdata/kkday.vue

@@ -40,7 +40,7 @@
             standout
             placeholder="蒐索關鍵字"
             class="q-ma-md"
-            @blur="changeAddrSearchHandler"
+            @blur="handleSearchKey"
           />
           <!-- <q-tree
           ref="area"
@@ -505,8 +505,6 @@ export default {
   },
   created() {
     this.msg = this.qMsg;
-    // this.msg.teamType = [];
-    //this.initAreaList();
     this.initGoods();
     this.msg.priceRange = {
       min: 1,
@@ -524,11 +522,11 @@ export default {
   mounted() {
     let LineIdList = [];
     if (this.msg.LineIds && this.msg.LineIds.length > 0) {
-      LineIdList = this.msg.LineIds.split(";");
+      LineIdList = this.msg.LineIds.split(",");
     }
     let SeriesIdList = [];
     if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) {
-      SeriesIdList = this.msg.SeriesIds.split(";");
+      SeriesIdList = this.msg.SeriesIds.split(",");
     }
     if (
       (LineIdList && LineIdList.length > 0) ||
@@ -536,7 +534,12 @@ export default {
     ) {
       let arr = [];
       this.goodsType.forEach((x) => {
-        let lineIdIndex = LineIdList.findIndex((yId) => x.Id.slice(2) == yId);
+        var tempLineId = 0;
+        var tempLineIdArray = x.Id.split("|");
+        if (tempLineIdArray && tempLineIdArray.length == 2) {
+          tempLineId = tempLineIdArray[0];
+        }
+        let lineIdIndex = LineIdList.findIndex((yId) => tempLineId == yId);
         if (lineIdIndex != -1) {
           arr.push(x.Id);
         }
@@ -544,8 +547,12 @@ export default {
           if (lineIdIndex != -1) {
             arr.push(y.Id);
           } else {
-            let seriesIdIndex = SeriesIdList.findIndex((yId) => y.Id.slice(2) == yId);
-
+            var tempLtId = 0;
+            var tempLtIdArray = y.Id.split("|");
+            if (tempLtIdArray && tempLtIdArray.length == 2) {
+              tempLtId = tempLtIdArray[0];
+            }
+            let seriesIdIndex = SeriesIdList.findIndex((yId) => tempLtId == yId);
             if (seriesIdIndex != -1) {
               arr.push(y.Id);
             }
@@ -556,15 +563,11 @@ export default {
     }
   },
   methods: {
-    handleSelected(target) {
-      console.log("handleSelected", target);
-    },
     handleTicked(target) {
       this.msg.pageIndex = 1;
       this.ticked = target;
       this.goSearchHandler();
     },
-
     handleSearchKey(target) {
       this.msg.pageIndex = 1;
       this.goSearchHandler();
@@ -635,11 +638,11 @@ export default {
       let arr = [];
       let LineIdList = [];
       if (this.msg.LineIds && this.msg.LineIds.length > 0) {
-        LineIdList = this.msg.LineIds.split(";");
+        LineIdList = this.msg.LineIds.split(",");
       }
       let SeriesIdList = [];
       if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) {
-        SeriesIdList = this.msg.SeriesIds.split(";");
+        SeriesIdList = this.msg.SeriesIds.split(",");
       }
       this.apipost(
         "b2c_get_GetB2CQueryCondition",
@@ -652,7 +655,13 @@ export default {
               x.explsed = false;
               x.isShow = true;
               x.children = x.SubList;
-              let lineIdIndex = LineIdList.findIndex((yId) => x.Id.slice(2) == yId);
+              var tempLineId = 0;
+              var tempLineIdArray = x.Id.split("|");
+              if (tempLineIdArray && tempLineIdArray.length == 2) {
+                tempLineId = tempLineIdArray[0];
+              }
+
+              let lineIdIndex = LineIdList.findIndex((yId) => tempLineId == yId);
               x.children.forEach((y) => {
                 y.checked = false;
                 y.explsed = false;
@@ -661,9 +670,12 @@ export default {
                   arr.push(y.Id);
                   this.ticked.push(y.Id);
                 } else {
-                  let seriesIdIndex = SeriesIdList.findIndex(
-                    (yId) => y.Id.slice(2) == yId
-                  );
+                  var tempLtId = 0;
+                  var tempLtIdArray = y.Id.split("|");
+                  if (tempLtIdArray && tempLtIdArray.length == 2) {
+                    tempLtId = tempLtIdArray[0];
+                  }
+                  let seriesIdIndex = SeriesIdList.findIndex((yId) => tempLtId == yId);
                   if (seriesIdIndex != -1) {
                     arr.push(y.Id);
                     this.ticked.push(y.Id);
@@ -758,7 +770,6 @@ export default {
         this.msg,
         (res) => {
           this.$q.loading.hide();
-          console.log("b2c_get_GetB2C2024TravelProductPage", res);
           if (res.data.resultCode == 1) {
             this.PageCount = res.data.data.pageCount;
             this.TotalCount = res.data.data.count;

src/components/searchdata/kkday.vue

@@ -676,6 +676,7 @@ export default {
       let arr = [];
       let jObj = JSON.parse(window.localStorage.getItem("baseifo"));
       jObj.CategoryList.forEach((x) => {
+        
         x.checked = false;
         x.explsed = false;
         x.isShow = true;