Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

pages/user/points/index.vue

@@ -11,8 +11,9 @@
 			</view>
 			<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
 			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
-				<view class="recharge-record-block-row">{{item.orderType}}<text class="text">{{item.changeAmount}}</text></view>
+				<view class="recharge-record-block-row">{{item.remark.slice(0, (item.remark.indexOf(',')))}}<text :class="item.actType === 1 ? 'text1' : 'text2'" >{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text></view>
 				<view class="time">{{item.createTime}}</view>
+				<view>{{item.remark.slice((item.remark.indexOf(','))+1)}}</view>
 			</view>
 		</view>
 	</z-paging>
@@ -40,7 +41,7 @@
 		try {
 			const res = await getPointsData(pageNo, pageSize, userId)
 			console.log(res, 'res');
-			paging.value.complete(res.transactionDetailsList.records)
+			paging.value.complete(res.transactionDetailsList)
 		} catch (error) {
 			paging.value.complete(false)
 			console.error('Failed to load book list:', error)
@@ -98,6 +99,7 @@
 				
 				.time{
 					font-size: 20rpx;
+					margin-bottom: 20rpx;
 				}
 
 				.recharge-record-block-row {
@@ -105,8 +107,11 @@
 					justify-content: space-between;
 					margin-bottom: 20rpx;
 					
-					.text{
-						color: #007bff;
+					.text1{
+						color: #ff0000;
+					}
+					.text2{
+						color: #00ff00;
 					}
 				}
 			}

pages/user/recharge/index.vue

@@ -9,10 +9,10 @@
 					: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('global.coin') }}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
-					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>
+					<span class="activity-label" v-if="item.givejf >0">{{item.description}}</span>
 					<text class="recharge_give" v-if="item.givejf >0">（赠{{item.givejf}}币）</text>
 				</view>
 			</view>
@@ -401,7 +401,7 @@
 			}
 
 			.recharge_give {
-				font-size: 16rpx;
+				font-size: 20rpx;
 				color: #FF0033;
 			}
 		}