pcwl_yancheng/uni-fans-score
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix；修复bug

Browse Source
This commit is contained in:
ISFP_T
2025-11-08 16:00:44 +08:00
parent 85702d8d08
commit 50a711bba8
13 changed files with 248 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/MapComponent.vue
+7 -6
View File
@@ -17,18 +17,19 @@
</cover-view>
<cover-view class="map-side-controls" v-if="!props.hideControls && !props.hideMapOverlays">
<cover-view class="side-btn locate" @tap="handleRelocate">
<cover-image class="side-icon" src="/static/location.png"></cover-image>
<!-- <cover-view class="side-text">定位</cover-view> -->
</cover-view>
<cover-view class="side-btn service" @tap="handleService">
<cover-image class="side-icon" src="/static/customer-service.png"></cover-image>
<!-- <cover-view class="side-text">客服</cover-view> -->
</cover-view>
<cover-view class="side-btn search" @tap="handleSearch">
<cover-image class="side-icon" src="/static/search-icon.png"></cover-image>
<cover-image class="side-icon" src="/static/other_device.png"></cover-image>
<!-- <cover-view class="side-text">搜索</cover-view> -->
</cover-view>
<cover-view class="side-btn locate" @tap="handleRelocate">
<cover-image class="side-icon" src="/static/location.png"></cover-image>
<!-- <cover-view class="side-text">定位</cover-view> -->
</cover-view>
</cover-view>
</map>
@@ -530,7 +531,7 @@ const handleSearch = () => {
flex-direction: row;
align-items: center;
justify-content: center;
box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.12);
// box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.12);
padding: 20rpx;
border: 2rpx solid #e0e0e0;
components/OrderItemCard.vue
+29 -13
View File
@@ -16,6 +16,9 @@
<text class="highlight">{{ $t('order.depositFree') }}</text>
</view>
</view>
<view class="payment-badge whitelist" v-else-if="order.payWay == 'wx_global_pay'">
<text class="badge-text">{{ $t('order.whitelistOrder') }}</text>
</view>
<view class="payment-badge member" v-else-if="order.payWay == 'wx_member_pay'">
<text class="badge-text">{{ $t('order.memberOrder') }}</text>
</view>
@@ -59,10 +62,22 @@
<!-- 订单底部 -->
<view class="order-footer">
<view class="footer-left">
<view v-if="isInUse" class="renting"><text class="dot"></text>{{ $t('order.renting') }}</view>
<view v-if="isInUse" class="renting">
<image src="/static/order_time.png" mode="aspectFit" class="icon-time"></image>
{{ $t('order.renting') }}
</view>
<view v-else-if="isFinished" class="meta">
<view class="meta-item"><text class="dot"></text>{{ usedDurationText }}</view>
<view class="meta-item"><text class="currency">￥</text>{{ displayAmount }}</view>
<view class="meta-item">
<image src="/static/order_time.png" mode="aspectFit" class="icon-time"></image>
{{ usedDurationText }}
</view>
<view class="meta-item">
<image src="/static/order_price.png" mode="aspectFit" class="icon-price"></image>
{{ displayAmount }}
</view>
</view>
<view v-else-if="isCancelled" class="cancelled">
{{ $t('order.orderCancelled') }}
</view>
</view>
@@ -127,6 +142,7 @@
const isWaitingForPayment = computed(() => normalizedStatus.value === 'waiting_for_payment');
const isInUse = computed(() => normalizedStatus.value === 'in_used');
const isFinished = computed(() => normalizedStatus.value === 'used_done');
const isCancelled = computed(() => normalizedStatus.value === 'order_cancelled');
const titleText = computed(() => $t('order.rentFan'));
@@ -202,16 +218,15 @@
border-radius: 0;
white-space: nowrap;
&.wx-score { }
&.member { }
&.deposit { }
.badge-icon { width: 32rpx; height: 26rpx; margin-right: 8rpx; }
.badge-text { font-size: 22rpx; color: #07c160; font-weight: 500; background: transparent; }
.divider { margin: 0 6rpx; color: #07c160; }
}
// 不同支付方式的文字颜色
.payment-badge.whitelist {
.badge-text, .divider { color: #FF9800; }
}
.payment-badge.member {
.badge-text, .divider { color: #1976D2; }
}
@@ -333,12 +348,13 @@
background: #fafafa;
border-top: 1rpx solid #f0f0f0;
.footer-left { display: flex; align-items: center; }
.renting { font-size: 26rpx; color: #333; display: flex; align-items: center; }
.meta { display: flex; align-items: center; }
.meta-item { font-size: 26rpx; color: #333; display: flex; align-items: center; margin-right: 28rpx; }
.dot { width: 16rpx; height: 16rpx; background: #000; border-radius: 50%; margin-right: 12rpx; display: inline-block; }
.currency { margin-right: 4rpx; color: #333; }
.footer-left { display: flex; align-items: center; }
.renting { font-size: 26rpx; color: #333; display: flex; align-items: center; }
.meta { display: flex; align-items: center; }
.meta-item { font-size: 26rpx; color: #333; display: flex; align-items: center; margin-right: 28rpx; }
.cancelled { font-size: 26rpx; color: #999; }
.icon-time { width: 32rpx; height: 32rpx; margin-right: 8rpx; }
.icon-price { width: 32rpx; height: 32rpx; margin-right: 8rpx; }
.actions {
display: flex;