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

# Conflicts:
#	src/router/routes.js

src/App.vue

@@ -10,7 +10,7 @@ export default {
 };
 </script>
 <style>
-@import url("//at.alicdn.com/t/font_1890699_863y2y4jxon.css");
+@import url("//at.alicdn.com/t/font_1890699_p3f17tlsn3.css");
 @font-face {
   font-family: "oswald";
   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");

src/components/label_other/diy-form.vue

@@ -4,28 +4,28 @@
       <h2 class="block-title q-mb-lg">專人服務</h2>
       <q-form @submit="onSubmit" class="q-gutter-md">
         <div class="row q-gutter-xl desktop-only q-mb-lg q-pl-md">
-          <q-input filled v-model="params.name" label="如何稱呼您" class="col" lazy-rules
+          <q-input filled v-model="params.Name" label="如何稱呼您" class="col" lazy-rules
             :rules="[ val => val && val.length > 0 || '請填寫您的稱呼']" />
-          <q-input filled v-model="params.phone" label="聯絡電話" class="col" lazy-rules
+          <q-input filled v-model="params.Mobile" label="聯絡電話" class="col" lazy-rules
             :rules="[ val => val && val.length > 0 || '請填寫您的聯絡電話哦']" />
         </div>
         <div class="row mobile-only q-mb-lg">
-          <q-input filled v-model="params.name" label="如何稱呼您" class="col" lazy-rules
+          <q-input filled v-model="params.Name" label="如何稱呼您" class="col" lazy-rules
             :rules="[ val => val && val.length > 0 || '請填寫您的稱呼']" />
         </div>
         <div class="row mobile-only q-mb-lg">
-          <q-input filled v-model="params.phone" label="聯絡電話" class="col" lazy-rules
+          <q-input filled v-model="params.Mobile" label="聯絡電話" class="col" lazy-rules
             :rules="[ val => val && val.length > 0 || '請填寫您的聯絡電話哦']" />
         </div>
         <div class="row q-mb-lg">
-          <q-input filled v-model="params.eMail" label="聯絡E-Mail" type="email" class="col" lazy-rules
+          <q-input filled v-model="params.EMail" label="聯絡E-Mail" type="email" class="col" lazy-rules
             :rules="[ val => val && val.length > 0 || '請填寫您的聯絡E-Mail哦']" />
         </div>
         <div class="row q-mb-lg">
-          <q-input filled v-model="params.remark" label="備註" class="col" type="textarea" />
+          <q-input filled v-model="params.Remarks" label="備註" class="col" type="textarea" />
         </div>
         <div class="row q-mb-lg">
-          <q-btn type="submit" unelevated color="primary" size="lg" label="送出" class="col" />
+          <q-btn type="submit" unelevated color="primary" size="lg" label="送出" class="col" @click="onSubmit" />
         </div>
       </q-form>
     </div>
@@ -37,21 +37,36 @@
     data() {
       return {
         params: {
-          name: "",
-          phone: "",
-          eMail: "",
-          remark: ""
+          Name: "",
+          Mobile: "",
+          EMail: "",
+          Remarks: "",
+          RB_Group_Id: 0,
         }
       };
     },
     methods: {
       onSubmit() {
-        this.$q.notify({
-          color: "green-4",
-          textColor: "white",
-          icon: "cloud_done",
-          message: "提交成功"
-        });
+        var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
+        this.params.RB_Group_Id = jObj.GroupId;
+        this.apipost(
+          "ws_post_SetService", this.params,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.params.Name = '';
+              this.params.Mobile = '';
+              this.params.EMail = '';
+              this.params.Remarks = '';
+              this.$q.notify({
+                color: "green-4",
+                textColor: "white",
+                icon: "cloud_done",
+                message: "提交成功"
+              });
+            }
+          },
+          err => {}
+        );
       }
     }
   };

src/components/navs/hor-btm.vue

@@ -273,7 +273,7 @@
       <div class="footer-top">
         <div class="footer-link">
           <ul class="hor_footuu">
-            <li>{{dataList.Config.Name}}</li>
+            <li><a @click="CommonJump('/index',{})">{{dataList.Config.Name}}</a></li>
             <li class="other_li" v-for="(item,index) in dataList.FooterList" :key="index">
               <a @click="CommonJump(item.url,{})">{{item.title}}</a>
             </li>
@@ -338,7 +338,16 @@
               <img style="width:120px;height:auto;" :src="dataList.Config.WhiteLogo" />
             </div>
             <div class="footer_fb_group">
-              <a :href="dataList.Config.FaceBookUrl"><img :src="dataList.Config.Logo" alt="" /></a>
+              <a :href="dataList.Config.FaceBookUrl">
+
+                <div class="fb-page" :data-href="dataList.Config.FaceBookUrl" data-tabs="timeline" data-width="340"
+                  data-height="130" data-small-header="false" data-adapt-container-width="false" data-hide-cover="false"
+                  data-show-facepile="false">
+                  <blockquote :cite="dataList.Config.FaceBookUrl" class="fb-xfbml-parse-ignore"><a
+                      :href="dataList.Config.FaceBookUrl">{{dataList.Config.Name}}</a></blockquote>
+                </div>
+
+              </a>
             </div>
             <div class="footer_qrcode">
               <a :href="dataList.Config.LineUrl">
@@ -376,8 +385,7 @@
       </div>
       <div class="footer-bottom">
         <div class="sponsor">
-          <a :href="item.url?item.url:'javascript:;'" target="_blank" v-for="(item,index) in dataList.BottomList"
-            :key="index">
+          <a @click="OpenNewUrl(item.url)" target="_blank" v-for="(item,index) in dataList.BottomList" :key="index">
             <img :src="item.icon" />
           </a>
         </div>
@@ -387,7 +395,7 @@
       </div>
       <div class="footer-watermark footer_Left">
         <template v-if="dataList&&dataList.AdLeftList">
-          <div v-for="(item,index) in dataList.AdLeftList" :key="index">
+          <div v-for="(item,index) in getAdLeftList" :key="index">
             <a @click="OpenNewUrl(item.AdLink)">
               <img style="width:100%" :src="item.AdImg" />
             </a>
@@ -396,7 +404,7 @@
       </div>
       <div class="footer-watermark footer_Right">
         <template v-if="dataList&&dataList.AdRightList">
-          <div v-for="(item,index) in dataList.AdRightList" :key="index">
+          <div v-for="(item,index) in getAdRightList" :key="index">
             <a @click="OpenNewUrl(item.AdLink)">
               <img style="width:100%" :src="item.AdImg" />
             </a>
@@ -420,8 +428,53 @@
       var myDate = new Date();
       this.year = myDate.getFullYear();
     },
+    computed: {
+      getAdLeftList() {
+        var tempArray = [];
+        var showId = this.getShowId();
+        if (this.dataList && this.dataList.AdLeftList) {
+          this.dataList.AdLeftList.forEach(item => {
+            if (item.ShowPage.indexOf(showId) > -1) {
+              tempArray.push(item);
+            }
+          });
+        }
+        return tempArray;
+      },
+      getAdRightList() {
+        var tempArray = [];
+        var showId = this.getShowId();
+        if (this.dataList && this.dataList.AdRightList) {
+          this.dataList.AdRightList.forEach(item => {
+            if (item.ShowPage.indexOf(showId) > -1) {
+              tempArray.push(item);
+            }
+          });
+        }
+        return tempArray;
+      }
+    },
     methods: {
-
+      getShowId() {
+        let locationName = window.location.hostname;
+        var routeStr = this.$route.path.toLowerCase();
+        var showId = 0;
+        switch (routeStr) {
+          case "/index":
+            showId = 1;
+            break;
+          case '/search':
+            showId = 2;
+            break;
+          case '/trip':
+            showId = 3;
+            break;
+          case '/self':
+            showId = 4;
+            break;
+        }
+        return showId;
+      }
     },
   };
 

src/components/search_el/search_el1.vue

@@ -234,7 +234,6 @@
     data() {
       return {
         slide: 0,
-
         searchKey: "",
         searchDate: "",
         searchEndDate: "",

src/components/trip/style1.vue

+<style>
+  .Style_main_Top {
+    height: 460px;
+    overflow: hidden;
+  }
+
+  .Style_main_Top .detOne_top {
+    display: inline-block;
+    width: calc(100% + 20px);
+    height: 100%;
+    margin-left: -10px;
+    background-size: cover;
+    background-position: center center;
+    background-repeat: no-repeat;
+    z-index: 0;
+    filter: blur(5px);
+  }
+
+  .Style_main_Top .detOneModel {
+    position: absolute;
+    left: 0;
+    top: 0;
+    display: inline-block;
+    z-index: 2;
+    width: 50%;
+    height: 450px;
+    float: left;
+    text-align: center;
+  }
+
+  .detOneModel label {
+    position: relative;
+    display: inline-block;
+    width: 400px;
+    height: 100%;
+    background-color: rgba(255, 255, 255, .55);
+    padding: 60px 40px 40px;
+    text-align: left;
+  }
+
+  .detOneModel>* {
+    display: inline-block;
+    letter-spacing: 2px;
+  }
+
+  .Style_main_Top .main-title {
+    font-size: 55px;
+    font-weight: bold;
+    color: #000;
+    -webkit-writing-mode: vertical-lr;
+    writing-mode: vertical-lr;
+    height: 100%;
+  }
+
+  .Style_main_Top .sub-title {
+    font-size: 24px;
+    font-weight: lighter;
+    padding-top: 74px;
+    -webkit-writing-mode: vertical-lr;
+    writing-mode: vertical-lr;
+    height: 100%;
+  }
+
+  @media only screen and (max-width: 768px) {
+    .Style_main_Top .detOneModel {
+      width: 100%;
+      height: 280px;
+      top:80px;
+    }
+    .Style_main_Top .main-title{
+      font-size:30px;
+    }
+    .Style_main_Top .sub-title{
+      font-size:15px;
+    }
+    .detOneModel label {
+        width: 100%;
+        padding-top: 50px;
+    }
+  }
+
+</style>
+<template>
+  <div class="Style_main_Top">
+    <div class="detOne_top" v-if="imgCover.length>0"
+      :style="{backgroundImage:'url('+imgCover[0].Url+')'}">
+    </div>
+    <div class="detOneModel">
+      <label>
+        <b class="main-title">{{dataList.countryName}}</b>
+        <span class="sub-title">{{dataList.placeName}}</span>
+      </label>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['dataList'],
+    data() {
+      return {
+        imgCover:[]
+      };
+    },
+    created() {},
+    mounted() {
+      this.imgCover = JSON.parse(this.dataList.imgCover);
+    },
+    methods: {
+
+    },
+  };
+
+</script>

src/components/trip/style2.vue

+<style>
+    .Style2_main{
+        position: relative;
+        margin-bottom: 60px;
+        margin-top: -10px;
+        padding: 40px 0;
+        background-color: #fff;
+        border-bottom: 1px solid #e5e5e5;
+        z-index: 3;
+    }
+    .Style2_main .wl-section-block{
+        width: 100%;
+        max-width: 1200px;
+        margin: 0 auto;
+        padding: 0 20px;
+        display:flex;
+    }
+    .Style2_main .wl-section-block>*{
+        flex:1;
+    }
+    .Style2_main .tour-intro{
+        padding-left:30px;
+    }
+    .Style2_main .tour_Nmae{
+        margin-bottom: 10px;
+        font-size: 24px;
+        font-weight: bold;
+    }
+    .Style2_main .drop-wrap{
+        position: relative;
+        margin-bottom:10px;
+        display: inline-block;
+        vertical-align: middle;
+    }
+    .drop-wrap a,.print_box{
+        margin-right: 10px;
+        margin-bottom: 10px;
+        display: inline-block;
+        font-size: 14px;
+        color: #006be2;
+        padding: 4px 8px;
+        transition: .15s ease-in;
+    }
+    .Style2_main .tour-detail-list{
+        padding: 0 0 20px;
+        font-size: 14px;
+        color: #999;
+        list-style: none;
+    }
+    .Style2_main .tour-detail-list li{
+        line-height:2;
+    }
+    .Style2_main .tour-cover2 img{
+        width:100%;
+        height:auto;
+    }
+    @media only screen and (max-width: 768px){
+        .Style2_main .wl-section-block {
+            padding: 0;
+            display: block;
+        }
+        .Style2_main{
+            padding:0;
+        }
+    }
+</style>
+<template>
+  <div class="Style2_main">
+    <div class="wl-section-block">
+        <div class="tour-cover2" v-if="imgCover.length>0">
+            <img :src="imgCover[0].Url"/>
+        </div>
+        <div class="tour-intro">
+            <div class="tour_Nmae">{{dataList.title}}</div>
+            <div class="drop-wrap">
+                <a>分享</a>
+                <a class="print_box" @click="window.print()">打印</a>
+            </div>
+            <ul class="tour-detail-list">
+                <li>行程編號：{{dataList.currentPriceInfo.tcnum}}</li>   
+                <li>旅遊地點：{{dataList.countryName}}</li>
+                <li>旅遊天數：{{dataList.dayNum}}天</li>
+                <li>出團日期：{{dataList.currentPriceInfo.startDate}}</li>
+            </ul>
+        </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['dataList'],
+    data() {
+      return {
+        imgCover:[]
+      };
+    },
+    created() {},
+    mounted() {
+        this.imgCover = JSON.parse(this.dataList.imgCover);
+    },
+    methods: {
+
+    },
+  };
+
+</script>

src/components/trip/style4.vue

+<style>
+.wl-section-block {
+    width: 100%;
+    max-width: 1200px;
+    margin: 0 auto;
+}
+.section-tour {
+    margin-bottom: 30px !important;
+    padding: 30px 30px 0;
+    border: 1px solid #e5e5e5;
+    background-color: #fff;
+}
+.section-tour .isHiden4{
+    height:450px;
+    overflow: hidden;
+}
+.toggle_down:before {
+    content: "";
+    width: 100%;
+    position: absolute;
+    top: -100px;
+    left: 0;
+    z-index: 2;
+    height: 100px;
+    background-image: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: -moz-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: -o-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: linear-gradient(180deg,rgba(255,255,255,0),#fff);
+}
+</style>
+<template>
+  <div>
+    <section class="section-tour wl-section-block">
+      <div class="todayTitle">行程特色</div>
+      <div class="featureBox">
+        <div class="feature-inner" v-html="dataList.feature.featureContent" :class="{'isHiden4':isShow}"></div>
+        <div class="collapse_toggle" v-if="!isShow">
+          <i class="iconfont iconarrow-top" @click="isShow=true"></i>
+        </div>
+        <div class="collapse_toggle toggle_down" v-else>
+          <i class="iconfont iconarrowdown" @click="isShow=false"></i>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['dataList'],
+    data() {
+      return {
+        isShow:false
+      };
+    },
+    created() {},
+    mounted() {
+      if (localStorage.baseifo) {
+        this.TripConfig = JSON.parse(window.localStorage.getItem('baseifo'));
+      }
+      if(this.TripConfig.TripConfig.TripFeatureIsOpen==1){
+          this.isShow=false
+      }else{
+          this.isShow=true;
+      }
+    },
+    methods: {
+
+    },
+  };
+
+</script>

src/components/trip/style5.vue

+<style>
+  .wl-section-block {
+    width: 100%;
+    max-width: 1200px;
+    margin: 0 auto;
+  }
+
+  .section-tour {
+    margin-bottom: 30px !important;
+    padding: 30px 30px 0;
+    border: 1px solid #e5e5e5;
+    background-color: #fff;
+  }
+
+  .style5_item_title {
+    padding: 20px 0;
+    text-align: center;
+    width: 100%;
+  }
+
+  .fee_title {
+    color: #333;
+    font-size: 18px;
+    font-family: PingFangR;
+  }
+
+  .fee_line {
+    text-align: center;
+    color: #ccc;
+    font-size: 12px;
+    width: 100%;
+  }
+
+  .fee_line {
+    width: 32px;
+    height: 2px;
+    background: #ee4454;
+    display: inline-block;
+  }
+
+  .expense {
+    display: flex;
+    margin: 30px auto;
+    width: 100%;
+  }
+
+  .detail-box .expense .left {
+    width: 120px;
+    text-align: center;
+    font-size: "18px";
+    font-family: PingFangR;
+  }
+
+  .detail-box .expense .right {
+    -webkit-box-flex: 1;
+    flex: 1;
+    overflow: hidden;
+    font-size: 16px;
+    line-height: 25px;
+    color: #666;
+    text-align: left;
+  }
+  .section-tour .isHiden5{
+    height:450px;
+    overflow: hidden;
+  }  
+  .toggle_down:before {
+    content: "";
+    width: 100%;
+    position: absolute;
+    top: -100px;
+    left: 0;
+    z-index: 2;
+    height: 100px;
+    background-image: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: -moz-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: -o-linear-gradient(-90deg,rgba(255,255,255,0),#fff);
+    background-image: linear-gradient(180deg,rgba(255,255,255,0),#fff);
+}
+</style>
+<template>
+  <div>
+    <section class="section-tour wl-section-block">
+      <div class="style5_item_title detail-box">
+        <div :class="{'isHiden5':isShow}">
+          <div class="fee_title">费用</div>
+          <div class="fee_line">
+            <small class="s"></small>
+          </div>
+          <div style="color:#ccc">Expense</div>
+          <div class="expense">
+            <div class="left">费用包含</div>
+            <div class="right">
+              <div v-html="dataList.feature.feeInclude"></div>
+            </div>
+          </div>
+          <div class="expense">
+            <div class="left">自理费用</div>
+            <div class="right">
+              <div v-html="dataList.feature.feeNonInclude"></div>
+            </div>
+          </div>
+          <div class="fee_title">购物说明</div>
+          <div class="fee_line">
+            <small class="s"></small>
+          </div>
+          <div style="color:#ccc">Expense</div>
+          <div class="expense">
+            <div class="left"></div>
+            <div class="right">
+              <div v-html="dataList.feature.shopRemark"></div>
+            </div>
+          </div>
+          <div class="fee_title">预订须知</div>
+          <div class="fee_line">
+            <small class="s"></small>
+          </div>
+          <div style="color:#ccc">Tips</div>
+          <div class="expense">
+            <div class="left">重要提示</div>
+            <div class="right">
+              <div v-html="dataList.feature.importantTip"></div>
+            </div>
+          </div>
+          <div class="expense">
+            <div class="left">温馨提示</div>
+            <div class="right">
+              <div v-html="dataList.feature.warmTip"></div>
+            </div>
+          </div>
+          <div class="fee_title">签证</div>
+          <div class="fee_line">
+            <small class="s"></small>
+          </div>
+          <div style="color:#ccc">Visa</div>
+          <div class="expense">
+            <div class="left">签证须知</div>
+            <div class="right">
+              <div v-html="dataList.feature.visaRemark"></div>
+            </div>
+          </div>
+          <div class="fee_title">同行备注</div>
+          <div class="fee_line">
+            <small class="s"></small>
+          </div>
+          <div style="color:#ccc">Remark</div>
+          <div class="expense">
+            <div class="left"></div>
+            <div class="right">
+              <div v-html="dataList.feature.b2BRemark"></div>
+            </div>
+          </div>
+        </div>
+        <div class="collapse_toggle" v-if="!isShow">
+          <i class="iconfont iconarrow-top" @click="isShow=true"></i>
+        </div>
+        <div class="collapse_toggle toggle_down" v-else>
+          <i class="iconfont iconarrowdown" @click="isShow=false"></i>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['dataList'],
+    data() {
+      return {
+        isShow: false
+      };
+    },
+    created() {},
+    mounted() {
+      if (localStorage.baseifo) {
+        this.TripConfig = JSON.parse(window.localStorage.getItem('baseifo'));
+      }
+      if(this.TripConfig.TripConfig.NoticeItemIsOpen==1){
+          this.isShow=false;
+      }else{
+          this.isShow=true;
+      }
+    },
+    methods: {
+
+    },
+  };
+
+</script>

src/components/trip/style6.vue

+<style>
+    .section-tour{
+        margin-bottom: 30px;
+        padding: 30px 30px 0;
+        border: 1px solid #e5e5e5;
+        background-color: #fff;
+    }
+    .wl-section-block{
+        width:100%;
+    }
+    .todayTitle{
+        font-size: 23px;
+        color: #666;
+        font-weight: bold;
+    }
+    .tour-detail-timeline{
+        padding:15px 0;
+    }
+    .tour-detail-timeline .detail-card {
+        position: relative;
+        min-height: 100px;
+        padding: 16px 0 16px 90px;
+        line-height: 1.8;
+    }
+</style>
+<template>
+  <div class="Style6_main">
+    <section class="section-tour wl-section-block">
+      <div class="todayTitle">每日行程</div>
+      <div class="tour-detail-timeline">
+        <div class="detail-card">
+
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+  export default {
+    props: ['tripList', 'isDirect'],
+    data() {
+      return {
+        trips: [],
+        slide: 0,
+      };
+    },
+    created() {},
+    mounted() {
+      console.log(this.tripList, 'triplistt');
+      this.init();
+    },
+    methods: {
+      init() {
+        this.tripList.forEach((x, j) => {
+          let useDinnerTypeBy = ''
+          let jin = [],
+            jiu = [],
+            jiu2 = [],
+            jiao = [],
+            dadian = [],
+            tips = [],
+            activy = [],
+            can = {
+              breakfirst: '敬请自理',
+              lanuch: '敬请自理',
+              dinner: '敬请自理'
+            }
+          x.dayArray.forEach((y, index) => {
+            if (y.type == 7 && y.childItem.title != '') {
+              let obj = {
+                title: y.childItem.title,
+                content: y.childItem.description,
+                img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ? y.childItem.imaArray[0].url :
+                  '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null,
+                url: ''
+              }
+              dadian.push(obj)
+            } else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
+              let title = ''
+              y.childItem.subTraffic.forEach((z, i) => {
+                title += z.startCityName
+                if (z.arrivalType == 1) {
+                  title += '<i class="iconfont icon-feiji"></i>'
+                } else if (z.arrivalType == 2) {
+                  title += '<i class="iconfont icon-bus"></i>'
+                } else if (z.arrivalType == 3) {
+                  title += '<i class="iconfont icon-icon31"></i>'
+                } else {
+                  title += '<i class="iconfont icon-gaotiedongche"></i>'
+                }
+                if (i + 1 == y.childItem.subTraffic.length) {
+                  title += z.arrivalCityName
+                }
+              })
+              let obj = {
+                title: title,
+                content: y.childItem.description,
+                img: '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null,
+                url: ''
+              }
+              jiao.push(obj)
+            } else if (y.type == 2 && y.childItem.imaArray.length > 0) {
+              let obj = {
+                title: y.childItem.couponsName,
+                content: y.childItem.description,
+                img: y.childItem.imaArray[0].url,
+                ticketName: y.childItem.couponsTicketName,
+                playTimeHour: y.childItem.playTimeHour,
+                playTimeMinutes: y.childItem.playTimeMinutes,
+                url: y.childItem.url,
+                scenicJson: y.childItem.scenicJson,
+                videoPath: y.childItem.imaArray[0].videoPath,
+                fileType: y.childItem.imaArray[0].fileType,
+
+              }
+              jin.push(obj)
+            } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
+              let obj = {
+                title: y.childItem.hotelName,
+                content: y.childItem.description,
+                img: y.childItem.imaArray[0].url,
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null,
+                url: y.childItem.url
+              }
+              jiu.push(obj)
+            } else if (y.type == 4) {
+              if (y.childItem.useDinnerType == "1") {
+                can.breakfirst = y.childItem.dinnerName
+              } else if (y.childItem.useDinnerType == "2") {
+                can.lanuch = y.childItem.dinnerName
+              } else if (y.childItem.useDinnerType == "3") {
+                can.dinner = y.childItem.dinnerName
+              }
+            } else if (y.type == 5) {
+              let obj = {
+                title: '自由活动',
+                content: y.childItem.description,
+                img: '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null,
+                url: ''
+              }
+              activy.push(obj)
+            } else if (y.type == 6) {
+              let obj = {
+                title: y.childItem.title,
+                content: y.childItem.description,
+                img: '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null,
+                url: ''
+              }
+              tips.push(obj)
+            }
+            if (y.type == 3) {
+              // jiu2.push(y.childItem.hotelName)
+              jiu2.push({
+                name: y.childItem.hotelName,
+                url: y.childItem.url
+              });
+              useDinnerTypeBy = y.childItem.useDinnerType
+            }
+          })
+          if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
+            can.breakfirst = '酒店内享用早餐'
+          } else if (can.breakfirst == '') {
+            can.breakfirst = '方便游玩敬请自理'
+          }
+          if (can.lanuch == '敬请自理' && useDinnerTypeBy.indexOf('2') != -1) {
+            can.lanuch = '酒店自助'
+          } else if (can.lanuch == '') {
+            can.lanuch = '方便游玩敬请自理'
+          }
+          if (can.dinner == '敬请自理' && useDinnerTypeBy.indexOf('3') != -1) {
+            can.dinner = '酒店自助'
+          } else if (can.dinner == '') {
+            can.dinner = '方便游玩敬请自理'
+          }
+          x.can = can
+          let details = [];
+          x.tips = tips
+          x.jiu2 = jiu2
+          if (jin.length > 0) {
+            details = jin
+          } else if (jiu.length > 0) {
+            details = jiu
+          } else if (dadian.length > 0) {
+            details = dadian
+          } else if (jiao.length > 0) {
+            if (j == this.tripList.length - 1) {
+              let obj = {
+                title: '温暖的家',
+                content: '感谢您参加本次行程，期待下次与您相遇',
+                img: ''
+              }
+              details.push(obj)
+            } else {
+              details = jiao
+            }
+          } else if (activy.length > 0) {
+            details = activy
+          }
+
+          x.title = dadian.length > 0 && dadian[0].title && dadian[0].title != '' ? dadian[0].title : (jiao.length >
+            0 ? jiao[0].title : '集合出发')
+          x.details = details
+
+          if (x.details.length == 0) {
+            if (j == 0) {
+              let obj = {
+                title: '集合出发',
+                content: '向着远方的目标出发起飞',
+                img: '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null
+              }
+              details.push(obj)
+            } else if (j == this.tripList.length - 1) {
+              let obj = {
+                title: '温暖的家',
+                content: '感谢您参加本次行程，期待下次与您相遇',
+                img: '',
+                ticketName: '',
+                playTimeHour: null,
+                playTimeMinutes: null
+              }
+              details.push(obj)
+            }
+          } else {
+            if (x.title == '集合出发') {
+              x.details.forEach(xc => {
+                if (xc.title !== undefined)
+                  x.title = xc.title + '~'
+              })
+              if (x.title == '集合出发') {
+                if (j > 0 && j < tripList.length - 1)
+                  x.title = '自由活动'
+              } else {
+                x.title = x.title.substring(0, x.title.length - 1)
+              }
+            }
+          }
+          x.islast = (j + 1) == this.tripList.length
+          this.$set(this.tripList, j, x)
+          x.dateTime = this.setDate(j);
+          x.myIndex=1;
+        })
+        this.trips = this.tripList
+
+        console.log(this.trips, 'tripsss');
+      },
+      setDate: function (j) {
+        if (j === 0) {
+          return this.clickDate
+        } else {
+          let d = new Date(this.clickDate)
+          d = d.getTime(d);
+          let add = d + ((24 * 60 * 60 * 1000) * j)
+          let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+          let Y = date.getFullYear() + '-';
+          let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+          let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
+          return Y + M + D;
+        }
+      },
+    },
+  };
+
+</script>

src/index.template.html

@@ -14,8 +14,10 @@
     <link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">
     <link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
+    <script async defer crossorigin="anonymous" src="https://connect.facebook.net/zh_CN/sdk.js#xfbml=1&version=v7.0" nonce="bDrSmWhp"></script>
   </head>
   <body>
+
     <!-- DO NOT touch the following DIV -->
     <div id="q-app"></div>
   </body>

src/layouts/HomeLayout.vue

@@ -39,6 +39,7 @@
         dataList: {},
         //集团编号
         RB_Group_Id: 0,
+
       };
     },
     created() {
@@ -47,23 +48,24 @@
       })
     },
     mounted() {
+      localStorage.clear();
       //获取集团数据
       if (localStorage.baseifo) {
         var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
         this.RB_Group_Id = jObj.GroupId;
       } else {
         this.getGroupData();
-      }
-      //获取网站基础配置
-      if (localStorage.baseifo) {
-        var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
-        this.baseinfo.logo = jObj.Config.Logo;
-        this.baseinfo.name = jObj.Config.Name;
-        this.baseinfo.nav.navs = jObj.HeaderList;
-        this.baseinfo.nav.bg = jObj.Config.BgColor;
-        this.dataList=jObj;
-      } else {
-        this.getData();
+        //获取网站基础配置
+        if (localStorage.baseifo) {
+          var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
+          this.baseinfo.logo = jObj.Config.Logo;
+          this.baseinfo.name = jObj.Config.Name;
+          this.baseinfo.nav.navs = jObj.HeaderList;
+          this.baseinfo.nav.bg = jObj.Config.BgColor;
+          this.dataList = jObj;
+        } else {
+          this.getConfigData();
+        }
       }
     },
     methods: {
@@ -81,6 +83,7 @@
           "admin_get_GetGroupDomain", msg,
           res => {
             if (res.data.resultCode == 1) {
+              this.RB_Group_Id = res.data.data.GroupId;
               var jsonData = JSON.stringify(res.data.data);
               window.localStorage.setItem("groupinfo", jsonData);
             }
@@ -88,10 +91,13 @@
           err => {}
         );
       },
-      getData() {
+      //获取网站配置数据
+      getConfigData() {
+        let locationName = window.location.hostname;
         this.apipost(
           "ws_get_GetWebSiteConfig", {
-            RB_Group_Id: this.RB_Group_Id
+            RB_Group_Id: this.RB_Group_Id,
+            B2BDomain: locationName
           },
           res => {
             if (res.data.resultCode == 1) {

src/pages/About.vue

 <template>
   <q-page>
-    <div>
-      {{AboutData[AboutData.length-1]}}
-    </div>
     <template v-for="(item,index) in AboutData">
       <div :key="index">
-
         <!--自訂版型(影片)-->
         <videoOne v-if="item.Id=='white_label_video'&&item.plugData.Type==1" :plugData="item.plugData"></videoOne>
         <videoTwo v-if="item.Id=='white_label_video'&&item.plugData.Type==2" :plugData="item.plugData"></videoTwo>
@@ -93,6 +89,8 @@
 
         <!--搜尋區塊(其他)search_el -->
         <searchel1 v-if="item.Id=='search_el'&&item.plugData.Type==1" :plugData="item.plugData"></searchel1>
+        <!--出團表group -->
+        <travelList v-if="item.Id=='group'" :plugData="item.plugData"></travelList>
       </div>
 
     </template>
@@ -100,6 +98,10 @@
 
 </template>
 <script>
+  //出團表 group -Start
+  import travelList from "../components/group/travel-list";
+  //出團表 group -End
+
   //搜尋區塊(輪播橫)search_s -Start
   import searchs1 from "../components/search_s/search_s1";
   import searchs2 from "../components/search_s/search_s2";
@@ -224,7 +226,8 @@
       diyTitle,
       paragraph,
       photo,
-      diyForm
+      diyForm,
+      travelList
     },
     data() {
       return {
@@ -233,10 +236,11 @@
       };
     },
     created() {
-      var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
-      this.RB_Group_Id = jObj.GroupId;
+
     },
     mounted() {
+      var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
+      this.RB_Group_Id = jObj.GroupId;
       this.getAbout();
     },
     methods: {
@@ -249,7 +253,6 @@
             if (res.data.resultCode == 1) {
               if (res.data.data) {
                 this.AboutData = res.data.data;
-                console.log("AboutData", this.AboutData);
               }
             }
           },