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

src/components/Hotel/reservation/OrderList.vue

@@ -280,9 +280,10 @@
   text-align: center;
 }
 .orderop div {
-  width: 100px;
-  height: 50%;
+  width: auto;
+  height: 30px;
   display: flex;
+  padding: 0 5px;
   justify-content: center;
 }
 .RoomList div {
@@ -734,7 +735,7 @@
         </div>
         <div
           v-if="item.OrderStatus > 3 || item.OrderStatus < 3"
-          class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
+          class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
         >
           <div
             v-if="

src/components/busManagement/BookAcar/components/orderList.vue

@@ -592,9 +592,8 @@
               style="padding: 10px; color: #f1416c"
               :style="{
                 padding:
-                  !item.Remark && item.isMore
-                    ? '0 10px 30px 10px'
-                    : '0 10px 10px 10px',
+                  item.Remark
+                    ? '0 10px 10px 10px':'10px',
               }"
             >
               OP备注：{{ item.OPRemark }}

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -505,7 +505,7 @@
                 <template slot="append">
                   <div v-if="item.CreateRemark" style="padding:10px;color:#f1416c">客户备注：{{item.CreateRemark}}</div>
                   <div v-if="item.Remark||pagesTitle=='OP'" style="padding:10px;color:#f1416c"
-                  :style="{'padding':!item.CreateRemark&&item.isMore?'10px 10px 30px 10px':item.CreateRemark&&item.isMore?'0 10px 30px 10px':'10px 10px 10px 10px'}">
+                  :style="{'padding':!item.CreateRemark&&item.isMore?'10px 10px 30px 10px':item.CreateRemark&&(item.isMore||!item.isMore)?'0 10px 30px 10px':'10px'}">
                     OP备注：{{item.Remark}}
                     <i v-if="item.OfferState!=1&&item.OfferState!=3&&pagesTitle=='OP'" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
                   </div>