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

src/assets/css/tripIndexNew.css

@@ -461,6 +461,9 @@ html, body{
       padding: 0;
       margin: 0;
       margin-right: 46px;
+  }
+  .travelDaysdetails-text.right0{
+    margin-right: 0;
   }
     .travelDaysdetails-text1{
       /* font-size: 16px !important; */

src/components/LeaveGroupDownload/travelDays.vue

@@ -120,7 +120,7 @@
             </div>
           </div>
           <div class="travelDaysdetails-textBox">
-            <div class="travelDaysdetails-text">
+            <div class="travelDaysdetails-text right0 row">
               <span class="travelDaysdetails-text0">住宿：</span>
               <template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
             </div>

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

@@ -155,22 +155,22 @@
       <div class="travelDaysdetails">
         <div class="travelDaysdetailsBJ column"
         :style="{'background':backgroundColor}">
-        <div class="travelDaysdetails-textBox row-sb">
-          <div class="travelDaysdetails-text">
+        <div class="travelDaysdetails-textBox row">
+          <div class="travelDaysdetails-text row">
             <span class="travelDaysdetails-text0">早餐：</span>
-            {{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
+            <div>{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}</div>
           </div>
-          <div class="travelDaysdetails-text">
+          <div class="travelDaysdetails-text row">
             <span class="travelDaysdetails-text0">午餐：</span>
-            {{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
+            <div>{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}</div>
           </div>
-          <div class="travelDaysdetails-text">
+          <div class="travelDaysdetails-text row">
             <span class="travelDaysdetails-text0">晚餐：</span>
-            {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
+            <div>{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}</div>
           </div>
         </div>
         <div class="travelDaysdetails-textBox">
-          <div class="travelDaysdetails-text">
+          <div class="travelDaysdetails-text right0 row">
             <span class="travelDaysdetails-text0">住宿：</span>
             <template v-for="(j,i) in item.HotelArray">{{j.HotelName?j.HotelName:'无'}}</template>
           </div>