From 64bccffe2889a13d0ffe48017e97cabe299c5da3 Mon Sep 17 00:00:00 2001
From: luo <luo@qq.com>
Date: Tue, 28 Jul 2026 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E5=8D=B3=E7=BB=AD=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/UserInfoCard.vue                   | 15 ++++++++++++
 .../specs/legacy-package-renewal/spec.md      | 21 ++++++++++++++++
 .../update-july-h5-c-iteration/tasks.md       |  1 +
 pages/index/index.vue                         | 24 +++++++++++++++----
 pages/order-list/order-list.vue               | 22 ++++++++++-------
 5 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/components/UserInfoCard.vue b/components/UserInfoCard.vue
index 0436c56..c36bf81 100644
--- a/components/UserInfoCard.vue
+++ b/components/UserInfoCard.vue
@@ -18,10 +18,13 @@
 				{{ networkStatus == 1 ? '正常' : '停机' }}
 			</view>
 		</view>
+		<button class="renew-button" @tap.stop="emit('renew')">立即续费</button>
 	</view>
 </template>
 
 <script setup>
+	const emit = defineEmits(['renew']);
+
 	defineProps({
 		currentCardNo: { type: String, default: '' },
 		deviceInfo: { type: Object, default: () => ({}) },
@@ -44,5 +47,17 @@
 			flex: 1;
 		}
 
+		.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; }
+		}
+
 	}
 </style>
diff --git a/openspec/changes/update-july-h5-c-iteration/specs/legacy-package-renewal/spec.md b/openspec/changes/update-july-h5-c-iteration/specs/legacy-package-renewal/spec.md
index 948d3d4..736dd88 100644
--- a/openspec/changes/update-july-h5-c-iteration/specs/legacy-package-renewal/spec.md
+++ b/openspec/changes/update-july-h5-c-iteration/specs/legacy-package-renewal/spec.md
@@ -36,3 +36,24 @@ The client SHALL create a renewal by calling `POST /api/c/v1/orders/create` with
 - **WHEN** neither asset info nor the relevant historical order supplies a valid package ID
 - **THEN** the client SHALL show that renewal is unavailable
 - **AND** the client SHALL not guess an ID from the ordinary package catalog
+
+### Requirement: Renewal buttons SHALL be limited to the homepage and order list
+
+The client SHALL show an `立即续费` button in the homepage asset summary and in every order card in the order list. The client SHALL NOT show a renewal button in the order detail page, package catalog, package-order page, or other pages.
+
+#### Scenario: Customer renews from the homepage
+
+- **WHEN** the homepage asset summary is displayed
+- **THEN** the client SHALL show an `立即续费` button
+- **AND** tapping it SHALL start the standard renewal flow for the asset's current package ID when one is available
+
+#### Scenario: Customer renews from an order card
+
+- **WHEN** an order is displayed in the order list
+- **THEN** the client SHALL show an `立即续费` button for that order
+- **AND** tapping it SHALL use the order's package IDs for the standard renewal flow
+
+#### Scenario: Customer views another page
+
+- **WHEN** the customer views any page other than the homepage or order list
+- **THEN** the client SHALL NOT show an `立即续费` button
diff --git a/openspec/changes/update-july-h5-c-iteration/tasks.md b/openspec/changes/update-july-h5-c-iteration/tasks.md
index 5ed8061..17805aa 100644
--- a/openspec/changes/update-july-h5-c-iteration/tasks.md
+++ b/openspec/changes/update-july-h5-c-iteration/tasks.md
@@ -19,6 +19,7 @@
 - [x] 3.2 Keep discontinued packages out of the ordinary package catalog for new customers and agents
 - [x] 3.3 Add the eligible existing-customer renewal path using `current_package_id` or historical `package_ids`
 - [x] 3.4 Reuse `POST /api/c/v1/orders/create` for renewal and preserve selected identifier, package IDs, payment method, and existing payment result handling
+- [x] 3.5 Show `立即续费` only on the homepage asset summary and every order-list card
 
 ## 4. Wallet recharge and payment completion
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fce85c8..7633528 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<UserInfoCard :currentCardNo="currentCardNo" :deviceInfo="deviceInfo" :onlineStatus="onlineStatus"
 			:isDevice="userInfo.isDevice" :networkStatus="deviceInfo.network_status"
-			:isExpiring="deviceInfo.isExpiring" :expiryDays="deviceInfo.expiryDays" />
+			:isExpiring="deviceInfo.isExpiring" :expiryDays="deviceInfo.expiryDays" @renew="startHomepageRenewal" />
 
 		<DeviceStatusCard v-if="userInfo.isDevice" :deviceInfo="deviceInfo" :isRealName="isRealName"
 			:isDevice="userInfo.isDevice" @authentication="enterDetail('authentication')" />
@@ -156,6 +156,7 @@
 		network_status: 1,
 		status: 1,
 		packageName: '-',
+		currentPackageId: 0,
 		expireDate: '-',
 		isExpiring: false,
 		expiryDays: null,
@@ -251,10 +252,11 @@
 			deviceInfo.network_status = data.network_status;
 			deviceInfo.status = data.status;
 			deviceInfo.imei = data.imei || '-';
-			deviceInfo.asset_type = data.asset_type || 'device';
-			deviceInfo.bound_phone = data.bound_phone || '';
-			deviceInfo.packageName = data.current_package || '-';
-			deviceInfo.expireDate = formatDate(data.estimated_final_expires_at);
+		deviceInfo.asset_type = data.asset_type || 'device';
+		deviceInfo.bound_phone = data.bound_phone || '';
+		deviceInfo.packageName = data.current_package || '-';
+		deviceInfo.currentPackageId = Number(data.current_package_id || 0);
+		deviceInfo.expireDate = formatDate(data.estimated_final_expires_at);
 			deviceInfo.isExpiring = data.is_expiring === true;
 			deviceInfo.expiryDays = data.days_until_final_expiry ?? null;
 			deviceInfo.expiryEstimateStatus = data.expiry_estimate_status || 'none';
@@ -350,6 +352,18 @@
 		}
 	};
 
+	const startHomepageRenewal = () => {
+		const packageId = Number(deviceInfo.currentPackageId || 0);
+		if (!packageId) {
+			uni.showToast({ title: '当前资产暂无可续费套餐', icon: 'none' });
+			return;
+		}
+
+		const packageName = deviceInfo.packageName === '-' ? '' : deviceInfo.packageName;
+		const query = `renewal_package_ids=${encodeURIComponent(String(packageId))}&renewal_package_names=${encodeURIComponent(packageName)}`;
+		uni.navigateTo({ url: `/pages/package-order/package-order?${query}` });
+	};
+
 	const modifyWifi = () => {
 		wifi_info.ssid = deviceInfo.ssidName;
 		wifi_info.pwd = deviceInfo.ssidPwd;
diff --git a/pages/order-list/order-list.vue b/pages/order-list/order-list.vue
index 2899c81..5dc8db7 100644
--- a/pages/order-list/order-list.vue
+++ b/pages/order-list/order-list.vue
@@ -62,13 +62,13 @@
 							</view>
 						</view>
 
-						<view v-if="item.payment_status === 1" class="card-footer">
-							<button class="btn-pay" :disabled="orderPayingId !== null" @tap.stop="showOrderPaymentMethods(item)">
+						<view class="card-footer">
+							<button v-if="item.payment_status === 1" class="btn-pay" :disabled="orderPayingId !== null"
+								@tap.stop="showOrderPaymentMethods(item)">
 								{{ isOrderPaying(item) ? '处理中...' : '立即支付' }}
 							</button>
-						</view>
-						<view v-else-if="item.payment_status === 2 && item.package_ids?.length" class="card-footer">
-							<button class="btn-pay btn-renew" @tap.stop="startHistoricalRenewal(item)">继续续费</button>
+							<button class="btn-pay btn-renew" :disabled="orderPayingId !== null"
+								@tap.stop="startHistoricalRenewal(item)">立即续费</button>
 						</view>
 					</view>
 				</view>
@@ -236,7 +236,10 @@
 
 	const startHistoricalRenewal = (order) => {
 		const packageIds = Array.isArray(order?.package_ids) ? order.package_ids.filter(Boolean) : [];
-		if (!packageIds.length) return;
+		if (!packageIds.length) {
+			uni.showToast({ title: '当前订单暂无可续费套餐', icon: 'none' });
+			return;
+		}
 		const packageNames = Array.isArray(order.package_names) ? order.package_names : [];
 		const query = `renewal_package_ids=${encodeURIComponent(packageIds.join(','))}&renewal_package_names=${encodeURIComponent(packageNames.join('|'))}`;
 		uni.navigateTo({ url: `/pages/package-order/package-order?${query}` });
@@ -523,9 +526,9 @@
 				padding-top: 24rpx;
 				border-top: 1rpx solid #f0f0f0;
 				display: flex;
-				justify-content: flex-end;
+				gap: 16rpx;
 
-					.btn-pay {
+				.btn-pay {
 					background: #1890ff;
 					color: #fff;
 					border: none;
@@ -533,7 +536,8 @@
 					padding: 16rpx 40rpx;
 					font-size: 26rpx;
 					font-weight: 500;
-					width: 100%;
+					width: auto;
+					flex: 1;
 
 					&[disabled] {
 						opacity: 0.7;