Skip to content

A
Athena
Commit 114dc87f authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

更新

parents ce00795f b125a4e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 656 additions and 388 deletions
src/components/Hotel/HotelDetail.vue
View file @ 114dc87f
This diff is collapsed.
src/components/Hotel/HotelHome.vue
View file @ 114dc87f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="choose"> <div class="choose">
<div style="background:#ffffff;display: flex;align-items: center;position:relative"> <div style="background:#ffffff;display: flex;align-items: center;position:relative">
<img class="Ht_bed" src="../../assets/img/hotel/hotelBed.png" alt=""/> <img class="Ht_bed" src="../../assets/img/hotel/hotelBed.png" alt=""/>
<el-select style="width:350px" clearable v-model="msg.place" placeholder="请选择"> <el-select style="width:350px" clearable filterable v-model="msg.place" placeholder="请选择">
<el-option value="东京都" label="东京都"></el-option> <el-option value="东京都" label="东京都"></el-option>
<el-option value="大阪府" label="大阪府"></el-option> <el-option value="大阪府" label="大阪府"></el-option>
<el-option value="京都府" label="京都府"></el-option> <el-option value="京都府" label="京都府"></el-option>
......
src/components/Hotel/HotelList.vue
View file @ 114dc87f
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
top:1px; top:1px;
} }
.HL_Screen{ .HL_Screen{
width:1158px; width:1198px;
height:auto; height:auto;
margin:auto; margin:auto;
border:1px solid #DCDCDC; border:1px solid #DCDCDC;
...@@ -112,9 +112,6 @@ ...@@ -112,9 +112,6 @@
padding:4px 8px; padding:4px 8px;
} }
.MoreList span{
margin-top:10px;
}
.HL_Stitle{ .HL_Stitle{
display: inline-block; display: inline-block;
width:50px; width:50px;
...@@ -312,14 +309,16 @@ ...@@ -312,14 +309,16 @@
width:85%; width:85%;
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
}
.HL_Concept span{
margin:5px 0;
} }
.HL_minHeight{ .HL_minHeight{
height:43px; height:45px;
line-height: 27px;
} }
.HL_AutoHeight{ .HL_AutoHeight{
height:auto; height:auto;
padding:10px 0;
} }
.HL_ConZhankai{ .HL_ConZhankai{
...@@ -355,6 +354,9 @@ ...@@ -355,6 +354,9 @@
.HotelList .HT_otherStar i{ .HotelList .HT_otherStar i{
color:rgb(239, 242, 247); color:rgb(239, 242, 247);
} }
.HL_Maxheight{
height:150px!important;
}
</style> </style>
<template> <template>
...@@ -363,7 +365,10 @@ ...@@ -363,7 +365,10 @@
<div class="HL_SearchInfo"> <div class="HL_SearchInfo">
<div class="HL_ComSearch HL_one"> <div class="HL_ComSearch HL_one">
<img class="HL_bed" src="../../assets/img/hotel/hotelBed.png" alt=""/> <img class="HL_bed" src="../../assets/img/hotel/hotelBed.png" alt=""/>
<el-select style="width:350px;" v-model="placeKeyWords" clearable placeholder="请选择"> <el-select style="width:350px;" v-model="placeKeyWords" filterable clearable placeholder="请选择">
<el-option value="东京都" label="东京都"></el-option>
<el-option value="大阪府" label="大阪府"></el-option>
<el-option value="京都府" label="京都府"></el-option>
<el-option value="爱知县" label="爱知县"></el-option> <el-option value="爱知县" label="爱知县"></el-option>
<el-option value="秋田县" label="秋田县"></el-option> <el-option value="秋田县" label="秋田县"></el-option>
<el-option value="青森县" label="青森县"></el-option> <el-option value="青森县" label="青森县"></el-option>
...@@ -385,7 +390,6 @@ ...@@ -385,7 +390,6 @@
<el-option value="神奈川县" label="神奈川县"></el-option> <el-option value="神奈川县" label="神奈川县"></el-option>
<el-option value="高知县" label="高知县"></el-option> <el-option value="高知县" label="高知县"></el-option>
<el-option value="熊本县" label="熊本县"></el-option> <el-option value="熊本县" label="熊本县"></el-option>
<el-option value="京都府" label="京都府"></el-option>
<el-option value="三重县" label="三重县"></el-option> <el-option value="三重县" label="三重县"></el-option>
<el-option value="宫城县" label="宫城县"></el-option> <el-option value="宫城县" label="宫城县"></el-option>
<el-option value="宫崎县" label="宫崎县"></el-option> <el-option value="宫崎县" label="宫崎县"></el-option>
...@@ -396,7 +400,6 @@ ...@@ -396,7 +400,6 @@
<el-option value="大分县" label="大分县"></el-option> <el-option value="大分县" label="大分县"></el-option>
<el-option value="冈山县" label="冈山县"></el-option> <el-option value="冈山县" label="冈山县"></el-option>
<el-option value="冲绳县" label="冲绳县"></el-option> <el-option value="冲绳县" label="冲绳县"></el-option>
<el-option value="大阪府" label="大阪府"></el-option>
<el-option value="佐贺县" label="佐贺县"></el-option> <el-option value="佐贺县" label="佐贺县"></el-option>
<el-option value="崎玉县" label="崎玉县"></el-option> <el-option value="崎玉县" label="崎玉县"></el-option>
<el-option value="滋贺县" label="滋贺县"></el-option> <el-option value="滋贺县" label="滋贺县"></el-option>
...@@ -404,7 +407,6 @@ ...@@ -404,7 +407,6 @@
<el-option value="静冈县" label="静冈县"></el-option> <el-option value="静冈县" label="静冈县"></el-option>
<el-option value="枥木县" label="枥木县"></el-option> <el-option value="枥木县" label="枥木县"></el-option>
<el-option value="德岛县" label="德岛县"></el-option> <el-option value="德岛县" label="德岛县"></el-option>
<el-option value="东京都" label="东京都"></el-option>
<el-option value="鸟取县" label="鸟取县"></el-option> <el-option value="鸟取县" label="鸟取县"></el-option>
<el-option value="富山县" label="富山县"></el-option> <el-option value="富山县" label="富山县"></el-option>
<el-option value="和歌山县" label="和歌山县"></el-option> <el-option value="和歌山县" label="和歌山县"></el-option>
...@@ -512,9 +514,9 @@ ...@@ -512,9 +514,9 @@
{{item.name}} {{item.name}}
</span> --> </span> -->
<!-- <span style="margin-right:10px;">自定义价格：</span> --> <!-- <span style="margin-right:10px;">自定义价格：</span> -->
<el-input type="text" style="width:100px;" v-model="searchMinRate" /> <el-input type="text" style="width:100px;" @keyup.native="checkPrice(monyMsg,'searchMinRate')" v-model="monyMsg.searchMinRate" />
<i class="HL_gang"></i> <i class="HL_gang"></i>
<el-input type="text" style="width:100px;" v-model="searchMaxRate" /> <el-input type="text" style="width:100px;" @keyup.native="checkPrice(monyMsg,'searchMaxRate')" v-model="monyMsg.searchMaxRate" />
</div> </div>
<div class="HL_ScList"> <div class="HL_ScList">
<span class="HL_Stitle">房型</span> <span class="HL_Stitle">房型</span>
...@@ -551,9 +553,9 @@ ...@@ -551,9 +553,9 @@
<span>越早预订越便宜</span> <span>越早预订越便宜</span>
<span>限定期限</span> <span>限定期限</span>
</div> --> </div> -->
<div class="HL_ScList MoreList" :class="isOpen==1?'HL_minHeight':'HL_AutoHeight'"> <div class="HL_ScList MoreList" style="height:auto;">
<div class="HL_Stitle">理念</div> <div class="HL_Stitle" style="height:45px;" :class="isOpen==2?'HL_Maxheight':''">理念</div>
<div class="HL_Concept" > <div class="HL_Concept" :class="isOpen==1?'HL_minHeight':'HL_AutoHeight'">
<span v-for="item in ConceptObj" :class="item.isCked?'HL_checked':''" @click="item.isCked=!item.isCked"> <span v-for="item in ConceptObj" :class="item.isCked?'HL_checked':''" @click="item.isCked=!item.isCked">
{{item.name}} {{item.name}}
</span> </span>
...@@ -568,9 +570,9 @@ ...@@ -568,9 +570,9 @@
<div class="HL_ScList"> <div class="HL_ScList">
<span class="HL_Stitle">评分</span> <span class="HL_Stitle">评分</span>
<span style="margin-right:10px;">输入评分范围：</span> <span style="margin-right:10px;">输入评分范围：</span>
<el-input type="text" style="width:100px;" v-model="reviewRatingLowerLimits" /> <el-input type="text" style="width:100px;" @keyup.native="checkInteger(starMsg,'reviewRatingLowerLimits')" v-model="starMsg.reviewRatingLowerLimits" />
<i class="HL_gang"></i> <i class="HL_gang"></i>
<el-input type="text" style="width:100px;" v-model="reviewRatingUpperLimits" /> <el-input type="text" style="width:100px;" @keyup.native="checkInteger(starMsg,'reviewRatingUpperLimits')" v-model="starMsg.reviewRatingUpperLimits" />
</div> </div>
<div class="HL_ScList"> <div class="HL_ScList">
<span class="HL_Stitle">酒店名称</span> <span class="HL_Stitle">酒店名称</span>
...@@ -679,14 +681,18 @@ export default { ...@@ -679,14 +681,18 @@ export default {
}, },
//总页数 //总页数
TotalPage:0, TotalPage:0,
//最小金额 monyMsg:{
searchMinRate:'', //最小金额
//最大金额 searchMinRate:'',
searchMaxRate:'', //最大金额
//最小星星 searchMaxRate:'',
reviewRatingLowerLimits:'', },
//最大星星 starMsg:{
reviewRatingUpperLimits:'', //最小星星
reviewRatingLowerLimits:'',
//最大星星
reviewRatingUpperLimits:'',
},
isShowPop:false, isShowPop:false,
roomList:[], roomList:[],
room:1, room:1,
...@@ -955,26 +961,26 @@ export default { ...@@ -955,26 +961,26 @@ export default {
this.msg.freewordType=2; this.msg.freewordType=2;
this.msg.freeword=this.keyWords; this.msg.freeword=this.keyWords;
} }
if(this.searchMinRate==""){ if(this.monyMsg.searchMinRate==""){
this.msg.searchMinRate=0; this.msg.searchMinRate=0;
}else{ }else{
this.msg.searchMinRate = this.searchMinRate; this.msg.searchMinRate = this.monyMsg.searchMinRate;
} }
if(this.searchMaxRate==""){ if(this.monyMsg.searchMaxRate==""){
this.msg.searchMaxRate=0; this.msg.searchMaxRate=0;
}else{ }else{
this.msg.searchMaxRate = this.searchMaxRate; this.msg.searchMaxRate = this.monyMsg.searchMaxRate;
} }
if(this.reviewRatingLowerLimits==""){ if(this.starMsg.reviewRatingLowerLimits==""){
this.msg.reviewRatingLowerLimits=0; this.msg.reviewRatingLowerLimits=0;
}else{ }else{
this.msg.reviewRatingLowerLimits = this.reviewRatingLowerLimits; this.msg.reviewRatingLowerLimits = this.starMsg.reviewRatingLowerLimits;
} }
if(this.reviewRatingUpperLimits==""){ if(this.starMsg.reviewRatingUpperLimits==""){
this.msg.reviewRatingUpperLimits = 0; this.msg.reviewRatingUpperLimits = 0;
}else{ }else{
this.msg.reviewRatingUpperLimits = this.reviewRatingUpperLimits; this.msg.reviewRatingUpperLimits = this.starMsg.reviewRatingUpperLimits;
} }
this.msg.searchHotelCategory=[]; this.msg.searchHotelCategory=[];
......
src/components/Hotel/HotelSure.vue
View file @ 114dc87f
This diff is collapsed.
src/components/global/newHead.vue
View file @ 114dc87f
...@@ -321,6 +321,13 @@ ...@@ -321,6 +321,13 @@
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 酒店 -->
<li :class="{_active: navActive === 10}">
<div @click="handleSelect('/HotelHome', 10), navActive = 10">
<span>酒店</span>
<span class="__splice">|</span>
</div>
</li>
<!-- 景点门票 --> <!-- 景点门票 -->
<!-- <li :class="{_active: navActive === 7}"> <!-- <li :class="{_active: navActive === 7}">
<div @click="handleSelect('/', 7), navActive = 7"> <div @click="handleSelect('/', 7), navActive = 7">
...@@ -498,7 +505,9 @@ export default { ...@@ -498,7 +505,9 @@ export default {
created() { created() {
let that = this; let that = this;
require(["http://pv.sohu.com/cityjson?ie=utf-8"], () => { require(["http://pv.sohu.com/cityjson?ie=utf-8"], () => {
setTimeout(() => { setTimeout(() => {
console.log("returnCitySN",returnCitySN)
if (returnCitySN) { if (returnCitySN) {
that.loadSites(); that.loadSites();
that.cityText = returnCitySN.cname; that.cityText = returnCitySN.cname;
......
src/components/newPersonalCenter/integral/RedEnvelopes.vue
View file @ 114dc87f
...@@ -44,14 +44,13 @@ ...@@ -44,14 +44,13 @@
<td>{{item.peopleNum}}</td> <td>{{item.peopleNum}}</td>
<td class="cee">￥{{item.money}}</td> <td class="cee">￥{{item.money}}</td>
</tr> </tr>
<tr v-if="dataList.length<1">
<td colspan="4">
<div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</td>
</tr>
</table> </table>
<div v-if="dataList.length==0" style="padding:15px 0;text-align:center">
<div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<p class="f14 c99">数据占比</p> <p class="f14 c99">数据占比</p>
...@@ -74,10 +73,10 @@ ...@@ -74,10 +73,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<p class="f14" style="color:#999999;margin-top:30px">本年累计交易总额</p> <p class="f14" style="color:#999999;margin-top:30px">本年累计交易总额</p>
<p style="margin-top:20px"><span>￥</span><span class="f30">{{datainfo.Amount}}</span></p> <p style="margin-top:20px"><span>￥</span><span class="f30 pfR">{{datainfo.Amount}}</span></p>
<div style="border-bottom:1px solid #EDEDED;width:256px;margin:30px 0"></div> <div style="border-bottom:1px solid #EDEDED;width:256px;margin:30px 0"></div>
<p class="f14" style="color:#999999;">累计收益</p> <p class="f14" style="color:#999999;">累计收益</p>
<p style="margin-top:20px"><span>￥</span><span class="f30">{{datainfo.TotalMoney}}</span></p> <p style="margin-top:20px"><span>￥</span><span class="f30 pfR">{{datainfo.TotalMoney}}</span></p>
</el-col> </el-col>
</el-row> </el-row>
<div class="jyeDiv"> <div class="jyeDiv">
...@@ -97,7 +96,7 @@ ...@@ -97,7 +96,7 @@
<el-col :span="9"> <el-col :span="9">
<p v-if="item.percent>1" style="color:#00B526" class="pfR">已激活，预计收益 ¥{{(item.Money*item.Ratio)/1000}}</p> <p v-if="item.percent>1" style="color:#00B526" class="pfR">已激活，预计收益 ¥{{(item.Money*item.Ratio)/1000}}</p>
<p v-if="item.percent<1" style="color:#EE4454" class="pfR">还差¥{{item.Money-datainfo.Amount}},预计收益 ¥{{(item.Money*item.Ratio)/1000}}</p> <p v-if="item.percent<1" style="color:#EE4454" class="pfR">还差¥{{item.Money-datainfo.Amount}},预计收益 ¥{{(item.Money*item.Ratio)/1000}}</p>
<p style="color:#999999">月交易额已达<span class="pfR">￥{{item.Money}}</span><span>返</span><span class="pfR">{{item.Ratio}}‰</span></p> <p style="color:#999999">年交易额已达<span class="pfR">￥{{item.Money}}</span><span>返</span><span class="pfR">{{item.Ratio}}‰</span></p>
</el-col> </el-col>
</el-row> </el-row>
...@@ -199,12 +198,18 @@ export default { ...@@ -199,12 +198,18 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data; let data=res.data.data;
let arr=[]; let arr=[];
for(let k in data){ data.forEach(item=>{
let obj={}; let obj={};
obj.name=k; obj.name=item.LineName;
obj.value=data[k]; obj.value=item.num;
this.zbList.push(obj); this.zbList.push(obj);
} })
// for(let k in data){
// let obj={};
// obj.name=k;
// obj.value=data[k];
// this.zbList.push(obj);
// }
this.creatZhanBi(); this.creatZhanBi();
}else{ }else{
...@@ -580,14 +585,14 @@ export default { ...@@ -580,14 +585,14 @@ export default {
border-bottom:1px solid rgba(234,234,234,1); border-bottom:1px solid rgba(234,234,234,1);
} }
.rentou-box th{ .rentou-box th{
font-size: 14px !important; font-size: 14px;
font-family: 'pingfangR';
font-weight: 400; font-weight: 400;
color:#666666;
} }
.rentou-box th,.rentou-box td { .rentou-box th,.rentou-box td {
padding: 8px 20px; padding: 8px 20px;
text-align: left !important; text-align: left !important;
font-size: 12px
} }
.rentou-box td{ .rentou-box td{
font-size: 14px; font-size: 14px;
......
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