更新登录

src/assets/css/localtourhome.css

@@ -625,7 +625,7 @@
     text-align: center;
     color: #fff;
 }
-.LocalTourList .choose_ul .spanMargin .el-date-editor.el-input, .el-date-editor.el-input__inner{
+.LocalTourList .choose_ul .spanMargin .el-date-editor.el-input,.LocalTourList .el-date-editor.el-input__inner{
     width:160px;
     height:28px;
     margin-top:3px;

src/assets/mall/newHead.css

@@ -23,8 +23,11 @@ ul,li{list-style: none;}
 .w100{
   width: 100px !important;
 }
-.wb60{
-  width: 60% !important;
+.wb40{
+  width: 40% !important;
+}
+.wb30{
+  width: 30% !important;
 }
 ._flex_center{
   display: flex;

src/components/DependentTravel/IndependentList.vue

@@ -243,6 +243,9 @@ export default {
      if(this.$route.query.lineteamId){
         this.listmsg.lineTeamId=this.$route.query.lineteamId;
      }
+     if(this.$route.query.time){
+        this.listmsg.monthdate=this.$route.query.time;
+      }
      this.isLogin=this.$store.state.isLogin;
     if(this.isLogin==1){
       this.listmsg.priceOrderByField=2;

src/components/Home.vue

@@ -37,7 +37,7 @@
                             <i class="iconfont icon-Shape"></i>
                             <p>酒店</p>
                         </li>
-                        <li @click="ChangeTab('admticket')" :class="tag=='admticket'?'tag_active':''"  v-show="false">
+                        <li @click="ChangeTab('admticket')" :class="tag=='admticket'?'tag_active':''" >
                             <i class="iconfont icon-menpiao1"></i>
                             <p>门票</p>
                         </li>
@@ -240,7 +240,7 @@
                             
                         </div>
                         <!-- 门票  v-show="tag=='admticket'"--> 
-                        <div style="width:394px"  class="visa"  v-show="false">
+                        <div style="width:394px"  class="visa" >
                             <el-form ref="visa_form" :model="visa_form" label-width="90px">
                                 <!-- <el-form-item label="关键词搜索" style="margin-bottom:10px">
                                     <el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
@@ -448,19 +448,19 @@
                                 </span>起</span></p>
                             </div> 
                        </div>
-                       
                    </div>
               </div>
           </div>
 
-        <!-- 冰糕活动跳转 --><el-row style="margin: 20px 0;cursor: pointer;">
+        <!-- 冰糕活动跳转 -->
+        <!-- <el-row style="margin: 20px 0;cursor: pointer;">
           <img
             @click="FootgoUrl('IceCreamTask')"
             class="huodong_img"
             src="../assets/img/active/huodong_img1.png"
             alt
           > 
-          </el-row>
+          </el-row> -->
           <!-- 景点门票 -->
           <div class="Ticket_spots"  v-show="false">
             <ul class="common_ul_tab">
@@ -1369,7 +1369,6 @@ export default {
   }
 };
 </script>
-
 <style>
 @import "../assets/css/home.css";
 @import "../assets/css/common.css";

src/components/Hotel/HotelList.vue

@@ -897,6 +897,15 @@ export default {
   mounted() {
   },
   created() {
+      if(this.$route.query.time){
+        this.dateList=this.$route.query.time;
+        this.msg.searchroomGroup = [{
+          roomNum:1,
+          numberOfAdults:1,
+          numberOfChildren:0
+        }]
+        this.getInOutDate()
+    }
       if(this.$route.query.searchKey){
           this.keyWords=this.$route.query.searchKey;
           this.SearchHotel();
@@ -912,6 +921,7 @@ export default {
       this.msg.searchroomGroup = msgList.roomList;
       this.SearchHotel();
     }
+    
     if(sessionStorage.getItem("OpenB2BCode")){
         if(sessionStorage.getItem("OpenB2BCode")=='jqk4n7BSaoI='){
             this.isShowTime=false;

src/components/Ticket/TicketList.vue

@@ -426,6 +426,9 @@ export default {
         this.choose_info.qFlightDateStart
       ).format("YYYY-MM-DD HH:mm:ss");
     }
+    if(this.$route.query.time){
+      this.choose_info.qFlightDateStart=this.$route.query.time[0];
+    }
     this.Datelist();
     this.initAirlines();
     this.CFD();

src/components/global/newHead.vue

@@ -47,6 +47,15 @@
 .item-tootip{
   width: 100px;
 }
+.my-input{
+  border: none !important;
+  border-radius: 0 !important;
+  height: 34px !important;
+  border-left: 1px solid #e6e6e6 !important;
+}
+.my-input .el-range-separator{
+  line-height: 28px !important;
+}
 </style>
 <template>
   <!-- 头部 -->
@@ -163,10 +172,10 @@
               </el-select>
             </div>
           </el-col>
-          <el-col :span="10" :offset="1">
+          <el-col :span="12" :offset="1">
             <div class="_search_box _flex_center">
               <!-- <span class="_city">成都</span> -->
-              <el-select v-model="select" slot="prepend" size="mini" class="w100" placeholder="请选择">
+              <el-select v-model="select" slot="prepend" @change="value6 = []" size="mini" class="w85" placeholder="请选择">
                 <el-option label="旅游" value="1"></el-option>
                 <el-option label="定制游" value="4"></el-option>
                 <el-option label="一日游" value="5-1" v-show="false"></el-option>
@@ -178,19 +187,30 @@
               </el-select>
               <span class="_splice"></span>
               <el-input
-                class="wb60"
+                class="wb40"
                 placeholder="搜索旅行地/酒店/旅游/门票/签证"
                 size="mini"
                 @keyup.enter="goSearch"
                 v-model="searchText"
               ></el-input>
+              <el-date-picker
+                v-if="select!=='6'"
+                size="mini"
+                :picker-options="select !== '3' && select !== '7' ? pickerOptions0 : pickerOptions1"
+                v-model="value6"
+                type="daterange"
+                class="wb30 my-input"
+                value-format="yyyy-MM-dd"
+                range-separator="-"
+                format="MM-dd">
+              </el-date-picker>
               <span class="_search_btn __cp" @click="goSearch">
                 <i class="iconfont icon-search"></i>
               </span>
             </div>
           </el-col>
           <!-- 右 电话 -->
-          <el-col :span="5" :offset="2">
+          <el-col :span="5" :offset="1">
             <div class="_phone _flex_center">
               <div>
                 <i class="iconfont icon-dianhua1"></i>
@@ -334,6 +354,7 @@ const map = new AMap.Map("map-container", {
 
 import { location } from "../../assets/utils/getLocation";
 import bus from "../../plugins/event-bus";
+import moment from "moment";
 export default {
   data() {
     return {
@@ -345,7 +366,19 @@ export default {
       navActive: "",
       sites: [],
       city: 0,
-      cityText: ""
+      cityText: "",
+      value6: '',
+      pickerOptions0: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        }
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          let today_after7=moment().add(7,'days').format('YYYY-MM-DD');
+          return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
+        }
+      },
     };
   },
   methods: {
@@ -426,14 +459,20 @@ export default {
       if (this.searchText != "") {
         if (this.select === "1") {
           // 旅游
-          let query = { keywords: encodeURIComponent(this.searchText) };
+          let time = [];
+          if (this.value6) {
+            this.value6.map(x=>{
+              time.push(x.substring(2, 10))
+            })
+          }
+          let query = { keywords: encodeURIComponent(this.searchText), time: time };
           this.$router.push({
             path: "search",
             query
           });
         }  else if (this.select === "3") {
           // 机票
-          let query = { keywords: encodeURIComponent(this.searchText) };
+          let query = { keywords: encodeURIComponent(this.searchText), time: this.value6 };
           this.$router.push({
             path: "TicketList",
             query
@@ -441,7 +480,7 @@ export default {
         }
         else if (this.select === "4") {
           // 定制游
-          let query = { keywords: this.searchText};
+          let query = { keywords: this.searchText, time: this.value6};
           this.$router.push({
             path: "IndependentList",
             query
@@ -449,7 +488,7 @@ export default {
         }
         else if (this.select === "5-1") {
           // 一日游
-          let query = { searchKey: this.searchText,tab:1};
+          let query = { searchKey: this.searchText,tab:1, time: this.value6};
           this.$router.push({
             path: "LocalTourList",
             query
@@ -457,7 +496,7 @@ export default {
         }
         else if (this.select === "5-2") {
           // 当地游门票
-          let query = { searchKey: this.searchText,tab:2};
+          let query = { searchKey: this.searchText,tab:2, time: this.value6};
           this.$router.push({
             path: "LocalTourList",
             query
@@ -465,7 +504,7 @@ export default {
         }
         else if (this.select === "5-3") {
           // 当地游美食
-          let query = { searchKey: this.searchText};
+          let query = { searchKey: this.searchText, time: this.value6};
           this.$router.push({
             path: "LocalCuisine",
             query
@@ -473,7 +512,7 @@ export default {
         }
         else if (this.select === "6") {
           // 签证
-          let query = { searchKey: this.searchText};
+          let query = { searchKey: this.searchText, time: this.value6};
           this.$router.push({
             path: "Visalist",
             query
@@ -481,7 +520,7 @@ export default {
         }
         else if (this.select === "7") {
           // 酒店
-          let query = { searchKey: this.searchText};
+          let query = { searchKey: this.searchText, time: this.value6};
           this.$router.push({
             path: "HotelList",
             query

src/components/mall/search.vue

@@ -221,6 +221,10 @@ export default {
         this.searchItem.push('')
         this.searchItem.push('')
         this.keywords=decodeURIComponent(this.$route.query.keywords)
+        if (this.$route.query.time) {
+            this.multData = this.$route.query.time
+            this.multDataChange()
+        }
         this.loadRecoItems()
         this.loadDates()
         this.loadDayCount()

src/router.js

@@ -3,6 +3,7 @@ import Router from "vue-router";
 import index from "./views/index";
 import login from "./views/login";
 import newLogin from "./views/newLogin";
+import loginNationalDay from "./views/loginNationalDay";
 import IceCreamTask from "./components/taskPage/IceCream/IceCreamTask";
 // import JuanSaid from "./components/taskPage/JuanSaid";
 import FoodImg from "./components/taskPage/FoodImg";
@@ -21,7 +22,7 @@ export default new Router({
     {
       path: "/login",
       name: "login",
-      component: newLogin
+      component: loginNationalDay
     },
     // {
     //   path: "/newLogin",