Merge branch 'shop-mall' into dev

src/views/shopMall/GoodsOrder.vue

@@ -65,7 +65,12 @@
               class="van-hairline--top"
             >
               <template #title>
-                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+                订单金额：<span
+                  >¥{{
+                    (list.actualAmount + list.balancePaymentAmount)
+                      | moneyFormat
+                  }}</span
+                >
               </template>
               <template>
                 <van-button
@@ -147,7 +152,12 @@
               title=" "
             >
               <template #title>
-                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+                订单金额：<span
+                  >¥{{
+                    (list.actualAmount + list.balancePaymentAmount)
+                      | moneyFormat
+                  }}</span
+                >
               </template>
               <template>
                 <div>

src/views/shopMall/GoodsOrderDetail.vue

@@ -37,13 +37,16 @@
       <p class="order-item">
         <span>应付金额</span
         ><span style="color: #ff3535"
-          >￥{{ goodsDetail.totalAmount | moneyFormat }}</span
+          >￥{{
+            (goodsDetail.actualAmount + goodsDetail.balancePaymentAmount)
+              | moneyFormat
+          }}</span
         >
       </p>
-      <p class="order-item">
+      <!-- <p class="order-item">
         <span>乐器减免</span
         ><span>￥{{ -goodsDetail.marketAmount | moneyFormat }}</span>
-      </p>
+      </p> -->
       <p class="order-item">
         <span>优惠券</span
         ><span>￥{{ -goodsDetail.couponRemitFee | moneyFormat }}</span>
@@ -403,4 +406,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/shopMall/GoodsSale.vue

@@ -462,7 +462,7 @@ export default {
         return;
       }
       // 确认退费规则
-      if (!this.refundSure && this.payCountMoney - this.marketAmount > 0) {
+      if (!this.refundSure) {
         this.refundStatus = true;
         this.hashState();
         return;
@@ -608,7 +608,7 @@ export default {
         return;
       }
       // 确认退费规则
-      if (!this.refundSure && this.payCountMoney > 0) {
+      if (!this.refundSure) {
         this.refundStatus = true;
         return;
       }