Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/assets/css/newPersonalCenter/block/HomePage.css

@@ -92,7 +92,7 @@
   position: absolute;
   width: 20px;
   height: 20px;
-  border: 1px solid #fff;
+  border: 1px solid #F5F5F5;
   z-index: 1;
   background: #fff;
 }
@@ -102,6 +102,7 @@
   border-radius:0px 0px 20px 0px;
   border-bottom: 1px solid rgba(230,230,230,1);
   border-right: 1px solid rgba(230,230,230,1);
+  background-color: #F5F5F5;
 }
 
 .top_info .cro_right_top{
@@ -110,6 +111,7 @@
   border-radius:0px 0px 0px 20px;
   border-bottom: 1px solid rgba(230,230,230,1);
   border-left: 1px solid rgba(230,230,230,1);
+  background-color: #F5F5F5;
 }
 
 .top_info .cro_left_bottom{
@@ -118,6 +120,7 @@
   border-radius:0px 20px 0px 0px;
   border-top: 1px solid rgba(230,230,230,1);
   border-right: 1px solid rgba(230,230,230,1);
+  background-color: #F5F5F5;
 }
 
 .top_info .cro_right_bottom{
@@ -126,6 +129,7 @@
   border-radius:20px 0px 0px 0px;
   border-top: 1px solid rgba(230,230,230,1);
   border-left: 1px solid rgba(230,230,230,1);
+  background-color: #F5F5F5;
 }
 .top_info ._head_icon ._addr{
   margin-top: 10px;
@@ -158,7 +162,16 @@
 }
 .top_info .top_info_right ._business ._business_ite{
   margin: 8% 0;
-  height: 80%;
+  height: auto;
+  position: relative;
+}
+.top_info .top_info_right ._business ._business_Line{
+  border-right:1px dashed #E6E6E6;
+  width:1px;
+  height:40px;
+  position: absolute;
+  top:35px;
+  right:0;
 }
 .top_info .top_info_right ._business ._business_ite p{
   text-align: center;
@@ -178,6 +191,9 @@
 .top_info .top_info_right ._business ._business_ite ._top span._bg_color_org{
   background-color: #FEAD5E;
 }
+.top_info .top_info_right ._business ._business_ite ._top span._bg_color_green{
+  background-color: #49C0A1;
+}
 .top_info .top_info_right ._business ._business_ite ._text{
   color: #666666;
   font-size: 14px;

src/components/Hotel/HotelDetail.vue

@@ -474,7 +474,7 @@
                 <div class="HD_Top_Price">
                     <span class="HD_Top_Pinfo"><i>¥</i>{{price}}</span>
                     <span class="HD_Top_qi">/起</span>
-                    <span>另付税：¥177</span>
+                    <!-- <span>另付税：¥177</span> -->
                     <input type="button" class="HD_SureBtn" style="display:none;" value="立即预订"/>
                 </div>
                 <div class="HD_Top_ImgList clearfix">
@@ -526,6 +526,7 @@
                     <el-date-picker class="HD_date_input" v-model="SimilarMsg.arrivalDate" style="width:190px;" clear-icon=""
                         size="small"
                         value-format="yyyy-MM-dd"
+                        :picker-options="pickerOptions0"
                         type="date" 
                         placeholder="">
                     </el-date-picker>
@@ -533,6 +534,7 @@
                     <el-date-picker class="HD_date_input" v-model="SimilarMsg.departureDate" style="width:190px;" clear-icon=""
                         size="small"
                         value-format="yyyy-MM-dd"
+                        :picker-options="pickerOptions0"
                         type="date" 
                         placeholder="">
                     </el-date-picker>
@@ -621,12 +623,12 @@
                                 <img :src="item.roomImageURL" alt=""/>
                             </div>
                             <div class="HD_Kefang">
-                                <span v-if="item.gradeType==1">标准间</span>
-                                <span v-if="item.gradeType==2">普通间</span>
-                                <span v-if="item.gradeType==3">经济间</span>
-                                <span v-if="item.gradeType==4">舒适间</span>
-                                <span v-if="item.gradeType==5">豪华间</span>
-                                <span v-if="item.gradeType==6">其他</span>
+                                <!-- <span v-if="item.gradeType==1">标准</span>
+                                <span v-if="item.gradeType==2">主力</span>
+                                <span v-if="item.gradeType==3">经济学家</span>
+                                <span v-if="item.gradeType==4">苏佩里</span>
+                                <span v-if="item.gradeType==5">豪华裤</span>
+                                <span v-if="item.gradeType==6">特别房间、套房、远离</span> -->
 
                                 <span v-if="item.roomType==1">单人</span>
                                 <span v-if="item.roomType==2">双人</span>
@@ -788,6 +790,7 @@
 </template>
 <script>
 import HTMap from '../global/HTMap'
+import moment from "moment";
 export default {
   data() {
     return {
@@ -826,7 +829,13 @@ export default {
       //浴室
       bathRoom:[],
       //地图坐标
-      travelLngLat:[]
+      travelLngLat:[],
+      pickerOptions0: {
+        disabledDate(time) {
+          let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
+          return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
+        }
+      }
     };
   },
   mounted() {
@@ -1146,6 +1155,7 @@ export default {
                         x.roomOptions = arr;
                     }
                 })
+                console.log(this.SimilarList,'SimilarList');
             } else {
                 this.Error(res.data.message);
             }
@@ -1201,9 +1211,13 @@ export default {
     },
     //点击预订传递参数
     bookHotel(roomOptionCd){
+        if(sessionStorage.getItem("UserId")==''&& !localStorage.userInfo){
+            return this.Error('请登录！')
+        }
+
         let msg = this.SimilarMsg;
         msg.roomOptionCd = roomOptionCd;
-
+        msg.imgUrl = this.hotelDetails.hotelImageUrl1;
         sessionStorage.setItem("HotelSure", JSON.stringify(msg));
         this.$router.push({
             path:"/HotelSure"

src/components/Hotel/HotelHome.vue

@@ -54,22 +54,15 @@
                 <el-option value="山梨县" label="山梨县"></el-option>
               </el-select>
               <span class="sx"></span>
-              <el-date-picker class="date_inputOne HO_input" style="width:140px;" prefix-icon="iconfont icon-img-rili" clear-icon=""
-                size="small"
+              <el-date-picker
+                style="width:290px;"
+                v-model="dateList"
+                type="daterange"
                 value-format="yyyy-MM-dd"
-                v-model="msg.StartDate"
-                type="date" 
+                range-separator="-"
                 :picker-options="pickerOptions0"
-                placeholder="入住日">
-              </el-date-picker>
-              <span class="Ht_hg"></span>
-              <el-date-picker class="date_input" style="width:130px;" prefix-icon="none" clear-icon=""
-                size="small"
-                value-format="yyyy-MM-dd"
-                v-model="msg.EndDate"
-                type="date" 
-                :picker-options="pickerOptions0"
-                placeholder="离店日">
+                start-placeholder="入住日"
+                end-placeholder="离店日">
               </el-date-picker>
               <span class="sx"></span>
               <el-popover :visible-arrow="false"
@@ -329,17 +322,34 @@ export default {
         }
       },
       isLogin:0,
+      dateList:"",
     };
   },
   mounted() {
     this.loadSize();
+
   },
   created() {
     this.isLogin=this.$store.state.isLogin;
+
+    //获取传递参数
+    var url = window.location.href;
+    if (url.indexOf("?") != -1) {
+      let str = url.split("?")[1];
+      let uid = str.split("=")[1];
+      sessionStorage.setItem("UserId", uid);
+    }
   },
   methods: {
     //查询
     Search() {
+      if(this.dateList){
+          this.msg.StartDate=this.dateList[0];
+          this.msg.EndDate=this.dateList[1];
+      }else{
+          this.msg.StartDate="";
+          this.msg.EndDate="";  
+      }
       if(this.msg.place==''){
         this.Error('请选择目的地');
         return;
@@ -424,7 +434,7 @@ export default {
       let w = document.body.clientWidth;
       this.carousel_height = w * 0.269* 0.75 + "px";
       this.banner_height=w*0.205+"px";
-    }
+    },
   }
 };
 </script>
@@ -518,7 +528,7 @@ export default {
   z-index:99;
 } 
 .Hotel_home .Ht_ul{
-  margin:0 20px;
+  margin:0 12px;
   height:46px;
   line-height: 46px;
 }

src/components/Hotel/HotelList.vue

@@ -230,11 +230,12 @@
         background-color: #DBF1DF;
         color:#4E9F5D;
         font-size:12px;
-        margin:20px 10px 20px 0;
+        margin:20px 10px 0 0;
     }
     .HL_ListAddress{
         font-size:12px;
         color:#333333;
+        margin-top:20px;
     }
     .HL_ListPrice{
         position: absolute;
@@ -421,22 +422,14 @@
                     </el-select>
                  </div>   
                 <div class="HL_ComSearch HL_Two">
-                    <el-date-picker class="date_inputOne" style="width:140px;" prefix-icon="iconfont icon-img-rili" clear-icon=""
-                        size="small"
+                    <el-date-picker
+                        v-model="dateList"
+                        type="daterange"
                         value-format="yyyy-MM-dd"
-                        v-model="msg.arrivalDate"
+                        range-separator="-"
                         :picker-options="pickerOptions0"
-                        type="date" 
-                        placeholder="入住日">
-                    </el-date-picker>
-                    <span class="Ht_hg"></span>
-                    <el-date-picker class="date_input" style="width:140px;" prefix-icon="none" clear-icon=""
-                        size="small"
-                        value-format="yyyy-MM-dd"
-                        v-model="msg.departureDate"
-                        :picker-options="pickerOptions0"
-                        type="date" 
-                        placeholder="离店日">
+                        start-placeholder="入住日"
+                        end-placeholder="离店日">
                     </el-date-picker>
                  </div>   
                 <div class="HL_ComSearch HL_Three">
@@ -605,9 +598,7 @@
                                             </span>
                                         </div>
                                         <div>
-                                            <span class="HL_ListSpecial">明日可定</span>
-                                            <span class="HL_ListSpecial">亲子游</span>
-                                            <span class="HL_ListSpecial">主题乐园</span>
+                                            <span v-for="subItem in getTravelFeature(item.hotelFeaturesMask)" class="HL_ListSpecial">{{subItem}}</span>
                                         </div>
                                         <div class="HL_ListAddress">
                                             <img src="../../assets/img/hotel/address.png" alt=""/>
@@ -693,6 +684,9 @@ export default {
       //酒店搜索关键字
       keyWords:'',
       placeKeyWords:'',
+      //日期
+      dateList:[],
+      //数据
       dataList:[],
       loading:false,
       //住宿类型
@@ -899,8 +893,8 @@ export default {
     if(sessionStorage.getItem("HotelInfo")){
       let msgList = JSON.parse(sessionStorage.getItem("HotelInfo"));
       this.placeKeyWords = msgList.place;
-      this.msg.arrivalDate = msgList.StartDate;
-      this.msg.departureDate = msgList.EndDate;
+      this.dateList=[];
+      this.dateList.push(msgList.StartDate,msgList.EndDate);
       this.auditNum = msgList.auditNum;
       this.childNum = msgList.childNum;
       this.room = msgList.room;
@@ -954,6 +948,21 @@ export default {
     },
     //点击搜索
     SearchHotel(){
+        if(this.dateList){
+            this.msg.arrivalDate=this.dateList[0];
+            this.msg.departureDate=this.dateList[1];
+        }else{
+            this.msg.arrivalDate="";
+            this.msg.departureDate="";  
+        }
+        if(this.msg.arrivalDate==''){
+            this.Error('请选择入住日期');
+            return;
+        }
+        if(this.msg.departureDate==''){
+            this.Error('请选择退房日期');
+            return;
+        }
         if(this.keyWords==''){
             this.msg.freewordType=1;
             this.msg.freeword= this.placeKeyWords;
@@ -1063,7 +1072,24 @@ export default {
       this.$router.push({
           path:"/HotelDetail"
       })
-
+    },
+    //主题特色
+    getTravelFeature(feature){
+        let fea = feature.split(',');
+        let newArr=[];
+        if(fea[0]==1){
+           newArr.push('从车站步行5分钟');
+        }
+        if(fea[1]==1){
+            newArr.push('有温泉');
+        }
+        if(fea[2]==1){
+            newArr.push('离海滩5分钟');
+        }
+        if(fea[3]==1){
+            newArr.push('退房11点以后');
+        }
+        return newArr;
     }
   }
 };

src/components/newPersonalCenter/block/model/HotelOrder.vue

@@ -65,8 +65,8 @@
                 <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>
+                <el-button size="mini"type="danger" v-if="item.OrderStatus!='已取消'"  @click="goPay(item)">立即付款</el-button> 
+                <el-button style="margin: 10px 0 0 0;" v-if="item.OrderStatus!='已取消'" size="mini" @click="canCelHotel(item.ThirdOrderNo)">取消订单</el-button>
               </td>
             </tr>
           </template>
@@ -184,9 +184,9 @@ export default {
             hotelName:item.HotelName,
             totalPnumber:item.Number
         }
+        sessionStorage.setItem("HotelPayMsg", JSON.stringify(msg));
         this.$router.push({
             path:"/HotelPay",
-            query:{msg:JSON.stringify(msg)}
         })
     },
     //取消

src/components/newPersonalCenter/block/model/OrderInfo.vue

@@ -200,14 +200,13 @@ export default {
         "/api/b2b/user/getrecentorder",
         this.getOrderMsg,
         res => {
+            this.orderLoading = false;
           if (res.data.resultCode == 1) {
-            this.tableData = res.data.data.pageData;
+            this.tableData = res.data.data.pageData?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);
-            this.orderLoading = false;
           }
         },
         null

src/components/newPersonalCenter/block/model/PersonalInfor.vue

@@ -70,19 +70,30 @@
     <div class="cro_left_bottom"></div>
     <el-col :span="12" class="top_info_right cro">
       <el-row class="_business">
-        <el-col :span="12" class="_business_ite">
+        <el-col :span="9" class="_business_ite">
           <p class="_top">
             <span>￥</span>
           </p>
           <p class="_text">本月交易额</p>
           <p class="_money">¥{{moneyFormat(userInfo.monthTradeMoney)}}</p>
+          <div class="_business_Line"></div>
         </el-col>
-        <el-col :span="12" class="_business_ite">
+        <el-col :span="8" class="_business_ite">
           <p class="_top">
             <span class="_bg_color_org">￥</span>
           </p>
           <p class="_text">累计交易额</p>
           <p class="_money">¥{{moneyFormat(userInfo.sumTradeMoney)}}</p>
+          <div class="_business_Line"></div>
+        </el-col>
+        <el-col :span="7" class="_business_ite">
+          <div @click="getCunzhe()" style="cursor:pointer;">
+            <p class="_top">
+              <span class="_bg_color_green">￥</span>
+            </p>
+            <p class="_text">幸福存折</p>
+            <p class="_money">¥{{moneyFormat(userInfo.Clientbalance)}}</p>
+          </div>
         </el-col>
       </el-row>
     </el-col>
@@ -110,13 +121,16 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.userInfo = res.data.data;
-            console.log(res.data.data);
           } else {
             this.Error(res.data.message);
           }
         },
         null
       );
+    },
+    //点击跳转幸福存折
+    getCunzhe(){
+      this.MsgBus.$emit("happyPassBook");
     }
   }
 };

src/components/newPersonalCenter/newPersonalCenter.vue

@@ -187,6 +187,12 @@ export default {
   created() {
     this.MsgBus.$on('newPersonalCenter', this.setActive)
     this.MsgBus.$on('goCPage', this.setActive)
+
+    //个人中心首页点击幸福存折跳过来
+    var that = this;
+    that.MsgBus.$on('happyPassBook', function () {
+      that.clickMenu("6");
+    });
   }
 }
 </script>

src/components/trade/order/indexTwo.vue

@@ -843,7 +843,7 @@ export default {
               OldPeopleNum:this.chosenObj.lrCount,
               SingleRoomNum:this.chosenObj.df,
               PreferPrice:this.price,
-              DiscountMoney: this.RedEnvelopeMoney,
+              DiscountMoney:this.price - this.SettlementPrice,
               CouponAllotIds: this.CouponIds!== '' ? this.CouponIds.slice(0,this.CouponIds.length-1) : '',
               YSeatNum:y,
               ESeatNum:f,