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

src/boot/product.js

@@ -19,6 +19,8 @@ const product = {
                 url = "/detail/" + encodeURIComponent(productInfo.id ? productInfo.id : productInfo.ID) + "/" + 0 + "/" + configId
             } else if (t === 5) {
                 url = "/detailHotal/" + configId + '/' + productInfo.b2CPrice
+            } else if (t === 6) {
+                url = "/detailHotalDida/" + configId + '/' + productInfo.lowrateBySetCurrency
             }
         } else {
             throw new Error("參數不合法");

src/boot/utils.js

@@ -25,7 +25,6 @@ Vue.prototype.domainManager = function () {
   if (domainNameUrl.indexOf('oytour') !== -1) {
     domainUrl = "https://reborn.oytour.com";
   }
-  domainUrl = "https://reborn.oytour.com";
   var obj = {
     //主地址
     DomainUrl: domainUrl,
@@ -38,7 +37,6 @@ Vue.prototype.domainManager = function () {
 //获取当前域名
 Vue.prototype.GetDomain = function () {
   var domainNameUrl = window.location.hostname;
-  domainNameUrl = "www.oytour.com";
   return domainNameUrl;
 }
 Vue.prototype.groupBy = function (array, f) {

src/components/search_sf/search-top.vue

@@ -280,6 +280,7 @@
 </template>
 
 <script>
+import { date } from "quasar";
 //搜尋輪播淡出 - 中
 import popup from "../props/index";
 export default {
@@ -510,15 +511,27 @@ export default {
         this.historys=Array.from(new Set([this.searchKey].concat(this.historys)))
         localStorage['recent_search'] = JSON.stringify(this.historys)
       }
+      let qsearchDate = this.searchDate
+      let qsearchEndDate = this.searchEndDate
       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(currentUrl.includes('/#/searchProduct')){
+      //   urlName="/searchProduct";
+      // }else if(currentUrl.includes('/#/planeticket')){
+      //   urlName="/planeticket";
+      // }else if(currentUrl.includes('/#/searchVisa')){
+      //   urlName="/searchVisa";
+      // }
       if(urlName=='/searchVisa'||urlName=='/planeticket'){
         this.CommonJump(urlName, {
           Name: this.searchKey,
@@ -528,8 +541,8 @@ export default {
         this.CommonJump(urlName, {
           qsearchKey: this.searchKey,
           areaIds: this.areaTicked.join(','),
-          qsearchDate: this.searchDate,
-          qsearchEndDate: this.searchEndDate,
+          qsearchDate,
+          qsearchEndDate,
         });
       }
       

src/components/searchdida/list.vue

+<template>
+  <!-- 列表 -->
+    <div class="group-result-list">
+      <div class="group-statis-block">
+        <div class="group-share" style="display:none;"></div>
+        <div class="group-statis-detail">
+          <span class="title" v-if="qMsg.searchKey">{{qMsg.searchKey}} :</span>
+          找到
+          <span class="num"> {{qMsg.TotalCount}} </span>個行程
+          <span class="pc">，目前在第<span style="color: #7f7f7f;"> {{qMsg.pageIndex}} </span>頁</span>
+        </div>
+      </div>
+      <div>
+        <div class="group-box" v-for="(item,index) in DataList" :key="index">
+          <a class="group-cover">
+            <img v-if="item.newCoverImg" :src="item.newCoverImg" />
+          </a>
+          <div class="group-main">
+            <div class="group-info">
+              <div class="group-name" style="margin-bottom:5px;cursor:pointer" @click="GotoDetails(item)">
+                {{item.title}}
+              </div>
+              <div class="group-detail">
+                <i class="iconfont iconaddress"></i>
+                <span>{{item.countryName}}</span>
+              </div>
+              <div class="group-detail">
+                <i class="iconfont icontime"></i>
+                <span>{{item.dayNum}} 天</span>
+              </div>
+              <ul class="group-list">
+                <li>
+                  <a>{{item.startDate}}</a>
+                </li>
+              </ul>
+            </div>
+            <div class="price-info">
+              <div class="price-wrap">
+                <div class="price_Search">
+                  <small class="price_unit">TWD$</small> {{item.b2BPrice}}
+                </div>
+                <a class="btn_warning" @click="GotoDetails(item)" style="cursor:pointer">更多出發日</a>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="display:flex;justify-content: center;">
+          <q-pagination v-if="qMsg.PageCount>1" v-model="qMsg.pageIndex" :max="qMsg.PageCount" @input="gerOrderList()"
+            :direction-links="true">
+          </q-pagination>
+        </div>
+      </div>
+    </div>
+
+</template>
+<script>
+  export default {
+    props: ["DataList", "qMsg"],
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      GotoDetails(item) {
+        this.CommonJump('/details/' + encodeURIComponent(item.id) + "/" + item.tcid, {});
+      },
+      //调用
+      gerOrderList(){
+        this.$emit('getPage')
+      }
+    }
+  }
+
+</script>

src/router/routes.js

@@ -99,6 +99,18 @@ const routes = [{
                 component: () =>
                     import ('pages/planeticket.vue')
             },
+            {
+                path: '/searchDida', //出行产品（道旅酒店）检索
+                meta: { title: '出行检索' },
+                component: () =>
+                    import ('pages/SearchDida.vue')
+            },
+            { // 道旅酒店
+                path: '/detailHotalDida/:id/:b2CPrice',
+                meta: { title: '酒店' },
+                component: () =>
+                    import ('pages/detailHotalDida.vue')
+            },
             {
                 path: '/account', //用户信息
                 meta: { isUserCenter: true, needLogin: true, title: '用户信息' },