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

src/components/searchProductdata/block.vue

@@ -4,8 +4,9 @@
     <ul class="pd-list">
       <li class="pd-box" v-for="(item,index) in DataList" :key="index">
         <a class="pd-link">
-          <div class="pd-img"
-            :style="{backgroundImage:`url('${item.newCoverImg}')`}">
+          <template v-if="item.imgCover && item.imgCover.length > 0">
+            <div class="pd-img"
+            :style="{backgroundImage:`url('${item.imgCover[0].url}')`}">
             <div class="pd-price">
               <div class="price">
                 {{item.dayNum}}
@@ -14,6 +15,19 @@
               </div>
             </div>
           </div>
+          </template>
+          <template v-else>
+            <div class="pd-img">
+            <div class="pd-price">
+              <div class="price">
+                {{item.dayNum}}
+                <small class="unit">天</small> {{item.b2BPrice}}
+                <small class="unit">元起</small>
+              </div>
+            </div>
+          </div>
+          </template>
+        
           <div class="pd-content">
             <h3 class="pd-title">{{item.title}}</h3>
             <div class="pd-departure">

src/components/searchProductdata/kkday.vue

@@ -70,8 +70,8 @@
             tick-strategy="leaf"
             @update:ticked="handleTicked"
             :ticked="ticked"
-          /> </q-card
-      ></popup>
+          /> 
+        </q-card  ></popup>
       <popup mode="top" v-model="showDate">
         <q-card flat class="rounded-borders q-mt-lg overflow-hidden">
           <div class="q-my-sm q-mx-lg f20 bold">旅程時間</div>
@@ -358,7 +358,7 @@
         </div>
       </div>
       <div
-        v-else-if="!$q.loading.isActive && DataList.length == 0"
+        v-else-if="!$q.loading.isActive && DataList&& DataList.length == 0"
         class="text-center q-mt-xl"
       >
         <div class="text-center inline-block">

src/components/search_sf/search-top.vue

@@ -328,7 +328,7 @@ export default {
   created() {
   },
   mounted() {
-    this.isSearch = this.$router.history.current.path === "/search";
+    this.isSearch = this.$router.history.current.path === "/search"||this.$router.history.current.path === "/searchProduct";
     this.initAreaList()
     var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
     const hotList = this.getHotList(jObj.AreaList)
@@ -502,8 +502,12 @@ export default {
         this.historys=Array.from(new Set([this.searchKey].concat(this.historys)))
         localStorage['recent_search'] = JSON.stringify(this.historys)
       }
-      
-      this.CommonJump("/search", {
+      var currentUrl = window.location.href;
+      let urlName="/search";
+      if(currentUrl.includes('/#/searchProduct')){
+        urlName="/searchProduct";
+      }
+      this.CommonJump(urlName, {
         qsearchKey: this.searchKey,
         areaIds: this.areaTicked.join(','),
         qsearchDate: this.searchDate,

src/pages/SearchProduct.vue

@@ -965,6 +965,7 @@
           </div>
         </q-card-section>
         <q-separator />
+        
         <div style="max-height: 550px;padding:20px 30px 30px 30px" class="scroll">
           <div class="chosen-box">
             <div class="chosen-tab">
@@ -1416,7 +1417,15 @@ export default {
     };
   },
   created() {},
+  watch:{
+    qMsg:{
+      handler(n,o){
+        console.log(n.searchKey,'====11111');
+      }
+    } 
+  },
   mounted() {
+    console.log(this.qMsg.searchKey,'====11111');
     // 支付宝退款 测试使用
     // this.apipost("GetAliPayReturn_post",{OrderNo:'D202304121702420001'},r=>{
     //     if(r.data.message=="退款成功"){
@@ -1444,6 +1453,7 @@ export default {
     var categoryId = this.getUrlKey("categoryId", window.location.href);
     var seriesIds = this.getUrlKey("SeriesIds", window.location.href);
     var lineIds = this.getUrlKey("LineIds", window.location.href);
+    console.log("qsearchKey",qsearchKey);
     if (qsearchKey) {
       this.qMsg.searchKey = qsearchKey;
     }
@@ -1470,11 +1480,11 @@ export default {
     }
     if ((qsearchKey || qsearchDate || qsearchEndDate) && this.ShowType != 2) {
       this.goSearchHandler();
+      this.$forceUpdate();
     }
   },
   methods: {
     handlerSearchChange(value) {
-      console.log("handlerSearchChange", value);
       this.qMsg = value;
       this.goSearchHandler();
     },

src/router/routes.js

@@ -83,6 +83,11 @@ const routes = [{
                 meta: { title: '出行检索' },
                 component: () =>
                     import ('pages/SearchProduct.vue')
+            },{
+                path: '/planeticket', //出行产品（机票）检索
+                meta: { title: '出行检索' },
+                component: () =>
+                    import ('pages/planeticket.vue')
             },
             {
                 path: '/account', //用户信息