From d52e728dc411aa8e43d37bda9f85bfc09871c1a0 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期六, 19 七月 2025 16:14:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- small-program/pages/order-details/order-details.vue | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue index 22dded0..f3f372d 100644 --- a/small-program/pages/order-details/order-details.vue +++ b/small-program/pages/order-details/order-details.vue @@ -163,8 +163,8 @@ </view> </view> </view> - <view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![4, 99].includes(info.status)"></view> - <view class="order-footer" v-if="![4, 99].includes(info.status)"> + <view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view> + <view class="order-footer" v-if="![99].includes(info.status)"> <view class="order-footer-btn"> <view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view> <view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view> -- Gitblit v1.9.3