no message

src/components/SalesVisa/VisaProductOrder.vue

@@ -877,10 +877,11 @@
         <th width="7%">出发日期</th>
         <th width="7%">报名日期</th>
         <th width="7%">应收总额</th>
-        <th width="7%">成本</th>
+        
         <th width="7%">实收</th>
         <th width="5%">退款</th>
         <th width="5%">平台税金</th>
+        <th width="7%">成本</th>
         <th width="5%">优惠</th>
         <th width="5%">待收</th>
         <th width="5%">在途</th>
@@ -909,9 +910,6 @@
           <td>
             <span class="totalPrice">￥{{moneyFormat(item.TotalPrice)}}</span>
           </td>
-          <td>
-            <span class="income">￥{{moneyFormat(item.CostMoney)}}</span>
-          </td>
           <td>
             <span class="income">￥{{moneyFormat(item.Income)}}</span>
           </td>
@@ -921,6 +919,9 @@
           <td>
             <span>￥{{moneyFormat(item.PlatformTax)}}</span>
           </td>
+          <td>
+            <span>￥{{moneyFormat(item.CostMoney)}}</span>
+          </td>
           <td>
             <span>￥{{moneyFormat(item.DiscountMoney)}}</span>
           </td>

src/components/scenicSpot/reservation/OrderList.vue

@@ -614,7 +614,10 @@
         </el-table-column>
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
-            <span class="fz15 fbold" :class="{'cF1416C':(item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)!=0}">{{ (item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)}}</span>
+            <span class="fz15 fbold" 
+            :class="{'cF1416C':item.DaiShou>0}">
+            {{item.DaiShou}}
+          </span>
           </template>
         </el-table-column>
         <el-table-column label="利润" min-width="100">
@@ -755,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.toFixed(2) }}</span>
+              <span class="fz15 fbold">{{ (item.Money+item.MailingMoney).toFixed(2) }}</span>
               <span class="fz12">{{ item.CurrencyName }}</span>
             </div>
           </div>

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -420,11 +420,13 @@ export default {
             let addList = function(arr){
               arr.forEach(x=>{
                 x.list = []
+                x.DaiShou = 0
               })
             }
             addList(data)
             data.forEach((x) => {
               // x.Money = 0
+              
               let Money = 0
               x.DetailList.forEach((y) => {
                 Money+=y.Money
@@ -440,6 +442,9 @@ export default {
                   PlatformTax: item.PlatformTax,
                   Refund: item.Refund
                 }
+                let DaiShou
+                DaiShou = Number(item.Money+item.MailingMoney-item.Income-item.PlatformTax+item.Refund)
+                item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
                 item.list.push(datas)
               })
             this.total = res.data.data.count;