Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app.json
#	pages/personCenter/accountSetting/accountSetting.js
#	pages/personCenter/mine/mine.wxml
This commit is contained in:
2025-05-29 09:02:42 +08:00
36 changed files with 1209 additions and 114 deletions

View File

@ -2,22 +2,23 @@
<view class="flex-col relative section">
<view class="flex-row justify-between items-center group">
<view class="flex-col">
<text class="self-start font text">{{ nickName }}</text>
<text class="self-start font text">qingcheng</text>
<view class="flex-row items-center self-stretch group_2 mt-9">
<image
class="image_3"
src="./images/dianhua.png"
mode="aspectFill"
/>
<text class="font_2 text_2 ml-7">{{ phoneNumber }}</text>
<text class="font_2 text_2 ml-7">15214547473</text>
</view>
<view class="flex-row items-center self-stretch section_2 mt-9">
<text class="font_3 text_3">邀请码123445</text>
<image
class="shrink-0 image_4"
src="./images/fuzhi.png"
mode="aspectFill"
/>
<text class="font_3 text_3">邀请码:{{ invitationCode }}</text>
<text class="font_3 text_3">邀请码:123445</text>
</view>
</view>
<view class="flex-col items-center" bind:tap="erweima">
@ -33,7 +34,7 @@
<view class="flex-row justify-between items-center group_4">
<view class="group_5">
<text class="font_2 text_6">当前金额:</text>
<text class="text_5">¥{{ currentBalance }}</text>
<text class="text_5">¥5.00</text>
</view>
<view class="flex-row items-center section_3" bind:tap="lijitixian">
<image
@ -46,15 +47,15 @@
<view class="flex-row items-start equal-division section_4">
<view class="flex-col items-center equal-division-item_8">
<text class="font_2 text_8">提现中</text>
<text class="font_4 mt-15">¥{{ withdrawalAmount }}</text>
<text class="font_4 mt-15">¥0.00</text>
</view>
<view class="flex-col items-center group_6 equal-division-item">
<text class="font_2 text_9">已提现</text>
<text class="font_4 mt-15">¥{{ withdrawnAmount }}</text>
<text class="font_4 mt-15">¥0.00</text>
</view>
<view class="flex-col items-center group_7 equal-division-item_8">
<text class="font_2 text_10">累计收入</text>
<text class="font_4 mt-15">¥{{ totalIncome }}</text>
<text class="font_4 mt-15">¥0.00</text>
</view>
</view>
</view>

View File

@ -57,14 +57,14 @@
line-height: 17.08rpx;
}
.section_2 {
padding: 10.5rpx 23.13rpx 10.5rpx 14.03rpx;
padding: 10.5rpx 14.03rpx 10.5rpx 14.03rpx;
background-color: #fff6de;
border-radius: 31.26rpx;
}
.image_4 {
margin-left: 169.72rpx;
width: 24.38rpx;
height: 24.38rpx;
margin-left: 10rpx;
}
.font_3 {
font-size: 22.5rpx;
@ -73,8 +73,6 @@
color: #ff8d1a;
}
.text_3 {
margin-left: -194.1rpx;
margin-right: 21.6rpx;
line-height: 20.68rpx;
}
.image_2 {