zm/taimed-international-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenghuan
2025-12-01 16:36:03 +08:00
parent 4b706bb811 23de3944dc
commit cd54ee48de
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/user/points/index.vue
View File

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

6
pages/user/recharge/index.vue
View File

@@ -9,10 +9,10 @@
:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''" :class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId"> v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
<view class="recharge_money">￥{{item.realMoney}}</view> <view class="recharge_money">￥{{item.realMoney}}</view>
<view>{{item.money}}{{ t('global.coin') }}</view> <view>{{item.money}}{{ $t('global.coin') }}</view>
<!-- 红框位置的618活动标签 --> <!-- 红框位置的618活动标签 -->
<!-- <view class="activity-tag">618活动</view> --> <!-- <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> <text class="recharge_give" v-if="item.givejf >0">（赠{{item.givejf}}币）</text>
</view> </view>
</view> </view>
@@ -401,7 +401,7 @@
} }
.recharge_give { .recharge_give {
font-size: 16rpx; font-size: 20rpx;
color: #FF0033; color: #FF0033;
} }
} }