Skip to content

M
million
Commit 04772f57 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 4d6d30d9
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 16 deletions
src/App.vue
View file @ 04772f57
......@@ -10,7 +10,7 @@ export default {
};
</script>
<style>
@import url("//at.alicdn.com/t/font_1890699_qxu7cdg74s.css");
@import url("//at.alicdn.com/t/font_1890699_s9m1btx2v8h.css");
@font-face {
font-family: "oswald";
src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
......
src/components/trip/style3.vue
View file @ 04772f57
......@@ -2643,6 +2643,11 @@
font-size:20px;
margin-right:6px;
}
.style3_detail{
display:inline-block;
margin-right:20px;
font-size:18px;
}
</style>
<template>
<div class="Style3_main">
......@@ -2700,10 +2705,10 @@
<span><i class="iconfont iconfangzi"></i>住宿</span>
<div class="detail_content">
<div class="val" v-if='item.jiu2.length>0'>
<label class="detail_meal" v-for="(t,k) in item.jiu2" :key="k">
<label class="style3_detail" v-for="(t,k) in item.jiu2" :key="k">
{{k==item.jiu2.length-1?t.name:t.name+' / '}}
</label>
{{getHotelSuffix(item)}}
<label class="style3_detail">{{getHotelSuffix(item)}}</label>
</div>
<div class="val" v-else>本日无酒店安排</div>
</div>
......
src/components/trip/style4.vue
View file @ 04772f57
......@@ -37,7 +37,12 @@
<section class="section-tour wl-section-block">
<div class="todayTitle">行程特色</div>
<div class="featureBox">
<div class="feature-inner" v-html="dataList.feature.featureContent" :class="{'isHiden4':isShow}"></div>
<template v-if="showType==3">
<div class="feature-inner" v-html="dataList.feature.featureContent" :class="{'isHiden4':isShow}"></div>
</template>
<template v-if="showType>=4">
<div class="feature-inner" v-html="dataList.feature.featureHtml" :class="{'isHiden4':isShow}"></div>
</template>
<div class="collapse_toggle" v-if="!isShow">
<i class="iconfont iconarrow-top" @click="isShow=true"></i>
</div>
......@@ -55,6 +60,7 @@
return {
TripConfig: {},
isShow: false,
showType:-1
};
},
created() {},
......@@ -67,6 +73,7 @@
} else {
this.isShow = true;
}
this.showType= this.dataList.feature.featureType;
},
methods: {
......
src/components/trip/style6.vue
View file @ 04772f57
......@@ -181,7 +181,7 @@
}
.style6_val {
margin-left: 30px;
margin-left: 40px;
}
@media only screen and (max-width: 900px) {
......@@ -236,7 +236,7 @@
</ul>
</div>
<div class="intro-list">
<i class="iconfont iconfangzi"></i>
<i class="iconfont iconhotel"></i>
<div class="style6_val" v-if='item.jiu2.length>0'>
<label class="detail_meal" v-for="(t,k) in item.jiu2" :key="k">
{{k==item.jiu2.length-1?t.name:t.name+' / '}}
......
src/components/trip/tripList.vue 0 → 100644
View file @ 04772f57
<template>
<div class="q-mt-lg q-mb-lg">
<div class="section-block download1">
<!-- <div class="group-title">{{plugData.Title}}</div> -->
<q-table :pagination.sync="paginationDesktop" :data="plugData.priceList" :columns="columns" row-key="id"
:filter="filter" table-header-class="travel-list" card-class="travel-list" :pagination-label="formatLabel"
rows-per-page-label=" " :rows-per-page-options="[]" TCNUM-data-labe="沒有找到適合的團期" v-if="!$q.screen.xs">
<template v-slot:body="props">
<q-tr :props="props">
<q-td key="startDate" :props="props">
<span class="text-red">{{ props.row.startDate }}</span>
</q-td>
<q-td key="Title" :props="props">
<div style="max-width:435px;white-space: pre-wrap;">
<a @click="OpenNewUrl(props.row.LinkUrl)" target="_blank">{{ props.row.Title }}</a>
</div>
</q-td>
<q-td key="DayNum" :props="props">{{ props.row.DayNum }}</q-td>
<q-td key="FlightStatus" :props="props">
<q-icon color="grey" name="iconfont iconhangbanxinxicopy" size="14" />
</q-td>
<q-td key="b2BPrice" :props="props">
<span caption>$</span>
<span class="text-subtitle2 text-weight-medium">{{ props.row.b2BPrice }}</span>
</q-td>
<q-td key="tcState" :props="props">
<span
:class="{'text-orange':props.row.tcState>0,'text-pink':(props.row.tcState==0 && props.row.isSubstitution),'text-red':(props.row.tcState==0 && !props.row.isSubstitution)}">{{ props.row.tcState>0?'有名額':(props.row.tcState==0 && props.row.isSubstitution?'可候補':'名額已滿') }}</span>
</q-td>
<q-td key="" :props="props">
<span>123</span>
</q-td>
<q-td key="" :props="props">
<span>123</span>
</q-td>
<q-td key="" :props="props">
<span>123</span>
</q-td>
<q-td key="TCID" :props="props">
<!-- <q-btn type="a" @click="OpenNewUrl(props.row.LinkUrl)" target="_blank"
:label="props.row.Seat>0||props.row.Substitute?'我有興趣':'無法預訂'"
:color="props.row.Seat>0||props.row.Substitute?'indigo':'grey'" rounded unelevated
:disable="props.row.Seat==0&&props.row.Substitute" /> -->
</q-td>
</q-tr>
</template>
</q-table>
<q-table :pagination.sync="pagination" v-if="$q.screen.xs" grid :data="plugData.priceList" :columns="columns"
row-key="id" :filter="filter" table-header-class="travel-list" card-class="travel-list"
:pagination-label="formatLabel" rows-per-page-label=" " :rows-per-page-options="[]" TCNUM-data-labe="沒有找到適合的團期">
<template v-slot:item="props">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 grid-style-transition">
<q-card class="q-mb-md q-pt-xs q-pb-xs" flat>
<q-list>
<q-item>
<q-item-section>
<q-item-label class="text-grey">出發日期</q-item-label>
<q-item-label class="text-red">{{props.row.startDate}}</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">團體名稱</q-item-label>
<q-item-label>123</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">天數</q-item-label>
<q-item-label>{{props.row.remainNum}}</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">交通</q-item-label>
<q-item-label>
<!--v-if="props.row.FlightStatus"-->
<q-icon color="grey" name="iconfont iconhangbanxinxicopy" size="14" />
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">售價</q-item-label>
<q-item-label>
<span caption>$</span>
<span class="text-subtitle2 text-weight-medium">{{ props.row.b2BPrice }}</span>
<span>起</span>
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">狀態</q-item-label>
<q-item-label>
<span
:class="{'text-orange':props.row.tcState>0,'text-pink':(props.row.tcState==0 && props.row.isSubstitution),'text-red':(props.row.tcState==0 && !props.row.isSubstitution)}">{{ props.row.tcState>0?'有名額':(props.row.tcState==0 && props.row.isSubstitution?'可候補':'名額已滿') }}</span>
</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label class="text-grey">報名</q-item-label>
<!-- <q-btn type="a" @click="OpenNewUrl(props.row.LinkUrl)" target="_blank"
:label="props.row.Seat>0||props.row.Substitute?'我有興趣':'無法預訂'"
:color="props.row.Seat>0||props.row.Substitute?'indigo':'grey'" rounded unelevated
:disable="props.row.Seat==0&&props.row.Substitute" /> -->
</q-item-section>
</q-item>
</q-list>
</q-card>
</div>
</template>
</q-table>
</div>
</div>
</template>
<script>
export default {
props: ["plugData"],
data() {
return {
pagination: {
sortBy: "id",
descending: false,
page: 1,
rowsPerPage: 1
},
paginationDesktop: {
sortBy: "id",
descending: false,
page: 1,
rowsPerPage: 5
},
filter: "",
columns: [{
name: "startDate",
required: true,
label: "出發日期",
align: "left",
sortable: true
},
{
name: "Title",
label: "團體名稱",
align: "left",
field: "Title"
},
{
name: "DayNum",
label: "天數",
align: "left",
field: "DayNum"
},
{
name: "FlightStatus",
label: "交通",
align: "left",
field: "FlightStatus"
},
{
name: "b2BPrice",
label: "售價",
align: "left",
field: "b2BPrice"
},
{
name: "tcState",
label: "位數",
align: "left",
field: "tcState"
},
{
name:"",
label: "可報名",
align:"left",
field:""
},
{
name: "Seat",
label: "狀態",
align: "left",
field: "Seat"
},
{
name: "tcid",
label: "報名",
align: "left",
field: "tcid"
}
],
};
},
methods: {
formatLabel(firstRowIndex, endRowIndex, totalRowsNumber) {
return "";
}
},
mounted(){
console.log(this.plugData,'plugDataaaa');
}
};
</script>
<style>
.my-th-head {
font-size: 18px !important;
font-weight: 600 !important;
}
.download1 .group-title {
margin: 0;
padding: 0;
line-height: unset;
margin-bottom: 20px;
font-size: 24px;
text-align: center;
font-weight: 600;
text-align: center;
}
.travel-list th {
font-size: 16px !important;
}
.travel-list td {
font-size: 14px !important;
}
</style>
src/components/trip/tripcalendar.vue 0 → 100644
View file @ 04772f57
<template>
<div class="q-mt-lg q-mb-lg">
<div class="section-block download1">
123
</div>
</div>
</template>
<script>
export default {
props: ['tripList'],
data() {
return {
};
},
created() {},
mounted() {
},
methods: {
},
};
</script>
src/pages/details.vue
View file @ 04772f57
......@@ -85,17 +85,20 @@
<template v-for="(item,index) in TripConfig.TripConfig.SortList">
<!-- 行程資訊 -->
<!-- TripListStyle 1月历 2列表 -->
<!-- <travelList v-if="item.Id=='TripList'" :key="index+10"></travelList> -->
<tripList v-if="item.Id=='TripList'" :key="index+10" :plugData="dataList"></tripList>
<tripcalendar v-if="item.Id=='TripList'" :key="index+10" :plugData="dataList"></tripcalendar>
<!-- 每日行程 -->
<!-- TripDayStyle 1竖起排 2横起 -->
<headStyle3 v-if="item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==1" id="tour_detail" ref="tour_detail" :tripList="dayList" :isDirect="isDirect" :key="index+3"></headStyle3>
<headStyle6 v-if="item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==2" :tripList="dayList" :isDirect="isDirect" :key="index+3"></headStyle6>
<headStyle3 v-if="item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==2" id="tour_detail" ref="tour_detail" :tripList="dayList" :isDirect="isDirect" :key="index+3"></headStyle3>
<headStyle6 v-if="item.Id=='TripDay' && TripConfig.TripConfig.TripDayStyle==1" :tripList="dayList" :isDirect="isDirect" :key="index+3"></headStyle6>
<!-- 行程特色 -->
<headStyle4 v-if="item.Id=='TripFeature'" ref="feature" id="feature" :dataList="dataList" :key="index+4">
</headStyle4>
<!-- 注意事项 -->
<headStyle5 v-if="item.Id=='Notice'" id="note" ref="note" :dataList="dataList" :key="index+5"></headStyle5>
<!-- 需求单 -->
<diyForm v-if="item.Id=='Order'" :key="index+100"></diyForm>
</template>
</template>
<div class="quick-banner-block" v-if="isShowNav" :class="{'orange':TripConfig.TripConfig.TripBottonStyle==1
......@@ -119,10 +122,13 @@
import headStyle5 from "../components/trip/style5";
//每日行程横放组件
import headStyle6 from "../components/trip/style6";
import diyForm from "../components/label_other/diy-form";
//出團表 group -Start
import travelList from "../components/group/travel-list";
import tripList from "../components/trip/tripList";
import tripcalendar from "../components/trip/tripcalendar"
//出團表 group -End
export default {
......@@ -130,10 +136,10 @@
data() {
return {
msg: {
configId: '87O4zB6zOs0%3D',
configId: '',
cityId: 0,
preview: 0,
tcid: '9353',
tcid: '10090',
teamType: 0
},
isShow: false,
......@@ -152,7 +158,9 @@
headStyle4,
headStyle5,
headStyle6,
travelList
tripList,
tripcalendar,
diyForm
},
created() {
......
src/pages/tour_visa.vue
View file @ 04772f57
......@@ -14,7 +14,7 @@
.tour_visa .tourtable {
width: 100%;
font-size: 14px;
font-size: 15px;
color: #666;
border-collapse: collapse;
}
......@@ -26,14 +26,18 @@
margin: 0;
border: 0;
vertical-align: baseline;
font-weight: 700;
font-weight: bold;
text-align: center;
}
.tour_visa .tourtable thead th:nth-child(6) {
width: 50%;
}
.tour_visa tbody td:nth-child(6){
text-align: left!important;
width: 50%;
line-height: 35px;
}
.tour_visa .tourtable tbody td {
vertical-align: middle;
padding: 8px;
......
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