道旅 酒店列表

src/boot/product.js

@@ -20,7 +20,7 @@ const product = {
             } else if (t === 5) {
                 url = "/detailHotal/" + configId + '/' + productInfo.b2CPrice
             } else if (t === 6) {
-                url = "/detailHotalDida/" + configId + '/' + productInfo.lowrateBySetCurrency
+                url = `/detailHotalDida/${configId}/${productInfo.lowrateBySetCurrency}/${encodeURIComponent(productInfo.CheckInDate)}/${encodeURIComponent(productInfo.CheckOutDate)}`
             }
         } else {
             throw new Error("參數不合法");

src/boot/utils.js

@@ -323,3 +323,14 @@ Vue.prototype.GetHtml = function (str) {
   }
   return str;
 }
+// 检查图片是否存在
+Vue.prototype.checkImageExists = function (imageUrl, callback) {
+  const img = new Image();
+  img.onload = function() {
+    callback(true);
+  };
+  img.onerror = function() {
+    callback(false);
+  };
+  img.src = imageUrl;
+}

src/components/search_sf/search-top.vue

@@ -420,14 +420,18 @@ export default {
       // this.historys=Array.from(new Set([this.searchKey].concat(this.historys)))
       // localStorage['recent_search'] = JSON.stringify(this.historys)
       var currentUrl = window.location.href;
-      let urlName="/search";
-      if(currentUrl.includes('/#/searchProduct')){
-        urlName="/searchProduct";
-      }else if(currentUrl.includes('/#/planeticket')){
-        urlName="/planeticket";
-      }else if(currentUrl.includes('/#/searchVisa')){
-        urlName="/searchVisa";
+      let urlName="";
+
+      let currentUrlArr = currentUrl.split('/')
+      let urlType = currentUrlArr[4].split('?')[0]
+      if(urlType){
+        urlName = `/${urlType}`
+        if(urlType=='SearchDida'||urlType=='searchDida'){
+          qsearchDate  = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
+          qsearchEndDate  = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
+        }
       }
+
       if(urlName=='/searchVisa'||urlName=='/planeticket'){
         this.CommonJump(urlName, {
           Name: this.searchKey,
@@ -438,7 +442,8 @@ export default {
           qsearchKey: this.searchKey,
           qsearchDate: this.searchDate,
           qsearchEndDate: this.searchEndDate,
-          areaId: item.Id
+          areaId: item.Id,
+          areaName: item.Name
         });
       }
       if(this.isSearch) {
@@ -518,6 +523,7 @@ export default {
       
       let currentUrlArr = currentUrl.split('/')
       let urlType = currentUrlArr[4].split('?')[0]
+      console.log(urlType,'-----')
       if(urlType){
         urlName = `/${urlType}`
         if(urlType=='SearchDida'||urlType=='searchDida'){

src/components/searchdida/block.vue

+<template>
+  <!-- 豆腐块 -->
+  <div class="Search_center">
+    <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}')`}">
+            <div class="pd-price">
+              <div class="price">
+                {{item.dayNum}}
+                <small class="unit">天</small> {{item.b2BPrice}}
+                <small class="unit">元起</small>
+              </div>
+            </div>
+          </div>
+          <div class="pd-content">
+            <h3 class="pd-title">{{item.title}}</h3>
+            <div class="pd-departure">
+              出發日期：{{item.startDate}}
+              <span class="more" @click="GotoDetails(item)" style="cursor:pointer">...更多</span>
+            </div>
+          </div>
+        </a>
+      </li>
+    </ul>
+  </div>
+</template>
+<script>
+  export default {
+    props: ["DataList", "PageCount"],
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      GotoDetails(item) {
+        this.CommonJump('/details/' + encodeURIComponent(item.id) + "/" + item.tcid, {});
+      }
+    }
+  }
+
+</script>

src/components/searchdida/kkday.vue

@@ -233,14 +233,20 @@
           :key="i"
         >
           <q-img
-            :src="x.ImgList[0].ImageUrl"
+            :src="x.images[0]"
             :ratio="1"
             spinner-color="grey"
             spinner-size="20px"
             :width="$q.platform.is.desktop ? '272px' : ''"
             :height="$q.platform.is.desktop ? '' : '200px'"
             class="bg-grey-3"
-          />
+          >
+            <template v-slot:error>
+              <div class="absolute-full flex flex-center bg-grey-3 text-dark">
+                <img src="../../assets/img/errImg.png" alt="" style="width: 60%;">
+              </div>
+            </template>
+          </q-img>
           <div class="q-pa-md col column">
             <div class="text-subtitle1 text-weight-bold text-grey-9">
               {{ x.hotelName }}
@@ -287,7 +293,7 @@
                 
               </div>
               <div class="text-h6 product-price">
-                CNY：{{ x.lowrateBySetCurrency }}<span class="price-stuff">起</span>
+                CNY：{{ x.lowrateBySetCurrency }}<span class="price-stuff">元起</span>
               </div>
             </div>
           </div>
@@ -443,23 +449,37 @@ export default {
       provTicked: [],
     };
   },
+  watch: {
+    qMsg: {
+      handler(newVal, oldVal) {
+        this.msg = this.qMsg;
+        this.msg.priceRange = {
+          min: 1,
+          max: 100000,
+        };
+        this.msg.MinPrice = 0;
+        this.msg.MaxPrice = 100000;
+        this.dayArray.forEach((x) => {
+          x.checked = false;
+        });
+        if(!newVal.StartDate||!newVal.EndDate){
+          this.msg.StartDate = date.formatDate(new Date(this.qMsg.StartDate), "YYYY/MM/DD")
+          this.msg.EndDate = date.formatDate(new Date(this.qMsg.EndDate), "YYYY/MM/DD")
+        }
+        this.dateRange = { from: this.msg.StartDate, to: this.msg.EndDate };
+        if(newVal!=oldVal){
+          this.goSearchHandler();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   created() {
-    this.msg = this.qMsg;
+    
     this.initAreaList();
     this.initGoods();
-    this.msg.priceRange = {
-      min: 1,
-      max: 100000,
-    };
-    this.msg.MinPrice = 0;
-    this.msg.MaxPrice = 100000;
-    this.dayArray.forEach((x) => {
-      x.checked = false;
-    });
-    this.msg.StartDate = date.formatDate(new Date(this.qMsg.StartDate), "YYYY/MM/DD")
-    this.msg.EndDate = date.formatDate(new Date(this.qMsg.EndDate), "YYYY/MM/DD")
-    this.dateRange = { from: this.msg.StartDate, to: this.msg.EndDate };
-    this.goSearchHandler();
+    
   },
   mounted() {
       this.areaTicked = this.msg.Country ? [this.msg.Country] : (this.msg.Countrys ? this.msg.Countrys : []);
@@ -848,6 +868,14 @@ export default {
               tempArray.forEach(item => {
                 item.productType = 6;
                 item.configId = item.hotelId;
+                item.images = []
+                item.ImgList.forEach(img => {
+                  this.checkImageExists(img.ImageUrl, (exists) => {
+                    if(exists){
+                      item.images.push(img.ImageUrl)
+                    }
+                  });
+                })
               });
               this.DataList = tempArray;
               
@@ -941,6 +969,8 @@ export default {
       // this.msg.dayNumList = arr;
     },
     GotoDetails(item) {
+      item.CheckInDate = this.msg.StartDate
+      item.CheckOutDate = this.msg.EndDate
       this.CommonJump(item, {}, "blank");
     },
   },

src/pages/SearchDida.vue

@@ -1443,8 +1443,6 @@ export default {
       qMsg: {
         pageIndex: 1,
         pageSize: 20,
-        companyId: 0,
-        orderBy: 0, // 排序  0默认   1价格升序   2价格降序
 
         //只查询日本
         Country: "JP",
@@ -1466,6 +1464,39 @@ export default {
       DataList: [],
     };
   },
+  watch:{
+    '$route': {
+      handler(newVal, oldVal) {
+        var qsearchKey = this.getUrlKey("qsearchKey", window.location.href);
+        var qsearchDate = this.getUrlKey("qsearchDate", window.location.href);
+        var qsearchEndDate = this.getUrlKey("qsearchEndDate", window.location.href);
+        var areaId = this.getUrlKey("areaId", window.location.href);
+        var areaName = this.getUrlKey("areaName", window.location.href);
+        if (qsearchKey) {
+          this.qMsg.HotelName = qsearchKey;
+        }else if (areaName) {
+          this.qMsg.HotelName = areaName;
+        }else this.qMsg.HotelName = ''
+
+        if (qsearchDate) {
+          this.qMsg.StartDate = qsearchDate;
+        }else {
+          this.qMsg.StartDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
+        }
+        if (qsearchEndDate) {
+          this.qMsg.EndDate = qsearchEndDate;
+        }else {
+          this.qMsg.EndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
+        }
+
+        if ((qsearchKey || qsearchDate || qsearchEndDate) && this.ShowType != 2) {
+          this.goSearchHandler();
+        }
+      },
+      deep: true,
+      immediate: true,
+    }
+  },
   created() {},
   mounted() {
     // 支付宝退款 测试使用
@@ -1487,38 +1518,7 @@ export default {
       this.getAera();
     }
     document.addEventListener("click", this.clickHandler);
-    var qsearchKey = this.getUrlKey("qsearchKey", window.location.href);
-    var qsearchDate = this.getUrlKey("qsearchDate", window.location.href);
-    var qsearchEndDate = this.getUrlKey("qsearchEndDate", window.location.href);
-    var areaId = this.getUrlKey("areaId", window.location.href);
-    var areaIds = this.getUrlKey("areaIds", window.location.href);
-    var categoryId = this.getUrlKey("categoryId", window.location.href);
-    if (qsearchKey) {
-      this.qMsg.HotelName = qsearchKey;
-    }
-    if (qsearchDate) {
-      this.qMsg.StartDate = qsearchDate;
-    }else {
-      this.qMsg.StartDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
-    }
-    if (qsearchEndDate) {
-      this.qMsg.EndDate = qsearchEndDate;
-    }else {
-      this.qMsg.EndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
-    }
-    if (areaId) {
-      this.qMsg.areaId = Number(areaId);
-    }
-    if (areaIds) {
-      this.qMsg.areaIds = areaIds.split(",").map((item) => Number(item));
-    }
-    if (categoryId) {
-      this.qMsg.categoryId = Number(categoryId);
-    }
-
-    if ((qsearchKey || qsearchDate || qsearchEndDate) && this.ShowType != 2) {
-      this.goSearchHandler();
-    }
+    
   },
   methods: {
     handlerSearchChange(value) {
@@ -1640,11 +1640,7 @@ export default {
           return false;
         }
       }
-      var companyId = -1;
-      if (localStorage.groupinfo) {
-        var groupinfo = JSON.parse(localStorage.groupinfo);
-        companyId = groupinfo.siteList[0].companyId;
-      }
+     
       this.SearchResult =
         this.qMsg.StartDate + "-" + this.qMsg.EndDate + "  " + this.qMsg.HotelName;
       let msg = this.qMsg

src/router/routes.js

@@ -106,11 +106,17 @@ const routes = [{
                     import ('pages/SearchDida.vue')
             },
             { // 道旅酒店
-                path: '/detailHotalDida/:id/:b2CPrice',
-                meta: { title: '酒店' },
+                path: '/detailHotalDida/:id/:b2CPrice/:CheckInDate/:CheckOutDate',
+                meta: { title: '道旅酒店' },
                 component: () =>
                     import ('pages/detailHotalDida.vue')
             },
+            { // 道旅酒店
+                path: '/HotalDidaForm/:id',
+                meta: { title: '道旅酒店' },
+                component: () =>
+                    import ('pages/didaHotel/orderForm.vue')
+            },
             {
                 path: '/account', //用户信息
                 meta: { isUserCenter: true, needLogin: true, title: '用户信息' },