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

src/components/newConfimationOrder.vue

@@ -96,7 +96,9 @@
     display: inline-block;
     width: 100px;
     vertical-align: top;
-    margin-top: 20px;
+    margin-top:0;
+    color:orange;
+    font-weight: bold;
   }
 
   .newTrip_Main .warmTipsContent {
@@ -111,6 +113,7 @@
   .newTrip_Main .newTripTutle {
     font-weight: bold;
     float:left;
+    color:#2dbb55;
   }
 
   .newTripImgList {
@@ -144,7 +147,7 @@
   }
 
   .newTripExpense {
-    margin: 0 auto;
+    margin: 20px auto;
     width: 100%;
   }
 
@@ -169,7 +172,7 @@
   }
 
   .newTripFeiyongtitle h2 {
-    font-size: 18px;
+    font-size: 25px;
   }
 
   .newTripflightInfo {
@@ -200,7 +203,7 @@
   }
 
   .newTripflight_list td {
-    font-size: 15px;
+    font-size: 18px;
     height: 34px;
     vertical-align: middle;
     background-color: #eaeaea;
@@ -299,6 +302,7 @@
     height: 100%;
     padding: 5px;
     border: 1px solid #d1d1d1;
+    color:#19a0f0;
   }
   .newTripPassenger td{
     font-size:14px;
@@ -316,6 +320,13 @@
   .newTripWarm p:first-child{
     margin-top:0;
   }
+  .newTripExpense .newTripRight p{
+    line-height: 2;
+  }
+  .newTripExpense .newTripRight li{
+    line-height: 2;
+  }
+
 </style>
 <template>
   <div class="newTrip_Main" v-loading="pdfLoading">
@@ -496,7 +507,7 @@
             </div>
           </div>
           <div class="newTripDay">
-            <div class="warmTipsTitle" style="margin-top:0;">温馨提示：</div>
+            <div class="warmTipsTitle">温馨提示：</div>
             <template v-if="item.tips.length>0">
                   <div class="warmTipsContent">
                     <template v-for="(sItem,sIndex) in item.tips">
@@ -561,11 +572,11 @@
           <div class="newTripEnglish">Expense</div>
         </div>
         <div v-if='vshowE' class="newTripExpense">
-          <div class="newTripleft">费用包含</div>
+          <div class="newTripleft" style="color:red;">费用包含</div>
           <div class="newTripRight">
             <div v-html="feature.feeInclude"></div>
           </div>
-          <div class="newTripleft" style="margin: 15px 0 10px 8px;">费用不包含</div>
+          <div class="newTripleft" style="margin: 15px 0 10px 8px;color:red;">费用不包含</div>
           <div class="newTripRight">
             <div v-html="feature.feeNonInclude"></div>
           </div>
@@ -576,9 +587,9 @@
             <table class="newTripTable newTripPassenger" cellspacing=0 cellpadding=0>
               <tr>
                 <th width="10%">城市</th>
-                <th width="10%">活动</th>
+                <th width="30%">活动</th>
                 <th width="20%">参考价格</th>
-                <th width="60%">说明</th>
+                <th width="40%">说明</th>
               </tr>
               <tr v-for="(item,i) in dataList.selfpayingList" :key="i">
                 <td>{{item.cityName}}</td>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -7,10 +7,9 @@
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
       <div class="TrfList clearfix">
-        <!-- 'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)-->
         <div class="TFslide" v-for="item in TypeArray"
           :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
-          @click="clickFeature(item)" :key="item.subCode" v-if="item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId()">
+          @click="clickFeature(item)" :key="item.subCode" v-if="(item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3">
           <img v-bind:src="item.imgUrl">
           <div>{{item.ckTitle}}</div>
         </div>