酒店

src/components/Hotel/HotelHome.vue

@@ -4,7 +4,7 @@
         <div class="choose">
           <div style="background:#ffffff;display: flex;align-items: center;position:relative"> 
               <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>

src/components/Hotel/HotelList.vue

@@ -74,7 +74,7 @@
         top:1px;
     }
     .HL_Screen{
-        width:1158px;
+        width:1198px;
         height:auto;
         margin:auto;
         border:1px solid #DCDCDC;
@@ -112,9 +112,6 @@
         padding:4px 8px;
         
     }
-    .MoreList span{
-        margin-top:10px;
-    }
     .HL_Stitle{
         display: inline-block;
         width:50px;
@@ -312,14 +309,16 @@
         width:85%;
         overflow: hidden;
         height: 100%;
-        
+    }
+    .HL_Concept span{
+        margin:5px 0;
     }
     .HL_minHeight{
-        height:43px;
+        height:45px;
+        line-height: 27px;
     }
     .HL_AutoHeight{
         height:auto;
-        padding:10px 0;
     }
    
     .HL_ConZhankai{
@@ -355,6 +354,9 @@
     .HotelList .HT_otherStar i{
         color:rgb(239, 242, 247);
     }
+    .HL_Maxheight{
+        height:150px!important;
+    }
 </style>
 
 <template>
@@ -363,7 +365,10 @@
             <div class="HL_SearchInfo">
                  <div class="HL_ComSearch HL_one">
                     <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>
@@ -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>
@@ -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>
@@ -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>
@@ -512,9 +514,9 @@
                     {{item.name}}
                 </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>
-                <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 class="HL_ScList">
                 <span class="HL_Stitle">房型</span>
@@ -551,9 +553,9 @@
                 <span>越早预订越便宜</span>
                 <span>限定期限</span>
             </div> -->
-            <div class="HL_ScList MoreList" :class="isOpen==1?'HL_minHeight':'HL_AutoHeight'">
-                <div class="HL_Stitle">理念</div>
-                <div class="HL_Concept" >
+            <div class="HL_ScList MoreList" style="height:auto;">
+                <div class="HL_Stitle" style="height:45px;" :class="isOpen==2?'HL_Maxheight':''">理念</div>
+                <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">
                         {{item.name}}
                     </span>
@@ -568,9 +570,9 @@
             <div class="HL_ScList">
                 <span class="HL_Stitle">评分</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>
-                <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 class="HL_ScList">
                 <span class="HL_Stitle">酒店名称</span>
@@ -679,14 +681,18 @@ export default {
       },
       //总页数
       TotalPage:0,
-      //最小金额
-      searchMinRate:'',
-      //最大金额
-      searchMaxRate:'',
-      //最小星星
-      reviewRatingLowerLimits:'',
-      //最大星星
-      reviewRatingUpperLimits:'',
+      monyMsg:{
+        //最小金额
+        searchMinRate:'',
+        //最大金额
+        searchMaxRate:'',
+      },
+      starMsg:{
+        //最小星星
+        reviewRatingLowerLimits:'',
+        //最大星星
+        reviewRatingUpperLimits:'',
+      },
       isShowPop:false,
       roomList:[],
       room:1,
@@ -955,26 +961,26 @@ export default {
             this.msg.freewordType=2;
             this.msg.freeword=this.keyWords;
         }
-        if(this.searchMinRate==""){
+        if(this.monyMsg.searchMinRate==""){
             this.msg.searchMinRate=0;
         }else{
-            this.msg.searchMinRate = this.searchMinRate;
+            this.msg.searchMinRate = this.monyMsg.searchMinRate;
         }
-        if(this.searchMaxRate==""){
+        if(this.monyMsg.searchMaxRate==""){
             this.msg.searchMaxRate=0;
         }else{
-            this.msg.searchMaxRate = this.searchMaxRate;
+            this.msg.searchMaxRate = this.monyMsg.searchMaxRate;
         }
 
-        if(this.reviewRatingLowerLimits==""){
+        if(this.starMsg.reviewRatingLowerLimits==""){
             this.msg.reviewRatingLowerLimits=0;
         }else{
-            this.msg.reviewRatingLowerLimits = this.reviewRatingLowerLimits;
+            this.msg.reviewRatingLowerLimits = this.starMsg.reviewRatingLowerLimits;
         }
-        if(this.reviewRatingUpperLimits==""){
+        if(this.starMsg.reviewRatingUpperLimits==""){
             this.msg.reviewRatingUpperLimits = 0;
         }else{
-            this.msg.reviewRatingUpperLimits = this.reviewRatingUpperLimits;
+            this.msg.reviewRatingUpperLimits = this.starMsg.reviewRatingUpperLimits;
         }
 
         this.msg.searchHotelCategory=[];

src/components/global/newHead.vue

@@ -321,6 +321,13 @@
               <span class="__splice">|</span>
             </div>
           </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}">
             <div @click="handleSelect('/', 7), navActive = 7">
@@ -498,7 +505,9 @@ export default {
   created() {
     let that = this;
     require(["http://pv.sohu.com/cityjson?ie=utf-8"], () => {
+      
       setTimeout(() => {
+        console.log("returnCitySN",returnCitySN)
         if (returnCitySN) {
           that.loadSites();
           that.cityText = returnCitySN.cname;