Skip to content

A
Athena
Commit 12ace2e5 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 75e778a5 607a0613
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 100 deletions
src/assets/css/home.css
View file @ 12ace2e5
......@@ -627,7 +627,7 @@ p {
color: #666666;
}
.Home .home_footer .float .iconfont{
font-size: 30px;
font-size: 32px;
margin: 15px 10px;
}
.Home .home_footer .float ul li{
......@@ -635,10 +635,10 @@ p {
font-size: 12px;
color:#666666;
width: 50%;
padding:1px 0;
padding:5px 0;
}
.Home .home_footer .float p{
padding:1px 0;
padding:5px 0;
}
.Home .home_footer .el-col-6{
padding-left: 40px;
......@@ -655,8 +655,8 @@ p {
top: -2px;
display: inline-block;
font-size: 12px;
height: 34px;
width: 50px;
height: 36px;
width: 54px;
text-align: center;
line-height: 34px;
background: url('../img/home/qipao.png') no-repeat;
......
src/components/DependentTravel/IndependentTravel.vue
View file @ 12ace2e5
......@@ -76,7 +76,7 @@
</div>
<div class="Season_content">
<div v-for="(item,index) in TreatmentList" :key="index+100" v-if="index<3">
<div class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div @click="goUrl('detail',item.id,item.tcid)" class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
<!-- <img ref="img0" id="img0" src="../../assets/img/visa/country1.png" alt=""> -->
<div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
......@@ -90,14 +90,14 @@
<div style="padding: 3px 10px 10px;">
<p
style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
>{{item.title}}</p>
>{{item.lineName}}</p>
<div class="text">
<p>{{item.lineName}}</p>
<p>{{item.title}}</p>
<p>{{item.ltName}}</p>
</div>
</div>
<div>
<el-button size="mini" class="btn">立即购买</el-button>
<el-button size="mini" class="btn" @click="goUrl('detail',item.id,item.tcid)">立即购买</el-button>
</div>
</div>
</div>
......@@ -105,7 +105,7 @@
<div v-if="TreatmentList.length>3" class="Season_content" style="padding: 0px 120px;">
<div v-for="(item,index) in TreatmentList" :key="index" v-if="index>2 && index<5">
<div class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div @click="goUrl('detail',item.id,item.tcid)" class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
<div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
<p style="font-size:12px;padding-top:10px">RMB</p>
......@@ -118,9 +118,9 @@
<div style="padding: 3px 10px 10px;">
<p
style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
>{{item.title}}</p>
>{{item.lineName}}</p>
<div class="text">
<p>{{item.lineName}}</p>
<p>{{item.title}}</p>
<p>{{item.ltName}}</p>
</div>
</div>
......@@ -157,12 +157,12 @@
<el-col :span="10">
<div>
<p class="zyx_title">
{{item.title}}
{{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span>
</p>
<div class="zyx_content">
<p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p>
<p>{{item.title}}</p>
<p>{{item.ltName}}</p>
......@@ -178,7 +178,7 @@
</span>
<span style="font-size:12px">{{item.startCityName}}出发</span>
</div>
<el-button
<el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button>
......@@ -189,12 +189,12 @@
<el-col :span="10">
<div>
<p class="zyx_title">
{{item.title}}
{{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span>
</p>
<div class="zyx_content">
<p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p>
<p>{{item.title}}</p>
<p>{{item.ltName}}</p>
......@@ -210,7 +210,7 @@
</span>
<span style="font-size:12px">{{item.startCityName}}出发</span>
</div>
<el-button
<el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button>
......@@ -233,12 +233,12 @@
<el-col :span="10">
<div>
<p class="zyx_title">
{{item.title}}
{{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span>
</p>
<div class="zyx_content">
<p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p>
<p>{{item.title}}</p>
<p>{{item.ltName}}</p>
......@@ -254,7 +254,7 @@
</span>
<span style="font-size:12px">{{item.startCityName}}出发</span>
</div>
<el-button
<el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button>
......@@ -385,6 +385,13 @@ export default {
},
},
methods: {
//
goUrl(path,id,tcid){
// detailTwo
path = 'detailThree'
path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
},
HotCrash(){
this.apipost('b2b_get_GetB2BFreeRecommendPageList',
this.commonmsg2,
......
src/components/Home.vue
View file @ 12ace2e5
......@@ -910,7 +910,7 @@
<el-row class="home_footer">
<el-col :span="6">
<div class="float"><i class="iconfont icon-icon-test6"></i></div>
<div class="float" style="width:200px">
<div class="float" style="width:198px">
<p class="color_33">印象之旅</p>
<ul>
<li>跟团游</li>
......@@ -926,7 +926,7 @@
</div>
</el-col>
<el-col :span="6">
<el-col :span="5">
<div class="float"><i class="iconfont icon-icon-test7"></i></div>
<div class="float">
<p class="color_33">优惠渠道</p>
......@@ -939,7 +939,7 @@
</div>
</el-col>
<el-col :span="6">
<el-col :span="5">
<div class="float"><i class="iconfont icon-cailiao"></i></div>
<div class="float">
<p class="color_33">定制旅游</p>
......@@ -951,7 +951,7 @@
</div>
</el-col>
<el-col :span="6">
<el-col :span="5">
<div class="float"><i class="iconfont icon-putonghuiyuan"></i></div>
<div class="float">
<p class="color_33">个人中心</p>
......@@ -964,23 +964,26 @@
</div>
</el-col>
<el-col :span="3" style="text-align:center">
<p style="color:#666666;font-size:14px;">微信扫描小程序</p>
<div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../assets/img/xiaocx.png" alt=""></div>
</el-col>
</el-row>
</div>
<div class="phone">
<!-- <div class="phone">
<div style="width:1180px;height:100%;margin:0 auto;display:flex;align-items:center;justify-content: flex-end;">
<el-col :span="1"><i class="iconfont icon-Shape2" style="color:#fff;font-size:30px"></i></el-col>
<el-col :span="4" style="color:#fff">
<p>客服服务电话
<!-- <img src="../assets/img/home/qipao.png" alt=""> -->
<span class="qipao">24小时</span>
</p>
<p style="font-size:18px;font-weight:700">028-88888888</p>
<p style="font-size:18px;font-weight:700">028-62051755</p>
</el-col>
</div>
</div>
</div> -->
</div>
</template>
......
src/components/Ticket/TicketHome.vue
View file @ 12ace2e5
......@@ -449,6 +449,9 @@ export default {
@import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css";
@import "../../assets/global/global.css";
@import "../../assets/css/reset.css";
.ticket_home .ch{
font-weight: 700;
}
.choose_form .el-input__inner {
border-radius: 0;
}
......
src/components/Ticket/TicketList.vue
View file @ 12ace2e5
......@@ -405,10 +405,10 @@ export default {
mounted() {},
created() {
this.loading = true;
this.choose_info = JSON.parse(sessionStorage.getItem("ChooseInfo"));
this.datainfo = JSON.parse(sessionStorage.getItem("ChooseInfo"));
if(sessionStorage.getItem("ChooseInfo")){
this.choose_info = JSON.parse(sessionStorage.getItem("ChooseInfo"));
this.datainfo = JSON.parse(sessionStorage.getItem("ChooseInfo"));
}
this.choose_info.priceSort = 0;
this.choose_info.timeSort = 0;
if (
......
src/router.js
View file @ 12ace2e5
......@@ -57,6 +57,16 @@ export default new Router({
title: '团队详情-印象之旅~感动与世界同步'
}
},
// 自由行详情
{
path: "/detailThree/:id/:tcid",
name: "detailThree",
component: resolve =>
require(["@/components/mall/detailThree"], resolve),
meta: {
title: "团队详情-印象之旅~感动与世界同步"
}
},
{
path: "/OneDayDetailTwo/:id/:tcid",
name: "OneDayDetailTwo",
......
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