Skip to content

Commit e2cacc2

Browse files
liaodeitygitee-org
liaodeity
authored and
gitee-org
committed
!4 更新版本8.0.1
Merge pull request !4 from liaodeity/8.x
2 parents ec656cf + cb7c6de commit e2cacc2

File tree

7 files changed

+99
-90
lines changed

7 files changed

+99
-90
lines changed

‎app/Enums/UserStatusEnum.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
/*
3+
|-----------------------------------------------------------------------------------------------------------
4+
| laravel-admin-cms [ 简单高效的开发插件系统 ]
5+
|-----------------------------------------------------------------------------------------------------------
6+
| Licensed ( MIT )
7+
| ----------------------------------------------------------------------------------------------------------
8+
| Copyright (c) 2020-2021 https://gitee.com/liaodeiy/laravel-admin-cms All rights reserved.
9+
| ----------------------------------------------------------------------------------------------------------
10+
| Author: 廖春贵 < liaodeity@gmail.com >
11+
|-----------------------------------------------------------------------------------------------------------
12+
*/
13+
14+
namespace App\Enums;
15+
16+
17+
class UserStatusEnum extends BaseEnum
18+
{
19+
const ENABLE = 1;
20+
const DISABLE = 2;
21+
protected static $ATTRS = [
22+
self::ENABLE => '启用',
23+
self::DISABLE => '禁用'
24+
];
25+
}

‎app/Helpers/function.php

Lines changed: 29 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@
1111
|-----------------------------------------------------------------------------------------------------------
1212
*/
1313

14+
require_once "my_function.php";
15+
1416
use Illuminate\Support\Carbon;
1517

18+
##########################################
19+
#系统助手函数库，自定义函数请my_function.php#
20+
#########################################
1621

17-
function array_to_object($arr){
22+
function array_to_object ($arr)
23+
{
1824
$json = json_encode ($arr);
1925

2026
return json_decode ($json);
@@ -27,35 +33,37 @@ function array_to_object($arr){
2733
* @param string $pid parent标记字段
2834
* @param string $child
2935
* @param int $root
30-
* @return array
36+
* @return \Illuminate\Support\Collection
3137
*/
32-
function list_to_tree($list, $pk='id', $pid = 'pid', $child = '_child', $root = 0) {
38+
function list_to_tree ($list, $pk = 'id', $pid = 'pid', $child = '_child', $root = 0)
39+
{
3340
// 创建Tree
3441
$tree = array();
35-
if(is_array($list)) {
42+
if (is_array ($list)) {
3643
// 创建基于主键的数组引用
3744
$refer = array();
3845
foreach ($list as $key => $data) {
39-
$refer[$data[$pk]] =& $list[$key];
46+
$refer[ $data[ $pk ] ] =& $list[ $key ];
4047
}
4148
foreach ($list as $key => $data) {
4249
// 判断是否存在parent
43-
$parentId = $data[$pid];
50+
$parentId = $data[ $pid ];
4451
if ($root == $parentId) {
45-
$tree[] =& $list[$key];
46-
}else{
47-
if (isset($refer[$parentId])) {
48-
$parent =& $refer[$parentId];
49-
$parent[$child][] =& $list[$key];
52+
$tree[] =& $list[ $key ];
53+
} else {
54+
if (isset($refer[ $parentId ])) {
55+
$parent =& $refer[ $parentId ];
56+
$parent[ $child ][] =& $list[ $key ];
5057
}
5158
}
5259
}
5360
}
54-
$tree = array_to_object($tree);
61+
$tree = array_to_object ($tree);
5562
$tree = collect ($tree);
5663

5764
return $tree;
5865
}
66+
5967
/**
6068
* 获取列标识
6169
* 目前最大支持702列
@@ -78,28 +86,20 @@ function get_key_num ()
7886
/**
7987
* 验证手机号是否正确
8088
*/
81-
function isMobile ($mobile)
89+
function is_mobile ($mobile)
8290
{
8391
if (!is_numeric ($mobile)) {
8492
return false;
8593
}
8694

87-
//return preg_match( '#^[1-9][0-9]{10,13}$#', $mobile ) ? true : false;
88-
8995
return preg_match ('#^([0])?([1])([0-9]{10,12})$#', $mobile) ? true : false;
90-
91-
//return preg_match( '#^[0-1][0-9]{10~14}$#', $mobile ) ? true : false ;
92-
93-
//
94-
//return preg_match( '#^([0])?([1])(([3][0-9])|([4][5,6,7,9])|([5][0-3,5-9])|([6][6])|([7][0,1,3,5,6,7,8])|([8][0-9])|([9][8,9]))[0-9]{8}$#', $mobile );
95-
9696
}
9797

9898

9999
/**
100100
* 验证固定电话是否正确
101101
*/
102-
function isPhone ($Phone)
102+
function is_phone ($Phone)
103103
{
104104
if (!is_numeric ($Phone)) {
105105
return false;
@@ -119,7 +119,6 @@ function isPhone ($Phone)
119119
break;
120120
}
121121

122-
123122
if (strpos ($Phone, '00853') === 0) {
124123
// 澳门电话
125124
// 非 0 开头 7-8 位数
@@ -145,16 +144,8 @@ function isPhone ($Phone)
145144
# 00886 台湾
146145
# 2 区号，空，或者 0 开头 3 至 4 位长，如：
147146
# 空，
148-
# 020, 广州
149-
# 0750 江门
150-
# 0760 中山
151147
# 3 实际号码，非 0 开头，7 至 8 位长，
152148
# 非空
153-
# 3926596 江门主号
154-
# 88888823 中山主号
155-
# 83892922 广州主号
156-
157-
#
158149
# ((0086)(0[1-9]\d{0,2})) - 处理以 0086 + 区号 的形式出现的 不能没有区号！
159150
# (0[1-9]\d{0,2})? 以 0xx 0xxx 形式出现的区号，可以有或者没有
160151
# [1-9]\d{6,7} 第一位不是 0 ，后 6 或者 7 位为数字 的电话号码。
@@ -164,27 +155,21 @@ function isPhone ($Phone)
164155
#
165156

166157
return preg_match ('#^(((0086)(0[1-9]\d{0,2}))|(0[1-9]\d{0,2})?)[0-9]\d{6,8}$#', $Phone) ? true : false;
167-
168-
// 中国固话
169-
//return preg_match( '#^(((0086)(0[1-9]\d{0,2}))|(0[1-9]\d{0,2})?)[1-9]\d{6,7}$#', $Phone ) ? true : false;
170158
}
171159

172160
/**
173161
* 手机或固话
174162
* @param $Phone
175163
* @return bool
176164
*/
177-
function isPhoneOrMobile ($Phone)
165+
function is_phone_or_mobile ($Phone)
178166
{
179167
if (!is_numeric ($Phone)) {
180-
//echo "FailMsg###联系电话 xx1 ( $Phone ) 不正确！";exit;
181168
return false;
182169
}
183170

184-
$ismobile = isMobile ($Phone);
185-
$isphone = isPhone ($Phone);
186-
187-
//echo "x话 xx1 ( $ismobile, $isphone ) 不正确！";
171+
$ismobile = is_mobile ($Phone);
172+
$isphone = is_phone ($Phone);
188173

189174
return $ismobile or $isphone;
190175
}
@@ -343,23 +328,6 @@ function get_range_display ($min, $max, $unit = '', $joiner = ' ~ ')
343328
return implode ($joiner, $arr);
344329
}
345330

346-
/**
347-
* 获取微信端访问所属代理商ID add by gui
348-
* @return mixed
349-
*/
350-
function get_member_share_agent_id ()
351-
{
352-
return session ()->get ('MEMBER_SHARE_AGENT_ID', 0);
353-
}
354-
355-
/**
356-
* 获取微信端访问所属分享人ID add by gui
357-
* @return mixed
358-
*/
359-
function get_member_share_user_id ()
360-
{
361-
return session ()->get ('MEMBER_SHARE_USER_ID', 0);
362-
}
363331

364332
/**
365333
* 将文本换行\n进行替换成p标签显示，
@@ -491,18 +459,6 @@ function get_item_parameter ($key, $ind = 'all', $html = false)
491459
return $arr;
492460
}
493461

494-
/**
495-
* 生成跳转Tab链接
496-
* @param $title
497-
* @param $name
498-
* @param $url
499-
* @return string
500-
*/
501-
function get_tab_link ($title, $name, $url)
502-
{
503-
return '<a href="javascript:;" data-iframe-tab="' . $url . '" data-title="' . $title . '" data-icon="fa fa-list-alt">' . $name . '</a>';
504-
}
505-
506462
/**
507463
* 获取版本号
508464
* @return string
@@ -590,8 +546,8 @@ function get_login_user_id ()
590546
function ajax_error_result ($msg, $result = [])
591547
{
592548

593-
$result['code'] = -1;
594-
$result['message'] = $msg;
549+
$result['code'] = -1;
550+
$result['message'] = $msg;
595551

596552
return response ()->json ($result);
597553
}
@@ -605,8 +561,8 @@ function ajax_error_result ($msg, $result = [])
605561

606562
function ajax_success_result ($msg, $result = [])
607563
{
608-
$result['code'] = 0;
609-
$result['message'] = $msg;
564+
$result['code'] = 0;
565+
$result['message'] = $msg;
610566

611567
return response ()->json ($result);
612568
}

‎app/Helpers/my_function.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
/*
3+
|-----------------------------------------------------------------------------------------------------------
4+
| laravel-admin-cms [ 简单高效的开发插件系统 ]
5+
|-----------------------------------------------------------------------------------------------------------
6+
| Licensed ( MIT )
7+
| ----------------------------------------------------------------------------------------------------------
8+
| Copyright (c) 2020-2021 https://gitee.com/liaodeiy/laravel-admin-cms All rights reserved.
9+
| ----------------------------------------------------------------------------------------------------------
10+
| Author: 廖春贵 < liaodeity@gmail.com >
11+
|-----------------------------------------------------------------------------------------------------------
12+
*/
13+
14+
//自定义助手函数库

‎database/migrations/2020_05_27_170357_create_web_views_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function up ()
1515
{
1616
Schema::create ('web_views', function (Blueprint $table) {
1717
$table->id ();
18-
$table->uuid('web_user')->default ('')->comment ('用户标识');
18+
$table->string('web_user',64)->default ('')->comment ('用户标识');
1919
$table->string ('view_url', 200)->default ('')->comment ('访问链接地址');
2020
$table->ipAddress ('client_ip')->default ('')->comment ('用户IP地址');
2121
$table->string ('user_agent', 250)->default ('')->comment ('浏览器标识');

‎resources/views/admin/user_member/add.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="layui-form-item">
1616
<label class="layui-form-label">状态<span class="color-red">*</span></label>
1717
<div class="layui-input-block">
18-
@foreach(\App\Libs\Parameter::userStatusItem () as $ind => $item)
18+
@foreach(\App\Enums\UserStatusEnum::attrs () as $ind => $item)
1919
<input type="radio" name="UserMember[status]" value="{{$ind}}"
2020
@if(isset($user->member->status) && $user->member->status == $ind) checked
2121
@endif title="{{$item}}">

‎resources/views/admin/user_member/index.blade.php

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,7 @@
2424
<input type="text" name="real_name" autocomplete="off" class="layui-input">
2525
</div>
2626
</div>
27-
<div class="layui-inline">
28-
<label class="layui-form-label">状态</label>
29-
<div class="layui-input-inline">
30-
<select name="status">
31-
<option value="">请选择</option>
32-
@foreach(\App\Libs\Parameter::userStatusItem () as $ind => $item)
33-
<option value="{{$ind}}">{{$item}}</option>
34-
@endforeach
35-
</select>
36-
</div>
37-
</div>
27+
<input type="hidden" id="status" name="status" value="">
3828
<div class="layui-inline">
3929
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i
4030
class="layui-icon"></i> 搜 索
@@ -44,7 +34,18 @@ class="layui-icon"></i> 搜 索
4434
</form>
4535
</div>
4636
</fieldset>
47-
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
37+
<div class="layui-tab layui-tab-brief margin-top-15" lay-filter="tabList">
38+
<ul class="layui-tab-title">
39+
<li class="layui-this">全部会员</li>
40+
<li>使用中会员</li>
41+
<li>已禁用会员</li>
42+
</ul>
43+
<div class="layui-tab-content">
44+
<div class="layui-tab-item layui-show">
45+
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
46+
</div>
47+
</div>
48+
</div>
4849

4950
<script type="text/html" id="toolbarFilter">
5051
<div class="layui-btn-container">
@@ -67,10 +68,11 @@ class="layui-icon"></i> 搜 索
6768

6869
@section('footer')
6970
<script>
70-
layui.use(['form', 'table'], function () {
71+
layui.use(['form', 'table','element'], function () {
7172
var $ = layui.jquery,
7273
form = layui.form,
7374
table = layui.table,
75+
element = layui.element,
7476
layuimini = layui.layuimini;
7577
7678
table.render({
@@ -96,7 +98,19 @@ class="layui-icon"></i> 搜 索
9698
limit: 15,
9799
page: true,
98100
});
99-
101+
element.on('tab(tabList)', function(data){
102+
var status = '';
103+
switch (data.index) {
104+
case 1:
105+
status = '{{\App\Enums\UserStatusEnum::ENABLE}}';
106+
break;
107+
case 2:
108+
status = '{{\App\Enums\UserStatusEnum::DISABLE}}';
109+
break;
110+
}
111+
$("#status").val(status);
112+
$(".layui-form button[type='submit']").click();
113+
});
100114
// 监听搜索操作
101115
form.on('submit(data-search-btn)', function (data) {
102116
var result = JSON.stringify(data.field);

‎resources/views/admin/user_member/show.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@include('admin.user.base_show')
2020
<tr>
2121
<th>状态</th>
22-
<td>{{\App\Libs\Parameter::userStatusItem ($user->member->status ?? '') }}</td>
22+
<td>{{\App\Enums\UserStatusEnum::toLabel ($user->member->status ?? '')}}</td>
2323
</tr>
2424
<tr>
2525
<th>登录次数</th>

0 commit comments

Comments
 (0)