fix: 移动端订单列表及详情页实付金额与优惠金额显示逻辑调整与PC一致

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -30,11 +30,11 @@ $(function () {
                     $(".productType").text("超级订阅（试用）");
                 }
             }
-            if (r.data.order.discount_price==undefined) {
+            if (!r.data.order.discount_price || (r.data.order.discount_price && r.data.order.discount_price <= 0)) {
             		$(".discountPrice").parent().hide();
             }
             //价格
-            $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100));
+            $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money  || r.data.order.order_money) / 100));
             $(".totalPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
             if (!r.data.order.isLiveActive) {
                 $(".origin-price-container").hide();
@@ -304,9 +304,11 @@ $(function () {
                   discount_price = r.data.order.discount_price;
                   var totalPrice = Number(r.data.order.discount_price)+Number(r.data.order.order_money);
                   $(".totalPrice").text('￥'+ formatMoney(totalPrice / 100)+'元')
-                  $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                  if (r.data.order.discount_price && r.data.order.discount_price > 0) {
+                    $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                  }
                 }
-                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
+                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
                 //未支付
                 $("#card-header-bg").addClass("bg nopay-bg")
                 $("#pageTitle").addClass("status")
@@ -358,9 +360,11 @@ $(function () {
                   discount_price = r.data.order.discount_price;
                   var totalPrice = Number(r.data.order.discount_price)+Number(r.data.order.order_money);
                   $(".totalPrice").text('￥'+ formatMoney(totalPrice / 100)+'元')
-                  $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                  if (r.data.order.discount_price && r.data.order.discount_price > 0) {
+                    $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                  }
                 }
-                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
+                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
 
 
 

src/web/staticres/common-module/order-list/js/order-detail.js

@@ -219,7 +219,7 @@ var vm = new Vue({
       // 订单金额
       this.orderInfo.orderMoney = this.moneyFormat(order.order_money)
       // 实付金额
-      this.orderInfo.payMoney = this.moneyFormat(order.order_money)
+      this.orderInfo.payMoney = this.moneyFormat(order.pay_money || order.order_money)
 
       if (info.transaction_id) {
         this.orderInfo.paymentId = info.transaction_id // 支付单号
@@ -277,7 +277,7 @@ var vm = new Vue({
       var payTime = order.pay_time ? this.time2Stamp(order.pay_time) : ''
       var payWay = order.pay_way ? order.pay_way : ''
 
-      var discountPrice = 0
+      var discountPrice = ''
       if (order.discount_price) {
         discountPrice = utils.formatMoney(order.discount_price / 100)
         discountPrice = '-￥' +  discountPrice
@@ -323,7 +323,7 @@ var vm = new Vue({
         {
           label: '实付金额',
           split: '：',
-          text: (order.pay_money==0) ? '￥' + this.moneyFormat(order.pay_money) : ''
+          text: (order.pay_money > 0)  ? '￥' + this.moneyFormat(order.pay_money) : ''
         },
         {
           label: '产品类型',

src/web/staticres/common-module/order-list/js/order-list.js

@@ -561,7 +561,7 @@ var vm = new Vue({
         info.totalPrice = Number(order.order_money) + Number(order.discount_price)
         info.totalPrice = utils.formatMoney(info.totalPrice);
       }
-      info.payPrice = utils.formatMoney(order.order_money)
+      info.payPrice = utils.formatMoney(order.pay_money || order.order_money)
 
       switch (productType) {
         case '历史数据': {

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -227,11 +227,11 @@
                         $(".productType").text("超级订阅（试用）");
                     }
                 }
-                if (r.data.order.discount_price==undefined) {
+                if (!r.data.order.discount_price || (r.data.order.discount_price && r.data.order.discount_price <= 0)) {
             		    $(".discountPrice").parent().hide();
                 }
                 //价格
-                $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100));
+                $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100));
                 $(".totalPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
 
                 //优惠码
@@ -570,9 +570,11 @@
                       discount_price = r.data.order.discount_price;
                       var totalPrice = Number(r.data.order.discount_price)+Number(r.data.order.order_money);
                       $(".totalPrice").text('￥'+ formatMoney(totalPrice / 100)+'元')
-                      $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                      if (r.data.order.discount_price && r.data.order.discount_price > 0) {
+                          $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                      }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
+                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
                     //未支付
                     $("#card-header-bg").addClass("bg nopay-bg")
                     $("#pageTitle").addClass("status")
@@ -638,9 +640,11 @@
                       discount_price = r.data.order.discount_price;
                       var totalPrice = Number(r.data.order.discount_price)+Number(r.data.order.order_money);
                       $(".totalPrice").text('￥'+ formatMoney(totalPrice / 100)+'元')
-                      $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                      if (r.data.order.discount_price && r.data.order.discount_price > 0) {
+                        $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
+                      }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
+                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
                     $("#card-header-bg").addClass("bg finish-bg")