更新服务器信息为新的 IP 地址，调整相关文档和代码中的默认配置，确保部署和连接的一致性。同时，优化订单管理界面，增强商品信息的格式化逻辑，提升用户体验。
This commit is contained in:
@@ -14,6 +14,7 @@ Page({
|
||||
statusBarHeight: 44,
|
||||
isLoggedIn: false,
|
||||
userInfo: null,
|
||||
isLoading: false, // 加载状态
|
||||
|
||||
// === 核心可见数据 ===
|
||||
bindingCount: 0, // 绑定用户数（当前有效）
|
||||
@@ -23,10 +24,14 @@ Page({
|
||||
expiredCount: 0, // 已过期人数
|
||||
|
||||
// === 收益数据 ===
|
||||
earnings: 0, // 已结算收益
|
||||
pendingEarnings: 0, // 待结算收益
|
||||
totalCommission: 0, // 累计佣金总额（所有获得的佣金）
|
||||
availableEarnings: 0, // 可提现金额（未申请提现的佣金）
|
||||
pendingWithdrawAmount: 0, // 待审核金额（已申请提现但未审核）
|
||||
withdrawnEarnings: 0, // 已提现金额
|
||||
earnings: 0, // 已结算收益（保留兼容）
|
||||
pendingEarnings: 0, // 待结算收益（保留兼容）
|
||||
shareRate: 90, // 分成比例（90%）
|
||||
minWithdrawAmount: 10, // 最低提现金额（从后端获取）
|
||||
|
||||
// === 统计数据 ===
|
||||
referralCount: 0, // 总推荐人数
|
||||
@@ -70,6 +75,9 @@ Page({
|
||||
async initData() {
|
||||
const { isLoggedIn, userInfo } = app.globalData
|
||||
if (isLoggedIn && userInfo) {
|
||||
// 显示加载状态
|
||||
this.setData({ isLoading: true })
|
||||
|
||||
// 生成邀请码
|
||||
const referralCode = userInfo.referralCode || 'SOUL' + (userInfo.id || Date.now().toString(36)).toUpperCase().slice(-6)
|
||||
|
||||
@@ -126,8 +134,11 @@ Page({
|
||||
status: type,
|
||||
daysRemaining: user.daysRemaining || 0,
|
||||
bindingDate: user.bindingDate ? this.formatDate(user.bindingDate) : '--',
|
||||
expiryDate: user.expiryDate ? this.formatDate(user.expiryDate) : '--',
|
||||
commission: (user.commission || 0).toFixed(2),
|
||||
orderAmount: (user.orderAmount || 0).toFixed(2)
|
||||
orderAmount: (user.orderAmount || 0).toFixed(2),
|
||||
purchaseCount: user.purchaseCount || 0,
|
||||
conversionDate: user.conversionDate ? this.formatDate(user.conversionDate) : '--'
|
||||
}
|
||||
console.log('[Referral] 格式化用户:', formatted.nickname, formatted.status, formatted.daysRemaining + '天')
|
||||
return formatted
|
||||
@@ -150,10 +161,14 @@ Page({
|
||||
expiredCount,
|
||||
|
||||
// 收益数据 - 格式化为两位小数
|
||||
totalCommission: formatMoney(realData?.totalCommission || 0),
|
||||
availableEarnings: formatMoney(realData?.availableEarnings || 0),
|
||||
pendingWithdrawAmount: formatMoney(realData?.pendingWithdrawAmount || 0),
|
||||
withdrawnEarnings: formatMoney(realData?.withdrawnEarnings || 0),
|
||||
earnings: formatMoney(realData?.earnings || 0),
|
||||
pendingEarnings: formatMoney(realData?.pendingEarnings || 0),
|
||||
withdrawnEarnings: formatMoney(realData?.withdrawnEarnings || 0),
|
||||
shareRate: realData?.shareRate || 90,
|
||||
minWithdrawAmount: realData?.minWithdrawAmount || 10,
|
||||
|
||||
// 统计
|
||||
referralCount: realData?.referralCount || realData?.stats?.totalBindings || activeBindings.length + convertedBindings.length,
|
||||
@@ -167,19 +182,33 @@ Page({
|
||||
totalBindings: activeBindings.length + convertedBindings.length + expiredBindings.length,
|
||||
|
||||
// 收益明细
|
||||
earningsDetails: (realData?.earningsDetails || []).map(item => ({
|
||||
id: item.id,
|
||||
productType: item.productType,
|
||||
commission: (item.commission || 0).toFixed(2),
|
||||
payTime: item.payTime ? this.formatDate(item.payTime) : '--',
|
||||
buyerNickname: item.buyerNickname
|
||||
}))
|
||||
earningsDetails: (realData?.earningsDetails || []).map(item => {
|
||||
// 解析商品描述，获取书名和章节
|
||||
const productInfo = this.parseProductDescription(item.description, item.productType)
|
||||
|
||||
return {
|
||||
id: item.id,
|
||||
productType: item.productType,
|
||||
bookTitle: productInfo.bookTitle,
|
||||
chapterTitle: productInfo.chapterTitle,
|
||||
commission: (item.commission || 0).toFixed(2),
|
||||
payTime: item.payTime ? this.formatDate(item.payTime) : '--',
|
||||
buyerNickname: item.buyerNickname || '用户',
|
||||
buyerAvatar: item.buyerAvatar
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
console.log('[Referral] ✅ 数据设置完成')
|
||||
console.log('[Referral] - 绑定中:', this.data.bindingCount)
|
||||
console.log('[Referral] - 即将过期:', this.data.expiringCount)
|
||||
console.log('[Referral] - 收益:', this.data.earnings)
|
||||
|
||||
// 隐藏加载状态
|
||||
this.setData({ isLoading: false })
|
||||
} else {
|
||||
// 未登录时也隐藏loading
|
||||
this.setData({ isLoading: false })
|
||||
}
|
||||
},
|
||||
|
||||
@@ -550,23 +579,33 @@ Page({
|
||||
})
|
||||
},
|
||||
|
||||
// 提现 - 直接到微信零钱（无门槛）
|
||||
// 提现 - 直接到微信零钱
|
||||
async handleWithdraw() {
|
||||
const pendingEarnings = parseFloat(this.data.pendingEarnings) || 0
|
||||
const availableEarnings = parseFloat(this.data.availableEarnings) || 0
|
||||
const minWithdrawAmount = this.data.minWithdrawAmount || 10
|
||||
|
||||
if (pendingEarnings <= 0) {
|
||||
if (availableEarnings <= 0) {
|
||||
wx.showToast({ title: '暂无可提现收益', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
// 检查是否达到最低提现金额
|
||||
if (availableEarnings < minWithdrawAmount) {
|
||||
wx.showToast({
|
||||
title: `满${minWithdrawAmount}元可提现`,
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// 确认提现
|
||||
wx.showModal({
|
||||
title: '确认提现',
|
||||
content: `将提现 ¥${pendingEarnings.toFixed(2)} 到您的微信零钱`,
|
||||
content: `将提现 ¥${availableEarnings.toFixed(2)} 到您的微信零钱`,
|
||||
confirmText: '立即提现',
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
await this.doWithdraw(pendingEarnings)
|
||||
await this.doWithdraw(availableEarnings)
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -668,6 +707,32 @@ Page({
|
||||
wx.navigateBack()
|
||||
},
|
||||
|
||||
// 解析商品描述，获取书名和章节
|
||||
parseProductDescription(description, productType) {
|
||||
if (!description) {
|
||||
return {
|
||||
bookTitle: '未知商品',
|
||||
chapterTitle: ''
|
||||
}
|
||||
}
|
||||
|
||||
// 匹配格式：《书名》- 章节名
|
||||
const match = description.match(/《(.+?)》(?:\s*-\s*(.+))?/)
|
||||
|
||||
if (match) {
|
||||
return {
|
||||
bookTitle: match[1] || '未知书籍',
|
||||
chapterTitle: match[2] || (productType === 'fullbook' ? '全书购买' : '')
|
||||
}
|
||||
}
|
||||
|
||||
// 如果匹配失败，直接返回原始描述
|
||||
return {
|
||||
bookTitle: description.split('-')[0] || description,
|
||||
chapterTitle: description.split('-')[1] || ''
|
||||
}
|
||||
},
|
||||
|
||||
// 格式化日期
|
||||
formatDate(dateStr) {
|
||||
if (!dateStr) return '--'
|
||||
|
||||
@@ -18,7 +18,15 @@
|
||||
</view>
|
||||
<view style="height: {{statusBarHeight + 44}}px;"></view>
|
||||
|
||||
<view class="content">
|
||||
<!-- 加载状态 -->
|
||||
<view class="loading-overlay" wx:if="{{isLoading}}">
|
||||
<view class="loading-content">
|
||||
<view class="loading-spinner"></view>
|
||||
<text class="loading-text">加载中...</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="content {{isLoading ? 'content-loading' : ''}}">
|
||||
<!-- 过期提醒横幅 -->
|
||||
<view class="expiring-banner" wx:if="{{expiringCount > 0}}">
|
||||
<view class="banner-icon">
|
||||
@@ -40,17 +48,17 @@
|
||||
<image class="icon-wallet" src="/assets/icons/wallet.svg" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="earnings-info">
|
||||
<text class="earnings-label">累计收益</text>
|
||||
<text class="earnings-label">累计佣金</text>
|
||||
<text class="commission-rate">{{shareRate}}% 返利</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="earnings-right">
|
||||
<text class="earnings-value">¥{{earnings}}</text>
|
||||
<text class="pending-text">待结算: ¥{{pendingEarnings}}</text>
|
||||
<text class="earnings-value">¥{{totalCommission}}</text>
|
||||
<text class="pending-text">待审核: ¥{{pendingWithdrawAmount}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="withdraw-btn {{earnings < 10 ? 'btn-disabled' : ''}}" bindtap="handleWithdraw">
|
||||
{{earnings < 10 ? '满10元可提现' : '申请提现'}}
|
||||
<view class="withdraw-btn {{availableEarnings < minWithdrawAmount ? 'btn-disabled' : ''}}" bindtap="handleWithdraw">
|
||||
{{availableEarnings < minWithdrawAmount ? '满' + minWithdrawAmount + '元可提现' : '申请提现 ¥' + availableEarnings}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -147,11 +155,15 @@
|
||||
<view class="user-status">
|
||||
<block wx:if="{{item.status === 'converted'}}">
|
||||
<text class="status-amount">+¥{{item.commission}}</text>
|
||||
<text class="status-order">订单 ¥{{item.orderAmount}}</text>
|
||||
<text class="status-order">已购{{item.purchaseCount || 1}}次</text>
|
||||
</block>
|
||||
<block wx:elif="{{item.status === 'expired'}}">
|
||||
<text class="status-tag tag-gray">已过期</text>
|
||||
<text class="status-time">{{item.expiryDate}}</text>
|
||||
</block>
|
||||
<block wx:else>
|
||||
<text class="status-tag {{item.daysRemaining <= 3 ? 'tag-red' : item.daysRemaining <= 7 ? 'tag-orange' : 'tag-green'}}">
|
||||
{{item.status === 'expired' ? '已过期' : item.daysRemaining + '天'}}
|
||||
{{item.daysRemaining}}天
|
||||
</text>
|
||||
</block>
|
||||
</view>
|
||||
@@ -197,23 +209,38 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 收益明细 - 移到分享按钮后面 -->
|
||||
<!-- 收益明细 - 增强版 -->
|
||||
<view class="earnings-detail-card" wx:if="{{earningsDetails.length > 0}}">
|
||||
<view class="detail-header">
|
||||
<text class="detail-title">收益明细</text>
|
||||
</view>
|
||||
<view class="detail-list">
|
||||
<view class="detail-item" wx:for="{{earningsDetails}}" wx:key="id">
|
||||
<view class="detail-left">
|
||||
<view class="detail-icon">
|
||||
<image class="icon-gift" src="/assets/icons/gift.svg" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="detail-info">
|
||||
<text class="detail-type">{{item.productType === 'fullbook' ? '整本书购买' : '单节购买'}}</text>
|
||||
<text class="detail-time">{{item.payTime}}</text>
|
||||
<!-- 买家头像 -->
|
||||
<view class="detail-avatar-wrap">
|
||||
<image
|
||||
class="detail-avatar"
|
||||
wx:if="{{item.buyerAvatar}}"
|
||||
src="{{item.buyerAvatar}}"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view class="detail-avatar-text" wx:else>
|
||||
{{item.buyerNickname.charAt(0)}}
|
||||
</view>
|
||||
</view>
|
||||
<text class="detail-amount">+¥{{item.commission}}</text>
|
||||
|
||||
<!-- 详细信息 -->
|
||||
<view class="detail-content">
|
||||
<view class="detail-top">
|
||||
<text class="detail-buyer">{{item.buyerNickname}}</text>
|
||||
<text class="detail-amount">+¥{{item.commission}}</text>
|
||||
</view>
|
||||
<view class="detail-product">
|
||||
<text class="detail-book">{{item.bookTitle}}</text>
|
||||
<text class="detail-chapter" wx:if="{{item.chapterTitle}}"> - {{item.chapterTitle}}</text>
|
||||
</view>
|
||||
<text class="detail-time">{{item.payTime}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -265,7 +292,7 @@
|
||||
<text class="poster-stat-label">好友优惠</text>
|
||||
</view>
|
||||
<view class="poster-stat">
|
||||
<text class="poster-stat-value poster-stat-pink">90%</text>
|
||||
<text class="poster-stat-value poster-stat-pink">{{shareRate}}%</text>
|
||||
<text class="poster-stat-label">你的收益</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -216,3 +216,149 @@
|
||||
.empty-gift-icon { width: 64rpx; height: 64rpx; display: block; filter: brightness(0) saturate(100%) invert(60%) sepia(0%) saturate(0%) hue-rotate(0deg) brightness(95%) contrast(85%); }
|
||||
.empty-title { font-size: 30rpx; font-weight: 500; color: #fff; display: block; margin-bottom: 16rpx; }
|
||||
.empty-desc { font-size: 26rpx; color: rgba(255,255,255,0.6); display: block; line-height: 1.5; }
|
||||
|
||||
|
||||
|
||||
|
||||
/ * = = = = = T<><54>rGm<18>5<EFBFBD><35> ? = = = = = * /
|
||||
|
||||
. l o a d i n g - o v e r l a y {
|
||||
|
||||
p o s i t i o n : f i x e d ;
|
||||
|
||||
t o p : 0 ;
|
||||
|
||||
l e f t : 0 ;
|
||||
|
||||
r i g h t : 0 ;
|
||||
|
||||
b o t t o m : 0 ;
|
||||
|
||||
b a c k g r o u n d : r g b a ( 0 , 0 , 0 , 0 . 7 ) ;
|
||||
|
||||
b a c k d r o p - f i l t e r : b l u r ( 1 0 r p x ) ;
|
||||
|
||||
z - i n d e x : 9 9 9 ;
|
||||
|
||||
d i s p l a y : f l e x ;
|
||||
|
||||
a l i g n - i t e m s : c e n t e r ;
|
||||
|
||||
j u s t i f y - c o n t e n t : c e n t e r ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. l o a d i n g - c o n t e n t {
|
||||
|
||||
d i s p l a y : f l e x ;
|
||||
|
||||
f l e x - d i r e c t i o n : c o l u m n ;
|
||||
|
||||
a l i g n - i t e m s : c e n t e r ;
|
||||
|
||||
g a p : 2 4 r p x ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. l o a d i n g - s p i n n e r {
|
||||
|
||||
w i d t h : 8 0 r p x ;
|
||||
|
||||
h e i g h t : 8 0 r p x ;
|
||||
|
||||
b o r d e r : 6 r p x s o l i d r g b a ( 5 6 , 1 8 9 , 1 7 2 , 0 . 2 ) ;
|
||||
|
||||
b o r d e r - t o p - c o l o r : # 3 8 b d a c ;
|
||||
|
||||
b o r d e r - r a d i u s : 5 0 % ;
|
||||
|
||||
a n i m a t i o n : s p i n 1 s l i n e a r i n f i n i t e ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ k e y f r a m e s s p i n {
|
||||
|
||||
0 % { t r a n s f o r m : r o t a t e ( 0 d e g ) ; }
|
||||
|
||||
1 0 0 % { t r a n s f o r m : r o t a t e ( 3 6 0 d e g ) ; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. l o a d i n g - t e x t {
|
||||
|
||||
f o n t - s i z e : 2 8 r p x ;
|
||||
|
||||
c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 8 ) ;
|
||||
|
||||
f o n t - w e i g h t : 5 0 0 ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. c o n t e n t - l o a d i n g {
|
||||
|
||||
o p a c i t y : 0 . 3 ;
|
||||
|
||||
p o i n t e r - e v e n t s : n o n e ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/ * = = = = = <00><>AR<41>lē<6C>^<5E>|<7C>o<EFBFBD>p<EFBFBD>]͓<>\!} = = = = = * /
|
||||
|
||||
. d e t a i l - i t e m {
|
||||
|
||||
d i s p l a y : f l e x ;
|
||||
|
||||
a l i g n - i t e m s : c e n t e r ;
|
||||
|
||||
g a p : 2 4 r p x ;
|
||||
|
||||
p a d d i n g : 2 4 r p x ;
|
||||
|
||||
b a c k g r o u n d : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 0 2 ) ;
|
||||
|
||||
b o r d e r - r a d i u s : 1 6 r p x ;
|
||||
|
||||
m a r g i n - b o t t o m : 1 6 r p x ;
|
||||
|
||||
t r a n s i t i o n : a l l 0 . 3 s ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. d e t a i l - i t e m : a c t i v e {
|
||||
|
||||
b a c k g r o u n d : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 0 5 ) ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. d e t a i l - a v a t a r - w r a p {
|
||||
|
||||
f l e x - s h r i n k : 0 ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
. d e t a i l - a v a t a r {
|
||||
|
||||
w i d t h : 8 8 r p x ;
|
||||
|
||||
h e i g h t : 8 8 r p x ;
|
||||
|
||||
b o r d e r - r a d i u s : 5 0 % ;
|
||||
|
||||
Reference in New Issue
Block a user