1

src/App.vue

@@ -76,7 +76,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_juczt3mz8sh.css';
+@import '//at.alicdn.com/t/font_863923_tqm52zonr0j.css';
 @import './assets/global/global.css';
 @import './assets/css/common.css';
 body,html{

src/assets/css/home.css

@@ -480,6 +480,7 @@ a{
 }
 .Ticket_spots {
   position: relative;
+  margin-top:30px;
 }
 .Ticket_spots .Ticket_spots_right{
   position: absolute;

src/assets/css/localtourhome.css

@@ -87,6 +87,7 @@
 .Localtourhome .commontitle .outone_top_right .content{
     border-bottom:2px solid #4CB960;
     padding-left: 75px;
+    min-height: 42px;
 }
 .Localtourhome .commontitle .outone_top_right .content span{
     display: inline-block;

src/components/DependentTravel/IndependentList.vue

@@ -26,7 +26,7 @@
                         <div class="select_title" style="top:15px">线路</div>
                         <ul class="select_ul" :class="lineselect?'':'select_ul_height'">
                            <li @click="ChangeLine(0)" :class="listmsg.lineTeamId==0?'visa_active':''">不限</li>
-                           <li @click="ChangeLine(item.id)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}{{item.id}}</li>
+                           <li @click="ChangeLine(item.id)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li>
                             
                         </ul>
                         <span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span>

src/components/GroupTour/index.vue

@@ -157,6 +157,19 @@ export default {
       lineLoad:false,
     }
   },
+  props:['changeCity'],
+  watch:{
+      changeCity: {
+            handler: function(val, oldVal) {
+                console.log(val)
+                if(val){
+                    this.loadTiaoshui()
+                    this.loadRecoItems()
+                }
+            },
+            deep: true
+        }, 
+  },
   methods: {
     // 系列
     GostartCity(place){

src/components/Home.vue

@@ -832,6 +832,18 @@ export default {
     isLogin:0,
     };
   },
+  props:['changeCity'],
+  watch:{
+      changeCity: {
+            handler: function(val, oldVal) {
+                console.log(val)
+                if(val){
+                    this.InitData()
+                }
+            },
+            deep: true
+        }, 
+  },
   mounted() {},
   created() {
     this.loadSize();

src/components/LocalTour/Localtourhome.vue

@@ -75,7 +75,7 @@
               </div>
               <div v-loading="dayLoad" class="basefix dayContent" style="margin-top:17px">
                   <div class="dayConDiv1">
-                      <div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300">
+                      <div @click="goOneDayDetail(item)" v-for="(item,index) in abroadList" v-if="index<2"  :key="index+300">
                           <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
                           <span class="daydes">{{item.title}}</span>
                           <span class="price">￥<span class="pfR font18">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>起</span>

src/components/LocalTour/OnedayList.vue

@@ -46,7 +46,10 @@
                     起</p>
                 </div>
             </li>
-            <img style="width:228px;height:100px;margin-top:25px" src="../../assets/img/localtour/guangg1.png" alt="">
+            <router-link to="/PersonalTailor">
+                <img style="width:228px;height:100px;margin-top:25px" src="../../assets/img/localtour/guangg1.png" alt="">
+            </router-link>
+            
         </ul>
   </div>
 </template>

src/components/Ticket/TicketHome.vue

@@ -303,12 +303,13 @@ export default {
         isDiscounts: 1
       },
       yhList: [],
-
+      today_after7:moment().add(7,'days').format('YYYY-MM-DD'),
       choose_info: {
         pageIndex: 1,
         pageSize: 10,
         id: 0,
-        qFlightDateStart: moment().format("YYYY-MM-DD"),
+        
+        qFlightDateStart: moment().add(7, "days").format("YYYY-MM-DD"),
         qFlightDateEnd: "",
         flight_number: "",
         airLineID: 0,
@@ -341,9 +342,11 @@ export default {
       value: "",
       airlineList: [],
       cfd: [],
+      
       pickerOptions0: {
         disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7;
+          let today_after7=moment().add(7,'days').format('YYYY-MM-DD');
+          return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
         }
       },
       slidemsg:{
@@ -360,6 +363,8 @@ export default {
   },
   created() {
     this.isLogin=this.$store.state.isLogin;
+    
+
     this.JXYH();
     this.initAirlines();
     this.CFD();

src/components/Ticket/TicketList.vue

@@ -291,7 +291,7 @@
                                   <p style="font-size:12px">余位
                                       <span style="color:#49C0A1">{{item.synum}}</span>
                                     </p>
-                                 <el-button v-if="item.synum>0 && item.isPayOrder==1 && item.btnshow" @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
+                                 <el-button v-if="item.synum>0 && item.isPayOrder==1" @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
                                      购买
                                 </el-button>
                              </el-col>
@@ -359,7 +359,7 @@ export default {
         pageIndex: 1,
         pageSize: 10,
         id: 0,
-        qFlightDateStart: null,
+        qFlightDateStart: moment().add(7, "days").format("YYYY-MM-DD"),
         qFlightDateEnd: "",
         flight_number: "",
         airLineID: 0,
@@ -397,10 +397,12 @@ export default {
       count: 0,
       pickerOptions0: {
         disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7;
+          let today_after7=moment().add(7,'days').format('YYYY-MM-DD');
+          return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
         }
       },
       isLogin:0,
+      today_after7:moment().add('days', 7).format('YYYY-MM-DD'),
     };
   },
   mounted() {},
@@ -582,9 +584,10 @@ export default {
     // 获取当前日期的前一天
     BeforeDate() {
       let today = moment().format("YYYY-MM-DD");
-      let changeday = moment(this.changeday).format("YYYY-MM-DD");
-      if (today == changeday) {
-        this.$message.error("不能选择过去的日期！");
+      let changeday = moment(this.changeday).subtract(1, "days").format("YYYY-MM-DD");
+      console.log("changeday",changeday)
+      if(moment(changeday).isBefore(this.today_after7)){
+        this.Error("只能购买七天之后的机票！")
         return;
       }
       this.changeday = moment(this.changeday)
@@ -598,6 +601,10 @@ export default {
     },
     // 获取点击时间
     GetClickDate(item) {
+      if(moment(item.timeStr).isBefore(this.today_after7)){
+        this.Error("只能购买七天之后的机票！")
+        return;
+      }
       this.datainfo.qFlightDateStart = moment(item.timeStr).format("YYYY-MM-DD HH:mm:ss");
       
       this.Datelist();
@@ -607,8 +614,8 @@ export default {
     Datelist() {
       this.datainfo = this.choose_info;
       if (this.choose_info.qFlightDateStart == null) {
-        this.choose_info.qFlightDateStart = moment().format("YYYY-MM-DD");
-        this.datainfo.qFlightDateStart = moment().format("YYYY-MM-DD HH:mm:ss");
+        this.choose_info.qFlightDateStart = moment().add(7, "days").format("YYYY-MM-DD");
+        this.datainfo.qFlightDateStart = moment().add(7, "days").format("YYYY-MM-DD HH:mm:ss");
       } else {
         this.datainfo.qFlightDateStart = moment(
           this.choose_info.qFlightDateStart
@@ -645,8 +652,6 @@ export default {
       this.getList();
     },
     getList() {
-      let today_after7=moment().add('days', 6).format('YYYY-MM-DD');
-      // console.log("today_after7",today_after7)
       this.loading = true;
       this.choose_info.qFlightDateStart = moment(
         this.choose_info.qFlightDateStart
@@ -663,9 +668,6 @@ export default {
               this.datalist.forEach(item => {
                 item.btnshow=false;
                 item.synum = item.airTicketScatterNum - item.useScatterNum;
-                if(moment(today_after7).isBefore(item.goFlightTime)){
-                  item.btnshow=true;
-                }
               });
             }
           } else {

src/components/global/newHead.vue

@@ -4,7 +4,32 @@
     color:#fff!important;
     border-bottom: 2px solid #DF3343!important;
 }
-
+.CityChange{
+  width:100px;
+  background:rgba(242,242,242,1);
+  border:1px solid rgba(230,230,230,1);
+  border-radius:6px;
+  padding-left:6px;
+  box-sizing: border-box;
+}
+.CityChange i{
+  color:#EE4454;
+  
+}
+.CityChange .el-select{
+  display: inline-block;
+  width:75px;
+  border:none;
+}
+.CityChange .el-select .el-input__inner{
+  background:rgba(242,242,242,1);
+  border:none;
+  outline: none;
+  padding:0 4px;
+}
+.CityChange .el-select .el-input__inner:focus{
+  border:none;
+}
 </style>
 <template>
   <!-- 头部 -->
@@ -96,12 +121,19 @@
             <img class="logo" src="../../assets/img/logo_t.png" alt="">
           </el-col>
           <!-- 中 搜索框 -->
-          <el-col :span="10" :offset="2">
+          <el-col :span="2">
+            <div class="CityChange">
+                <i class="iconfont icon-ditu"></i>
+                <el-select v-model="city" placeholder="请选择"  @change="changeSite">
+                    <el-option v-for="item in sites" :key="item.companyId" :label="item.siteName" :value="item.companyId"></el-option>
+                </el-select>
+            </div>
+            
+          </el-col>
+          <el-col :span="10" :offset="1">
             <div class="_search_box _flex_center">
               <!-- <span class="_city">成都</span> -->
-              <el-select v-model="city" placeholder="请选择" class="w85" size="mini" @change="changeSite">
-                <el-option v-for="item in sites" :key="item.companyId" :label="item.siteName" :value="item.companyId"></el-option>
-              </el-select>
+              
               <el-select v-model="select" slot="prepend" size="mini" class="w100" placeholder="请选择">
                 <el-option label="旅游" value="1"></el-option>
                 <!-- <el-option label="酒店" value="2"></el-option> -->

src/components/mall/newcalendar.vue

@@ -100,6 +100,7 @@ export default {
 			daysData:[],
 			isSelect:-1,
 			mydate:-1,
+			today_after7:moment().add('days', 7).format('YYYY-MM-DD'),
 		}
 	},mounted(){
 		
@@ -146,7 +147,7 @@ export default {
 				let dateStr=moment(price.dateStr).format("YYYY-MM-DD");
 				var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
 				var dayDict = daysData[Number(dayIndex)-1];
-				if (moment(dateStr).isBefore(today)){
+				if (moment(dateStr).isBefore(this.today_after7)){
 					dayDict.price='';
 				}else{
 					dayDict.price = price.price;

src/views/index.vue

@@ -5,7 +5,7 @@
 <template>
     <div class="home-box" v-if="isPhone">
         <!-- <mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> -->
-        <newHead/>
+        <newHead @siteCity="siteCity"/>
         <div :style='{"min-height":minHeight+"px"}'>
             <transition name="slide">
                 <router-view :changeCity='changeCity'></router-view>