Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-12 fb48777cd4c3f086f77b5b26e1d03aebf995f4f5

 pages/order/order-detail.vue

@@ -200,6 +200,7 @@
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
                              tmp.$store.dispatch('getCurrentInfo')
                           }
                        },
                        fail(e) {
@@ -584,11 +585,29 @@
         </view>
      </view>
      <view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
         <view class="form-item">
         <view class="form-item flex">
            <view class="label">订单金额:</view>
            <view class="value">{{ dto.totalAmount || '-' }}</view>
            <view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
         </view>
         <view class="form-item">
         <view class="form-item flex">
            <view class="label">运费:</view>
            <view class="value  m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
         </view>
         <view class="form-item flex">
            <view class="label">打包费:</view>
            <view class="value  m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
         </view>
         <view class="form-item flex t-red">
            <view class="label">优惠:</view>
            <view class="value  m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
         </view>
         <view class="form-item flex t-red">
            <view class="label">实际支付:</view>
            <view class="value  m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
         </view>


         <!--    <view class="form-item">
            <view class="label">支付金额:</view>
            <view class="value">{{ dto.paymentAmount || '-' }}</view>
         </view>
@@ -596,10 +615,7 @@
            <view class="label">商品金额:</view>
            <view class="value">{{ dto.flowerAmount || '-' }}</view>
         </view>
         <view class="form-item">
            <view class="label">运费:</view>
            <view class="value">{{ dto.transportFee || '-' }}</view>
         </view>
		
         <view class="form-item">
            <view class="label">折扣类型:</view>
            <view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
@@ -611,11 +627,11 @@
         <view class="form-item">
            <view class="label">优惠券:</view>
            <view class="value">{{ dto.memberCouponName || '-' }}</view>
         </view>
         <view class="form-item">
         </view> -->
         <!--    <view class="form-item">
            <view class="label">优惠金额:</view>
            <view class="value">{{ dto.memberCouponAmount || '-' }}</view>
         </view>
         </view> -->
      </view>
      <view class="info-container bg-white br-4 m-t-12"
         v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">