解决冲突

This commit is contained in:
2025-11-27 14:35:11 +08:00
28 changed files with 705 additions and 1059 deletions

View File

@@ -44,7 +44,7 @@
<view class="vip-card wallet_l">
<view class="assets">
<view @click="goVirtualList">
<view class="assets_row">天医币</view>
<view class="assets_row">{{ t('global.coin') }}</view>
<view>{{userInfo.peanutCoin ?? 1}}</view>
</view>
<view @click="goPointsList">
@@ -157,15 +157,12 @@
userStore.setUserInfo(userRes.result)
}
// 获取VIP信息
const vipRes = await getVipInfo()
if (vipRes.vipInfo) {
vipInfo.value = vipRes.vipInfo
}
} catch (error) {
console.error('获取数据失败:', error)
// 获取VIP信息
const vipRes = await getVipInfo()
if (vipRes.vipInfo) {
vipInfo.value = vipRes.vipInfo
}
}
}}
/**
* 跳转到设置页面