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

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

@@ -7,8 +7,8 @@
     to="/index"
   >
     <q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg">
-      <img :src="baseData.logo" style="height:45px; cursor:pointer;" class="q-mr-lg"  @click="CommonJump('/index',{})" />
       <q-tabs align="left" style="margin:0 auto;" class="desktop-only" shrink>
+        <img :src="baseData.logo" style="height:45px; cursor:pointer;" class="q-mr-lg"  @click="CommonJump('/index',{})" />
         <template v-for="(x, i) in baseData.nav.navs">
           <q-btn :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
           <!-- <q-route-tab :key="i" :to="x.url" :label="x.title" :icon="x.icon" v-if="x.icon!=''" exact />
@@ -27,7 +27,7 @@
         <q-menu>
           <q-tabs align="left" vertical shrink>
             <template v-for="(x, i) in baseData.nav.navs">
-             <q-btn :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
+             <q-btn style="display:block;" :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
               <!-- <q-route-tab :key="i" :to="x.url" :label="x.title" :icon="x.icon" v-if="x.icon!=''" exact />
               <q-route-tab :key="i" :to="x.url" :label="x.title" v-else exact /> -->
             </template>

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

@@ -2,13 +2,14 @@
   <q-header
     reveal
     elevated
-    :style="{background:'transparent',color:'#FFF'}"
+    :style="{background:baseData.nav.bg,color:baseData.nav.color}"
     height-hint="98"
     to="/index"
   >
     <q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg">
-      <img :src="baseData.logo" style="height:45px; cursor:pointer;" class="q-mr-lg"  @click="CommonJump('/index',{})" />
+        <img :src="baseData.logo" style="height:45px; cursor:pointer;" class="q-mr-lg mobile-only"  @click="CommonJump('/index',{})" />
       <q-tabs align="left" style="margin:0 auto;" class="desktop-only" shrink>
+        <img :src="baseData.logo" style="height:45px; cursor:pointer;margin-right:100px;" class="q-mr-lg"  @click="CommonJump('/index',{})" />
         <template v-for="(x, i) in baseData.nav.navs">
             <q-btn :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
           <!-- <q-route-tab :key="i" :to="x.url" :label="x.title" :icon="x.icon" v-if="x.icon!=''" exact />
@@ -22,12 +23,13 @@
         icon="menu"
         aria-label="Menu"
         class="mobile-only"
+        label="選單"
         style="margin-left:auto;"
       >
         <q-menu>
           <q-tabs align="left" vertical shrink>
             <template v-for="(x, i) in baseData.nav.navs">
-             <q-btn :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
+             <q-btn style="display:block;" :key="i"  stretch flat :label="x.title" @click="OpenNewUrl(x.url)" />
               <!-- <q-route-tab :key="i" :to="x.url" :label="x.title" :icon="x.icon" v-if="x.icon!=''" exact />
               <q-route-tab :key="i" :to="x.url" :label="x.title" v-else exact /> -->
             </template>

src/components/search_sf/search_sf1.vue

@@ -408,7 +408,7 @@
     height: 345px;
     background: #fff;
     left: 0;
-    top: 145px;
+    top: 190px;
     box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.3), 0px 0px 20px rgba(0, 0, 0, 0.1);
   }