更新开发配置，调整项目路径以支持新环境。同时，优化提现管理API，增强安全性和错误处理逻辑，确保数据一致性和用户体验。重构数据库查询逻辑，提升性能和可维护性。
This commit is contained in:
乘风
@@ -1,48 +1,45 @@
|
|||||||
/**
|
/**
|
||||||
* 后台提现管理 API - SQL 调试版
|
* 后台提现 API
|
||||||
|
* GET: 查提现记录。PUT: 查库 + 更新提现状态 + 更新用户已提现金额（当前未接入微信打款）
|
||||||
*/
|
*/
|
||||||
import { NextResponse } from 'next/server'
|
import { NextResponse } from 'next/server'
|
||||||
import { query } from '@/lib/db'
|
import { query } from '@/lib/db'
|
||||||
import { requireAdminResponse } from '@/lib/admin-auth'
|
import { requireAdminResponse } from '@/lib/admin-auth'
|
||||||
|
|
||||||
|
/** 安全转数组，避免 undefined.length；绝不返回 undefined */
|
||||||
|
function toArray<T = any>(x: unknown): T[] {
|
||||||
|
if (x == null) return []
|
||||||
|
if (Array.isArray(x)) return x as T[]
|
||||||
|
if (typeof x === 'object' && x !== null) return [x] as T[]
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 安全取数组长度，避免对 undefined 读 .length */
|
||||||
|
function safeLength(x: unknown): number {
|
||||||
|
if (x == null) return 0
|
||||||
|
if (Array.isArray(x)) return x.length
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// ========== GET：只查提现记录 ==========
|
||||||
export async function GET(request: Request) {
|
export async function GET(request: Request) {
|
||||||
console.log('[Withdrawals Debug] ===== SQL Query Version Started =====')
|
console.log('[Withdrawals] GET 开始')
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 1. 权限检查
|
|
||||||
console.log('[Withdrawals Debug] 1. Checking Auth')
|
|
||||||
const authErr = requireAdminResponse(request)
|
const authErr = requireAdminResponse(request)
|
||||||
if (authErr) {
|
if (authErr) return authErr
|
||||||
console.log('[Withdrawals Debug] Auth Failed')
|
|
||||||
return authErr
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. 执行 SQL
|
|
||||||
console.log('[Withdrawals Debug] 2. Executing SQL Join')
|
|
||||||
const sql = `
|
const sql = `
|
||||||
SELECT
|
SELECT
|
||||||
w.id,
|
w.id, w.user_id, w.amount, w.status, w.created_at,
|
||||||
w.user_id,
|
u.nickname as user_nickname, u.avatar as user_avatar
|
||||||
w.amount,
|
|
||||||
w.status,
|
|
||||||
w.created_at,
|
|
||||||
u.nickname as user_nickname,
|
|
||||||
u.avatar as user_avatar
|
|
||||||
FROM withdrawals w
|
FROM withdrawals w
|
||||||
LEFT JOIN users u ON w.user_id = u.id
|
LEFT JOIN users u ON w.user_id = u.id
|
||||||
ORDER BY w.created_at DESC
|
ORDER BY w.created_at DESC
|
||||||
LIMIT 100
|
LIMIT 100
|
||||||
`
|
`
|
||||||
|
|
||||||
const result = await query(sql)
|
const result = await query(sql)
|
||||||
console.log('[Withdrawals Debug] result type:', typeof result)
|
const rows = toArray(result)
|
||||||
console.log('[Withdrawals Debug] is array:', Array.isArray(result))
|
|
||||||
|
|
||||||
// 3. 安全转数组
|
|
||||||
const rows = Array.isArray(result) ? result : (result ? [result] : [])
|
|
||||||
console.log('[Withdrawals Debug] count after safety conversion:', rows.length)
|
|
||||||
|
|
||||||
// 4. 映射字段 (对应前端需要的 user_name, amount, status)
|
|
||||||
const withdrawals = rows.map((w: any) => ({
|
const withdrawals = rows.map((w: any) => ({
|
||||||
id: w.id,
|
id: w.id,
|
||||||
user_id: w.user_id,
|
user_id: w.user_id,
|
||||||
@@ -51,134 +48,95 @@ export async function GET(request: Request) {
|
|||||||
amount: parseFloat(w.amount) || 0,
|
amount: parseFloat(w.amount) || 0,
|
||||||
status: w.status === 'success' ? 'completed' : (w.status === 'failed' ? 'rejected' : w.status),
|
status: w.status === 'success' ? 'completed' : (w.status === 'failed' ? 'rejected' : w.status),
|
||||||
created_at: w.created_at,
|
created_at: w.created_at,
|
||||||
method: 'wechat' // 默认值
|
method: 'wechat',
|
||||||
}))
|
}))
|
||||||
|
|
||||||
console.log('[Withdrawals Debug] 3. Success, returning rows:', withdrawals.length)
|
|
||||||
return NextResponse.json({
|
return NextResponse.json({
|
||||||
success: true,
|
success: true,
|
||||||
withdrawals,
|
withdrawals,
|
||||||
stats: { total: withdrawals.length }
|
stats: { total: safeLength(withdrawals) },
|
||||||
})
|
})
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error('[Withdrawals Debug] !!! SQL Version Crashed !!!')
|
console.error('[Withdrawals] GET 失败:', error?.message)
|
||||||
console.error('[Withdrawals Debug] Error Msg:', error.message)
|
|
||||||
|
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
{
|
{ success: false, error: '获取提现记录失败: ' + (error?.message || String(error)) },
|
||||||
success: false,
|
|
||||||
error: 'SQL版崩溃: ' + error.message,
|
|
||||||
stack: error.stack
|
|
||||||
},
|
|
||||||
{ status: 500 }
|
{ status: 500 }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ========== PUT：查库 + 更新状态 + 更新用户已提现，暂不调用微信打款 ==========
|
||||||
export async function PUT(request: Request) {
|
export async function PUT(request: Request) {
|
||||||
const authErr = requireAdminResponse(request)
|
const STEP = '[Withdrawals PUT]'
|
||||||
if (authErr) return authErr
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
console.log(STEP, '1. 开始')
|
||||||
|
const authErr = requireAdminResponse(request)
|
||||||
|
if (authErr) return authErr
|
||||||
|
console.log(STEP, '2. 鉴权通过')
|
||||||
|
|
||||||
const body = await request.json()
|
const body = await request.json()
|
||||||
const { id, action, errorMessage, reason } = body
|
console.log(STEP, '3. body 已解析', typeof body, body ? 'ok' : 'null')
|
||||||
const rejectReason = errorMessage || reason || '管理员拒绝'
|
const id = body?.id
|
||||||
|
const action = body?.action
|
||||||
|
const rejectReason = body?.errorMessage || body?.reason || '管理员拒绝'
|
||||||
|
|
||||||
if (!id || !action) {
|
if (!id || !action) {
|
||||||
return NextResponse.json({ success: false, error: '缺少参数 id 或 action' }, { status: 400 })
|
return NextResponse.json({ success: false, error: '缺少 id 或 action' }, { status: 400 })
|
||||||
}
|
}
|
||||||
|
console.log(STEP, '4. id/action 有效', id, action)
|
||||||
|
|
||||||
// 1. 查询该提现单
|
console.log(STEP, '5. 即将 query SELECT')
|
||||||
const result = await query(`SELECT * FROM withdrawals WHERE id = ?`, [id])
|
const result = await query('SELECT * FROM withdrawals WHERE id = ?', [id])
|
||||||
|
console.log(STEP, '6. query 返回', typeof result, 'length=', safeLength(result))
|
||||||
const rows = toArray<any>(result)
|
const rows = toArray<any>(result)
|
||||||
|
console.log(STEP, '7. toArray 后 length=', safeLength(rows))
|
||||||
if (rows.length === 0) {
|
if (safeLength(rows) === 0) {
|
||||||
return NextResponse.json({ success: false, error: '提现记录不存在' }, { status: 404 })
|
return NextResponse.json({ success: false, error: '提现记录不存在' }, { status: 404 })
|
||||||
}
|
}
|
||||||
|
console.log(STEP, '8. 有记录')
|
||||||
|
|
||||||
const withdrawal = rows[0]
|
const row = rows[0]
|
||||||
if (withdrawal.status !== 'pending') {
|
console.log(STEP, '9. row', row ? 'ok' : 'null')
|
||||||
|
if (row.status !== 'pending') {
|
||||||
return NextResponse.json({ success: false, error: '该记录已处理，不可重复审批' }, { status: 400 })
|
return NextResponse.json({ success: false, error: '该记录已处理，不可重复审批' }, { status: 400 })
|
||||||
}
|
}
|
||||||
|
console.log(STEP, '10. 状态 pending')
|
||||||
|
|
||||||
const amount = parseFloat(withdrawal.amount) || 0
|
const amount = parseFloat(String(row.amount ?? 0)) || 0
|
||||||
const userId = withdrawal.user_id
|
const userId = String(row.user_id ?? '')
|
||||||
const openid = withdrawal.wechat_openid
|
console.log(STEP, '11. amount/userId', amount, userId)
|
||||||
|
|
||||||
if (action === 'approve') {
|
if (action === 'approve') {
|
||||||
// --- 真正的微信打款逻辑 ---
|
console.log(STEP, '12. 执行 approve UPDATE withdrawals')
|
||||||
|
|
||||||
if (openid && amount > 0) {
|
|
||||||
console.log(`[Withdrawals] 准备发起微信转账: OpenID=${openid}, 金额=${amount}`)
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 1. 调用微信转账接口 (单位为分)
|
|
||||||
const transferResult = await createTransfer({
|
|
||||||
openid: openid,
|
|
||||||
amountFen: Math.round(amount * 100),
|
|
||||||
outDetailNo: id,
|
|
||||||
transferRemark: '佣金提现',
|
|
||||||
})
|
|
||||||
|
|
||||||
if (transferResult.success) {
|
|
||||||
// 2. 微信转账发起成功 (状态可能为 processing 或 success)
|
|
||||||
// 更新提现表，记录微信返回的单号
|
|
||||||
await query(
|
|
||||||
`UPDATE withdrawals SET status = 'processing', transaction_id = ? WHERE id = ?`,
|
|
||||||
[transferResult.batchId || transferResult.outBatchNo || `wx_${Date.now()}`, id]
|
|
||||||
)
|
|
||||||
|
|
||||||
return NextResponse.json({
|
|
||||||
success: true,
|
|
||||||
message: '微信转账已发起，请稍后在零钱查看'
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
// 微信接口返回明确失败
|
|
||||||
console.error('[Withdrawals] 微信转账失败:', transferResult.errorMessage)
|
|
||||||
return NextResponse.json({
|
|
||||||
success: false,
|
|
||||||
error: `微信转账失败: ${transferResult.errorMessage || '请检查微信支付商户后台'}`
|
|
||||||
}, { status: 400 })
|
|
||||||
}
|
|
||||||
} catch (transferErr: any) {
|
|
||||||
console.error('[Withdrawals] 调用微信接口异常:', transferErr)
|
|
||||||
return NextResponse.json({
|
|
||||||
success: false,
|
|
||||||
error: '调用微信支付接口异常，请检查证书配置'
|
|
||||||
}, { status: 500 })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- 如果没有 OpenID，回退到线下手动打款逻辑 ---
|
|
||||||
await query(
|
await query(
|
||||||
`UPDATE withdrawals SET status = 'success', processed_at = NOW(), transaction_id = ? WHERE id = ?`,
|
`UPDATE withdrawals SET status = 'success', processed_at = NOW(), transaction_id = ? WHERE id = ?`,
|
||||||
[`manual_${Date.now()}`, id]
|
[`manual_${Date.now()}`, id]
|
||||||
)
|
)
|
||||||
|
console.log(STEP, '13. 执行 approve UPDATE users')
|
||||||
await query(
|
await query(
|
||||||
`UPDATE users SET withdrawn_earnings = COALESCE(withdrawn_earnings, 0) + ? WHERE id = ?`,
|
`UPDATE users SET withdrawn_earnings = COALESCE(withdrawn_earnings, 0) + ? WHERE id = ?`,
|
||||||
[amount, userId]
|
[amount, userId]
|
||||||
)
|
)
|
||||||
return NextResponse.json({ success: true, message: 'OpenID缺失，已标记为线下手动打款' })
|
console.log(STEP, '14. 批准完成')
|
||||||
|
return NextResponse.json({ success: true, message: '已批准，已更新提现状态与用户已提现金额（未发起微信打款）' })
|
||||||
}
|
}
|
||||||
|
|
||||||
if (action === 'reject') {
|
if (action === 'reject') {
|
||||||
// --- 拒绝逻辑 ---
|
console.log(STEP, '15. 执行 reject UPDATE')
|
||||||
await query(
|
await query(
|
||||||
`UPDATE withdrawals SET status = 'failed', processed_at = NOW(), error_message = ? WHERE id = ?`,
|
`UPDATE withdrawals SET status = 'failed', processed_at = NOW(), error_message = ? WHERE id = ?`,
|
||||||
[rejectReason, id]
|
[rejectReason, id]
|
||||||
)
|
)
|
||||||
|
console.log(STEP, '16. 拒绝完成')
|
||||||
console.log(`[Withdrawals] 提现拒绝: ID=${id}, 原因=${rejectReason}`)
|
|
||||||
return NextResponse.json({ success: true, message: '已拒绝该提现申请' })
|
return NextResponse.json({ success: true, message: '已拒绝该提现申请' })
|
||||||
}
|
}
|
||||||
|
|
||||||
return NextResponse.json({ success: false, error: '无效的 action 类型' }, { status: 400 })
|
return NextResponse.json({ success: false, error: '无效的 action' }, { status: 400 })
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error('[Withdrawals] PUT 处理失败:', error.message)
|
console.error(STEP, '!!! 崩溃 !!!', error?.message)
|
||||||
|
console.error(STEP, '堆栈:', error?.stack)
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
{ success: false, error: '审批操作失败: ' + error.message },
|
{ success: false, error: '审批操作失败: ' + (error?.message || String(error)) },
|
||||||
{ status: 500 }
|
{ status: 500 }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ except ImportError:
|
|||||||
# 端口统一从环境变量 DEPLOY_PORT 读取，未设置时使用此默认值（需与 Nginx proxy_pass、ecosystem.config.cjs 一致）
|
# 端口统一从环境变量 DEPLOY_PORT 读取，未设置时使用此默认值（需与 Nginx proxy_pass、ecosystem.config.cjs 一致）
|
||||||
DEPLOY_PM2_APP = "soul"
|
DEPLOY_PM2_APP = "soul"
|
||||||
DEFAULT_DEPLOY_PORT = 3006
|
DEFAULT_DEPLOY_PORT = 3006
|
||||||
DEPLOY_PROJECT_PATH = "/www/wwwroot/soul"
|
DEPLOY_PROJECT_PATH = "/www/wwwroot/自营/soul"
|
||||||
DEPLOY_SITE_URL = "https://soul.quwanzhi.com"
|
DEPLOY_SITE_URL = "https://soul.quwanzhi.com"
|
||||||
# SSH 端口（支持环境变量 DEPLOY_SSH_PORT，未设置时默认为 22022）
|
# SSH 端口（支持环境变量 DEPLOY_SSH_PORT，未设置时默认为 22022）
|
||||||
DEFAULT_SSH_PORT = int(os.environ.get("DEPLOY_SSH_PORT", "22022"))
|
DEFAULT_SSH_PORT = int(os.environ.get("DEPLOY_SSH_PORT", "22022"))
|
||||||
@@ -65,7 +65,7 @@ def get_cfg_devlop():
|
|||||||
实际运行目录为 dist_path（切换后新版本在 dist），宝塔 PM2 项目路径必须指向 dist_path，
|
实际运行目录为 dist_path（切换后新版本在 dist），宝塔 PM2 项目路径必须指向 dist_path，
|
||||||
否则会从错误目录启动导致 .next/static 等静态资源 404。"""
|
否则会从错误目录启动导致 .next/static 等静态资源 404。"""
|
||||||
cfg = get_cfg().copy()
|
cfg = get_cfg().copy()
|
||||||
cfg["base_path"] = os.environ.get("DEVOP_BASE_PATH", "/www/wwwroot/soul")
|
cfg["base_path"] = os.environ.get("DEVOP_BASE_PATH", DEPLOY_PROJECT_PATH)
|
||||||
cfg["dist_path"] = cfg["base_path"] + "/dist"
|
cfg["dist_path"] = cfg["base_path"] + "/dist"
|
||||||
cfg["dist2_path"] = cfg["base_path"] + "/dist2"
|
cfg["dist2_path"] = cfg["base_path"] + "/dist2"
|
||||||
return cfg
|
return cfg
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ export function verifyAdminToken(token: string | null | undefined): boolean {
|
|||||||
const exp = parseInt(payload, 10)
|
const exp = parseInt(payload, 10)
|
||||||
if (Number.isNaN(exp) || exp < Math.floor(Date.now() / 1000)) return false
|
if (Number.isNaN(exp) || exp < Math.floor(Date.now() / 1000)) return false
|
||||||
const expected = sign(payload)
|
const expected = sign(payload)
|
||||||
|
if (typeof expected !== 'string' || typeof sig !== 'string') return false
|
||||||
if (sig.length !== expected.length) return false
|
if (sig.length !== expected.length) return false
|
||||||
try {
|
try {
|
||||||
return timingSafeEqual(Buffer.from(sig, 'base64url'), Buffer.from(expected, 'base64url'))
|
return timingSafeEqual(Buffer.from(sig, 'base64url'), Buffer.from(expected, 'base64url'))
|
||||||
|
|||||||
@@ -61,8 +61,12 @@ export async function query(sql: string, params?: any[]) {
|
|||||||
if (!connection) {
|
if (!connection) {
|
||||||
throw new Error('数据库未配置或已跳过 (SKIP_DB)')
|
throw new Error('数据库未配置或已跳过 (SKIP_DB)')
|
||||||
}
|
}
|
||||||
|
// mysql2 内部会读 params.length，不能传 undefined
|
||||||
|
const safeParams = Array.isArray(params) ? params : []
|
||||||
|
console.log('[DB Query] SQL:', sql.slice(0, 100))
|
||||||
|
console.log('[DB Query] Params Type:', typeof params, '| Is Array:', Array.isArray(params), '| safeParams:', safeParams)
|
||||||
try {
|
try {
|
||||||
const [results] = await connection.execute(sql, params)
|
const [results] = await connection.execute(sql, safeParams)
|
||||||
// 确保调用方拿到的始终是数组，避免 undefined.length 报错
|
// 确保调用方拿到的始终是数组，避免 undefined.length 报错
|
||||||
if (Array.isArray(results)) return results
|
if (Array.isArray(results)) return results
|
||||||
if (results != null) return [results]
|
if (results != null) return [results]
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ Page({
|
|||||||
|
|
||||||
// 初始化用户状态
|
// 初始化用户状态
|
||||||
initUserStatus() {
|
initUserStatus() {
|
||||||
const { isLoggedIn, userInfo, hasFullBook, purchasedSections } = app.globalData
|
const { isLoggedIn, userInfo } = app.globalData
|
||||||
|
|
||||||
if (isLoggedIn && userInfo) {
|
if (isLoggedIn && userInfo) {
|
||||||
const readIds = app.globalData.readSectionIds || []
|
const readIds = app.globalData.readSectionIds || []
|
||||||
@@ -107,17 +107,11 @@ Page({
|
|||||||
title: `章节 ${id}`
|
title: `章节 ${id}`
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// 截短用户ID显示
|
|
||||||
const userId = userInfo.id || ''
|
const userId = userInfo.id || ''
|
||||||
const userIdShort = userId.length > 20 ? userId.slice(0, 10) + '...' + userId.slice(-6) : userId
|
const userIdShort = userId.length > 20 ? userId.slice(0, 10) + '...' + userId.slice(-6) : userId
|
||||||
|
|
||||||
// 获取微信号（优先显示）
|
|
||||||
const userWechat = wx.getStorageSync('user_wechat') || userInfo.wechat || ''
|
const userWechat = wx.getStorageSync('user_wechat') || userInfo.wechat || ''
|
||||||
|
|
||||||
// 格式化收益金额（保留两位小数）
|
// 先设基础信息；收益数据由 loadReferralEarnings 从推广中心同源接口拉取并覆盖
|
||||||
const earnings = Number(userInfo.earnings || 0)
|
|
||||||
const pendingEarnings = Number(userInfo.pendingEarnings || 0)
|
|
||||||
|
|
||||||
this.setData({
|
this.setData({
|
||||||
isLoggedIn: true,
|
isLoggedIn: true,
|
||||||
userInfo,
|
userInfo,
|
||||||
@@ -125,11 +119,12 @@ Page({
|
|||||||
userWechat,
|
userWechat,
|
||||||
readCount: Math.min(app.getReadCount(), this.data.totalSections || 62),
|
readCount: Math.min(app.getReadCount(), this.data.totalSections || 62),
|
||||||
referralCount: userInfo.referralCount || 0,
|
referralCount: userInfo.referralCount || 0,
|
||||||
earnings: earnings.toFixed(2),
|
earnings: '0.00',
|
||||||
pendingEarnings: pendingEarnings.toFixed(2),
|
pendingEarnings: '0.00',
|
||||||
recentChapters: recentList,
|
recentChapters: recentList,
|
||||||
totalReadTime: Math.floor(Math.random() * 200) + 50
|
totalReadTime: Math.floor(Math.random() * 200) + 50
|
||||||
})
|
})
|
||||||
|
this.loadReferralEarnings()
|
||||||
} else {
|
} else {
|
||||||
this.setData({
|
this.setData({
|
||||||
isLoggedIn: false,
|
isLoggedIn: false,
|
||||||
@@ -144,6 +139,33 @@ Page({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// 从与推广中心相同的接口拉取收益数据并更新展示（累计收益 = totalCommission，可提现 = 累计-已提现-待审核）
|
||||||
|
async loadReferralEarnings() {
|
||||||
|
const userInfo = app.globalData.userInfo
|
||||||
|
if (!app.globalData.isLoggedIn || !userInfo || !userInfo.id) return
|
||||||
|
|
||||||
|
const formatMoney = (num) => (typeof num === 'number' ? num.toFixed(2) : '0.00')
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await app.request('/api/referral/data?userId=' + userInfo.id)
|
||||||
|
if (!res || !res.success || !res.data) return
|
||||||
|
|
||||||
|
const d = res.data
|
||||||
|
const totalCommissionNum = d.totalCommission || 0
|
||||||
|
const withdrawnNum = d.withdrawnEarnings || 0
|
||||||
|
const pendingWithdrawNum = d.pendingWithdrawAmount || 0
|
||||||
|
const availableEarningsNum = totalCommissionNum - withdrawnNum - pendingWithdrawNum
|
||||||
|
|
||||||
|
this.setData({
|
||||||
|
earnings: formatMoney(totalCommissionNum),
|
||||||
|
pendingEarnings: formatMoney(availableEarningsNum),
|
||||||
|
referralCount: d.referralCount || d.stats?.totalBindings || this.data.referralCount
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
console.log('[My] 拉取推广收益失败:', e && e.message)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
// 微信原生获取头像（button open-type="chooseAvatar" 回调）
|
// 微信原生获取头像（button open-type="chooseAvatar" 回调）
|
||||||
async onChooseAvatar(e) {
|
async onChooseAvatar(e) {
|
||||||
const tempAvatarUrl = e.detail.avatarUrl
|
const tempAvatarUrl = e.detail.avatarUrl
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
<text class="stat-label">推荐好友</text>
|
<text class="stat-label">推荐好友</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="stat-item">
|
<view class="stat-item">
|
||||||
<text class="stat-value gold-color">{{earnings > 0 ? '¥' + earnings : '--'}}</text>
|
<text class="stat-value gold-color">{{pendingEarnings > 0 ? '¥' + pendingEarnings : '--'}}</text>
|
||||||
<text class="stat-label">待领收益</text>
|
<text class="stat-label">待领收益</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -241,309 +241,60 @@
|
|||||||
.empty-title { font-size: 30rpx; font-weight: 500; color: #fff; display: block; margin-bottom: 16rpx; }
|
.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; }
|
.empty-desc { font-size: 26rpx; color: rgba(255,255,255,0.6); display: block; line-height: 1.5; }
|
||||||
|
|
||||||
|
|
||||||
|
/* ===== Loading 遮罩（备用） ===== */
|
||||||
|
.loading-overlay {
|
||||||
/ * = = = = = T??rGm?5?? ? = = = = = * /
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
. l o a d i n g - o v e r l a y {
|
left: 0;
|
||||||
|
right: 0;
|
||||||
p o s i t i o n : f i x e d ;
|
bottom: 0;
|
||||||
|
background: rgba(0,0,0,0.7);
|
||||||
t o p : 0 ;
|
backdrop-filter: blur(10rpx);
|
||||||
|
z-index: 999;
|
||||||
l e f t : 0 ;
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
r i g h t : 0 ;
|
justify-content: center;
|
||||||
|
}
|
||||||
b o t t o m : 0 ;
|
.loading-content {
|
||||||
|
display: flex;
|
||||||
b a c k g r o u n d : r g b a ( 0 , 0 , 0 , 0 . 7 ) ;
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
b a c k d r o p - f i l t e r : b l u r ( 1 0 r p x ) ;
|
gap: 24rpx;
|
||||||
|
}
|
||||||
z - i n d e x : 9 9 9 ;
|
.loading-spinner {
|
||||||
|
width: 80rpx;
|
||||||
d i s p l a y : f l e x ;
|
height: 80rpx;
|
||||||
|
border: 6rpx solid rgba(56,189,172,0.2);
|
||||||
a l i g n - i t e m s : c e n t e r ;
|
border-top-color: #38bdac;
|
||||||
|
border-radius: 50%;
|
||||||
j u s t i f y - c o n t e n t : c e n t e r ;
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
}
|
@keyframes spin {
|
||||||
|
0% { transform: rotate(0deg); }
|
||||||
|
100% { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
. l o a d i n g - c o n t e n t {
|
.loading-text {
|
||||||
|
font-size: 28rpx;
|
||||||
d i s p l a y : f l e x ;
|
color: rgba(255,255,255,0.8);
|
||||||
|
font-weight: 500;
|
||||||
f l e x - d i r e c t i o n : c o l u m n ;
|
}
|
||||||
|
.content-loading {
|
||||||
a l i g n - i t e m s : c e n t e r ;
|
opacity: 0.3;
|
||||||
|
pointer-events: none;
|
||||||
g a p : 2 4 r p x ;
|
}
|
||||||
|
|
||||||
}
|
/* ===== 收益明细独立块 ===== */
|
||||||
|
.detail-item { display: flex; align-items: center; gap: 24rpx; padding: 24rpx; background: rgba(255,255,255,0.02); border-radius: 16rpx; margin-bottom: 16rpx; transition: all 0.3s; }
|
||||||
|
.detail-item:active { background: rgba(255,255,255,0.05); }
|
||||||
|
.detail-avatar-wrap { flex-shrink: 0; }
|
||||||
. l o a d i n g - s p i n n e r {
|
.detail-avatar { width: 88rpx; height: 88rpx; border-radius: 50%; border: 2rpx solid rgba(56,189,172,0.2); }
|
||||||
|
.detail-avatar-text { width: 88rpx; height: 88rpx; border-radius: 50%; background: linear-gradient(135deg, #38bdac 0%, #2da396 100%); display: flex; align-items: center; justify-content: center; font-size: 36rpx; font-weight: 700; color: #ffffff; }
|
||||||
w i d t h : 8 0 r p x ;
|
.detail-content { flex: 1; display: flex; flex-direction: column; gap: 8rpx; min-width: 0; }
|
||||||
|
.detail-top { display: flex; align-items: center; justify-content: space-between; gap: 16rpx; }
|
||||||
h e i g h t : 8 0 r p x ;
|
.detail-buyer { font-size: 28rpx; font-weight: 500; color: #ffffff; flex-shrink: 0; }
|
||||||
|
.detail-amount { font-size: 32rpx; font-weight: 700; color: #38bdac; flex-shrink: 0; }
|
||||||
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 ) ;
|
.detail-product { display: flex; align-items: center; font-size: 24rpx; color: rgba(255,255,255,0.6); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.detail-book { color: rgba(255,255,255,0.7); font-weight: 500; }
|
||||||
b o r d e r - t o p - c o l o r : # 3 8 b d a c ;
|
.detail-chapter { color: rgba(255,255,255,0.5); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.detail-time { font-size: 22rpx; color: rgba(255,255,255,0.4); }
|
||||||
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 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/ * = = = = = ??AR?l??^?|?o?p?]??\!} = = = = = * /
|
|
||||||
|
|
||||||
. 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 % ;
|
|
||||||
|
|
||||||
b o r d e r : 2 r p x s o l i d r g b a ( 5 6 , 1 8 9 , 1 7 2 , 0 . 2 ) ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - a v a t a r - t e x t {
|
|
||||||
|
|
||||||
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 % ;
|
|
||||||
|
|
||||||
b a c k g r o u n d : l i n e a r - g r a d i e n t ( 1 3 5 d e g , # 3 8 b d a c 0 % , # 2 d a 3 9 6 1 0 0 % ) ;
|
|
||||||
|
|
||||||
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 ;
|
|
||||||
|
|
||||||
f o n t - s i z e : 3 6 r p x ;
|
|
||||||
|
|
||||||
f o n t - w e i g h t : 7 0 0 ;
|
|
||||||
|
|
||||||
c o l o r : # f f f f f f ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - c o n t e n t {
|
|
||||||
|
|
||||||
f l e x : 1 ;
|
|
||||||
|
|
||||||
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 ;
|
|
||||||
|
|
||||||
g a p : 8 r p x ;
|
|
||||||
|
|
||||||
m i n - w i d t h : 0 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - t o p {
|
|
||||||
|
|
||||||
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 : s p a c e - b e t w e e n ;
|
|
||||||
|
|
||||||
g a p : 1 6 r p x ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - b u y e r {
|
|
||||||
|
|
||||||
f o n t - s i z e : 2 8 r p x ;
|
|
||||||
|
|
||||||
f o n t - w e i g h t : 5 0 0 ;
|
|
||||||
|
|
||||||
c o l o r : # f f f f f f ;
|
|
||||||
|
|
||||||
f l e x - s h r i n k : 0 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - a m o u n t {
|
|
||||||
|
|
||||||
f o n t - s i z e : 3 2 r p x ;
|
|
||||||
|
|
||||||
f o n t - w e i g h t : 7 0 0 ;
|
|
||||||
|
|
||||||
c o l o r : # 3 8 b d a c ;
|
|
||||||
|
|
||||||
f l e x - s h r i n k : 0 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - p r o d u c t {
|
|
||||||
|
|
||||||
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 ;
|
|
||||||
|
|
||||||
f o n t - s i z e : 2 4 r p x ;
|
|
||||||
|
|
||||||
c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 6 ) ;
|
|
||||||
|
|
||||||
o v e r f l o w : h i d d e n ;
|
|
||||||
|
|
||||||
t e x t - o v e r f l o w : e l l i p s i s ;
|
|
||||||
|
|
||||||
w h i t e - s p a c e : n o w r a p ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - b o o k {
|
|
||||||
|
|
||||||
c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 7 ) ;
|
|
||||||
|
|
||||||
f o n t - w e i g h t : 5 0 0 ;
|
|
||||||
|
|
||||||
f l e x - s h r i n k : 0 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - c h a p t e r {
|
|
||||||
|
|
||||||
c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 5 ) ;
|
|
||||||
|
|
||||||
o v e r f l o w : h i d d e n ;
|
|
||||||
|
|
||||||
t e x t - o v e r f l o w : e l l i p s i s ;
|
|
||||||
|
|
||||||
w h i t e - s p a c e : n o w r a p ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
. d e t a i l - t i m e {
|
|
||||||
|
|
||||||
f o n t - s i z e : 2 2 r p x ;
|
|
||||||
|
|
||||||
c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 4 ) ;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/ * = = = ??AR?l??^?|??\!}?m??2? = = = * /
|
|
||||||
. 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 ; }
|
|
||||||
. 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 % ; }
|
|
||||||
. d e t a i l - a v a t a r - t e x t { 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 % ; b a c k g r o u n d : l i n e a r - g r a d i e n t ( 1 3 5 d e g , # 3 8 b d a c 0 % , # 2 d a 3 9 6 1 0 0 % ) ; 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 ; f o n t - s i z e : 3 6 r p x ; f o n t - w e i g h t : 7 0 0 ; c o l o r : # f f f f f f ; }
|
|
||||||
. d e t a i l - c o n t e n t { f l e x : 1 ; 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 ; g a p : 8 r p x ; m i n - w i d t h : 0 ; o v e r f l o w : h i d d e n ; }
|
|
||||||
. d e t a i l - t o p { 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 : s p a c e - b e t w e e n ; g a p : 1 6 r p x ; }
|
|
||||||
. d e t a i l - b u y e r { f o n t - s i z e : 2 8 r p x ; f o n t - w e i g h t : 5 0 0 ; c o l o r : # f f f f f f ; f l e x : 1 ; o v e r f l o w : h i d d e n ; t e x t - o v e r f l o w : e l l i p s i s ; w h i t e - s p a c e : n o w r a p ; }
|
|
||||||
. d e t a i l - a m o u n t { f o n t - s i z e : 3 2 r p x ; f o n t - w e i g h t : 7 0 0 ; c o l o r : # 3 8 b d a c ; f l e x - s h r i n k : 0 ; }
|
|
||||||
. d e t a i l - p r o d u c t { d i s p l a y : f l e x ; a l i g n - i t e m s : b a s e l i n e ; f o n t - s i z e : 2 4 r p x ; c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 6 ) ; o v e r f l o w : h i d d e n ; }
|
|
||||||
. d e t a i l - b o o k { c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 7 ) ; f o n t - w e i g h t : 5 0 0 ; m a x - w i d t h : 2 0 0 r p x ; o v e r f l o w : h i d d e n ; t e x t - o v e r f l o w : e l l i p s i s ; w h i t e - s p a c e : n o w r a p ; f l e x - s h r i n k : 1 ; }
|
|
||||||
. d e t a i l - c h a p t e r { c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 5 ) ; f l e x : 1 ; o v e r f l o w : h i d d e n ; t e x t - o v e r f l o w : e l l i p s i s ; w h i t e - s p a c e : n o w r a p ; m a r g i n - l e f t : 4 r p x ; }
|
|
||||||
. d e t a i l - t i m e { f o n t - s i z e : 2 2 r p x ; c o l o r : r g b a ( 2 5 5 , 2 5 5 , 2 5 5 , 0 . 4 ) ; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user