Merge branch 'master' of http://git.echepei.com/tire-platform/tire-platform-ui

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -790,7 +790,7 @@ export default {
         row.returnsNumber = 0;
         this.$message.error("退货数量不能超过销售数量");
       }
-      row.returnsAmount = _.round(_.multiply(row.returnsNumber, row.price), 2);
+      row.returnsAmount = _.round(_.multiply(row.returnsNumber, row.price) - _.multiply(row.returnsNumber, Number(row.redPacketAmount)), 2);
     },
     generateData(data) {
       generateReturns({ id: data.id }).then(res => {
@@ -802,7 +802,7 @@ export default {
         });
         if (res.data.data.orderItemsList.length > 0) {
           res.data.data.orderItemsList.forEach(e => {
-            e.returnsAmount = _.round(_.multiply(e.returnsNumber, e.price), 2);
+            e.returnsAmount = _.round(_.multiply(e.returnsNumber, e.price) - _.multiply(e.returnsNumber, Number(e.redPacketAmount)), 2);
           });
         }