Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelContractDetail.vue

@@ -5,7 +5,6 @@
         padding-top: 10px;   
         font: normal 13px 'Microsoft Yahei';  
         color:#555;   
-        height:auto!important;
     }
     .TD_MainContent .container-fluid{
         padding:0 20px;
@@ -206,7 +205,7 @@
         text-align: center;
     }
     .TD_MainContent .page_break_avoid p{
-        padding-bottom:10px;
+        padding-bottom:15px;
     }
     .TDteam_Table{
         width: 900px;
@@ -559,7 +558,7 @@
                                     </td>
                                     <td>
                                         <span>{{dataList.company}}</span>
-                                        <img class="esealDiv" src="" alt="">
+                                        <img class="esealDiv" src='../assets/img/dzht/zhang.png' alt=""/>
                                     </td>
                                 </tr>
                                 <tr>
@@ -741,7 +740,7 @@
                     </div>
                     <!-- 自愿购物 -->
                     <div class="shoppings" :class="{'checkedNav':cked==6}">
-                        <table class="ZTable">
+                        <table class="ZTable" v-if="dataList.shopProtocolList&&dataList.shopProtocolList.length>0">
                             <tbody>
                                 <tr>
                                     <td width="5%">序号</td>
@@ -768,7 +767,7 @@
                     </div>
                     <!-- 自愿补充协议 -->
                     <div class="activitys" :class="{'checkedNav':cked==7}">
-                        <table class="ZTable">
+                        <table class="ZTable" v-if="dataList.payProtocolList&&dataList.payProtocolList.length>0">
                             <tbody>
                                 <tr>
                                     <td width="5%">序号</td>
@@ -796,7 +795,7 @@
                     <!-- 文明旅游公约 -->
                     <div class="TD-convention" :class="{'checkedNav':cked==8}">
                         <div class="page_break_avoid">
-                            <h1 class="text_center" style="font-size:30px;color:#555;">中国公民出境旅游文明行为指南</h1>
+                            <h1 class="text_center" style="font-size:30px;color:#555;margin:30px 0;">中国公民出境旅游文明行为指南</h1>
                             <p class="text_center">中国公民， 出境旅游， 注重礼仪， 保持尊严。</p>
                             <p class="text_center">讲究卫生， 爱护环境； 衣着得体， 请勿喧哗。</p>
                             <p class="text_center">尊老爱幼， 助人为乐； 女士优先， 礼貌谦让。</p>
@@ -1359,7 +1358,6 @@
           }
         }
         this.trifficList.forEach((x,index)=>{
-            console.log(x.airportPickUp==1||x.airportPickUp==2,'ssssss');
             if(x.airportPickUp==1||x.airportPickUp==2){
                 if(x.isUseBus==1){
                     this.tripList[index].TrifficType='飞机+车'

src/components/TravelContractNew.vue

@@ -102,7 +102,7 @@
     .TC-MainContent .block em {
         font-style: normal;
     }
-    TC-MainContent .createTableTitle {
+    .TC-MainContent .createTableTitle {
         padding: 10px 0;
         margin: 5px 30px 0;
         border-bottom: 1px dashed #ccc;
@@ -1265,7 +1265,6 @@
             singleRemark:'',
             nobedRemark:'',
             aloneRemark:'',
-            healthRemark:'',
             tcid:0,
             orderId:0,
             tCNum:'',
@@ -1304,7 +1303,6 @@
             terminateOpinion:[{ required: true, validator: validateterminateOpinion, trigger: "change" }],
             carpoolOpinion:[{ required: true, validator: validatecarpoolOpinion, trigger: "change" }],
             settleDisputeMode:[{ required: true, validator: validatesettleDisputeMode, trigger: "change" }],
-            healthRemark:[{ required: true, message: "请填写参团旅客健康情况说明", trigger: "blur" }]
         },
         //自愿购物活动补充协议
         VoluntaryArr:[],
@@ -1319,7 +1317,7 @@
       //跳转锚点
       goAnchor(selector) {
         var anchor = this.$el.querySelector(selector)
-        document.documentElement.scrollTop = anchor.offsetTop-80
+        document.documentElement.scrollTop = anchor.offsetTop-70
       },
       getList(){
         this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
@@ -1595,7 +1593,7 @@
      //滚动条滚动选中tab
      menu() {
         var _self = this;
-        _self.scroll = document.documentElement.scrollTop || document.body.scrollTop;
+        _self.scroll = (document.documentElement.scrollTop || document.body.scrollTop)+70;
         //滑动到指定位置相应菜单高亮
         var a_0 = $("#anchor-0").offset().top;
         var a_1 = $("#anchor-1").offset().top;
@@ -1607,17 +1605,17 @@
         var a_7 = $("#anchor-7").offset().top;
         if (_self.scroll < a_0) {
             this.ckedIndex = 0
-        } else if (_self.scroll < a_1) {
+        } else if (_self.scroll>a_0 && _self.scroll < a_1) {
             this.ckedIndex = 1
-        } else if (_self.scroll > a_2) {
+        } else if (_self.scroll > a_2 && _self.scroll<a_3) {
             this.ckedIndex = 2
-        }else if (_self.scroll > a_3) {
+        }else if (_self.scroll > a_3 && _self.scroll<a_4) {
             this.ckedIndex = 3
-        }else if (_self.scroll > a_4) {
+        }else if (_self.scroll > a_4 && _self.scroll<a_5) {
             this.ckedIndex = 4
-        }else if (_self.scroll > a_5) {
+        }else if (_self.scroll > a_5 && _self.scroll<a_6) {
             this.ckedIndex = 5
-        }else if (_self.scroll > a_6) {
+        }else if (_self.scroll > a_6 && _self.scroll<a_7) {
             this.ckedIndex = 6
         }else if (_self.scroll > a_7) {
             this.ckedIndex = 7