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

src/assets/css/tripIndexNew.css

@@ -426,6 +426,10 @@ html, body{
   -ms-border-radius: 14px;
   -o-border-radius: 14px;
 }
+.travelDaysdetails-tsText p{
+  padding: 0;
+  margin: 0;
+}
 .travelDaysdetailsBJ {
     border-radius: 100px;
     padding: 20px 35px;

src/components/LeaveGroupDownload/travelDays.vue

@@ -58,7 +58,7 @@
         <template v-for="(t,tIndex) in item.tips">
           <div :key="tIndex" class="travelDaysdetails-tsTextBox" v-if="t.content&&getHtmlPlainText(t.content).length>0">
             <div class="travelDaysdetails-tsText row" :style="{'background':backgroundColor2}">
-              <span class="travelDaysdetails-text0">温馨提示：</span>
+              <span class="travelDaysdetails-text0" style="float:left;">温馨提示：</span>
               <span v-html="t.content"></span>
             </div>
           </div>

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -75,8 +75,8 @@
         <div class="travelDaysdetails-tsTextBox"
           v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
           <div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
-            <div class="travelDaysdetails-text0" style="float:left;">温馨提示：</div>
-            <div v-html="item.WarmTipObj.Description"></div>
+            <span class="travelDaysdetails-text0" style="float:left;">温馨提示：</span>
+            <span v-html="item.WarmTipObj.Description"></span>
           </div>
         </div>
         <div class="travelDaysdetails">