From 083c7097d5b69b74fa66a830a597c9c8cfcb4ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 14 Oct 2026 18:04:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=B9=B6?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 账单页原误用推广佣金接口,改为独立资金明细接口 user/money/list/:type(0=全部 1=消费 2=充值) --- .../api/controller/v1/user/UserBillController.php | 14 ++++++++++++++ backend/app/api/route/v1.php | 1 + frontend/uni-app/src/api/user.js | 7 +++++++ .../uni-app/src/pages/users/user_bill/index.vue | 4 ++-- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/backend/app/api/controller/v1/user/UserBillController.php b/backend/app/api/controller/v1/user/UserBillController.php index 66122e49e..375b5f6c1 100644 --- a/backend/app/api/controller/v1/user/UserBillController.php +++ b/backend/app/api/controller/v1/user/UserBillController.php @@ -471,4 +471,18 @@ class UserBillController $uid = (int)$request->uid(); return app('json')->success($this->services->divisionOrder($uid)); } + + /** + * 资金明细(0=全部, 1=消费, 2=充值) + * @param Request $request + * @param int $type + * @return mixed + */ + public function moneyList(Request $request, $type) + { + /** @var UserMoneyServices $moneyServices */ + $moneyServices = app()->make(UserMoneyServices::class); + return app('json')->success($moneyServices->getMoneyList((int)$request->uid(), (int)$type)); + } + } diff --git a/backend/app/api/route/v1.php b/backend/app/api/route/v1.php index a881c7877..c481ed2a1 100644 --- a/backend/app/api/route/v1.php +++ b/backend/app/api/route/v1.php @@ -181,6 +181,7 @@ Route::group(function () { Route::get('spread/count/:type', [\app\api\controller\v1\user\UserBillController::class, 'spreadCount'])->name('spreadCount')->option(['real_name' => '推广佣金']);//推广 佣金 3/提现 4 总和 Route::get('spread/banner', [\app\api\controller\v1\user\UserBillController::class, 'spreadBanner'])->name('spreadBanner')->option(['real_name' => '推广分销二维码海报生成']);//推广分销二维码海报生成 Route::get('integral/list', [\app\api\controller\v1\user\UserBillController::class, 'integralList'])->name('integralList')->option(['real_name' => '积分记录']);//积分记录 + Route::get('user/money/list/:type', [\app\api\controller\v1\user\UserBillController::class, 'moneyList'])->name('userMoneyList')->option(['real_name' => '资金明细']);//资金明细 Route::get('user/routine_code', [\app\api\controller\v1\user\UserBillController::class, 'getRoutineCode'])->name('getRoutineCode')->option(['real_name' => '小程序二维码']);//小程序二维码 Route::get('user/spread_info', [\app\api\controller\v1\user\UserBillController::class, 'getSpreadInfo'])->name('getSpreadInfo')->option(['real_name' => '获取分销背景等信息']);//获取分销背景等信息 Route::post('division/order', [\app\api\controller\v1\user\UserBillController::class, 'divisionOrder'])->name('divisionOrder')->option(['real_name' => '事业部推广订单']);//事业部推广订单 diff --git a/frontend/uni-app/src/api/user.js b/frontend/uni-app/src/api/user.js index 3a6ef3705..c52ac9220 100644 --- a/frontend/uni-app/src/api/user.js +++ b/frontend/uni-app/src/api/user.js @@ -150,6 +150,13 @@ export function getCommissionInfo(q, types) { return request.get("spread/commission/" + types, q); } +/* + * 资金明细(types|0=全部,1=消费,2=充值) + * */ +export function getMoneyList(q, types) { + return request.get("user/money/list/" + types, q); +} + /* * 积分记录 * */ diff --git a/frontend/uni-app/src/pages/users/user_bill/index.vue b/frontend/uni-app/src/pages/users/user_bill/index.vue index 53ada2cbf..ad132c24a 100644 --- a/frontend/uni-app/src/pages/users/user_bill/index.vue +++ b/frontend/uni-app/src/pages/users/user_bill/index.vue @@ -42,7 +42,7 @@ import { ref } from 'vue'; import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app'; import { storeToRefs } from 'pinia'; import { - getCommissionInfo + getMoneyList } from '@/api/user.js'; import { toLogin @@ -112,7 +112,7 @@ function getUserBillList() { if (loadend.value) return; loading.value = true; loadTitle.value = ''; - getCommissionInfo({ + getMoneyList({ page: page.value, limit: limit.value }, type.value).then(res => {