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

src/components/Hotel/reservation/OrderList.vue

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

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?'10px':'0 10px 10px 10px'}">
+                  :style="{'padding':item.isMore?'0 10px 30px 10px':'0 10px 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>