lex-xin před 4 měsíci
rodič
revize
b3e43a993d

+ 4 - 5
miniprogram/pages/orders/order-result.ts

@@ -71,11 +71,10 @@ Page({
             typeName: this.formatPeriod(item.activationCodeInfo?.times || 1, item.activationCodeInfo.type)
           })
         })
-        const firstGoods = tempGoods[0]
         let refundStyleStr = ''
-        if(firstGoods?.refundStyle === 'TURN_BACK') {
+        if(result.refundStyle === 'TURN_BACK') {
           refundStyleStr = '原路返回'
-        } else if(firstGoods?.refundStyle === 'OFFLINE') {
+        } else if(result.refundStyle === 'OFFLINE') {
           refundStyleStr = '线下'
         }
         const goodsInfo = {
@@ -83,8 +82,8 @@ Page({
           createTime: result.createTime,
           wechatStatus: result.wechatStatus,
           goods: tempGoods,
-          refundTime: firstGoods.refundTime,
-          refundAmount: firstGoods.refundAmount,
+          refundTime: result.refundTime,
+          refundAmount: this.formatPrice(result.refundAmount || 0, 'ALL'),
           refundStyleStr
         }
         this.setData({

+ 3 - 3
miniprogram/pages/orders/order-result.wxml

@@ -3,7 +3,7 @@
   <navigation-bar title="订单详情"></navigation-bar>
 
   <scroll-view class="record-list" type="list" scroll-y bindscrolltolower="loadMore">
-    <view class="order-status">
+    <view class="order-status" wx:if="{{statusList[status]}}">
       <view class="status">
         <image src="{{ statusList[status].logo }}"></image>
         <text>{{ statusList[status].title }}</text>
@@ -52,11 +52,11 @@
       </view>
       <view class="order-item">
         <view class="title">退款金额</view>
-        <view class="value">¥{{ goodsInfo.refundAmount }}</view>
+        <view class="value red">¥{{ goodsInfo.refundAmount }}</view>
       </view>
       <view class="order-item">
         <view class="title">退款路径</view>
-        <view class="value red">{{ goodsInfo.refundStyleStr }}</view>
+        <view class="value">{{ goodsInfo.refundStyleStr }}</view>
       </view>
     </view>
   </scroll-view>