Skip to content

M
million
Commit fb797202 authored by youjie's avatar youjie
Browse files
Options

no message

parents 1a5d4838 597cccad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1012 additions and 232 deletions
src/assets/subscriber-bg.png 0 → 100644
View file @ fb797202
This diff is collapsed.
src/boot/utils.js
View file @ fb797202
...@@ -19,7 +19,7 @@ Vue.prototype.domainManager = function () { ...@@ -19,7 +19,7 @@ Vue.prototype.domainManager = function () {
domainUrl = "http://testapi.oytour.com"; domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) { } else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
domainUrl = 'http://192.168.10.206:8015' domainUrl = 'http://192.168.10.11:8083'
} }
var obj = { var obj = {
//主地址 //主地址
......
src/components/navs/hor-big-one.vue
View file @ fb797202
This diff is collapsed.
src/components/navs/hor-btm-old.vue 0 → 100644
View file @ fb797202
This diff is collapsed.
src/components/navs/hor-btm.vue
View file @ fb797202
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.hor_BtmContent .footer-top { .hor_BtmContent .footer-top {
padding: 0 40px 18px; padding: 0 40px 18px;
background-color: #313131; background: #2B2B2B;
} }
.hor_BtmContent .footer-link { .hor_BtmContent .footer-link {
...@@ -61,16 +61,9 @@ ...@@ -61,16 +61,9 @@
.hor_BtmContent .foot_content { .hor_BtmContent .foot_content {
display: flex; display: flex;
justify-content: space-around; justify-content: space-between;
width: 100%; max-width: 1200px;
text-align: left; margin: 0 auto;
}
.hor_BtmContent .footer-box {
width: 100%;
padding: 20px;
font-size: 14px;
text-align: left;
} }
.hor_BtmContent .footer-box .footer_title1 { .hor_BtmContent .footer-box .footer_title1 {
...@@ -254,11 +247,6 @@ ...@@ -254,11 +247,6 @@
margin-left: 28px; margin-left: 28px;
} }
.hor_BtmContent .foot_content {
flex-wrap: wrap;
justify-content: flex-start;
}
.hor_BtmContent .footer-box { .hor_BtmContent .footer-box {
width: 50% !important; width: 50% !important;
} }
...@@ -270,79 +258,40 @@ ...@@ -270,79 +258,40 @@
} }
} }
</style>
<style scoped>
.logo {
width: 40px;
height: 34px;
margin: 10px 16px 6px 0;
}
.nav-title1 {
height: 12px;
font-size: 14px;
font-family: Microsoft JhengHei;
font-weight: bold;
color: #FFFFFF;
line-height: 26px;
padding: 60px 0 25px 0;
cursor: pointer;
}
.nav-title2 {
font-size: 12px;
font-family: Microsoft JhengHei;
font-weight: 400;
color: #7A7A7A;
line-height: 26px;
cursor: pointer;
}
.margin-x {
margin: 0 10px 0 10px;
}
</style> </style>
<template> <template>
<div class="hor_BtmContent"> <div class="hor_BtmContent">
<template v-if="dataList&&dataList.Config"> <template v-if="dataList&&dataList.Config">
<div class="footer-top"> <div class="footer-top">
<div class="footer-link">
<ul class="hor_footuu">
<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>
</ul>
</div>
<div class="foot_content"> <div class="foot_content">
<div class="footer-box">
<div class="footer_title1">聯絡資訊</div>
<table class="footer_table">
<tbody>
<tr>
<td class="footer_tbtitle">地址</td>
<td>
{{dataList.Config.Address}}
</td>
</tr>
<tr>
<td class="footer_tbtitle">電話</td>
<td>{{dataList.Config.Tel}}</td>
</tr>
<tr>
<td class="footer_tbtitle">傳真</td>
<td>{{dataList.Config.Fax}}</td>
</tr>
<tr>
<td class="footer_tbtitle">服務時間</td>
<td>{{dataList.Config.ServiceTime}}</td>
</tr>
</tbody>
</table>
<div class="social-link">
<a class="foot_line" @click="OpenNewUrl(dataList.Config.LineUrl)">
<i class="iconfont iconline"></i>
</a>
<a class="foot_fb" @click="OpenNewUrl(dataList.Config.FaceBookUrl)">
<i class="iconfont iconzan" style="position:relative;top:-2px;"></i>
</a>
<a class="foot_mail" @click="OpenNewUrl(dataList.Config.ServiceMail)">
<i class="iconfont iconemail"></i>
</a>
</div>
</div>
<div class="footer-box">
<div class="footer_title1">公司資訊</div>
<table class="footer_table">
<tbody>
<tr>
<td class="footer_tbtitle">{{dataList.Config.TypeStr}}</td>
<td>{{dataList.Config.JiaoGuanCode}}</td>
</tr>
<tr>
<td class="footer_tbtitle">品保協會會員</td>
<td>{{dataList.Config.PingBaoCode}}</td>
</tr>
<tr>
<td class="footer_tbtitle">統一編號</td>
<td>{{dataList.Config.UnifyCode}}</td>
</tr>
<tr>
<td class="footer_tbtitle">代表人</td>
<td>{{dataList.Config.Behalf}}</td>
</tr>
</tbody>
</table>
</div>
<div class="footer-box"> <div class="footer-box">
<div class="footer_logo_block"> <div class="footer_logo_block">
<img style="width:120px;height:auto;" :src="dataList.Config.WhiteLogo" /> <img style="width:120px;height:auto;" :src="dataList.Config.WhiteLogo" />
...@@ -358,28 +307,25 @@ ...@@ -358,28 +307,25 @@
</a> </a>
</div> </div>
</div> </div>
</div> <!-- 中间导航 -->
<div class="branch-company"> <div class="flex">
<div class="footer-box"> <div class="margin-x" v-for="item in dataList.FooterList" :key="item.Id">
<template v-if="dataList.BranchList&&dataList.BranchList.length>0"> <div class="nav-title1">{{item.NavTitle}}</div>
<div class="footer_title1">{{dataList.BranchList[0].Name}}</div> <div v-if="item.SubList">
<table class="footer_table"> <div class="nav-title2" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
<tbody> </div>
<tr> </div>
<td class="footer_tbtitle">地址</td> </div>
<td>{{dataList.BranchList[0].Address}}</td> <!-- 右侧导航 -->
</tr> <div class="flex">
<tr> <div class="margin-x" v-for="item in dataList.BottomList" :key="item.Id">
<td class="footer_tbtitle">電話</td> <div class="nav-title1">{{item.NavTitle}}</div>
<td>{{dataList.BranchList[0].Tel}}</td> <div v-if="item.SubList">
</tr> <div @click="navigateTo(item2)" v-for="item2 in item.SubList" :key="item2.Id">
<tr> <img class="logo" :src="item2.Icon">
<td class="footer_tbtitle">傳真</td> </div>
<td>{{dataList.BranchList[0].Fax}}</td> </div>
</tr> </div>
</tbody>
</table>
</template>
</div> </div>
</div> </div>
</div> </div>
...@@ -455,6 +401,13 @@ ...@@ -455,6 +401,13 @@
} }
}, },
methods: { methods: {
navigateTo(urlInfo) {
if(urlInfo.IsNewOpen === 1) {
window.open(urlInfo.NavUrl)
} else {
window.location.href = urlINfo.NavUrl
}
},
getShowId() { getShowId() {
let locationName = this.GetDomain(); let locationName = this.GetDomain();
var routeStr = this.$route.path.toLowerCase(); var routeStr = this.$route.path.toLowerCase();
......
src/components/navs/subscriber.vue 0 → 100644
View file @ fb797202
<style scoped>
.fill {
background-image: url('../../assets/subscriber-bg.png');
height: 301px;
}
.box {
max-width: 1200px;
margin: 0 auto;
}
.title {
font-size: 20px;
font-family: Microsoft JhengHei;
font-weight: bold;
color: #FFFFFF;
line-height: 26px;
text-align: center;
padding-top: 80px;
}
.desc {font-size: 12px;
font-family: Microsoft JhengHei;
font-weight: 400;
color: #FFFFFF;
margin: 10px 0 20px 0;
text-align: center;}
.email-box {
width: 630px;
height: 56px;
margin: 0 auto;
position: relative;
}
.input {
width: 630px;
height: 56px;
background-color: #fff;
border-radius: 28px;
}
.btn {
position: absolute;
right: 5px;
top: 5px;
width: 102px;
height: 46px;
background: #EE4454;
border-radius: 23px;
}
</style>>
<template>
<div class="fill">
<div class="box">
<div class="title">
輸入電子郵箱接收訂閱信息
</div>
<div class="desc">
最高可省60%，只有订阅用户才能享受到隐藏优惠，点击“订阅”，即表示你同意我们的《訂閱條款》
</div>
<div class="email-box">
<q-input class="input" rounded outlined placeholder="請輸入您在使用的電子郵件"></q-input><q-btn class="btn" label="提交"></q-btn>
</div>
</div>
</div>
</template>
<script>
export default {
// props: ["dataList"],
data() {
return {
year: ''
};
},
created() {},
mounted() {
//获取当前年
var myDate = new Date();
this.year = myDate.getFullYear();
},
methods: {
},
};
</script>
src/components/search_sf/search_sf2.vue
View file @ fb797202
...@@ -166,19 +166,22 @@ ...@@ -166,19 +166,22 @@
> >
<div class="q-px-sm q-pt-sm" v-if="historys.length>0"> <div class="q-px-sm q-pt-sm" v-if="historys.length>0">
<div class="q-mb-sm text-weight-bold">搜尋紀錄</div> <div class="q-mb-sm text-weight-bold">歷史搜索</div>
<div class="row"> <div class="row">
<div class="col overflow-hidden" style="height:36px"> <div class="col overflow-hidden" style="height:36px">
<q-chip style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" v-for="(x,i) in historys" :key="i" /> <q-chip style="background:#f6f7f9;" @click="goSearchHandler(x)" clickable text-color="dark" class="cursor-pointer" :label="x" v-for="(x,i) in historys" :key="i" />
</div> </div>
<q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys"> <q-btn text-color="grey-6" icon="delete" class="q-py-none" dense size="sm" flat @click="clearHistorys">
<q-tooltip class="bg-dark" co>清空搜尋紀錄</q-tooltip> <q-tooltip class="bg-dark" co>清空歷史</q-tooltip>
</q-btn> </q-btn>
</div> </div>
</div> </div>
<div class="text-weight-bold q-pa-sm">熱門目的地</div> <div class="text-weight-bold q-pa-sm">熱門目的地</div>
<q-separator /> <q-separator />
<div class="col full-width row"> <div>
<div :key="item" v-for="item in 12">熱門地址</div>
</div>
<!-- <div class="col full-width row">
<div style="width: 180px"> <div style="width: 180px">
<q-scroll-area <q-scroll-area
:thumb-style="thumbStyle" :thumb-style="thumbStyle"
...@@ -258,7 +261,7 @@ ...@@ -258,7 +261,7 @@
</template> </template>
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div v-if="$q.screen.xs"> <div v-if="$q.screen.xs">
......
src/layouts/HomeLayout.vue
View file @ fb797202
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<i class="iconfont iconarrow-top"></i> <i class="iconfont iconarrow-top"></i>
</div> </div>
<q-footer elevated class="bg-grey-8 text-white" style="position: unset;"> <q-footer elevated class="bg-grey-8 text-white" style="position: unset;">
<subscriber></subscriber>
<horBtm :dataList="dataList"></horBtm> <horBtm :dataList="dataList"></horBtm>
</q-footer> </q-footer>
</q-layout> </q-layout>
...@@ -45,11 +46,13 @@ ...@@ -45,11 +46,13 @@
import horBigOne from "../components/navs/hor-big-one"; import horBigOne from "../components/navs/hor-big-one";
import horBigTwo from "../components/navs/hor-big-tow"; import horBigTwo from "../components/navs/hor-big-tow";
import horBtm from "../components/navs/hor-btm"; import horBtm from "../components/navs/hor-btm";
import subscriber from "../components/navs/subscriber";
export default { export default {
components: { components: {
horBigOne, horBigOne,
horBigTwo, horBigTwo,
horBtm horBtm,
subscriber
}, },
data() { data() {
return { return {
...@@ -176,6 +179,7 @@ ...@@ -176,6 +179,7 @@
this.baseinfo.nav.navs = this.dataList.HeaderList; this.baseinfo.nav.navs = this.dataList.HeaderList;
this.baseinfo.nav.bg = this.dataList this.baseinfo.nav.bg = this.dataList
.Config.BgColor; .Config.BgColor;
this.baseinfo.AreaList = this.dataList.AreaList
} }
} }
}, },
......
yarn.lock
View file @ fb797202
...@@ -1236,10 +1236,10 @@ ...@@ -1236,10 +1236,10 @@
babel-plugin-dynamic-import-node "^2.3.0" babel-plugin-dynamic-import-node "^2.3.0"
babel-plugin-module-resolver "^4.0.0" babel-plugin-module-resolver "^4.0.0"
"@quasar/extras@^1.15.10": "@quasar/extras@^1.0.0":
version "1.15.10" version "1.8.2"
resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.15.10.tgz#515298377249765f9ca0027f6843f6a8e61efcd8" resolved "https://registry.npmmirror.com/@quasar/extras/-/extras-1.8.2.tgz"
integrity sha512-6w8e+wPNfcWhzW43tlnJPHOrcNwAgaaNJ3zBz8k+BMqpenA3fHZhFhxCYEVRZVqPFE2IK/8nRiPBp4t9xlW5tA== integrity sha512-y3A4OO4DGDxuFyh/X4k5fS17TTxhpPauZv8Qr/0bso+RTk5f+3X4lLAcP7aaiqcBLOV8HsUKpGzNArMleClYgg==
"@quasar/fastclick@1.1.4": "@quasar/fastclick@1.1.4":
version "1.1.4" version "1.1.4"
...@@ -2114,11 +2114,6 @@ babel-plugin-transform-object-rest-spread@^6.26.0: ...@@ -2114,11 +2114,6 @@ babel-plugin-transform-object-rest-spread@^6.26.0:
babel-plugin-syntax-object-rest-spread "^6.8.0" babel-plugin-syntax-object-rest-spread "^6.8.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
babel-plugin-transform-remove-console@^6.9.4:
version "6.9.4"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
integrity sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==
babel-runtime@^6.26.0: babel-runtime@^6.26.0:
version "6.26.0" version "6.26.0"
resolved "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz" resolved "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz"
...@@ -7627,10 +7622,10 @@ qs@~6.5.2: ...@@ -7627,10 +7622,10 @@ qs@~6.5.2:
resolved "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz" resolved "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz"
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
quasar@^1.22.5: quasar@^1.0.0:
version "1.22.5" version "1.12.5"
resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.22.5.tgz#7c33a02a5541b62b057f1d805b64cbcb59243152" resolved "https://registry.npmmirror.com/quasar/-/quasar-1.12.5.tgz"
integrity sha512-cb/Q1Nvx1Lo3i2Gq+7j6kN/DJzZrTPG6JJKus3WJ0YpqsiovoWchnbDrGkTyL8nCnj2Im4SAX50DF0Vbd6pK3w== integrity sha512-pZUE0v98Zo0n7jepF77GZq8wuM7AQlZhjhiofzAX7ROePxbAD/bdvfmm2KJhVqOKW0ipMAvmihB7rt5dm03lMA==
query-string@^4.1.0: query-string@^4.1.0:
version "4.3.4" version "4.3.4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment