revert 26cef66e82

revert 解决冲突报错

pages/user/index.vue

@@ -44,11 +44,11 @@
 			<view class="vip-card wallet_l">
 				<view class="assets">
 					<view @click="goVirtualList">
-						<view class="assets_row">{{ $t('global.coin') }}</view>
+						<view class="assets_row">{{ t('global.coin') }}</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
 					<view @click="goPointsList">
-						<view class="assets_row">{{ $t('order.points') }}</view>
+						<view class="assets_row">积分</view>
 						<view>{{userInfo.jf ?? 1}}</view>
 					</view>
 					<!-- <view>
@@ -56,7 +56,7 @@
 						<view>0</view>
 					</view> -->
 				</view>
-				<view class="chong_btn" @click="goRecharge">{{ $t('user.recharge') }}</view>
+				<view class="chong_btn" @click="goRecharge">充 值</view>
 				<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
         <text class="wallet_count">{{userMes.peanutCoin}}</text> -->
 			</view>
@@ -148,8 +148,11 @@
 	 * 获取数据
 	 */
 	const getData = async () => {
+		console.log(userInfo.value);
+		try {
+			// 获取用户信息
 			const userRes = await getUserInfo()
-			console.log(userRes);
+			console.log(userRes, '-----userRes');
 			if (userRes.result) {
 				userStore.setUserInfo(userRes.result)
 			}
@@ -159,7 +162,7 @@
 		if (vipRes.vipInfo) {
 			vipInfo.value = vipRes.vipInfo
 		}
-	}
+	}}
 
 	/**
 	 * 跳转到设置页面

pages/user/recharge/index.vue

@@ -9,7 +9,7 @@
 					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
 					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
 					<view class="recharge_money">￥{{item.realMoney}}</view>
-					<view>{{item.money}}{{$t('global.coin')}}</view>
+					<view>{{item.money}}{{$t('order.virtualCoin')}}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>