diff --git a/components/UserInfoCard.vue b/components/UserInfoCard.vue
index 7c3008f..f1b13cb 100644
--- a/components/UserInfoCard.vue
+++ b/components/UserInfoCard.vue
@@ -18,7 +18,8 @@
{{ networkStatus == 1 ? '正常' : '停机' }}
-
+ 立即续费
@@ -56,14 +57,8 @@
.renew-button {
margin: 24rpx 0 0;
- background: var(--primary);
- color: #fff;
- border: none;
- border-radius: 12rpx;
- font-size: 26rpx;
- line-height: 2.6;
-
- &::after { border: none; }
+ width: 180rpx;
+ margin-left: auto;
}
}
diff --git a/pages/order-list/order-list.vue b/pages/order-list/order-list.vue
index 2e0fd24..0e81f99 100644
--- a/pages/order-list/order-list.vue
+++ b/pages/order-list/order-list.vue
@@ -37,27 +37,19 @@
- 套餐名称
-
-
- {{ pkgName }}
-
-
+ 套餐名称:
+ {{ getPackageNamesText(item) }}
- 购买角色
- {{ item.purchase_role || '-' }}
-
-
- 资产标识
+ 资产标识:
{{ item.asset_identifier || '-' }}
- 订单金额
+ 订单金额:
¥{{ formatMoney(item.total_amount) }}
- 下单时间
+ 下单时间:
{{ item.created_at }}
@@ -67,8 +59,8 @@
@tap.stop="showOrderPaymentMethods(item)">
{{ isOrderPaying(item) ? '处理中...' : '立即支付' }}
-
+ 立即续费
@@ -234,6 +226,13 @@
const isOrderPaying = (order) => orderPayingId.value === order.order_id;
+ const getPackageNamesText = (order) => {
+ const packageNames = Array.isArray(order?.package_names)
+ ? order.package_names.filter(Boolean)
+ : [];
+ return packageNames.join('、') || '-';
+ };
+
const openOrderDetail = (order) => {
if (!order?.order_id || orderPayingId.value !== null) return;
uni.navigateTo({ url: `/pages/order-detail/order-detail?id=${order.order_id}` });
@@ -491,19 +490,26 @@
.info-grid {
display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 20rpx;
+ grid-template-columns: 1fr;
+ gap: 16rpx;
.info-item {
+ display: flex;
+ align-items: baseline;
+ gap: 8rpx;
+
.info-label {
font-size: 22rpx;
color: #999;
- margin-bottom: 8rpx;
+ flex-shrink: 0;
}
.info-value {
font-size: 26rpx;
color: #333;
+ flex: 1;
+ min-width: 0;
+ word-break: break-all;
&.amount {
color: #ff6b6b;
@@ -514,22 +520,12 @@
}
}
- .package-item {
- display: flex;
- align-items: center;
- padding: 8rpx 0;
- }
-
- .package-name {
- font-size: 26rpx;
- color: #333;
- }
-
.card-footer {
margin-top: 24rpx;
padding-top: 24rpx;
border-top: 1rpx solid #f0f0f0;
display: flex;
+ justify-content: flex-end;
gap: 16rpx;
.btn-pay {
@@ -537,11 +533,13 @@
color: #fff;
border: none;
border-radius: 20rpx;
- padding: 16rpx 40rpx;
+ height: 64rpx;
+ padding: 0 28rpx;
font-size: 26rpx;
font-weight: 500;
width: auto;
- flex: 1;
+ min-width: 168rpx;
+ line-height: 64rpx;
&[disabled] {
opacity: 0.7;
@@ -550,8 +548,11 @@
&::after {
border: none;
}
+ }
- &.btn-renew { background: #52c41a; }
+ .btn-renew {
+ flex-shrink: 0;
+ width: 180rpx;
}
}
}
diff --git a/pages/package-order/package-order.vue b/pages/package-order/package-order.vue
index 74cd879..8ab6061 100644
--- a/pages/package-order/package-order.vue
+++ b/pages/package-order/package-order.vue
@@ -30,7 +30,7 @@
{{ formatPackagePrice(item.retail_price) }}
- 立即订购
+ 立即订购