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

src/App.vue

@@ -15,11 +15,20 @@ export default {
   font-family: "oswald";
   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
 }
+@font-face{
+  font-family: 'FZDBSJW';
+  src: local('FZDaBiaoSong-B06S')
+}
+
+.text-subtitle1 {
+  font-size: 1.25rem !important;
+}
 body {
   font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
     Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol,
     Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
     Microsoft JhengHei;
+  font-family:  Roboto, Arial,微軟正黑體修正, 微軟正黑體, "Microsoft JhengHei","Microsoft JhengHei UI", sans-serif !important;
   background-color: #f6f6f6;
 }
 .rounded-borders{
@@ -53,4 +62,46 @@ body {
     letter-spacing: 0;
     text-align: right;
 }
+/************************************ 重新Tree样式  BEGIN************************************/
+.q-tree__node-header{
+  padding:8px 16px !important;
+  position: relative;
+  border-radius: unset;
+}
+body.desktop .q-tree__node .q-focusable:focus > .q-focus-helper,
+body.desktop .q-tree__node .q-manual-focusable--focused > .q-focus-helper, 
+body.desktop .q-tree__node .q-hoverable:hover > .q-focus-helper{
+  background: none !important;
+  opacity: 1 !important;
+}
+body.desktop .q-tree__node .q-focus-helper:before,
+body.desktop .q-tree__node .q-focus-helper:after{
+  background: none !important;
+}
+.q-tree__node-header:hover{
+  background: #f1416c1a;
+}
+.q-tree__arrow{
+  position: absolute;
+  top:50%;
+  margin-top: -8px;
+  right: 16px;
+  color:transparent;
+}
+.q-tree__arrow::after{
+  content: 'keyboard_arrow_down' !important;
+  margin-left: -16px;
+  font-size: 20px;
+  color:#666;
+}
+.q-tree__arrow--rotate{
+  transform: rotate3d(0, 0, 1, 180deg) !important;
+}
+.q-checkbox__bg{
+  border: 1px solid currentColor !important;
+}
+.q-checkbox__inner{
+  color: rgb(0 0 0 / 72%) !important;
+}
+/************************************ 重新Tree样式  END************************************/
 </style>

src/components/common/end.vue

@@ -213,7 +213,6 @@ export default {
   methods: {
     handleScroll(e) {
       this.currentHeight = this.getScroll().top;
-      console.log(this.currentHeight);
       let h=document.location.hash
       if(h!='#/' && h!='#/index'){
         window.removeEventListener("scroll", this.handleScroll)

src/components/navs/hor-big-one.vue

@@ -337,7 +337,8 @@ color: #EE4454;
         </template>
       </div>
     </q-toolbar>
-    <div class="header-box flex">
+    <q-separator color="grey-2" v-if="isHome"/>
+    <div class="header-box flex q-py-sm" v-if="isHome">
       <q-tabs align="center" shrink>
         <q-btn flat class="address-btn" @mouseenter="mouseenterAddress" @mouseleave="mouseeleaveAddress">
           <span slot="default" class="flex item-center">
@@ -478,7 +479,8 @@ export default {
       navsStyle: 1,
       areas: [],
       selectedArea: [],
-      selectedAreaId: ''
+      selectedAreaId: '',
+      isHome:false
     };
   },
   watch: {
@@ -491,6 +493,13 @@ export default {
         this.initAreas();
       },
       deep: true
+    },
+    $route: {
+      handler: function(val, oldVal){
+        this.isHome = val.path==='/' || val.path==='/index'
+      },
+      // 深度观察监听
+      deep: true
     }
   },
   meta() {
@@ -502,6 +511,7 @@ export default {
     };
   },
   mounted() {
+    this.isHome = this.$router.history.current.path==='/' || this.$router.history.current.path==='/index'
     if (localStorage.b2bUser) {
       this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser"));
     }

src/components/navs/hor-btm.vue

 <style>
   .hor_BtmContent {
-    display: inline-block;
+    /*display: inline-block;*/
     width: 100%;
-    background: #fff;
+    background: #2B2B2B;
+    padding-top: 60px;
+  }
+  .hor_BtmContent .footer-content {
+    max-width: 1200px;
+    margin:0 auto;
   }
-
   .hor_BtmContent .footer-top {
-    padding: 0 40px 18px;
-    background: #2B2B2B;
+    max-width: 1200px;
+    margin:0 auto;
   }
 
   .hor_BtmContent .footer-link {
@@ -289,7 +293,7 @@ cursor: pointer;
 </style>
 <template>
   <div class="hor_BtmContent">
-    <template v-if="dataList&&dataList.Config">
+    <template v-if="dataList&&dataList.Config && 1==0">
       <div class="footer-top">
         <div class="foot_content">
           <div class="footer-box">
@@ -301,8 +305,8 @@ cursor: pointer;
                 <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>
+                  <!-- <blockquote :cite="dataList.Config.FaceBookUrl" class="fb-xfbml-parse-ignore"><a
+                      :href="dataList.Config.FaceBookUrl">{{dataList.Config.Name}}</a></blockquote> -->
                 </div>
               </a>
             </div>
@@ -358,6 +362,36 @@ cursor: pointer;
         </template>
       </div>
     </template>
+    <div class="footer-content" v-if="dataList&&dataList.Config">
+      <div class="row  justify-between full-width">
+      <div class="">
+        <img style="width:auto;height:35px;" :src="dataList.Config.WhiteLogo" />
+        <div class="rounded-borders q-mt-lg q-pa-md text-grey-8" style="background:rgba(255,255,255,.05)">
+          <div class="f12">服务热线：{{ dataList.Config.Tel }}</div>
+          <div class="q-mt-md">服务时间：08:00 至 21:00</div>
+        </div>
+      </div>
+      <div class="row">
+        <div  v-for="(item,i) in dataList.FooterList" :key="item.Id" :class="{'q-ml-xl':i>0}">
+          <div class="text-subtitle1 text-weight-bold text-white">{{ item.NavTitle }}</div>
+          <div class="q-mt-xl"  v-if="item.SubList">
+            <div class="q-mb-lg text-subtitle2 text-regular text-grey-8 cursor-pointer" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
+          </div>
+        </div> 
+      </div>
+      <div  v-for="item in dataList.BottomList" :key="item.Id">
+        <div class="text-subtitle1 text-weight-bold text-white">{{ item.NavTitle }}</div>
+        <div class="q-mt-xl row" style="width:210px">
+            <div class="bg-white rounded-borders q-pa-xs overflow-hidden q-mb-md q-mr-md" @click="navigateTo(item2)" v-for="item2 in item.SubList" :key="item2.Id"  style="width:40px;height:34px;">
+              <img style="width:100%" :src="item2.Icon" :title="item2.NavTitle" />
+            </div>
+        </div>
+      </div>
+    </div>
+      <div class="text-center q-py-xl text-grey-8" style="margin-top:35px">
+        蜀ICP备13000760号 © 2010-{{year}} {{ dataList.Config.Name }}. All Rights Reserved. 旅行社业务经营许可证 {{ dataList.Config.UnifyCode }}
+      </div>
+    </div>
   </div>
 </template>
 <script>

src/components/searchdata/kkday.vue

@@ -61,6 +61,7 @@
           tick-strategy="leaf"
           @update:ticked="handleAreaTicked"
           :ticked="areaTicked"
+          text-color="#666"
         />
       </q-card>
       <q-card flat class="rounded-borders q-py-md q-mt-lg">
@@ -145,7 +146,7 @@
       <q-card flat class="rounded-borders q-pa-md q-mt-lg">
         <div class="text-subtitle1 text-weight-bold">價錢篩選（CNY）</div>
         <div
-          class="q-mt-md text-grey-6 text-subtitle1"
+          class="q-mt-md text-grey-6 text-subtitle2 text-regular"
         >{{ msg.priceRange.min }} - {{ msg.priceRange.max }}</div>
         <q-range
           v-model="msg.priceRange"
@@ -169,7 +170,7 @@
             :key="yi"
           >
             <q-checkbox v-model="y.checked" size="xs" @input="changeTripDayHandler" />
-            <span class="col text-grey-8" style="font-weight: 400">
+            <span class="col text-grey-8 text-subtitle2 text-regular q-mt-xs" style="font-weight: 400">
               {{
               y.text
               }}
@@ -217,7 +218,7 @@
           >{{ x.label }}</q-chip>
         </div>
       </div>
-      <div class="q-mt-lg">
+      <div class="q-mt-lg" v-if="!$q.loading.isActive && DataList.length>0">
         <div
           class="rounded-borders cursor-pointer overflow-hidden q-mb-md row bg-white"
           @click="GotoDetails(x)"
@@ -275,7 +276,21 @@
           </div>
         </div>
       </div>
-
+      <div v-else-if="!$q.loading.isActive && DataList.length==0" class="text-center q-mt-xl">
+        <div class="text-center inline-block">
+          <p>
+            <img
+              src="~assets/sad.svg"
+              style="width:30vw;max-width:150px;"
+            >
+          </p>
+          <p class="text-faded">
+            我们找不到有关
+            <span v-if="msg.searchKey">\"{{msg.searchKey}}\"</span>
+            的旅游体验，输入其他字眼重试或探索以下人气体验
+          </p>
+        </div>
+      </div>
       <div style="display: flex; justify-content: center">
         <q-pagination
           v-if="PageCount > 1"
@@ -413,6 +428,7 @@ export default {
     });
     this.dateRange = { from: this.msg.startDate, to: this.msg.endDate };
     this.goSearchHandler();
+    console.log(this.msg)
   },
   methods: {
     handleSelected(target) {
@@ -424,7 +440,6 @@ export default {
       this.goSearchHandler();
     },
     handleAreaTicked(target) {
-      console.log("handleAreaTicked", target, this.areaTicked);
       this.areaTicked = target
       this.goSearchHandler();
     }, 
@@ -651,8 +666,10 @@ export default {
       console.log('filterAddress2',this.areaListJSON, addressList)
     },
     goSearchHandler() {
+      console.log(this.ticked)
       this.msg.webSiteCategoryIds = this.ticked.join(',')
-      // this.$q.loading.show();
+      this.msg.placeIds = this.areaTicked.join(',')
+      this.$q.loading.show();
       this.DataList = [];
       let minTripDay = -1,
         maxTripDay = -1,
@@ -686,6 +703,7 @@ export default {
         this.msg,
         res => {
           this.$q.loading.hide();
+          
           if (res.data.resultCode == 1) {
             this.PageCount = res.data.data.pageCount;
             this.TotalCount = res.data.data.count;