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

src/App.vue

@@ -59,7 +59,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_z7sx0rhjxjt.css';
+@import '//at.alicdn.com/t/font_863923_qby3muwdoh.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/components/DependentTravel/IndependentList.vue

@@ -133,7 +133,7 @@
                                 <p v-if="item.priceTags"><span v-for="(tag,index) in item.priceTags" :key="index+100" class=tag>{{tag}}</span></p>
                                 <p>
                                     <i class="iconfont icon-bb-chufadi"></i>
-                                    {{item.startCityName}}出发</p>
+                                    <span style="color:#518BE0">{{item.startCityName}}出发</span></p>
                                 <p>出发日期：最早{{item.startDate}}出发</p>
                             </el-col>
                             <el-col :span="4" style="color:#FF680B;font-size:16px;">

src/components/DependentTravel/IndependentTravel.vue

@@ -925,6 +925,7 @@ p {
 }
 ._top_box .wrap2{
   background:rgba(71,165,255,1);
+  cursor: pointer;
 }
 ._top_box .wrap2 .common{
   background:rgba(71,165,255,1);

src/components/DependentTravel/PersonalTailor.vue

@@ -2,6 +2,7 @@
   .PersonalTailor{
     background-color: #F5F3E6;
     height: 765px;
+    font-family: "PingFang"
   }
   .PersonalTailor .max-w1500 {
     max-width: 1500px;
@@ -163,6 +164,7 @@
   position: relative;
 }
 .ordershow{
+  margin-top:20px;
   background: #fff;
   padding:50px 0;
 }
@@ -224,7 +226,7 @@
                           <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
                       </div>
                       <span slot="reference">
-                          <el-input size="mini" :disabled="true" clearable @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
+                          <el-input size="small" :disabled="true" clearable @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
                           </el-input>
                       </span>
                     </el-popover>
@@ -240,8 +242,20 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="预估出行日期：" required>
-                  <el-form-item prop="startDate">
-                    <el-date-picker type="date" :picker-options="pickerOptions0" value-format="yyyy-MM-dd" placeholder="选择日期" v-model="ruleForm.startDate" size="small" class="w220"></el-date-picker>
+                  <el-form-item>
+                    <el-date-picker
+                        @change="dateChange"
+                        style="width: 220px;"
+                        size="small"
+                        value-format="yyyy-MM-dd"
+                        v-model="DateList"
+                        type="daterange"
+                        range-separator="至"
+                        :picker-options="pickerOptions0"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                      </el-date-picker>
+                    <!-- <el-date-picker type="date" :picker-options="pickerOptions0" value-format="yyyy-MM-dd" placeholder="选择日期" v-model="ruleForm.startDate" size="small" class="w220"></el-date-picker> -->
                   </el-form-item>
                 </el-form-item>
                 <el-form-item label="预估出行人数：" required>
@@ -306,11 +320,11 @@
                 <p><label>出游性质：</label> <span class="d">个人定制</span></p>
                 <p><label>出发地：</label> <span class="d">{{ruleForm.departureName}}</span></p>
                 <p><label>目的地：</label><span class="d">{{ruleForm.destinationNames}}</span></p>
-                <p><label>预估出行日期：</label><span class="d">{{ruleForm.startDate}}</span></p>
+                <p><label>预估出行日期：</label><span class="d">{{ruleForm.startDate}} <span v-if="ruleForm.backDate!=''">至</span> {{ruleForm.backDate}}</span></p>
                 <p><label>预估出行人数：</label><span class="d">{{ruleForm.audltNumber+ruleForm.childrenNumber}}</span></p>
                 <p><label>预估人均预算：</label> <span class="d">{{ruleForm.budget}}</span></p>
                 <p><label>需要提供什么：</label><span class="d">{{ruleForm.provideItem}}</span></p>
-                <p><label>其他需求：</label><span class="d">{{ruleForm.otherDemand}}</span></p>
+                <p style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;-webkit-line-clamp: 2;display: -webkit-box;"><label>其他需求：</label><span class="d">{{ruleForm.otherDemand}}</span></p>
                 <p><label>姓名：</label><span class="d">{{ruleForm.contact}}</span></p>
                 <p><label>手机：</label><span class="d">{{ruleForm.phoneNumber}}</span></p>
                 <p><label>邮箱：</label><span class="d">{{ruleForm.email}}</span></p>
@@ -327,7 +341,7 @@
             <div style="position:relative">
                 <img src="../../assets/img/ticket/gou.png" alt="" style="height:54px;width:54px;position:absolute">
                 <div style="padding-left:70px">
-                  <span style="font-weight:700;font-size:24px">您的订单已经成功提交！</span><br>
+                  <span style="font-family:'PingFangR';font-size:24px">您的订单已经成功提交！</span><br>
                   <span style="font-size:14px;color:#a8a8a8">需求单号：{{OrderId}}</span>
                 </div>
             </div>
@@ -337,9 +351,9 @@
               我们正在为您分配定制师
             </p>
             <p>
-              定制师接单后将在<span style="color:#FB8F0F;font-weight:700">明天（{{tomorrow}}）</span>联系您，请注意接听哦
+              定制师接单后将在<span style="color:#FB8F0F;font-family: 'PingFangR';">明天（{{tomorrow}}）</span>联系您，请注意接听哦
             </p>
-            <p><el-button size="mini" type="danger">查看订单</el-button></p>
+            <p><el-button size="mini" type="danger" @click="goUrl()">查看订单</el-button></p>
           </div>
           <div style="width:384px;height:289px;float:right">
             <img style="width:100%;height:100%" src="../../assets/img/ticket/back.png" alt="">
@@ -361,6 +375,7 @@ export default {
   },
   data(){
     return {
+      DateList:"",
       loading:false,
       tomorrow:moment().add(1,'days').format("YYYY-MM-DD"),
       ruleForm: {
@@ -379,6 +394,7 @@ export default {
         destinationNames:'',
         provideItem:'线路设计',
         otherDemand:"",
+        backDate:"",
       },
       showType: 1,
       active: [],
@@ -391,12 +407,6 @@ export default {
         email: [
           { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
         ],
-        departureId: [
-          { required: true, message: '请输入活动名称', trigger: 'change' }
-        ],
-        regions: [
-          { required: true, message: '请选择活动区域', trigger: 'change' }
-        ],
         startDate: [
           { type: 'string', required: true, message: '请选择日期', trigger: 'change' }
         ],
@@ -417,6 +427,18 @@ export default {
     }
   }, 
   methods: {
+    goUrl(path,id,tcid){
+            // detailTwo
+            path = 'CustomizedTourism'
+            // path=`${path}/${encodeURIComponent(id)}/`+tcid
+            this.$router.push({ path })
+    },
+    dateChange(val){
+      if(val){
+        this.ruleForm.startDate=val[0];
+        this.ruleForm.backDate=val[1];
+      }
+    },
     SubmitOK(){
       let that=this;
       this.$refs['ruleForm'].validate((valid) => {
@@ -434,9 +456,9 @@ export default {
               "/api/b2b/free/setTravelCusotom",
               that.ruleForm,
               res => {
-                this.loading=true;
+                this.loading=false;
                 if(res.data.resultCode==1){
-                  this.orderShow=false;
+                  this.orderShow=true;
                   this.OrderId=res.data.data;
                   this.Success(res.data.message)
                 }else{
@@ -468,6 +490,11 @@ export default {
               this.Error("出行人数至少一人！")
               return;
             }
+            if(!that.DateList||that.DateList==""){
+              this.Error("请选择出行日期！")
+              return;
+            }
+            
             this.showType = 2;
           } else {
             

src/components/Ticket/TicketHome.vue

 <template>
   <div class="ticket_home">
-    <div class="banner" style="width:100%">
-        <el-carousel arrow="always" :height="banner_height" :interval="10000" trigger="click" :style="{'background':'#ddd'}">
+    <div class="banner">
+        <!-- <el-carousel arrow="always" :height="banner_height" :interval="10000" trigger="click" :style="{'background':'#ddd'}">
             <el-carousel-item v-for="item in slideList" :key="item.url">
                 <img :src='item.url'>
             </el-carousel-item>
-        </el-carousel>
+        </el-carousel> -->
         <div class="choose">
-            <div class="choose_w">
-                <div class="choose_1">
+          <div style="background:#ffffff;display: flex;align-items: center;padding:8px 0;position:relative"> 
+              <el-select style="width:92px" size="small" clearable  v-model="choose_info.ticketType" placeholder="请选择">
+                <el-option :value=1 label="单程"></el-option>
+                <el-option :value=2 label="往返"></el-option>
+            </el-select>
+            <span class="sx"></span>
+            <el-popover
+            placement="bottom"
+            trigger="click">
+              <div v-show="startcity" class="citycompent">
+              <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
+              </div>
+              <span class="city_span" slot="reference">
+                <span class="iconfont icon-mudedi"></span>
+              <el-input size="small" clearable @focus="CityCompStatus('start')" class="ChooseCity" v-model="choose_info.departure_cityname" placeholder="您的出发地">
+              </el-input>
+              </span>
+            </el-popover>
+            <span class="sx"></span>
+            <el-popover
+              placement="bottom"
+              trigger="click">
+                  <div v-show="endcity" class="citycompent">
+                  <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
+              </div>
+              <span class="city_span" slot="reference">
+                <span class="iconfont icon-mudedi"></span>
+                  <el-input size="mini" clearable @focus="CityCompStatus('end')" class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="您的目的地">
+                  </el-input>
+              </span>
+              </el-popover>
+              <span class="sx"></span>
+              <el-date-picker class="date_input" prefix-icon="iconfont icon-img-rili" clear-icon=""
+                size="small"
+                value-format="yyyy-MM-dd"
+                v-model="choose_info.qFlightDateStart"
+                type="date" 
+                :picker-options="pickerOptions0"
+                placeholder="选择日期">
+                </el-date-picker>
+                <span @click="Search" class="search_span">
+                  搜索
+                </span>
+          </div>
+            
+                <!-- <div class="choose_1" style="margin-top:30px;">
                     <div class="choose_back">
                         <el-row class="choose_form">
                             <div style="margin-bottom:10px;padding-left:22px;">
@@ -29,6 +73,19 @@
                                     </span>
                                     </el-popover>
                                 </el-form-item>
+                                <el-form-item class="form_big" label="目的地">
+                                    <el-popover
+                                    placement="bottom"
+                                    trigger="click">
+                                        <div v-show="endcity" class="citycompent">
+                                        <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
+                                    </div>
+                                    <span slot="reference">
+                                       <el-input size="mini" clearable @focus="CityCompStatus('end')" class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="城市">
+                                        </el-input>
+                                    </span>
+                                    </el-popover>
+                                </el-form-item>
                                 <el-form-item class="form_big" label="出发">
                                     <el-date-picker
                                         size="small"
@@ -51,19 +108,7 @@
                                 <el-form-item label="老人">
                                     <el-input-number size="mini" v-model="choose_info.lr" :min="0" :max="10" label="描述文字"></el-input-number>
                                 </el-form-item>
-                                <el-form-item class="form_big" label="目的地">
-                                    <el-popover
-                                    placement="bottom"
-                                    trigger="click">
-                                        <div v-show="endcity" class="citycompent">
-                                        <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
-                                    </div>
-                                    <span slot="reference">
-                                       <el-input size="mini" clearable @focus="CityCompStatus('end')" class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="城市">
-                                        </el-input>
-                                    </span>
-                                    </el-popover>
-                                </el-form-item>
+                                
                                 <el-form-item class="form_big" label="舱位选择">
                                    <el-select size="small" clearable  v-model="choose_info.freightSpace" placeholder="请选择">
                                         <el-option :value=0 label="不限"></el-option>
@@ -98,32 +143,27 @@
                         </el-row>
                         
                     </div>
-                </div>
-            </div>
+                </div> -->
             
         </div>
     </div>
     <div class="banner_two">
         <div style="text-align:center;">
-             <p style="margin-top:79px;font-size:24px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(0,0,0,1);">目的地直选</p>
-            <p style="margin-top:10px;font-size:12px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);">Choose your favorite destination</p>
-            <div style="width:41px;height:7px;margin:0 auto;margin-top:10px">
-                <img style="width:100%" src="../../assets/img/ticket/jx.png" alt="">
+             <p style="margin-top:70px;font-size:24px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(0,0,0,1);">目的地直选</p>
+            <p style="margin-top:4px;font-size:12px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);">Choose your favorite destination</p>
+            <div>
+                <img style="width:41px;height:8px" src="../../assets/img/ticket/jx.png" alt="">
             </div>
         </div>
-        <div class="banner_img" style="margin:0 auto;margin-top:20px;">
-            <el-carousel ref="carousel" arrow="never" :height="carousel_height">
-                <el-carousel-item>
-                    <el-row :gutter="18" style="height:100%">
-                        <el-col :span="18" :offset="3" style="height:100%">
-                        <el-row style="height:100%">
-                        <el-col :span="5" style="height:100%">
+          <div class="banner_img" style="margin:0 auto;margin-top:30px;">
+                      <div class="destion">
+                        <div class="carousel_div" style="margin-left:0">
                             <div class="carousel_small" @click="ArrivalCity(1145,'科伦坡')">
                                 <img style="width:100%" src="../../assets/img/ticket/sllk.png" alt="">
                                 <div class="info">
                                     <div class="table_cell">
                                         <p class="ch">科伦坡</p>
-                                        <p class="en">Colombo</p>
+                                        <p class="en">COlOMBO</p>
                                     </div>
                                     
                                 </div>
@@ -139,8 +179,8 @@
                                     
                                 </div>
                             </div>
-                        </el-col>
-                        <el-col :span="9" style="height:100%">
+                        </div>
+                        <div class="carousel_div">
                             <div class="carousel_large" @click="ArrivalCity(653,'东京')">
                                 <img style="width:100%;height: 100%;" src="../../assets/img/ticket/rb.png" alt="">
                                 <div class="info">
@@ -151,8 +191,8 @@
                                     
                                 </div>
                             </div>
-                        </el-col>
-                        <el-col :span="5">
+                        </div>
+                        <div class="carousel_div">
                             <div class="carousel_small" @click="ArrivalCity(622,'巴厘岛')">
                                 <img style="width:100%" src="../../assets/img/ticket/bld.png" alt="">
                                 <div class="info">
@@ -173,8 +213,8 @@
                                     
                                 </div>
                             </div>
-                        </el-col>
-                        <el-col :span="5">
+                        </div>
+                        <div class="carousel_div">
                             <div class="carousel_small" @click="ArrivalCity(1221,'伊斯坦布尔')">
                                 <img style="width:100%" src="../../assets/img/ticket/teq.png" alt="">
                                 <div class="info">
@@ -195,39 +235,39 @@
                                     
                                 </div>
                             </div>
-                        </el-col>
-                    </el-row>
-                        </el-col>
-                    </el-row> 
+                        </div>
+                    </div>
                     
-                </el-carousel-item>
-            </el-carousel>
         </div>
        
 
     </div>
-    <div style="background:#f5f5f5">
-        <el-row :gutter="18">
-        <el-col :span="18" :offset="3" >
+    <div style="margin-bottom:78px">
             <div >
-                <p class="jxyh">精选特惠</p>
+                <div style="text-align:center;margin-top:55px;">
+              <p style="font-size:24px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(0,0,0,1);">精选特惠</p>
+              <p style="margin-top:4px;font-size:12px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);">Selection of preferential</p>
+              <div>
+                  <img style="width:41px;height:8px" src="../../assets/img/ticket/jx.png" alt="">
+              </div>
+          </div>
                 <!-- <img src="../../assets/img/ticket/banner.png" alt=""> -->
             </div>
             <div class="yh" style="background:#fff">
                 <div @click="GoUrl(item)" v-for="(item,key) in yhList" :key="key" style="cursor:pointer">
                     <img :src="item.airlineUrl" alt="">
                     <div class="list_content">
-                        <p class="des">
+                        <p class="des" style="padding-top:26px;">
                             <!--  -->
                             <span>{{item.flightList[0].departureName}} - {{item.flightList[item.flightList.length-1].arrivalCityName}} </span>
                             <span class="money">￥{{item.scatterB2BPrice | priceFormat}}</span>
                         </p>
-                        <p>
+                        <p  style="display:flex;align-items:center">
                             <img style="width:20px;height:20px" :src="item.airlineUrl" alt="">
-                            <span style="margin-left:10px">{{item.airlineName}} </span>
+                            <span style="margin-left:10px;font-size:14px">{{item.airlineName}} </span>
                         </p>
                         <p class="time">出发时间：{{item.goFlightTime}}</p>
-                        <el-button class="goumai" size="mini">立即购买</el-button>
+                        <!-- <el-button class="goumai" size="mini">立即购买</el-button> -->
                     </div>
                 </div>
             </div>
@@ -238,8 +278,6 @@
                      <img style="width:10px;height:13px" src="../../assets/img/ticket/qbyh.png" alt="">
                     更多机票</span></router-link>
             </div>
-        </el-col >
-    </el-row>
     </div>
     
   </div>
@@ -449,8 +487,101 @@ export default {
 @import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css";
 @import "../../assets/global/global.css";
 @import "../../assets/css/reset.css";
+.ticket_home{
+  font-family: "PingFang"
+}
+.ticket_home .choose .search_span{
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: inline-block;
+  width: 77px;
+  height: 100%;
+  text-align: center;
+  background: #EE4454;
+  color:#fff;
+  line-height: 48px;
+  font-size: 14px;
+}
+.ticket_home .choose .date_input .el-input__inner{
+    margin-left:30px;
+}
+.ticket_home .choose .city_span .icon-mudedi,.icon-img-rili{
+  color:#CCCCCC;
+  font-size: 18px;
+  margin-left: 20px;
+}
+.ticket_home .ChooseCity {
+  position: relative;
+  display: inline-block;
+  width: 230px;
+}
+.ticket_home .choose .city_span{
+  display: inline-block;
+  width: 288px;
+}
+.ticket_home .choose .sx{
+  width:1px;
+  height:24px;
+  display: inline-block;
+  border-left:1px solid #D8DADC;
+}
+.ticket_home .choose .el-input__inner{
+  border: none;
+}
+.ticket_home .choose {
+  width:1093px;
+  background:rgba(0,0,0,0.5);
+  border-radius:0px 4px 4px 4px;
+  margin: 0 auto;
+  padding: 20px 28px;
+  box-sizing: border-box;
+}
+.choose_w {
+  width: 1350px;
+  height: 100%;
+  margin: 0 auto;
+  background: rgba(255, 255, 255, 0.24);
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 10px;
+  box-shadow: 0px 2px 29px 0px rgba(107, 107, 107, 0.27);
+}
+.choose_1 {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto;
+  border-radius: 4px;
+  padding: 8px;
+  box-sizing: border-box;
+  background: rgba(255, 255, 255, 1);
+
+  border-radius: 0px 4px 4px 4px;
+}
+.ticket_home .banner{
+  box-sizing: border-box;
+  padding-top: 208px;
+ width: 100%;
+ height: 352px;
+ background: url("../../assets/img/ticket/banner.png") no-repeat;
+ background-size:100% 100%;
+}
+.ticket_home .destion {
+  width:1200px;
+  margin:0 auto;
+  overflow: auto;
+}
+.ticket_home .carousel_div{
+  float: left;
+  margin-left: 13px;
+}
 .ticket_home .ch{
-  font-weight: 700;
+  font-family: "PingFangR";
+  font-size: 24px;
+}
+.ticket_home .en{
+  font-family: "PingFangR";
 }
 .choose_form .el-input__inner {
   border-radius: 0;
@@ -481,9 +612,7 @@ export default {
   position: absolute;
   top: 36px;
 }
-.ticket_home .ChooseCity {
-  position: relative;
-}
+
 
 
 .ticket_home a {
@@ -491,16 +620,20 @@ export default {
   text-decoration: none;
 }
 
-.allyh {
+.ticket_home .allyh {
   display: inline-block;
   width: 128px;
   height: 34px;
   line-height: 34px;
   background: rgba(255, 255, 255, 1);
   border: 1px solid rgba(51, 51, 51, 1);
-  margin: 15px 0;
   font-size: 14px;
   cursor: pointer;
+  box-sizing: border-box;
+}
+.ticket_home .allyh:hover{
+  font-family: "PingFangR";
+  border: 2px solid rgba(51, 51, 51, 1);
 }
 .list_content p {
   padding: 4px 0;
@@ -510,15 +643,13 @@ export default {
 }
 .list_content .time {
   font-size: 14px;
-  font-family: MicrosoftYaHei;
   font-weight: 400;
   color: #333;
 }
 .list_content .money {
   float: right;
-  font-size: 24px;
-  font-family: MicrosoftYaHei-Bold;
-  font-weight: bold;
+  font-size: 14px;
+  font-family:"PingFangR" ;
   color: rgba(255, 102, 51, 1);
 }
 .list_content .des {
@@ -538,35 +669,40 @@ export default {
 }
 .list_content {
   width: 100%;
-  padding-left: 120px;
+  padding-left: 144px;
   box-sizing: border-box;
   position: relative;
 }
-.yh {
+ .ticket_home .yh {
+   padding: 0 2px;
+  padding-top: 20px;
+  width: 1200px;
+  margin:0 auto;
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
   overflow: auto;
-  padding: 10px;
   box-sizing: border-box;
+  padding-bottom:50px;
 }
-.yh > div {
-  margin: 6px 0;
-  width: 45%;
-  padding: 10px;
+ .ticket_home .yh > div {
+  width:554px;
+  height:160px;
+  padding: 14px;
   box-sizing: border-box;
   position: relative;
+  margin-bottom: 55px;
 }
-.yh > div:hover {
-  box-shadow: 0px 4px 8px 0px rgba(107, 107, 107, 0.27);
+ .ticket_home .yh > div:hover {
+  box-shadow:0px 2px 29px 0px rgba(107,107,107,0.27);
   transition: all linear 0.5s;
 }
-.yh > div > img {
+ .ticket_home .yh > div > img {
   position: absolute;
-  width: 100px;
-  height: 100px;
+  width: 120px;
+  height: 120px;
 }
-.banner_img .info {
+ .ticket_home .banner_img .info {
   position: absolute;
   top: 0;
   width: 100%;
@@ -584,28 +720,25 @@ export default {
 }
 .carousel_large,
 .carousel_small {
-  padding: 0 6px;
   box-sizing: border-box;
   position: relative;
 }
 .carousel_small {
-  height: 50%;
+  width: 226px;
+  height: 155px;
 }
 .carousel_large {
-  height: 100%;
-}
-.el-col-5 {
-  height: 100%;
+  width: 483px;
+  height: 322px;
 }
 
+
 .banner_two .carousel {
   display: flex;
   justify-content: space-between;
 }
 .banner_two .carousel_small {
-  /* width: 194px;
-    height: 132px; */
-  margin-bottom: 10px;
+  margin-bottom: 12px;
 }
 .banner_two .carousel_small img {
   width: 100%;
@@ -624,32 +757,5 @@ export default {
   width: 100%;
   font-size: 0;
 }
-.choose {
-  position: absolute;
-  width: 100%;
-  height: 175px;
-  bottom: -10px;
-  z-index:100;
-}
-.choose_w {
-  width: 1350px;
-  height: 100%;
-  margin: 0 auto;
-  background: rgba(255, 255, 255, 0.24);
-  border-radius: 4px;
-  box-sizing: border-box;
-  padding: 10px;
-  box-shadow: 0px 2px 29px 0px rgba(107, 107, 107, 0.27);
-}
-.choose_1 {
-  width: 100%;
-  height: 100%;
-  margin: 0 auto;
-  border-radius: 4px;
-  padding: 8px;
-  box-sizing: border-box;
-  background: rgba(255, 255, 255, 1);
 
-  border-radius: 0px 4px 4px 4px;
-}
 </style>

src/components/trade/order/index.vue

@@ -503,6 +503,7 @@ export default {
             }
             this.apipost("sellorder_post_SetOrderInfoForB2B",msg,
                 res => {
+                    this.isCommit=false;
                    if(res.data.message=='操作成功！'){
                        this.$router.push({ path:'/PsOrder' })
                    }else{

src/components/visa/SchedProduct.vue

@@ -95,7 +95,7 @@
                                         </div>
                                         <div class="guestInfo" v-for="(item,index) in formInline.GuestList" :key="index+50">
                                             <div class="guestInfo_left">
-                                            <p style="font-weight:600">旅客1</p>
+                                            <p style="font-weight:600">旅客{{index+1}}</p>
                                             <!-- <span style="font-size:12px;background:#6EA3F1;color:#fff;border-radius:2px">成人</span>
                                             <span style="font-size:12px;background:##56D098;color:#fff;border-radius:2px">儿童</span> -->
                                             

src/components/visa/VisaHomePage.vue

@@ -9,7 +9,7 @@
                     </el-carousel-item>
                 </el-carousel>
             </div>
-                
+<!--                 
         <div class="search-box" :style="{'width':searchBoxWidth,'left':searchBoxLeft}">
             <div class="chosen-item">签证</div>
             <div class="search-content">
@@ -25,7 +25,7 @@
                     </el-col>
                 </el-row>
             </div>
-        </div>
+        </div> -->
         </div>
 
          <el-row :gutter="20">
@@ -216,22 +216,32 @@
         </div> 
         <!-- 签证办理常见问题 -->
         <!-- 热门签证 -->
-        <div style="padding:20px 0;background:#f5f5f5">
+        <div style="padding:50px 0;background:#f5f5f5">
             <el-row class="Common_problem" :gutter="20">
-            <el-col :span="18" :offset="3">
+            <el-col :span="18" :offset="3" style="border:1px solid #E6E6E6;padding:20px;box-sizing:border-box;background:#fff">
                 <p style="font-size:18px;color:#333333;padding:15px 0">签证办理常见问题</p>
-                <el-row type="flex" justify="space-between">
+                <el-row type="flex" justify="space-between" style="flex-wrap:wrap">
                     <el-col :span="11">
-                    <span class="circle"></span>
-                    <span style="font-size:14px;margin-left:4px">个别材料无法提供是否影响出签率？</span>
-                    <div style="color:#999999;padding:4px 0;font-size:12px">
-                        亲，我司批露所需材料均是领馆要求提供哦，如个别材料无法提供将会影响您的出签率，请尽可能准备齐全所有材料。
-                    </div>
-                </el-col>
-                <el-col :span="11">
-                    <span class="circle"></span>
-                    销签/面试销签其实很重要?
-                </el-col>
+                        <span class="circle"></span>
+                        <span style="font-size:14px;margin-left:4px">个别材料无法提供是否影响出签率？</span>
+                        <div style="color:#999999;padding:4px 0;font-size:12px">
+                            亲，我司批露所需材料均是领馆要求提供哦，如个别材料无法提供将会影响您的出签率，请尽可能准备齐全所有材料。
+                        </div>
+                    </el-col>
+                    <el-col :span="11">
+                        <span class="circle"></span>
+                        <span style="font-size:14px;margin-left:4px">面试签证时间？</span>
+                        <div style="color:#999999;padding:4px 0;font-size:12px">
+                            亲，面试时间是由领馆决定的哦。当然我们会在领馆允许的时间下尽量帮您协调，同时也建议您尽早安排好行程，以免因预约到的时间过晚影响出行时间哦。
+                        </div>
+                    </el-col>
+                    <el-col :span="11">
+                        <span class="circle"></span>
+                        <span style="font-size:14px;margin-left:4px">有过申根国签证，是否材料可以简化？</span>
+                        <div style="color:#999999;padding:4px 0;font-size:12px">
+                            亲，每个国家签证材料要求不同哦，有任何其他国家签证都无法简化当前申请国家签证的材料。
+                        </div>
+                    </el-col>
                 </el-row>
                 
                 
@@ -318,7 +328,6 @@ export default {
             
         },
         goUrlVisaList(id){
-            console.log(id);
             this.$router.push({path: `/Visalist?id=${id}`});
         },
         Gethotvisa(){
@@ -456,7 +465,7 @@ export default {
     }
     .visa_flex .el-col .visa_money{
         color: #EE4454;
-        font-size: 14px;
+        font-size: 16px;
     }
     .visa_flex .el-col .visa_title{
         color: #333333;
@@ -467,6 +476,7 @@ export default {
         /* position: absolute; */
         width: 74px;
         height: 48px;
+        border-radius: 2px;
         border:1px solid #B3B3B3;
     }
     .visa_flex .visa_content{
@@ -491,7 +501,7 @@ export default {
         width: 19%;
         margin-right:0.8%;
         margin-bottom: 15px;
-        padding: 6px;
+        padding: 10px;
         box-sizing: border-box;
         display: flex;
         align-items: center;

src/components/visa/Visalist.vue

@@ -26,7 +26,7 @@
                         <div class="select_title" style="top:15px">常住地</div>
                         <ul class="select_ul" :class="selectcon?'':'select_ul_height'">
                             <!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li>                             -->
-                            <li @click="SelectCity(item.companyId)" :class="listmsg.companyId==item.companyId?'visa_active':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li>
+                            <li @click="SelectCity(item.companyId)" :class="listmsg.companyId==item.companyId?'visa_active_city':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li>
                             
                         </ul>
                         <span class="czd" @click="ChangeSelect">{{selectcontext}}<i :class="selectcon?'rolate':''" class="iconfont icon-moban"></i></span>
@@ -35,7 +35,7 @@
                         <el-col :span="7">
                             <div class="select_title">签证类型</div>
                             <div class="select_ul">
-                                <el-select multiple size="mini" collapse-tags style="width:90%" v-model="tagType1" clearable placeholder="请选择">
+                                <el-select multiple size="small" collapse-tags style="width:90%" v-model="tagType1" clearable placeholder="请选择">
                                     <el-option v-if="item.tagType==1"
                                     v-for="item in tagItem"
                                     :key="item.id"
@@ -48,7 +48,7 @@
                         <el-col :span="7">
                             <div class="select_title">产品标签</div>
                             <div class="select_ul">
-                                <el-select multiple size="mini" collapse-tags style="width:90%" v-model="tagType2" clearable placeholder="请选择">
+                                <el-select multiple size="small" collapse-tags style="width:90%" v-model="tagType2" clearable placeholder="请选择">
                                     <el-option v-if="item.tagType==2"
                                     v-for="item in tagItem"
                                     :key="item.id"
@@ -61,7 +61,7 @@
                         <el-col :span="7">
                             <div class="select_title">特色服务</div>
                             <div class="select_ul">
-                                <el-select multiple size="mini" collapse-tags style="width:90%" v-model="tagType3" clearable placeholder="请选择">
+                                <el-select multiple size="small" collapse-tags style="width:90%" v-model="tagType3" clearable placeholder="请选择">
                                     <el-option v-if="item.tagType==3"
                                     v-for="item in tagItem"
                                     :key="item.id"
@@ -221,7 +221,10 @@ export default {
               this.datalist=res.data.data.pageData;
               this.total=res.data.data.count;
               this.datalist.forEach(item=>{
-                  item.tagList=item.tagTames.split(",");
+                  if(item.tagTames){
+                      item.tagList=item.tagTames.split(",");
+                  }
+                  
               })
               
           } else {
@@ -269,6 +272,7 @@ export default {
         "/api/b2b/visa/getVisaProductSearchItem",
         this.msg,
         res => {
+            console.log("签证国家",res);
           if (res.data.resultCode == 1) {
             this.hotcountry=res.data.data.pageData;
             this.pageCount=res.data.data.pageCount;
@@ -391,14 +395,23 @@ export default {
 }
 .visaList .visa_active{
     color: #EE4454!important;
-    font-weight: bold;
+    font-family: "PingFangR";
 }
- .content_list .row_content .visa_title:hover{
+.visaList .visa_active p{
+    text-decoration: underline;
+}
+.visaList .visa_active_city{
+    color: #ffffff!important;
+    font-family: "PingFangR";
+    background: #EE4454;
+    border-radius:2px;
+}
+ .visaList .content_list .row_content .visa_title:hover{
     color: #EE4454!important;
     text-decoration: underline;
     cursor: pointer;
 }
- .content_list .row_content .div_2 p{
+ .visaList .content_list .row_content .div_2 p{
      padding:4px 0;
      font-weight:400;
      color:#333333;
@@ -428,6 +441,7 @@ export default {
 }
 .visaList .datalist .content_list img{
     width: 120px;
+    height: 90px;
 }
 .visaList .datalist  .icon-moban{
     font-size: 10px;
@@ -446,12 +460,16 @@ export default {
     margin-top: -5px!important;
      transition: all 0.2s;
 }
-.select_ul li:hover{
-    color: #EE4454!important;
+.visaList .select_ul li:hover{
+    color: #ffffff!important;
+    background: #EE4454;
+    font-family: "PingFangR";
+    border-radius:2px;
 }
-.select_ul li{
+.visaList .select_ul li{
+    margin-right: 5px;
     display: inline-block;
-    padding: 0 10px;
+    padding: 2px 10px;
     cursor: pointer;
     white-space:nowrap; overflow:hidden; text-overflow:ellipsis;
 }
@@ -465,12 +483,12 @@ export default {
     color: #333333;
     cursor: pointer;
 }
-.czd .icon-moban{
+.visaList .czd .icon-moban{
     font-size: 12px;
     margin-top: 5px;
     margin-left: 6px;
 }
-.Selectconditions .select_ul{
+.visaList .Selectconditions .select_ul{
     padding-left:70px;
     padding-right:50px;
     box-sizing: border-box;
@@ -478,7 +496,7 @@ export default {
     overflow: hidden;
     min-height: 21px;
 }
-.Selectconditions .select_title{
+.visaList .Selectconditions .select_title{
     position: absolute;
     /* font-size:14px; */
     font-weight:bold;
@@ -486,12 +504,12 @@ export default {
     top: 20px;
 
 }
-.Selectconditions>div{
+.visaList .Selectconditions>div{
     position: relative;
     border-bottom: 1px solid #E6E6E6;
     padding:15px 0;
 }
-.Selectconditions{
+.visaList .Selectconditions{
     background: #fff;
     padding:0 15px;
     box-sizing: border-box;
@@ -522,8 +540,12 @@ export default {
 }
 .visaList .top_ul li:hover{
     color:#EE4454;
-    font-weight:bold;
+    font-family: "PingFangR";
+
     
+}
+.visaList .top_ul li:hover p{
+    text-decoration: underline;
 }
 .visaList .top_ul li:hover img{
     border:1px solid #EE4454;

src/router.js

@@ -353,6 +353,15 @@ export default new Router({
             title: "私人定制"
           }
         },
+        {
+          path: "/CustomizedTourism",
+          name: "CustomizedTourism",
+          component: resolve =>
+            require(["@/components/DependentTravel/CustomizedTourism"], resolve),
+          meta: {
+            title: "私人定制订单"
+          }
+        },
         {
           path: "/Home",
           name: "Home",