Skip to content

M
million
Commit 23ad73a4 authored by 沈良进's avatar 沈良进
Browse files
Options

首页调整

parent 35cc1e92
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10099 additions and 10394 deletions
src/assets/subscriber-bg.png 0 → 100644
View file @ 23ad73a4
This diff is collapsed.
src/boot/utils.js
View file @ 23ad73a4
......@@ -19,7 +19,7 @@ Vue.prototype.domainManager = function () {
domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
domainUrl = 'http://192.168.10.206:8015'
domainUrl = 'http://192.168.10.11:8083'
}
var obj = {
//主地址
......
src/components/navs/hor-big-one.vue
View file @ 23ad73a4
This diff is collapsed.
src/components/navs/hor-btm-old.vue 0 → 100644
View file @ 23ad73a4
This diff is collapsed.
src/components/navs/hor-btm.vue
View file @ 23ad73a4
......@@ -7,7 +7,7 @@
.hor_BtmContent .footer-top {
padding: 0 40px 18px;
background-color: #313131;
background: #2B2B2B;
}
.hor_BtmContent .footer-link {
......@@ -61,16 +61,9 @@
.hor_BtmContent .foot_content {
display: flex;
justify-content: space-around;
width: 100%;
text-align: left;
}
.hor_BtmContent .footer-box {
width: 100%;
padding: 20px;
font-size: 14px;
text-align: left;
justify-content: space-between;
max-width: 1200px;
margin: 0 auto;
}
.hor_BtmContent .footer-box .footer_title1 {
......@@ -254,11 +247,6 @@
margin-left: 28px;
}
.hor_BtmContent .foot_content {
flex-wrap: wrap;
justify-content: flex-start;
}
.hor_BtmContent .footer-box {
width: 50% !important;
}
......@@ -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>
<template>
<div class="hor_BtmContent">
<template v-if="dataList&&dataList.Config">
<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="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_logo_block">
<img style="width:120px;height:auto;" :src="dataList.Config.WhiteLogo" />
......@@ -358,28 +307,25 @@
</a>
</div>
</div>
</div>
<div class="branch-company">
<div class="footer-box">
<template v-if="dataList.BranchList&&dataList.BranchList.length>0">
<div class="footer_title1">{{dataList.BranchList[0].Name}}</div>
<table class="footer_table">
<tbody>
<tr>
<td class="footer_tbtitle">地址</td>
<td>{{dataList.BranchList[0].Address}}</td>
</tr>
<tr>
<td class="footer_tbtitle">電話</td>
<td>{{dataList.BranchList[0].Tel}}</td>
</tr>
<tr>
<td class="footer_tbtitle">傳真</td>
<td>{{dataList.BranchList[0].Fax}}</td>
</tr>
</tbody>
</table>
</template>
<!-- 中间导航 -->
<div class="flex">
<div class="margin-x" v-for="item in dataList.FooterList" :key="item.Id">
<div class="nav-title1">{{item.NavTitle}}</div>
<div v-if="item.SubList">
<div class="nav-title2" v-for="item2 in item.SubList" :key="item2.Id" @click="navigateTo(item2)">{{item2.NavTitle}}</div>
</div>
</div>
</div>
<!-- 右侧导航 -->
<div class="flex">
<div class="margin-x" v-for="item in dataList.BottomList" :key="item.Id">
<div class="nav-title1">{{item.NavTitle}}</div>
<div v-if="item.SubList">
<div @click="navigateTo(item2)" v-for="item2 in item.SubList" :key="item2.Id">
<img class="logo" :src="item2.Icon">
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -455,6 +401,13 @@
}
},
methods: {
navigateTo(urlInfo) {
if(urlInfo.IsNewOpen === 1) {
window.open(urlInfo.NavUrl)
} else {
window.location.href = urlINfo.NavUrl
}
},
getShowId() {
let locationName = this.GetDomain();
var routeStr = this.$route.path.toLowerCase();
......
src/components/navs/subscriber.vue 0 → 100644
View file @ 23ad73a4
<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 @ 23ad73a4
......@@ -166,19 +166,22 @@
>
<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="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" />
</div>
<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>
</div>
</div>
<div class="text-weight-bold q-pa-sm">熱門目的地</div>
<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">
<q-scroll-area
:thumb-style="thumbStyle"
......@@ -258,7 +261,7 @@
</template>
</q-scroll-area>
</div>
</div>
</div> -->
</div>
</div>
<div v-if="$q.screen.xs">
......
src/layouts/HomeLayout.vue
View file @ 23ad73a4
......@@ -36,6 +36,7 @@
<i class="iconfont iconarrow-top"></i>
</div>
<q-footer elevated class="bg-grey-8 text-white" style="position: unset;">
<subscriber></subscriber>
<horBtm :dataList="dataList"></horBtm>
</q-footer>
</q-layout>
......@@ -45,11 +46,13 @@
import horBigOne from "../components/navs/hor-big-one";
import horBigTwo from "../components/navs/hor-big-tow";
import horBtm from "../components/navs/hor-btm";
import subscriber from "../components/navs/subscriber";
export default {
components: {
horBigOne,
horBigTwo,
horBtm
horBtm,
subscriber
},
data() {
return {
......@@ -176,6 +179,7 @@
this.baseinfo.nav.navs = this.dataList.HeaderList;
this.baseinfo.nav.bg = this.dataList
.Config.BgColor;
this.baseinfo.AreaList = this.dataList.AreaList
}
}
},
......
yarn.lock
View file @ 23ad73a4
This diff is collapsed.
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