liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(订单详情):[#4026]订单详情显示具体领取记录情况

Browse Source
This commit is contained in:
lifizer
2025-07-15 15:03:31 +08:00
parent 8d393f0ee8
commit d774abbbc2
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/order/MyOrder/index.vue
+18 -4
View File
@@ -165,8 +165,22 @@
v-if="order.merName">联系商家
</view>
<view class="v12-align-center">
<button v-if="Number(order.status) !== 0 && order.giftCardInfo.giftCardStatus !== 9 && getGiftTips(order.giftCardInfo) && order.giftCardInfo.giftCardStatus !== 2 && order.giftCardInfo.giftNum !== order.giftCardInfo.receiveNum" open-type="share" @click="shareGift(order)" class="gift-btn service v12-primary-text v12-primary-border" >送给朋友</button>
<button v-if="Number(order.status) === 0 " @click="subscribePay(order)" class="gift-btn service v12-primary-text v12-primary-border" >立即支付</button>
<button
v-if="Number(order.status) !== 0 &&
order.giftCardInfo.giftCardStatus !== 9 &&
getGiftTips(order.giftCardInfo) &&
order.giftCardInfo.giftCardStatus !== 2 &&
order.giftCardInfo.giftNum !== order.giftCardInfo.receiveNum
"
open-type="share"
class="gift-btn service v12-primary-text v12-primary-border"
@click="shareGift(order)"
>送给朋友</button>
<button
v-if="Number(order.status) === 0"
class="gift-btn service v12-primary-text v12-primary-border"
@click="subscribePay(order)"
>立即支付</button>
<!-- 查看详情 -->
<view class="bnt service v12-primary-text v12-primary-border" @click="goOrderDetails(order)">查看详情</view>
</view>
@@ -470,9 +484,9 @@ export default {
path: "/pages/order/OrderDetails/index",
query: {
id: order.orderId,
isGift: order.isGiftCardSend ? 1 : '',
isGift: order.isGiftCardSend ? 1 : ''
}
});
})
},
setOfflinePayStatus: function (status) {
let that = this;
pages/order/OrderDetails/index.vue
+8 -2
View File
@@ -328,13 +328,19 @@
<text class="money font-color-red">￥{{ force2Decimal(orderInfo.payPrice) }}</text>
</view>
</view>
<view class="gift-wrap" v-if="order.isGiftCardSend || order.isGiftCardReceive">
<view
v-if="isGift"
class="gift-wrap"
>
<view class="v12-justify-between v12-align-center">
<view class="v12-font-28 v12-font-bold v12-align-center">
<u-icon :name="webUrl + '/icon/gift-primary.png'" size="24"></u-icon>
{{ `已领取${orderInfo.giftCardInfo.receiveNum}/${orderInfo.giftCardInfo.giftNum}份礼包` }}
</view>
<view class="v12-font-bold v12-primary-text v12-font-24">{{ `剩余${orderInfo.giftCardInfo.refundNum}份已退回` }}</view>
<view
v-if="orderInfo.giftCardInfo.refundNum > 0"
class="v12-font-bold v12-primary-text v12-font-24"
>{{ `剩余${orderInfo.giftCardInfo.refundNum}份已退回` }}</view>
</view>
<view
v-for="(receive, index) in orderInfo.giftCardInfo.receiveInfo"