fix: 修改套餐位置

pages/index/index.vue

@@ -216,6 +216,7 @@
 		return dateStr.split('T')[0] || '-';
 	};
 
+<<<<<<< HEAD
 	const resolveAssetRealName = (assetData) => {
 		const cards = Array.isArray(assetData?.cards) ? assetData.cards : [];
 
@@ -229,6 +230,12 @@
 		}
 
 		return assetData?.real_name_status === 1;
+=======
+	const resolveCurrentCard = (cards = []) => {
+		if (cards.length === 1) return cards[0];
+		if (cards.length > 1) return cards.find(card => card.is_current) || null;
+		return null;
+>>>>>>> 368c0d75e7860196ca0a353b2154e2c257b7c4fb
 	};
 
 	const loadAssetInfo = async () => {
@@ -251,18 +258,23 @@
 			deviceInfo.expireDate = formatDate(data.current_package_expires_at);
 			deviceInfo.iccid = data.iccid || '-';
 			deviceInfo.walletBalance = data.wallet_balance ?? 0;
+<<<<<<< HEAD
 			isRealName.value = resolveAssetRealName(data);
 			realNameStatus.value = isRealName.value ? '已实名' : '未实名';
+=======
+			const currentCard = resolveCurrentCard(data.cards || []);
+			const realNameStatusCode = currentCard?.real_name_status ?? data.real_name_status;
+			isRealName.value = realNameStatusCode === 1;
+			realNameStatus.value = realNameStatusCode === 1 ? '已实名' : '未实名';
+>>>>>>> 368c0d75e7860196ca0a353b2154e2c257b7c4fb
 			boundPhone.value = data.bound_phone || '';
 			alreadyBindPhone.value = !!data.bound_phone;
 
 			// 流量信息已由 TrafficCard 组件独立获取，这里不再处理
 
 			// 当前卡信息
-			let currentCard = null;
 			if (data.cards && data.cards.length > 0) {
-				currentCard = data.cards.find(card => card.is_current) || '';
-				deviceInfo.currentIccid = currentCard.iccid || '-';
+				deviceInfo.currentIccid = currentCard?.iccid || '-';
 
 				// 卡列表
 				deviceInfo.mchList = data.cards.map(card => ({

pages/package-order/package-order.vue

@@ -9,14 +9,16 @@
 		<view class="card package-card" v-for="item in packageList" :key="item.package_id">
 			<view class="package-header flex-row-sb">
 				<view class="package-name">{{ item.package_name }}</view>
+			</view>
+			<view>
+				<view class="package-data">{{ formatData(item.data_allowance, item.data_unit) }}</view>
 				<view class="header-right">
-					<view class="validity-tag">有效期 {{ item.validity_days }} 天</view>
+					<view class="validity-tag">有效期: {{ item.validity_days }} 天</view>
 					<view class="tag-apple" :class="item.is_addon ? 'tag-warning' : 'tag-primary'">
 						{{ item.is_addon ? '加油包' : '正式套餐' }}
 					</view>
 				</view>
 			</view>
-			<view class="package-data">{{ formatData(item.data_allowance, item.data_unit) }}</view>
 			<view class="package-desc">{{ item.description }}</view>
 			<view class="package-footer flex-row-sb">
 				<view class="package-price">¥{{ formatMoney(item.retail_price) }}</view>