Skip to content

A
Athena
Commit df7af74d authored by zhengke's avatar zhengke
Browse files
Options

新增

parent 36c69f59
Hide whitespace changes
Inline Side-by-side
Showing with 445 additions and 31 deletions
src/components/Hotel/HotelDetail.vue
View file @ df7af74d
......@@ -372,19 +372,14 @@
}
.HD_Top_Right_Star{
width:262px;
height:140px;
height:122px;
padding:0 20px;
/* background-color: #F5F5F5; */
border:1px solid #DDDDDD;
margin-top:70px;
}
.HD_TOP_Map{
width:100%;
height:238px;
margin-top:20px;
display:none;
height:244px;
margin-top:27px;
border:1px solid #DDDDDD;
}
.HD_TopScore{
......@@ -410,7 +405,7 @@
font-size:24px!important;
}
.HD_xing{
margin-top:29px;
margin-top:20px;
text-align: center;
}
.blackColor{
......@@ -519,8 +514,8 @@
</el-rate>
</div>
</div>
<div class="HD_TOP_Map">
<div class="HD_TOP_Map" v-if="travelLngLat.length>0">
<HTMap :dataList="travelLngLat" :type="2"></HTMap>
</div>
</div>
</div>
......@@ -792,6 +787,7 @@
</div>
</template>
<script>
import HTMap from '../global/HTMap'
export default {
data() {
return {
......@@ -829,6 +825,8 @@ export default {
HotSpring:[],
//浴室
bathRoom:[],
//地图坐标
travelLngLat:[]
};
},
mounted() {
......@@ -845,6 +843,9 @@ export default {
},
created() {
},
components: {
HTMap
},
methods: {
getList(){
......@@ -853,6 +854,14 @@ export default {
this.hotelDetails = res.data.data.hotelDetails;
this.hotelSummary = res.data.data.hotelSummary;
this.hotelDetails.roomReviewRating = parseFloat(this.hotelDetails.roomReviewRating);
console.log(res,'resss');
this.travelLngLat.push(
{
lat:this.hotelSummary.latitudeW,
lng:this.hotelSummary.longitudeW,
name:this.hotelSummary.hotelName
}
)
//拆分酒店服务与设施
if(this.hotelDetails.roomEquipments!=""){
let ServeArr = this.hotelDetails.roomEquipments.split(",");
......
src/components/Hotel/HotelPay.vue
View file @ df7af74d
......@@ -27,10 +27,8 @@
</div>
</div>
<div class="payvue_content">
<div class="payvue_content" style="margin-bottom:30px;">
<div class="ordernum">
订单号 : {{bookingNumber}}
<div class="triangle_border_left"></div>
......@@ -175,8 +173,9 @@ export default {
this.bookingNumber=msgList.orderId;
this.code.body=`酒店名称${msgList.hotelName}，总人数${msgList.totalPnumber}人，总价格${msgList.bookMoney}元`;
this.code.body=`酒店名称${msgList.hotelName}，房间数${msgList.totalPnumber}人，总价格${msgList.bookMoney}元`;
this.code.attach=`${msgList.costType}|${userInfo.name}|${msgList.orderId}|${userInfo.customerId}|${msgList.RB_Branch_id}`
this.code.total_fee=msgList.bookMoney+'';
this.code.CancelTime = moment(msgList.CancelTime).format('YYYY-MM-DD HH:mm:ss');
......@@ -194,7 +193,7 @@ export default {
this.wxpay_imgcode = false;
this.code.payway = this.payway;
this.apipost(
"OnlinePay_post_GetCodeUrl",
"OnlinePay_post_GetCodeUrlForCommonB2B",
this.code,
res => {
this.codeLoading=false;
......@@ -317,7 +316,6 @@ export default {
color: #49C0A1;
font-size: 38px;
position: absolute;
top:8px;
}
.pay_vue .orderPay .div_2 p span:nth-child(2){
float: right;
......
src/components/Hotel/HotelPayBefore.vue 0 → 100644
View file @ df7af74d
<style>
.payBefore_vue{
width:1200px;
height:auto;
margin:auto;
}
.payBefore_vue .head{
padding: 4px 0;
position: relative;
height: 40px;
width:100%;
}
.payBefore_vue .icon-jinggao{
color: #49C0A1;
font-size: 38px;
position: absolute;
}
.payBefore_content{
min-height: 380px;
position: relative;
margin-top: 15px;
padding-bottom: 25px;
padding-top: 16px;
background: rgba(255, 255, 255, 1);
-webkit-box-shadow: 0px 4px 38px 0px rgba(107, 107, 107, 0.2);
box-shadow: 0px 4px 38px 0px rgba(107, 107, 107, 0.2);
}
.payBefore_content .ordernum{
position: relative;
width: 203px;
height: 35px;
line-height: 35px;
background: #49c0a1;
font-size: 14px;
font-weight: 400;
color: rgba(255, 255, 255, 1);
padding-left: 16px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin-left: -7px;
border-right-color: transparent;
}
.payBefore_content .triangle_border_left{
width: 0;
height: 0;
border-width: 17px 17px 17px 0;
border-style: solid;
border-color: transparent #30a19b transparent transparent;
position: absolute;
right: 0;
top: 0px;
}
.PayBefore_Left{
float:left;
margin-left:173px;
width:435px;
height:150px;
margin-top:30px;
}
.PayBefore_Right{
float:left;
margin-left:26px;
width:349px;
height:218px;
}
.PayBefore_Right img{
width:100%;
}
.PB_img{
width:54px;
height:54px;
float:left;
}
.PB_img img{
width:100%;
}
.PB_Detail{
float:left;
width:363px;
font-size:12px;
color:#333333;
margin-left:10px;
}
.PB_Detail div:first-child{
font-size:24px;
font-weight: bold;
margin-bottom:5px;
}
.HP_time{
color:#EE4454;
font-weight: bold;
}
.HP_zhifu{
width:70px;
height:30px;
background-color: #EE4454;
color:#fff;
border: none;
outline: none;
cursor: pointer;
border-radius: 4px;
margin-top:43px;
}
</style>
<template>
<div class="payBefore_vue">
<!-- 头部 -->
<div class="head" style="margin-top:20px;">
<div style="box-sizing:border-box;">
<div style="float:left;">
<i class="iconfont icon-jinggao"></i>
<div style="margin-left:50px">
<p style="font-size:14px;font-weight:600">
订单提交成功！
</p>
<p style="font-size:12px">请您在
<span style="color:#FF680B;">12小时</span>
内完成支付，否则订单会自动取消</p>
</div>
</div>
<div style="text-align:center;float:right">
<span style="font-weight:200;font-size:12px;margin-right:10px;">应付金额</span>
<span style="color:#FF680B;font-size:18px;font-weight:bold;">{{TotalPrice}}</span>
<span style="font-size:12px;color:#333333">元</span>
</div>
</div>
</div>
<div class="payBefore_content" style="margin-bottom:30px;">
<div class="ordernum">
订单号 : {{bookingNumber}}
<div class="triangle_border_left"></div>
</div>
<div class="clearfix" style="margin-top:45px;">
<div class="PayBefore_Left clearfix">
<div class="PB_img">
<img src="../../assets/img/hotel/smile.png" alt=""/>
</div>
<div class="PB_Detail">
<div>
恭喜您下单成功！
</div>
<div>
为了保证您能够顺利入住酒店，请您在<span class="HP_time">12小时</span>内完成付款，如果在此
时间内未能完成付款我们将自动取消此订单
</div>
</div>
<div>
<input type="button" class="HP_zhifu" @click="gotoPay" value="立即支付" />
</div>
</div>
<div class="PayBefore_Right">
<img src="../../assets/img/hotel/paySuccess.png" alt=""/>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//应付总额
TotalPrice:0,
//订单号
bookingNumber:0,
msgList:''
};
},
created() {
this.msgList = JSON.parse(this.$route.query.msg);
this.TotalPrice=this.msgList.bookMoney;
this.bookingNumber=this.msgList.orderId;
},
methods: {
gotoPay(){
this.$router.push({
path:"/HotelPay",
query:{msg:JSON.stringify(this.msgList)}
})
}
}
};
</script>
<style>
</style>
src/components/Hotel/HotelSure.vue
View file @ df7af74d
......@@ -467,12 +467,6 @@
<el-form-item label="客户需求" prop="guestRequest">
<el-input type="textarea" :rows="3" maxlength="400" v-model="sureMsg.guestRequest" style="width:400px;" placeholder="住宿需求"></el-input>
</el-form-item>
<el-form-item label="客户需求补充" prop="guestRequest">
<el-input type="textarea" :rows="3" maxlength="400" v-model="sureMsg.guestRequestAppendix" style="width:400px;" placeholder="客户补充需求"></el-input>
</el-form-item>
<el-form-item label="评语" prop="guestRequest">
<el-input type="textarea" :rows="3" maxlength="400" v-model="sureMsg.comment" style="width:400px;" placeholder="评语"></el-input>
</el-form-item>
</el-form>
<div class="HS_div2One HS_AreaSelect">
<ul v-for="item in sureMsg.roomGroup">
......@@ -611,11 +605,12 @@ export default {
guestAddress:'',
guestPhoneNumber:'',
guestEmail:'',
//备注
guestRequest:'',
guestRequestAppendix:'',
comment:'',
CustomerId:0,
CreateBy:0
CreateBy:0,
HotelName:'',
HotelPic:'',
},
//验证规则
rules: {
......@@ -765,7 +760,9 @@ export default {
}
let tt = 0;
x.rateGroup.forEach(z=>{
tt+=parseFloat(z.perAdultRate);
if(z.perAdultRate){
tt+=parseFloat(z.perAdultRate);
}
})
this.totalPrice+=tt*x.roomAdultCount;
})
......@@ -805,6 +802,8 @@ export default {
this.sureMsg.totalRoomCount = this.msg.searchroomGroup.length;
this.sureMsg.departureDate = this.msg.departureDate;
this.sureMsg.roomOptionCd = this.msg.roomOptionCd;
this.sureMsg.HotelName = this.dataList.hotelName;
this.sureMsg.HotelPic = this.dataList.roomRateDetails.roomImageURL;
this.dataList.roomGroup.forEach(x=>{
this.sureMsg.roomGroup.forEach(j=>{
......@@ -843,7 +842,7 @@ export default {
totalPnumber:num
}
this.$router.push({
path:"/HotelPay",
path:"/HotelPayBefore",
query:{msg:JSON.stringify(msg)}
})
} else {
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ df7af74d
......@@ -21,7 +21,9 @@
<TscenOrder v-if="data === '8-8'"/>
<!--美食订单 -->
<FoodOrder v-if="data === '8-9'"/>
<!--酒店订单 -->
<HotelOrder v-if="data === '8-10'"/>
<!-- <ScenOrder v-if="data === '8-8'"/> -->
</div>
</template>
......@@ -34,6 +36,7 @@ import TkOrder from './model/TkOrder'
import TscenOrder from './model/TscenOrder'
import TDDOrder from './model/TDDOrder'
import FoodOrder from './model/FoodOrder'
import HotelOrder from './model/HotelOrder'
export default {
props:{
......@@ -48,6 +51,7 @@ export default {
TQOrder:TQOrder,
TDDOrder:TDDOrder,
FoodOrder:FoodOrder,
HotelOrder:HotelOrder
},
data() {
return {
......
src/components/newPersonalCenter/block/model/HotelOrder.vue 0 → 100644
View file @ df7af74d
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)" :key="item.ID"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
</ul>
<!-- 表格 -->
<table class="orderTable HO_Table" border="0" cellspacing="0" cellpadding="0" v-loading="orderLoading">
<thead>
<tr>
<th width="328px">
</th>
<th width="159px">
房间数
</th>
<th width="170px">
总额
</th>
<th width="">
订单状态
</th>
<th width="159px">
操作
</th>
</tr>
</thead>
<tbody>
<template v-for="(item, index) in tableData">
<tr class="top" :key="index" :class="{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<td colspan="5">
<span class="time">{{item.CreateDateStr}}</span>
<span class="num">订单号：<span>{{item.OrderID}}</span></span>
</td>
</tr>
<tr class="info" @mouseenter="enter(index)" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
<td>
<div class="tc_info">
<div class="_left" style="background-color:#EDEDED;">
<img style="width:100%;height:100%" :src="item.HotelPic" alt="">
</div>
<div class="_right">
<p class="text2 color333 font-size14">{{item.HotelName}}</p>
</div>
</div>
</td>
<td class="name_list">
<p>
{{item.Number}}
</p>
</td>
<td class="money">
<p>总额 ¥{{item.TotalPrice | priceFormat}}</p>
</td>
<td class="color333 font-size14">
<span>{{item.OrderStatus}}</span>
</td>
<td style="text-align:center;">
<el-button size="mini"type="danger" @click="goPay(item)">立即付款</el-button>
<el-button style="margin: 10px 0 0 0;" size="mini" @click="canCelHotel(item.ThirdOrderNo)">取消订单</el-button>
</td>
</tr>
</template>
</tbody>
</table>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
export default {
data() {
return {
activeName: 0,
currentPage: 1,
orderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 5,
B2BSelectOrderState:0,
CustomerId: "",
HotelName:''
},
activeRow:'',
TitList: [
{
Type: "全部",
ID: 0
},
{
Type: "待付款",
ID: 1
},
{
Type: "交易成功",
ID: 2
},
{
Type: "取消",
ID: 3
}
],
tableData: []
};
},
created() {},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
},
methods: {
enter: function (t) {
if (t+1) {
this.activeRow = t
} else {
this.activeRow = ''
}
},
gerOrderList: function() {
this.orderLoading = true;
this.apipost(
"sellorder_post_GetB2BJapanHotelOrderList",
this.getOrderMsg,
res => {
this.orderLoading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.B2BSelectOrderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
},
//去支付
goPay(item){
let msg = {
RB_Branch_id:item.RB_Branch_id,
costType:item.costType,
orderId:item.OrderID,
bookMoney:item.TotalPrice,
CancelTime:item.EndTime,
hotelName:item.HotelName,
totalPnumber:item.Number
}
this.$router.push({
path:"/HotelPay",
query:{msg:JSON.stringify(msg)}
})
},
//取消
canCelHotel(ThirdOrderNo){
let msg ={
bookingNumber:ThirdOrderNo
}
this.apipost(
"dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation",
msg,
res => {
if (res.data.resultCode == 1) {
this.Success('取消成功');
this.gerOrderList();
} else {
this.Error(res.data.message);
}
},
null
);
}
}
};
</script>
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ df7af74d
......@@ -71,6 +71,7 @@
<!-- <el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item> -->
<el-menu-item index="8-8" @click="clickMenu('8-8')">门票订单</el-menu-item>
<el-menu-item index="8-9" @click="clickMenu('8-9')">美食订单</el-menu-item>
<el-menu-item index="8-10" @click="clickMenu('8-10')">酒店订单</el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title">
......@@ -170,7 +171,6 @@ export default {
},
clickMenu: function (key) {
this.active = key
// console.log(key)
},
setActive: function(t){
if (t) {
......
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