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/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",