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

src/components/Hotel/reservation/OrderList.vue

@@ -474,10 +474,10 @@
               <span class="fz15 fbold">{{ item.HandFittingFee ? item.HandFittingFee : "-" }}</span>
             </template>
           </el-table-column>
-          <template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
-            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
+          <template slot="append" v-if="item.Remark||item.OPRemark||item.isMore||(item.OrderStatus>1||item.OrderStatus!=3)">
+            <div 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"
+            <div style="padding:10px;color:#f1416c"
             :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>

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

src/components/scenicSpot/reservation/OrderList.vue

@@ -758,7 +758,7 @@
           <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz15 fbold">{{ (item.Money+item.MailingMoney).toFixed(2) }}</span>
+              <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
               <span class="fz12">{{ item.CurrencyName }}</span>
             </div>
           </div>

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -443,7 +443,7 @@ export default {
                   Refund: item.Refund
                 }
                 let DaiShou
-                DaiShou = Number(item.Money+item.MailingMoney-item.Income-item.PlatformTax+item.Refund)
+                DaiShou = Number(item.Money-item.Income-item.PlatformTax+item.Refund)
                 item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
                 item.list.push(datas)
               })