Merge pull request 'fix(orders): stop no-thumbnail order items being squeezed' (#362) from worktree-uc-orders-into-services into main
Reviewed-on: CYL/wordpress-theme-aksrt#362
This commit is contained in:
commit
99f710d6e0
2 files changed
+27
-9
No files matched your search
@@ -315,6 +315,12 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Item without a thumbnail: drop the fixed 64px image column so the title
|
||||||
|
* and price fill the row instead of being crushed into the missing image cell. */
|
||||||
|
.aksrt-orders-page__card-item--no-image {
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
}
|
||||||
|
|
||||||
.aksrt-orders-page__card-img {
|
.aksrt-orders-page__card-img {
|
||||||
width: 64px;
|
width: 64px;
|
||||||
height: 64px;
|
height: 64px;
|
||||||
@@ -1520,6 +1526,14 @@ html.dark .aksrt-order-detail-dialog .aksrt-modal__footer {
|
|||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.aksrt-orders-page__card-item--no-image {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.aksrt-orders-page__card-item--no-image .aksrt-orders-page__card-item-price {
|
||||||
|
grid-column: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.aksrt-orders-page__card-time {
|
.aksrt-orders-page__card-time {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@@ -197,12 +197,15 @@ $pending_count = (int) ($stats['pending'] ?? 0);
|
|||||||
|
|
||||||
<div class="aksrt-orders-page__card-items">
|
<div class="aksrt-orders-page__card-items">
|
||||||
<?php if (!empty($items) && is_array($items)) : ?>
|
<?php if (!empty($items) && is_array($items)) : ?>
|
||||||
<?php foreach ($items as $item) : ?>
|
<?php foreach ($items as $item) :
|
||||||
<div class="aksrt-orders-page__card-item" data-product-id="<?php echo esc_attr((string) ($item['product_id'] ?? 0)); ?>">
|
$item_image = (string) ($item['image'] ?? '');
|
||||||
<?php if (!empty($item['image'])) : ?>
|
if ($item_image === '') {
|
||||||
<img src="<?php echo esc_url((string) $item['image']); ?>" alt="" class="aksrt-orders-page__card-img">
|
$item_image = (string) ($order['image'] ?? '');
|
||||||
<?php elseif (!empty($order['image'])) : ?>
|
}
|
||||||
<img src="<?php echo esc_url((string) $order['image']); ?>" alt="" class="aksrt-orders-page__card-img">
|
?>
|
||||||
|
<div class="aksrt-orders-page__card-item<?php echo $item_image === '' ? ' aksrt-orders-page__card-item--no-image' : ''; ?>" data-product-id="<?php echo esc_attr((string) ($item['product_id'] ?? 0)); ?>">
|
||||||
|
<?php if ($item_image !== '') : ?>
|
||||||
|
<img src="<?php echo esc_url($item_image); ?>" alt="" class="aksrt-orders-page__card-img">
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<div class="aksrt-orders-page__card-item-info">
|
<div class="aksrt-orders-page__card-item-info">
|
||||||
<span class="aksrt-orders-page__card-item-title"><?php echo esc_html((string) ($item['product_title'] ?? $order['product_name'] ?? '')); ?></span>
|
<span class="aksrt-orders-page__card-item-title"><?php echo esc_html((string) ($item['product_title'] ?? $order['product_name'] ?? '')); ?></span>
|
||||||
@@ -223,9 +226,10 @@ $pending_count = (int) ($stats['pending'] ?? 0);
|
|||||||
</div>
|
</div>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
<div class="aksrt-orders-page__card-item" data-product-id="<?php echo esc_attr((string) ($order['product_id'] ?? 0)); ?>">
|
<?php $order_image = (string) ($order['image'] ?? ''); ?>
|
||||||
<?php if (!empty($order['image'])) : ?>
|
<div class="aksrt-orders-page__card-item<?php echo $order_image === '' ? ' aksrt-orders-page__card-item--no-image' : ''; ?>" data-product-id="<?php echo esc_attr((string) ($order['product_id'] ?? 0)); ?>">
|
||||||
<img src="<?php echo esc_url((string) $order['image']); ?>" alt="" class="aksrt-orders-page__card-img">
|
<?php if ($order_image !== '') : ?>
|
||||||
|
<img src="<?php echo esc_url($order_image); ?>" alt="" class="aksrt-orders-page__card-img">
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<div class="aksrt-orders-page__card-item-info">
|
<div class="aksrt-orders-page__card-item-info">
|
||||||
<span class="aksrt-orders-page__card-item-title"><?php echo esc_html((string) ($order['product_name'] ?? __('订单', 'aksrt'))); ?></span>
|
<span class="aksrt-orders-page__card-item-title"><?php echo esc_html((string) ($order['product_name'] ?? __('订单', 'aksrt'))); ?></span>
|
||||||
|
|||||||
Reference in new issue
Block a user