server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
youda 2025-04-18 15:52:45 +08:00
commit 6c86a47bd1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/controller/Config.php
View File

@ -18,7 +18,6 @@ class Config extends Base
// 查询盒子类型数据 // 查询盒子类型数据
$goodsTypeList = Db::name('goods_type') $goodsTypeList = Db::name('goods_type')
->field('value, sort_order,is_show, name,pay_wechat,pay_balance,pay_currency,pay_currency2,pay_coupon,is_deduction') ->field('value, sort_order,is_show, name,pay_wechat,pay_balance,pay_currency,pay_currency2,pay_coupon,is_deduction')
// ->where('is_show', 1)
->order('sort_order') ->order('sort_order')
->select() ->select()
->toArray(); ->toArray();
@ -26,7 +25,9 @@ class Config extends Base
// 返回数据 // 返回数据
return $this->renderSuccess('获取成功', [ return $this->renderSuccess('获取成功', [
'good_type' => $goodsTypeList, 'good_type' => $goodsTypeList,
'app_setting' => $app_setting 'app_setting' => $app_setting,
'version' => '100'
]); ]);
} }
} }

1
app/api/route/app.php
View File

@ -212,6 +212,7 @@ Route::any('order_detail', 'Order/getOrderDetail');
#============================ #============================
Route::any('getFloatBall', 'Index/getFloatBall'); Route::any('getFloatBall', 'Index/getFloatBall');
// // getUserAccount // // getUserAccount
// Route::any('getUserAccount', 'User/getUserAccount'); // Route::any('getUserAccount', 'User/getUserAccount');
// Route::any('createUser', 'User/createUser'); // Route::any('createUser', 'User/createUser');