切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
6 years ago
提交
f3d743ef8e1f308c7f2259fc6c35f8bb3a1e511d
1 个父辈
4e007998
1 个管道 的构建
通过
耗费 40 秒
后台下线老师优化,提现手机号正则修改
变更
3
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
15 行增加
和
23 行删除
app/admin/controller/SalesmanController.php
public/themes/admin_simpleboot3/admin/salesman/teacher_list.html
public/themes/simpleboot3/portal/personalcenter/my_wallet.html
app/admin/controller/SalesmanController.php
查看文件 @
f3d743e
...
...
@@ -301,34 +301,23 @@ class SalesmanController extends AdminBaseController{
* 下线老师列表
*/
public
function
teacher_list
(){
if
(
$this
->
request
->
isPost
()){
$param
=
$this
->
request
->
param
();
$where
=
[
'status'
=>
3
,
'pid'
=>
$_POST
[
'salesman_id'
]
'pid'
=>
$param
[
'id'
]
];
if
(
!
empty
(
$_POST
[
'start_time'
])
&&
!
empty
(
$_POST
[
'end_time'
])){
$start_time
=
strtotime
(
$_POST
[
'start_time'
]);
$end_time
=
strtotime
(
$_POST
[
'end_time'
]);
if
(
!
empty
(
$param
[
'start_time'
])
&&
!
empty
(
$param
[
'end_time'
])){
$start_time
=
strtotime
(
$param
[
'start_time'
]);
$end_time
=
strtotime
(
$param
[
'end_time'
]);
$where
[
'a.create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$_POST
[
'keyword'
])){
$keyword
=
$_POST
[
'keyword'
];
$where
[
'user_nickname'
]
=
[
'like'
,
"%
$keyword
%"
];
if
(
!
empty
(
$param
[
'keyword'
])){
$keyword
=
$param
[
'keyword'
];
$where
[
'b.user_nickname'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$this
->
assign
(
'salesman_id'
,
$_POST
[
'salesman_id'
]);
$data
=
Db
::
name
(
'my_user'
)
->
alias
(
'a'
)
->
field
(
'a.*,b.user_nickname'
)
->
join
(
'user b'
,
'a.uid = b.id'
,
'left'
)
->
where
(
$where
)
->
paginate
(
1000000
);
$data_arr
=
$data
->
toArray
();
}
else
{
$id
=
$this
->
request
->
param
();
$this
->
assign
(
'salesman_id'
,
$id
[
'id'
]);
$data
=
Db
::
name
(
'my_user'
)
->
where
(
"status = 3 and pid ="
.
$id
[
'id'
])
->
paginate
(
12
);
$this
->
assign
(
'salesman_id'
,
!
empty
(
$param
[
'id'
])
?
$param
[
'id'
]
:
''
);
$data
=
Db
::
name
(
'my_user'
)
->
alias
(
'a'
)
->
field
(
'a.*,b.user_nickname'
)
->
join
(
'user b'
,
'a.uid = b.id'
,
'left'
)
->
where
(
$where
)
->
paginate
(
12
);
$data_arr
=
$data
->
toArray
();
foreach
(
$data_arr
[
'data'
]
as
$key
=>
$val
){
$data_nick
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$data
[
$key
][
'uid'
])
->
find
();
$data_arr
[
'data'
][
$key
][
'user_nickname'
]
=
$data_nick
[
'user_nickname'
];
}
}
foreach
(
$data_arr
[
'data'
]
as
$key
=>
$val
){
$money_income
=
Db
::
name
(
'money_income'
)
->
where
(
'uid'
,
$val
[
'uid'
])
->
select
();
...
...
@@ -338,6 +327,9 @@ class SalesmanController extends AdminBaseController{
}
$data_arr
[
'data'
][
$key
][
'money'
]
=
$m_money
;
}
$this
->
assign
(
'start_time'
,
!
empty
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
(
'end_time'
,
!
empty
(
$param
[
'end_time'
])
?
$param
[
'end_time'
]
:
''
);
$this
->
assign
(
'keyword'
,
!
empty
(
$param
[
'keyword'
])
?
trim
(
$param
[
'keyword'
])
:
''
);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'data_arr'
,
$data_arr
[
'data'
]);
return
$this
->
fetch
();
...
...
public/themes/admin_simpleboot3/admin/salesman/teacher_list.html
查看文件 @
f3d743e
...
...
@@ -12,7 +12,7 @@
<li><a
href=
"{:url('Salesman/salesman_list')}"
>
业务员列表
</a></li>
<li
class=
"active"
><a
href=
"#"
>
老师名单
</a></li>
</ul>
<form
class=
"well form-inline margin-top-20"
method=
"post"
action=
"{:url('Salesman/teacher_list'
)}"
>
<form
class=
"well form-inline margin-top-20"
method=
"post"
action=
"{:url('Salesman/teacher_list'
,array('id'=>$salesman_id))}"
>
时间:
<input
type=
"text"
class=
"form-control js-bootstrap-datetime"
name=
"start_time"
value=
"{$start_time|default=''}"
...
...
public/themes/simpleboot3/portal/personalcenter/my_wallet.html
查看文件 @
f3d743e
...
...
@@ -317,7 +317,7 @@
var
code
=
$
(
"#code"
);
code
.
attr
(
"disabled"
,
"disabled"
);
phone
=
$
(
'#phone'
).
val
();
if
(
phone
==
''
||
!
(
/^1
[
345
78
]\d{9}
$/
.
test
(
phone
))){
if
(
phone
==
''
||
!
(
/^1
[
345
6789
]\d{9}
$/
.
test
(
phone
))){
alert
(
'手机号有误,请重新输入'
);
}
else
{
$
.
post
(
"{:url('Personalcenter/send_message')}"
,{
phone
:
phone
},
function
(
data
){
...
...
请
注册
或
登录
后发表评论