Skip to content

Commit f0174c6

Browse files
modstartmodstart
committed
feat: str util mb wordwrap
1 parent be475d3 commit f0174c6

File tree

19 files changed

+283
-49
lines changed

19 files changed

+283
-49
lines changed

‎module/Banner/Admin/routes.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/* @var \Illuminate\Routing\Router $router */
4-
$router->match(['get', 'post'], 'banner', '\Module\Banner\Admin\Controller\BannerController@index');
5-
$router->match(['get', 'post'], 'banner/add', '\Module\Banner\Admin\Controller\BannerController@add');
6-
$router->match(['get', 'post'], 'banner/edit', '\Module\Banner\Admin\Controller\BannerController@edit');
7-
$router->match(['post'], 'banner/delete', '\Module\Banner\Admin\Controller\BannerController@delete');
8-
$router->match(['get'], 'banner/show', '\Module\Banner\Admin\Controller\BannerController@show');
9-
$router->match(['post'], 'banner/sort', '\Module\Banner\Admin\Controller\BannerController@sort');
4+
$router->match(['get', 'post'], 'banner', 'BannerController@index');
5+
$router->match(['get', 'post'], 'banner/add', 'BannerController@add');
6+
$router->match(['get', 'post'], 'banner/edit', 'BannerController@edit');
7+
$router->match(['post'], 'banner/delete', 'BannerController@delete');
8+
$router->match(['get'], 'banner/show', 'BannerController@show');
9+
$router->match(['post'], 'banner/sort', 'BannerController@sort');

‎module/Member/Core/MemberMoneyChargePayCenterBiz.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66

77
use ModStart\Core\Dao\ModelUtil;
8+
use ModStart\Core\Exception\BizException;
9+
use ModStart\Core\Input\Response;
810
use Module\Member\Util\MemberMoneyUtil;
911
use Module\PayCenter\Biz\AbstractPayCenterBiz;
1012
use Module\PayCenter\Type\PayType;
@@ -42,5 +44,26 @@ public function onPayed($payBizId, $payOrder, $param = [])
4244
MemberMoneyUtil::change($order['memberUserId'], $order['money'], '钱包充值');
4345
}
4446

47+
public function createOrderForQuick($quickOrder, $param = [])
48+
{
49+
BizException::throwsIf('钱包充值未开启', !modstart_config('Member_MoneyChargeEnable', false));
50+
$memberUserId = $quickOrder['session']['memberUserId'];
51+
$money = $quickOrder['param']['money'];
52+
BizException::throwsIfEmpty('用户ID为空', $memberUserId);
53+
BizException::throwsIf('充值金额异常', $money < 0.01 || $money > 1000 * 10000);
54+
$order = ModelUtil::insert('member_money_charge_order', [
55+
'status' => OrderStatus::WAIT_PAY,
56+
'memberUserId' => $memberUserId,
57+
'money' => $money,
58+
]);
59+
return Response::generateSuccessData([
60+
'bizId' => $order['id'],
61+
'feeTotal' => $money,
62+
'body' => '钱包充值',
63+
'param' => [],
64+
'redirect' => modstart_web_url('member_money'),
65+
]);
66+
}
67+
4568

4669
}

‎module/Member/Docs/release.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 3.6.0
2+
3+
- 新增：用户PC充值页面适配快捷支付功能
4+
- 修复：在线充值支付中心未安装页面提示
5+
6+
---
7+
18
## 3.5.0 PC端在线充值，用户退出事件
29

310
- 新增：用户PC端在线充值功能

‎module/Member/View/pc/memberMoneyCharge/index.blade.php‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,65 @@
1717
<div class="title">钱包充值</div>
1818
</div>
1919
<div class="body">
20-
<form action="{{modstart_api_url('member_money/charge/submit')}}" method="post" data-ajax-form>
20+
@if(!modstart_module_enabled('PayCenter'))
21+
<div class="ub-alert ub-alert-warning">
22+
<i class="iconfont icon-warning"></i>
23+
请先安装 <a href="https://modstart.com/m/PayCenter" target="_blank">PayCenter</a> 模块
24+
</div>
25+
@elseif(\Module\PayCenter\Util\PayUtil::preferShowQuick())
2126
<div class="ub-form">
2227
<div class="line">
2328
<div class="label">充值金额</div>
2429
<div class="field">
25-
<input class="form" type="number" step="any" name="money"/>
30+
<input class="form" type="number" step="any" value="100" name="money"/>
2631
</div>
2732
</div>
2833
<div class="line">
29-
<div class="label">&nbsp;</div>
34+
<div class="label">扫码支付</div>
3035
<div class="field">
31-
<input type="hidden" name="recirect" {{modstart_web_url('member_money')}} />
32-
<button class="btn btn-primary" type="submit">提交支付</button>
36+
@include('module::PayCenter.View.inc.quick')
37+
<script>
38+
$(function () {
39+
var refresh = function () {
40+
var money = parseFloat($('[name="money"]').val());
41+
if (money >= 0.01 && money < 1000 * 10000) {
42+
money = parseFloat(money).toFixed(2)
43+
$('[name="money"]').val(money + '')
44+
window.__payCenterQuick.prepareLazy(
45+
'{{\Module\Member\Core\MemberMoneyChargePayCenterBiz::NAME}}',
46+
{money: money},
47+
{money: money}
48+
);
49+
} else {
50+
window.__payCenterQuick.empty();
51+
}
52+
};
53+
$('[name="money"]').on('keyup', refresh);
54+
refresh();
55+
});
56+
</script>
3357
</div>
3458
</div>
3559
</div>
36-
37-
</form>
60+
@else
61+
<form action="{{modstart_api_url('member_money/charge/submit')}}" method="post" data-ajax-form>
62+
<div class="ub-form">
63+
<div class="line">
64+
<div class="label">充值金额</div>
65+
<div class="field">
66+
<input class="form" type="number" step="any" value="100" name="money"/>
67+
</div>
68+
</div>
69+
<div class="line">
70+
<div class="label">&nbsp;</div>
71+
<div class="field">
72+
<input type="hidden" name="recirect" {{modstart_web_url('member_money')}} />
73+
<button class="btn btn-primary" type="submit">提交支付</button>
74+
</div>
75+
</div>
76+
</div>
77+
</form>
78+
@endif
3879
</div>
3980
</div>
4081

@@ -44,7 +85,14 @@
4485
</div>
4586
<div class="body">
4687
<div class="margin-bottom">
47-
@include('module::PayCenter.View.pc.pay.types')
88+
@if(!modstart_module_enabled('PayCenter'))
89+
<div class="ub-alert ub-alert-warning">
90+
<i class="iconfont icon-warning"></i>
91+
请先安装 <a href="https://modstart.com/m/PayCenter" target="_blank">PayCenter</a> 模块
92+
</div>
93+
@else
94+
@include('module::PayCenter.View.pc.pay.types')
95+
@endif
4896
</div>
4997
@if(modstart_config('Member_MoneyChargeDesc'))
5098
<div class="tw-rounded-lg tw-p-3" style="background:#F8F8F8;">

‎module/Member/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"MemberSSOServer",
4848
"MemberWechatMpLogin"
4949
],
50-
"version": "3.5.0",
50+
"version": "3.6.0",
5151
"modstartVersion": ">=3.7.0",
5252
"author": "官方",
5353
"description": "提供基础的用户管理服务",

‎module/Vendor/Provider/Schedule/ScheduleProvider.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ public static function callByName($name)
6060

6161
public static function call(Schedule $schedule)
6262
{
63+
if (!isset($_SERVER['argv'][1]) || $_SERVER['argv'][1] != 'schedule:run') {
64+
return;
65+
}
6366
$autoCleanHistory = true;
6467
foreach (ScheduleBiz::all() as $provider) {
6568
// Log::info('ScheduleProvider.schedule - ' . $provider->title() . ' - ' . $provider->cron());

‎module/Vendor/Util/FilterUtil.php‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
3+
4+
namespace Module\Vendor\Util;
5+
6+
7+
use ModStart\Core\Exception\BizException;
8+
use ModStart\Core\Util\TreeUtil;
9+
10+
class FilterUtil
11+
{
12+
private static function categoryGet($categories, $id)
13+
{
14+
foreach ($categories as $category) {
15+
if ($category['id'] == $id) {
16+
return $category;
17+
}
18+
}
19+
return null;
20+
}
21+
22+
public static function categoryTreeFilter($categoryId, $categories, $keyTitle = 'title', $keyPid = 'pid')
23+
{
24+
$filterText = [];
25+
$pageTitle = [];
26+
$category = null;
27+
if ($categoryId) {
28+
$category = self::categoryGet($categories, $categoryId);
29+
BizException::throwsIfEmpty('分类不存在', $category);
30+
$filterText[] = $category[$keyTitle];
31+
$pageTitle[] = $category[$keyTitle];
32+
if ($category[$keyPid]) {
33+
$parentCategory = self::categoryGet($categories, $category[$keyPid]);
34+
$pageTitle[] = $parentCategory[$keyTitle];
35+
}
36+
}
37+
$categoryIds = [
38+
$categoryId
39+
];
40+
$childrenIds = TreeUtil::nodesChildrenIds($categories, $categoryId);
41+
$categoryIds = array_merge($categoryIds, $childrenIds);
42+
$categoryChain = TreeUtil::nodesChainWithItems($categories, $categoryId);
43+
return [
44+
$category,
45+
$categoryIds,
46+
$categoryChain,
47+
$filterText,
48+
$pageTitle,
49+
];
50+
}
51+
}

‎module/Vendor/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Vendor",
33
"title": "通用功能包",
4-
"version": "4.0.0",
4+
"version": "4.1.0",
55
"author": "官方",
66
"description": "提供基础功能",
77
"modstartVersion": ">=3.3.0",

‎module/VisitStatistic/Docs/release.md‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
## 1.2.0 功能版本说明
2-
3-
- 提供内置的网站访问记录功能
4-
- 每行一个功能特性
5-
6-
---
7-
8-
## 1.1.0 功能版本说明
9-
10-
- 提供内置的网站访问记录功能
11-
- 每行一个功能特性
12-
13-
---
141

152
## 1.0.0 网站访问记录
163

‎module/VisitStatistic/config.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"name": "VisitStatistic",
33
"title": "网站访问记录",
4-
"env": ["laravel5","laravel9"],
4+
"env": [
5+
"laravel5",
6+
"laravel9"
7+
],
58
"types": [
69
"PC",
710
"Mobile"

0 commit comments

Comments
 (0)