update

src/assets/css/localtourhome.css

@@ -139,6 +139,11 @@
     color:#333333;
     top: 18px;
     right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 .Localtourhome .outoneday .dayContent .dayConDiv1 div .price{
     position: absolute;

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}}</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>
                             
                         </ul>
                         <span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span>
@@ -233,7 +233,7 @@ export default {
           this.listmsg.searchKey=this.$route.query.keywords;
       }
      if(this.$route.query.lineteamId){
-         this.listmsg.lineteamId=this.$route.query.lineteamId;
+         this.listmsg.lineTeamId=this.$route.query.lineteamId;
      }
      this.isLogin=this.$store.state.isLogin;
     if(this.isLogin==1){
@@ -372,6 +372,8 @@ export default {
           this.GetList();
       },
     GetList(){
+         
+         
         this.listmsg.minPrice=-1;
         this.listmsg.maxPrice=-1;
           if(this.minPrice!=''){

src/components/DependentTravel/PersonalTailor.vue

@@ -200,7 +200,7 @@
   <div class="PersonalTailor">
     <el-row class="max-w1500">
       <el-col class="header"></el-col>
-      <el-col v-loading="loading" :span="18" :offset="3" class="main" v-show="!orderShow">
+      <div style="width:1180px;margin:0 auto" v-loading="loading" class="main" v-show="!orderShow">
         <el-row class="info">
           <el-col :span="14" class="info_ info_left">
             <p class="info_left_tit">填写需求，快速定制行程</p>
@@ -218,16 +218,16 @@
               </div>
             </div>
             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
-              <div v-if="showType === 1">
+              <div v-show="showType === 1">
                 <el-form-item label="出发地：">
                   <el-popover v-model="startcity"
                       placement="bottom"
                       trigger="click">
-                          <div v-show="startcity" class="citycompent">
+                          <div class="citycompent">
                               <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
                           </div>
                       <span slot="reference">
-                          <el-input size="small" :disabled="true" clearable @focus="CityCompStatus('start')" class="ChooseCity w220" v-model="ruleForm.departureName" placeholder="城市">
+                          <el-input size="small" clearable readonly="readonly"  @focus="!startcity" class="ChooseCity w220" v-model="ruleForm.departureName" placeholder="城市">
                           </el-input>
                       </span>
                     </el-popover>
@@ -240,7 +240,7 @@
                           <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
                       </div>
                       <span slot="reference">
-                          <el-input size="small" :disabled="true" clearable @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
+                          <el-input size="small" clearable readonly="readonly" @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
                           </el-input>
                       </span>
                     </el-popover>
@@ -301,7 +301,7 @@
                   <el-button type="primary" class="_next w100" @click="onSubmit" size="small">下一步</el-button>
                 </el-form-item>
               </div>
-              <div v-else>
+              <div v-show="showType === 2">
                 <el-form-item prop="contact" label="联系人：">
                   <el-input v-model="ruleForm.contact" size="small" class="w220" placeholder="必填，定制师对您的称呼"></el-input>
                 </el-form-item>
@@ -348,7 +348,7 @@
           </el-col>
         </el-row>
 
-      </el-col>
+      </div>
        <!--  -->
       <el-col v-show="orderShow" class="ordershow" el-col :span="18" :offset="3">
         <div class="content">
@@ -426,7 +426,7 @@ export default {
           { type: 'string', required: true, message: '请选择日期', trigger: 'change' }
         ],
         phoneNumber: [
-          { required: true, message: '请输入电话', trigger: 'blur' },
+          { required: true, message: '请输入手机号', trigger: 'blur' },
           { required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8][0-9]\d{8}$/ ,message: '请填写正确的手机号'}
         ],
         contact: [
@@ -439,6 +439,7 @@ export default {
       destinationarr:[],
       OrderId:0,
       orderShow:false,
+      isLogin:0,
     }
   }, 
   methods: {
@@ -459,6 +460,7 @@ export default {
     SubmitOK(){
       let that=this;
       this.$refs['ruleForm'].validate((valid) => {
+        console.log(valid);
           if (valid) {
             if(that.ruleForm.departureName==""){
               this.Error("请选择出发地！")
@@ -468,7 +470,16 @@ export default {
               this.Error("请选择目的地！")
               return;
             }
+            
+            return
+            if(that.isLogin==0){
+              this.Error("请先登录！")
+              this.$router.push({name:'login'})
+              return;
+            }
+
             this.loading=true;
+
             this.apiJavaPost(
               "/api/b2b/free/setTravelCusotom",
               that.ruleForm,
@@ -493,8 +504,6 @@ export default {
     },
     onSubmit: function() {
       let that=this;
-      this.$refs['ruleForm'].validate((valid) => {
-          if (valid) {
             if(that.ruleForm.departureName==""){
               this.Error("请选择出发地！")
               return;
@@ -513,11 +522,6 @@ export default {
             }
             
             this.showType = 2;
-          } else {
-            
-            return false;
-          }
-        });
     },
     handleClose(tag){
       let that=this;
@@ -565,14 +569,7 @@ export default {
     CityCompClose1(val) {
       this.endcity = false;
     },
-    //   城市组件状态
-    CityCompStatus(str) {
-      if (str == "start") {
-        this.startcity = true;
-      } else {
-        this.endcity = true;
-      }
-    },
+    
     //  出发地关闭子组件
     CityCompClose(val) {
       this.startcity = false;
@@ -600,7 +597,7 @@ export default {
   }, mounted() {
 
   },created(){
-    
+    this.isLogin=this.$store.state.isLogin;
     this.active = [
       {
         lable: '线路设计',

src/components/Ticket/FillItinerary.vue

@@ -179,6 +179,15 @@
                                         <el-radio label="2" value="2">女</el-radio>
                                         </el-radio-group>
                                     </el-form-item>
+                                    <el-form-item label="签证有效期" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择签证有效期', trigger: 'change' }]">
+                                        <el-date-picker
+                                            v-model="value1"
+                                            type="daterange"
+                                            range-separator="至"
+                                            start-placeholder="开始日期"
+                                            end-placeholder="结束日期">
+                                            </el-date-picker>
+                                    </el-form-item>
                             </el-col>
                         </div>
                     </el-form>

src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue

@@ -116,6 +116,13 @@
   .orderTable tbody .info .money .pay_list.height_aotu{
     height: 66px;
   }
+  .orderTable .text2{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
   .shang{
     transform: rotate(180deg);
     display: inline-block;
@@ -200,7 +207,7 @@
                     <img v-if="item.imgCover.length>0" style="width:100%;height:100%" :src="item.imgCover[0].url" alt="">
                   </div>
                   <div class="_right">
-                    <p class="color333 font-size14">{{item.title}}</p>
+                    <p class="text2 color333 font-size14">{{item.title}}</p>
                     <p>{{item.ltName}}</p>
                     <p>团号：{{item.tcid}}</p>
                   </div>