From 6c3cf15165530154107216c5bfee013f609c9be7 Mon Sep 17 00:00:00 2001
From: luo <luo@qq.com>
Date: Wed, 29 Jul 2026 15:48:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AA=E8=A6=81=E4=BB=BB=E6=84=8F?=
 =?UTF-8?q?=E4=B8=80=E5=BC=A0=E5=AE=9E=E5=90=8D=E4=BA=86=E5=B0=B1=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=B8=8D=E5=BC=BA=E5=88=B6=E8=B7=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                              |  2 +-
 api/modules/asset.js                      |  8 ++++++
 components/RenewalPaymentPopup.vue        |  4 +--
 components/UserInfoCard.vue               | 11 +++++--
 pages/device-exchange/device-exchange.vue | 35 ++++++++++++++++-------
 pages/index/index.vue                     |  4 +--
 pages/package-order/package-order.vue     |  4 +--
 7 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/api/index.js b/api/index.js
index 1bf53a4..37a9b00 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,5 +1,5 @@
 export { authApi } from './modules/auth.js';
-export { assetApi } from './modules/asset.js';
+export { assetApi, isAssetRealNameCompleted } from './modules/asset.js';
 export { deviceApi } from './modules/device.js';
 export { exchangeApi } from './modules/exchange.js';
 export { orderApi } from './modules/order.js';
diff --git a/api/modules/asset.js b/api/modules/asset.js
index ebe376c..7e16449 100644
--- a/api/modules/asset.js
+++ b/api/modules/asset.js
@@ -19,6 +19,14 @@ export const normalizeAssetInfo = (data = {}) => ({
 		: data.is_expiring === true || data.is_expiring === 1
 });
 
+export const isAssetRealNameCompleted = (assetInfo = {}) => {
+	if (assetInfo.asset_type === 'device') {
+		return (assetInfo.cards || []).some((card) => Number(card?.real_name_status) === 1);
+	}
+
+	return Number(assetInfo.real_name_status) === 1;
+};
+
 export const assetApi = {
 	getInfo(identifier) {
 		return request({
diff --git a/components/RenewalPaymentPopup.vue b/components/RenewalPaymentPopup.vue
index 096f5f5..0f38f8f 100644
--- a/components/RenewalPaymentPopup.vue
+++ b/components/RenewalPaymentPopup.vue
@@ -42,7 +42,7 @@
 
 <script setup>
 	import { ref, computed } from 'vue';
-	import { assetApi, orderApi } from '@/api/index.js';
+	import { assetApi, isAssetRealNameCompleted, orderApi } from '@/api/index.js';
 	import {
 		handlePaymentError,
 		isValidAlipayPaymentLink,
@@ -110,7 +110,7 @@
 		}
 
 		if (assetInfo.value.effective_realname_policy === 'before_order' &&
-			assetInfo.value.realname_required && Number(assetInfo.value.real_name_status) !== 1) {
+			assetInfo.value.realname_required && !isAssetRealNameCompleted(assetInfo.value)) {
 			uni.showModal({
 				title: '需要实名认证',
 				content: '当前资产下单前需要完成实名认证',
diff --git a/components/UserInfoCard.vue b/components/UserInfoCard.vue
index c36bf81..7c3008f 100644
--- a/components/UserInfoCard.vue
+++ b/components/UserInfoCard.vue
@@ -18,14 +18,16 @@
 				{{ networkStatus == 1 ? '正常' : '停机' }}
 			</view>
 		</view>
-		<button class="renew-button" @tap.stop="emit('renew')">立即续费</button>
+		<button v-if="hasPackageName" class="renew-button" @tap.stop="emit('renew')">立即续费</button>
 	</view>
 </template>
 
 <script setup>
+	import { computed } from 'vue';
+
 	const emit = defineEmits(['renew']);
 
-	defineProps({
+	const props = defineProps({
 		currentCardNo: { type: String, default: '' },
 		deviceInfo: { type: Object, default: () => ({}) },
 		onlineStatus: { type: String, default: '离线' },
@@ -35,6 +37,11 @@
 		expiryDays: { type: [Number, String], default: null }
 	});
 
+	const hasPackageName = computed(() => {
+		const packageName = String(props.deviceInfo?.packageName || '').trim();
+		return Boolean(packageName && packageName !== '-');
+	});
+
 </script>
 
 <style scoped lang="scss">
diff --git a/pages/device-exchange/device-exchange.vue b/pages/device-exchange/device-exchange.vue
index 0d469d0..7b10c0a 100644
--- a/pages/device-exchange/device-exchange.vue
+++ b/pages/device-exchange/device-exchange.vue
@@ -91,7 +91,9 @@
 					<view class="form-label">收件人电话</view>
 					<up-input
 						v-model="form.recipient_phone"
-						placeholder="请输入收件人电话"
+						placeholder="请输入11位手机号"
+						type="number"
+						maxlength="11"
 						border="surround"
 					/>
 				</view>
@@ -188,6 +190,24 @@
 		return String(time).split('T').join(' ').slice(0, 19);
 	};
 
+	const getRecipientPhone = () => String(form.recipient_phone || '').trim();
+
+	const validateRecipientPhone = () => {
+		const phone = getRecipientPhone();
+
+		if (!phone) {
+			uni.showToast({ title: '请输入收件人电话', icon: 'none' });
+			return '';
+		}
+
+		if (!PHONE_REG.test(phone)) {
+			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+			return '';
+		}
+
+		return phone;
+	};
+
 	const syncAreaPickerState = (regionCodes = []) => {
 		const { columns, defaultIndex } = buildRegionColumns(regionCodes);
 		areaPickerColumns.value = columns;
@@ -307,15 +327,8 @@
 			return;
 		}
 
-		if (!form.recipient_phone.trim()) {
-			uni.showToast({ title: '请输入收件人电话', icon: 'none' });
-			return;
-		}
-
-		if (!PHONE_REG.test(form.recipient_phone.trim())) {
-			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
-			return;
-		}
+		const recipientPhone = validateRecipientPhone();
+		if (!recipientPhone) return;
 
 		if (form.recipient_region_codes.length !== 3) {
 			uni.showToast({ title: '请选择省市区', icon: 'none' });
@@ -336,7 +349,7 @@
 			await exchangeApi.submitShippingInfo(
 				exchangeData.value.id,
 				form.recipient_name.trim(),
-				form.recipient_phone.trim(),
+				recipientPhone,
 				recipientAddress
 			);
 			uni.showToast({ title: '提交成功', icon: 'success' });
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9735e40..49f1315 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -360,12 +360,12 @@
 
 	const startHomepageRenewal = () => {
 		const packageId = Number(deviceInfo.currentPackageId || 0);
-		if (!packageId) {
+		const packageName = String(deviceInfo.packageName || '').trim();
+		if (!packageId || !packageName || packageName === '-') {
 			uni.showToast({ title: '当前资产暂无可续费套餐', icon: 'none' });
 			return;
 		}
 
-		const packageName = deviceInfo.packageName === '-' ? '' : deviceInfo.packageName;
 		renewalPopupRef.value?.open([packageId], [packageName]);
 	};
 
diff --git a/pages/package-order/package-order.vue b/pages/package-order/package-order.vue
index 4d0bf66..3b8c3b8 100644
--- a/pages/package-order/package-order.vue
+++ b/pages/package-order/package-order.vue
@@ -86,7 +86,7 @@
 <script setup>
 	import { ref, reactive, onMounted, computed } from 'vue';
 	import { onLoad, onShow } from '@dcloudio/uni-app';
-	import { assetApi, orderApi, walletApi } from '@/api/index.js';
+	import { assetApi, isAssetRealNameCompleted, orderApi, walletApi } from '@/api/index.js';
 	import { useUserStore } from '@/store/index.js';
 	import {
 		consumePendingPaymentRefresh,
@@ -208,7 +208,7 @@
 	const buyPackage = async (item) => {
 		await loadAssetType();
 		if (assetInfo.value.effective_realname_policy === 'before_order' &&
-			assetInfo.value.realname_required && Number(assetInfo.value.real_name_status) !== 1) {
+			assetInfo.value.realname_required && !isAssetRealNameCompleted(assetInfo.value)) {
 			uni.showModal({
 				title: '需要实名认证',
 				content: '当前资产下单前需要完成实名认证',