update

src/components/DependentTravel/IndependentTravel.vue

@@ -3,7 +3,7 @@
     <div class="top_img">
       <el-carousel class="carousel" arrow="always" style="height:100%" :interval="10000" trigger="click">
               <el-carousel-item v-for="item in slideList" :key="item.url">
-                  <img :src='compressImg(item.url, "filt", 245, "")'>
+                  <img :src='compressImg(item.url, "filt", 1200, "")'>
               </el-carousel-item>
       </el-carousel>
       <div class="box">

src/components/GroupTour/index.vue

@@ -4,8 +4,8 @@
 <template>
   <el-row class="GroupTour">
     <!-- 顶部图片 -->
-    <el-row class="GroupTour_top_bg">
-      <div class="bg">
+    <el-row class="GroupTour_top_bg" v-loading="lineLoad">
+      <div class="bg" >
         <ul class="typeLi">
           <li class="alltype">所有分类</li>
            <li v-for="(item,index) in lineList" :key="index+100">
@@ -34,7 +34,7 @@
                     <li v-if="item.sbuItem.hotTicketcouponsNames.length>0" style="margin-top:15px;">
                       <p style="color:#111111;font-family:'PingFangR'">热门景点</p>
                       <div style="margin-top:6px">
-                        <span v-for="(hot,index) in item.sbuItem.hotTicketcouponsNames" :key="index+200">
+                        <span @click="TagGourl('LocalTourList',hot,2)" v-for="(hot,index) in item.sbuItem.hotTicketcouponsNames" :key="index+200">
                           <span>{{hot}}</span> 
                           <span style="padding:0 6px" v-if="index!=item.sbuItem.hotTicketcouponsNames.length-1">|</span>
                         </span>
@@ -43,7 +43,7 @@
                     <li v-if="item.sbuItem.lineTeamList.length>0" style="margin-top:15px;">
                       <p style="color:#111111;font-family:'PingFangR'">系列</p>
                       <div style="margin-top:6px">
-                        <span v-for="(line,index) in item.sbuItem.lineTeamList" :key="index+300">
+                        <span @click="GoLine(item,line)" v-for="(line,index) in item.sbuItem.lineTeamList" :key="index+300">
                           <span>{{line.ltName}}</span> 
                           <span style="padding:0 6px" v-if="index!=item.sbuItem.lineTeamList.length-1">|</span>
                         </span>
@@ -104,11 +104,25 @@ export default {
       loadingIndex: -1,
       loading: true,
       lineList:[],
+      lineLoad:false,
     }
   },
   methods: {
+    // 系列
+    GoLine(item,line){
+      this.$router.push({ path:'/search',
+         query:{tab:2,keywords:"",lineId:item.lineName,lineteamId:line.ltName} })
+    },
+    // 景点
+    TagGourl(path,item,num){
+      this.$router.push({ path:'/LocalTourList',
+         query:{tab:2,searchKey:item} })
+          
+      },
     LineTeam(){
+      this.lineLoad=true;
         this.apiJavaPost('/api/b2b/group/getHomeLineSort',{},res=>{  
+        this.lineLoad=false;
             if(res.data.resultCode==1){
                 this.lineList=res.data.data;
 

src/components/Home.vue

@@ -305,12 +305,13 @@
                                 <div class="cztm_item_content">
                                     <div id="triangle-left"></div>
                                     <p class="cztm_title text2">{{item.title}}</p>
-                                    <p style="margin-top:35px" class="cztm_title">{{item.dayNum}}日{{item.nightNum}}晚</p>
+                                    <p style="margin-top:8px" class="cztm_title">{{item.dayNum}}日{{item.nightNum}}晚</p>
                                     <!-- <p><span class="discount">7.2折</span></p> -->
                                     <p style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
                                         {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                         </span>起
                                     </p>
+                                    <p v-html="ComputingTime(item)">}</p>
                                     <!-- <p><span class="bg">5</span>天<span class="bg">14</span>时<span class="bg">18</span>分</p> -->
                                 </div>
                             </div>
@@ -884,8 +885,7 @@ export default {
   },
   methods: {
     //   机票购买
-      Purchase(item) {
-          console.log(item)
+    Purchase(item) {
       let isLogin = this.$store.state.isLogin;
       if (isLogin == 0) {
         this.Error("请先登录！");
@@ -1113,6 +1113,7 @@ export default {
             // 超值特卖
             if(data.homeTravelSpecialSale){
                 this.homeTravelSpecialSale=data.homeTravelSpecialSale;
+                // this.ComputingTime();
             }
             
             
@@ -1122,6 +1123,37 @@ export default {
         }
         },null)
     },
+    ComputingTime(item){
+        var returnStr ="";
+        var startDate = moment().format("x"); //获取系统当前时间
+        let endDate=moment(item.sendVisaTime).format("x");
+        var diff = endDate- startDate; //时间差的毫秒数
+        //计算出相差天数
+        var days = Math.floor(diff / (24 * 3600 * 1000));
+
+        //计算出小时数
+        var leave1 = diff % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
+        var hours = Math.floor(leave1 / (3600 * 1000));
+        //计算相差分钟数
+        var leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
+        var minutes = Math.floor(leave2 / (60 * 1000));
+
+        //计算相差秒数
+        var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
+        var seconds = Math.round(leave3 / 1000);
+        // var returnStr = seconds + "秒";
+        if (days > 0) {
+            returnStr += "<span class='bg'>"+days+"</span>" + "天";
+        }
+        if (minutes > 0) {
+            returnStr += "<span class='bg'>"+minutes+"</span>" + "分";
+        }
+        if (hours > 0) {
+            returnStr += "<span class='bg'>"+hours+"</span>" + "时";
+        }
+        
+        return returnStr
+    },
     handleClick(tab, event) {
       if(this.activecontent1=="first"){
           this.Cztm();

src/components/LocalTour/LocalTourList.vue

@@ -234,7 +234,6 @@ export default {
         startCityId:0,
         countryId:0,
         cityId:0,
-        searchKey:"",
       },
       pickerBeginDateBefore: {
           disabledDate: time => {

src/components/LocalTour/Localtourhome.vue

@@ -21,7 +21,7 @@
                   <el-carousel class="carousel" arrow="always" style="height:100%" :interval="10000" trigger="click">
                     <el-carousel-item v-for="item in slideList" :key="item.url">
                         <!-- <img :src='item.url'> -->
-                        <img :src='compressImg(item.url, "filt", 245, "")' alt="">
+                        <img :src='compressImg(item.url, "filt", 800, "")' alt="">
                         
                     </el-carousel-item>
                 </el-carousel>

src/components/LocalTour/TicketDetails.vue

@@ -4,7 +4,7 @@
           <!-- 头部 -->
           <div class="TicketHead">
               <div class="TicketHeadLeft">
-                  <img style="width:499px;height:281px;display:inline-block" :src='compressImg(imgHoverSrc, "filt", 245, "")' alt="">
+                  <img style="width:499px;height:281px;display:inline-block" :src='compressImg(imgHoverSrc, "filt", 499, "")' alt="">
                    <div class="block">
                        <i @click="ImgBefore" :class="ImgIndex==0?'green':''" class="ChangeImgTab" style="margin-left:0">
                            <span class="iconfont icon-xiangzuo"></span>
@@ -14,7 +14,7 @@
                                <li v-if="index<10" @mouseover="LiHover(item,index)" :class="imgHover==index?'liActive':''" v-for="(item,index) in dataDes.coverImgs" :key="index"  >
                                     
                                     <a href="#">
-                                        <img :src='compressImg(item, "filt", 245, "")' :onerror="defaultImg" alt="">
+                                        <img :src='compressImg(item, "filt", 77, "")' :onerror="defaultImg" alt="">
                                     </a>
                                     
                                 </li>

src/components/Ticket/Pay.vue

@@ -56,9 +56,9 @@
                       <div v-show="zfbpay_imgcode" style="text-align:center">
                           <img class="pay_imgcode" :src="codeInfo.CodeURL" alt="">
                           <p style="color:#FF680B;cursor:pointer" @click="Code('3')" v-show="code_ts!=''">{{code_ts}}</p>
-                          <p>二维码有效时限
+                          <!-- <p>二维码有效时限
                               <span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
-                          </p>
+                          </p> -->
                       </div>
                   </div>
                 </el-col>
@@ -78,9 +78,9 @@
                             <img class="pay_imgcode" :src="codeInfo.CodeURL" alt="">
                             <p style="color:#FF680B;cursor:pointer" @click="Code('1')" v-show="code_ts!=''">{{code_ts}}</p>
 
-                            <p>二维码有效时限
+                            <!-- <p>二维码有效时限
                                 <span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
-                            </p>
+                            </p> -->
                         </div>
                     </div>
                 </el-col>
@@ -182,6 +182,9 @@ export default {
     }
     
   },
+   destroyed: function () {
+      clearInterval(this.Pay_timer);
+ },
   methods: {
     // 机票订单获取数据
     TimeDjs() {
@@ -196,6 +199,8 @@ export default {
             this.code.body=this.Commoditydetails.description;
             this.code.attach=`${this.Commoditydetails.costType}|${this.Commoditydetails.customerName}|${this.AirOrderId}|${this.Commoditydetails.customerId}|${this.Commoditydetails.outBranchId}`
             this.Time15();
+            this.Code('3');
+
           }else if (res.data.resultCode == 0){
               this.order_exit='2';
               this.order_exit_info=res.data.message;
@@ -210,6 +215,7 @@ export default {
     },
     Code(str) {
         this.payway=str?this.payway=str:this.payway;
+        console.log("this.payway",this.payway)
         this.codeLoading=true;
         this.code_ts="";
          this.zfbpay_imgcode = false; 

src/components/Ticket/TicketList.vue

@@ -193,7 +193,7 @@
                                 <p class="fg"></p>
                                 <p class="adress" v-if="item.goTransfer"><span class="green">{{item.goTransfer}}</span>转机</p>
                             </el-col>
-                            <el-col :span="6"  style="text-align:left">
+                            <el-col :span="6"  style="text-align:left;position:relative">
                                 <p class="time">{{item.goEndHouseTime}}</p>
                                 <p class="adress">{{item.goEndAirPlace}}</p>
                                 <span class="green num" v-if="item.goIsNextDay==1">+{{item.goIsNextDay}}</span>
@@ -216,7 +216,7 @@
                                     <p class="fg"></p>
                                     <p class="adress" v-if="item.backTransfer"><span class="green">{{item.backTransfer}}</span>转机</p>
                                 </el-col>
-                                <el-col :span="6"  style="text-align:left">
+                                <el-col :span="6"  style="text-align:left;position:relative">
                                     <p class="time">{{item.backEndHouseTime}}</p>
                                     <p class="adress">{{item.backEndAirPlace}}</p>
                                     <span class="green num" v-if="item.backIsNextDay==1">+{{item.backIsNextDay}}</span>
@@ -279,7 +279,7 @@
                                  </p>
                              </el-col>
                              <el-col :span="8">
-                                 <p class="orange">￥{{item.scatterB2BPrice | priceFormat}}</p>
+                                 <p class="orange">￥{{(isLogin!=1 ? item.scatterB2CPrice : item.scatterB2BPrice) | priceFormat}}</p>
                                  <p class="font_12" style="margin-top:10px;">
                                      <span v-if="item.freightSpace==1">头等舱</span>
                                      <span v-if="item.freightSpace==2">商务舱</span>
@@ -399,11 +399,13 @@ export default {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;
         }
-      }
+      },
+      isLogin:0,
     };
   },
   mounted() {},
   created() {
+    this.isLogin=this.$store.state.isLogin;
     this.loading = true;
     if(sessionStorage.getItem("ChooseInfo")){
       this.choose_info = JSON.parse(sessionStorage.getItem("ChooseInfo"));
@@ -698,7 +700,7 @@ export default {
         };
         monthArray.push(dateDict);
       }
-      console.log("monthArray",monthArray)
+      // console.log("monthArray",monthArray)
       //数组去重,获取有几个月
       var hash = {};
       monthArray = monthArray.reduce(function(item, next) {

src/main.js

@@ -120,8 +120,9 @@ Vue.filter('priceFormat', function (value) {
   }
   else if(value<1){
     return value;
-  }else{
-    let nStr = value.toFixed(0)
+  }
+  else{
+    let nStr = Number(value).toFixed(0)
     nStr += '';
     let x = nStr.split('.');
     let x1 = x[0];

src/views/login.vue

@@ -24,7 +24,7 @@
                 </div>
                 <p>账号或密码错误，请重新输入</p>
             </div>
-            <div v-if="!activeShow&&type==1">
+            <div style="width:88%" v-if="!activeShow&&type==1">
                 <div class="login_input">
                     <p class="title"><span class="iconfont icon-user"></span>账号</p>
                     <el-input @change="errorTips=false,GetAccountState()"