Skip to content

A
Athena
Commit 68109d04 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 046050c8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 660 additions and 14 deletions
public/index.html
View file @ 68109d04
......@@ -810,6 +810,13 @@
};
google.maps.MarkerWithLabel = MarkerWithLabel;
</script>
<script>
document.ondragover = function (e) { e.preventDefault(); };
document.ondrop = function (e) { e.preventDefault(); };
$(document).on("dragstart", function (e) {
return false;
});
</script>
<!-- <script src="http://pv.sohu.com/cityjson?ie=utf-8"></script> -->
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.3&key=86f2f611126f36b93cf2ef280300524f&plugin=AMap.CitySearch"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
......
src/components/FreeTravel/FreeDetail.vue
View file @ 68109d04
This diff is collapsed.
src/components/FreeTravel/OrderConfirmation.vue 0 → 100644
View file @ 68109d04
<template>
<div class="OrderCon commonF">
<div class="w1200">
<div class="Content basefix" style="margin-top:20px">
<div class="left" style="width:795px;margin-right:17px">
<el-form class="OrderConForm" ref="form" :model="form" label-width="80px">
<div class="ListDiv">
<div class="commomStyle">
<div class="titleDiv">
<span class="redSpan"></span>
<span class="f18 pfR">预订人资料</span>
</div>
<div style="padding:20px">
<el-row>
<el-col style="padding-top:8px" :span="2">
<span class="f12 c88">预定人</span>
</el-col>
<el-col :span="20">
<el-form-item label="姓名">
<el-input placeholder="姓" size="mini" style="width:100px" v-model="form.name"></el-input>
<el-input placeholder="名" size="mini" style="width:100px;margin-left:10px" v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input size="mini" style="width:300px" v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="Email">
<el-input placeholder="接收确认邮件，获得出行资讯" size="mini" style="width:300px" v-model="form.name"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="commomStyle">
<div class="titleDiv">
<span class="redSpan"></span>
<span class="f18 pfR">优惠券</span>
</div>
<div style="padding:20px">
<el-row>
<el-col style="padding-top:8px" :span="2">
<span class="f12 c88">优惠券</span>
</el-col>
<el-col :span="14">
<el-form-item class="yhqform" label="其他优惠券码，请直接输入">
<el-input placeholder="优惠券码" size="mini" style="width:180px" v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col style="padding-top:8px" :span="2">
<el-button size="small" style="border:1px solid #EE4454;color:#EE4454">确定</el-button>
</el-col>
</el-row>
</div>
</div>
<div class="commomStyle">
<div class="titleDiv">
<span class="redSpan"></span>
<span class="f18 pfR">提示</span>
</div>
<div class="f12" style="padding:20px">
东京市从2002年10月起征收住宿税。征税标准根据住宿金额按每人每晚征收，
每晚住宿费在1万日元以上每人每晚征收100日元，1.5万日元
以上每人每晚征收200日元，部分房价不包含住宿税，需客人另付前台 。
</div>
</div>
<div class="OrderConBtn">
下一步，支付
</div>
</div>
</el-form>
</div>
<div class="right" style="width:388px;box-sizing:border-box">
<div style="border:1px solid rgba(224, 224, 224, 1);box-sizing:border-box">
<div style="width:388px;height:194px;border-radius:3px;">
<img style="width:100%;height:100%" src="../../assets/img//juan/dongjin.png" alt="">
</div>
<div style="padding:15px">
<p class="cee f22">【东京人气温泉】大江户温泉物语实体门票（台湾邮寄）</p>
<p style="margin:15px 0" class="f14"><span class="c99" style="margin-right:20px">日期</span><span class="c66">2019-02-20</span></p>
<p class="f14"><span class="c99" style="margin-right:20px">人数</span><span class="c66">成人x1</span></p>
</div>
</div>
<div style="margin-top:20px;border:1px solid rgba(224, 224, 224, 1);box-sizing:border-box">
<div style="width:100%;height:72px;line-height:72px;background:rgba(237,244,255,1);padding:0 20px;box-sizing:border-box">
<span class="f20">订单总额</span>
<span style="float:right" class="cee f26 pfR">¥ 1658.00</span>
</div>
<div class="f14" style="padding:20px">
<el-row>
<el-col :span="4">成人x1</el-col>
<el-col :span="14"><div class="dashDiv"></div></el-col>
<el-col :span="6">￥152</el-col>
</el-row>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
data () {
return {
form:{},
}
},
mounted() {
},
methods: {
}
}
</script>
<style>
@import '../../assets/css/common.css';
.OrderCon .OrderConForm .OrderConBtn{
width:100%;
height:66px;
line-height:66px;
background:rgba(238,68,84,1);
border-radius:4px;
text-align: center;
color: #fff;
font-size: 18px;
margin-bottom:60px;
cursor: pointer;
}
.OrderCon .OrderConForm .yhqform .el-form-item__label{
width:200px!important;
}
.OrderCon .OrderConForm .el-form-item__label{
color:#111111;
}
.OrderCon .OrderConForm .el-input__inner{
border: none;
outline: none;
border-bottom: 1px solid #DDDDDD;
border-radius: 0;
}
.OrderCon .right .dashDiv{
border-bottom: 1px dashed #999999;
margin-top:10px;
}
.OrderCon .Content .ListDiv .commomStyle .fysm li img{
margin-right:6px;
}
.OrderCon .Content .ListDiv .commomStyle .fysm li{
display: inline-block;
margin:0 35px 15px 0;
}
.OrderCon .Content .ListDiv .commomStyle .typeList span{
padding:0 24px;
background:rgba(255,186,193,1);
border:1px solid rgba(238, 68, 84, 1);
border-radius:2px;
margin-right: 10px;
font-size:14px;
height:32px;
line-height:32px;
display: inline-block;
}
.OrderCon .Content .ListDiv .commomStyle .choosedate{
width:166px;
height:40px;
line-height:40px;
background:rgba(238,68,84,1);
border-radius:2px;
text-align: center;
color:#fff;
font-size: 14px;
margin:20px 0;
}
.calendarPopover{
padding:0;
}
.calendarDiv{
width:406px;
background:rgba(255,255,255,1);
z-index: 100;
border: 1px solid #E1E1E1;
}
.calendarDiv .month_circle{
display: inline-block;
width:28px;
height:28px;
background:rgba(227,227,227,1);
color: #fff;
text-align: center;
line-height: 28px;
border-radius: 2px;
cursor: pointer;
}
.OrderCon .Content .ListDiv .commomStyle .titleDiv .redSpan{
width:4px;
height:20px;
background:rgba(238,68,84,1);
display: inline-block;
position: absolute;
left: 0;
top: 15px;
}
.OrderCon .Content .ListDiv .commomStyle .titleDiv{
width:100%;
height:50px;
line-height:50px;
border-bottom:1px solid rgba(224, 224, 224, 1);
background: #EDF4FF;
position: relative;
padding-left: 20px;
box-sizing: border-box;
}
.OrderCon .Content .ListDiv .commomStyle div{
box-sizing: border-box;
}
.OrderCon .Content .ListDiv .commomStyle{
border:1px solid rgba(224, 224, 224, 1);
width:792px;
box-sizing: border-box;
margin-bottom: 30px;
}
.OrderCon .Content .titleEl .el-col{
display: inline-flex;
align-items: center;
}
.OrderCon .Content .titleEl .el-col img{
margin-right: 6px;
}
.OrderCon .Content .right .Btn{
width:320px;
height:50px;
line-height:50px;
background:rgba(238,68,84,1);
border-radius:4px;
color:#fff;
text-align: center;
margin: 10px 0 15px 20px;
box-sizing: border-box;
}
.OrderCon .Content>div{
float: left;
}
</style>
src/components/taskPage/FoodImg2.vue
View file @ 68109d04
......@@ -106,7 +106,7 @@ height: 100%;
<div style="position: relative;" v-show="!isPhone" class="fisPhone">
<img @click="goUrl('Home')" class="Homeimg" src="../../assets/img/juan/home.png" alt />
<div class="div1" ref="div1" :style="{height: height2}">
<img class="img" src="../../assets/img/juan/fengye1.jpg" alt=""/>
<img class="img" src="../../assets/img/juan/fengye1.jpg" οndragstart="return false;" alt=""/>
</div>
<div class="bottom">
<!-- <img src="" alt=""/> -->
......
src/router.js
View file @ 68109d04
......@@ -663,6 +663,24 @@ export default new Router({
title: "卷妹说-热门目的地详情"
}
},
{
path: "/FreeDetail",
name: "FreeDetail",
component: resolve =>
require(["@/components/FreeTravel/FreeDetail.vue"], resolve),
meta: {
title: "自由行-详情"
}
},
{
path: "/OrderConfirmation",
name: "OrderConfirmation",
component: resolve =>
require(["@/components/FreeTravel/OrderConfirmation.vue"], resolve),
meta: {
title: "自由行-订单确认"
}
},
]
},
{
......
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