Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
c124d813
Commit
c124d813
authored
Jun 21, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户列表第一次登录时间
parent
dba2d09c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
28 deletions
+39
-28
Finance.php
application/index/controller/Finance.php
+1
-11
Member.php
application/index/controller/Member.php
+20
-4
users_list.html
application/index/view/member/users_list.html
+5
-5
user.js
public/resource/js/user.js
+12
-7
user_template_tpl.html
public/resource/template/user_template_tpl.html
+1
-1
No files found.
application/index/controller/Finance.php
View file @
c124d813
...
...
@@ -21,7 +21,6 @@ use app\model\OFinancialAudit;
use
app\model\OPartialCommission
;
use
app\model\OPayLogModel
;
use
app\model\ORefundModel
;
use
think\exception\PDOException
;
class
Finance
extends
Basic
{
...
...
@@ -151,9 +150,6 @@ class Finance extends Basic
* 成交报告审核
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
checkReport
()
{
...
...
@@ -332,7 +328,6 @@ class Finance extends Basic
* 新增分佣提成
*
* @return \think\Response
* @throws \think\exception\DbException
*/
public
function
addBargain
()
{
...
...
@@ -570,9 +565,6 @@ class Finance extends Basic
* 分佣提成明细表
*
* @return \think\Response|\think\response\View
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
partialCommissionList
()
{
...
...
@@ -630,9 +622,7 @@ class Finance extends Basic
/**
* 导出分佣提成明细表
*
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @return string
*/
public
function
exportExcel
()
{
...
...
application/index/controller/Member.php
View file @
c124d813
...
...
@@ -3,7 +3,6 @@
namespace
app\index\controller
;
use
app\index\extend\Basic
;
use
app\model\AAgents
;
use
app\model\AStore
;
use
app\model\GOperatingRecords
;
use
app\model\Users
;
use
app\model\UPhoneFollowPp
;
...
...
@@ -232,9 +231,27 @@ class Member extends Basic{
$type
=
3
;
}
if
(
!
empty
(
$params
[
'first_login_start'
]))
{
$where
[
'a.first_login_time'
]
=
$params
[
'first_login_start'
]
.
' 00:00:00'
;
}
if
(
!
empty
(
$params
[
'first_login_end'
]))
{
$where
[
'a.first_login_time'
]
=
$params
[
'first_login_end'
]
.
' 23:59:59'
;
}
if
(
!
empty
(
$params
[
'first_login_start'
])
&&
!
empty
(
$params
[
'first_login_end'
]))
{
$where
[
'a.first_login_time'
]
=
[
'between time'
,
[
$params
[
'first_login_start'
]
.
' 00:00:00'
,
$where
[
'a.first_login_time'
]
=
$params
[
'first_login_end'
]
.
' 23:59:59'
]];
}
$fields
=
'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status'
;
$data
[
'list'
]
=
$this
->
user
->
getUserAgent
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
,
$type
);
$data
[
'total'
]
=
$this
->
user
->
getUserAgentTotal
(
$where
,
$type
);
try
{
$data
[
'list'
]
=
$this
->
user
->
getUserAgent
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
,
$type
);
$data
[
'total'
]
=
$this
->
user
->
getUserAgentTotal
(
$where
,
$type
);
}
catch
(
\Exception
$e
)
{
return
$this
->
response
(
101
,
'内部错误,获取客户失败!请联系运营。'
);
}
$return
=
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
);
}
else
{
$return
=
view
(
'member/users_list'
);
...
...
@@ -252,7 +269,6 @@ class Member extends Basic{
public
function
user_add
()
{
$params
=
$this
->
request
->
param
();
$status
=
101
;
$msg
=
''
;
$data
=
''
;
if
(
empty
(
$params
[
'id'
]))
{
...
...
application/index/view/member/users_list.html
View file @
c124d813
...
...
@@ -231,13 +231,13 @@
<input
class=
"form-control btn2 margin-top-ld input"
data-rule-phoneus=
"false"
data-rule-required=
"false"
name=
"invite_agent_phone"
placeholder=
"邀请人(经纪人)手机号"
type=
"text"
value=
""
>
<!--<div class="clear"></div>-->
<!--<span class='left bottom'>(注:客方所属部门,客方所属门店与邀请人所属部门,邀请人所属门店不作为并列筛选项)</span>-->
<span
class=
"fore-span ld-Marheight"
>
第一次登录时间:
</span>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"first_login_start"
type=
"date"
>
<span
class=
"fore-span ld-Marheight"
>
-
</span>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"first_login_end"
type=
"date"
>
<div
class=
"row"
></div>
<div
class=
"clear"
></div>
<!-- <span class="btn btn-info btn3 margin-top-ld" class="reset_1">搜索</span>
<span class="btn btn-info btn3 margin-top-ld" class="reset_1">重置</span> -->
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"search"
>
搜索
</span>
...
...
public/resource/js/user.js
View file @
c124d813
...
...
@@ -425,6 +425,8 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
params
.
area_type
=
$
(
"select[name=area_type]"
).
val
();
params
.
price_type
=
$
(
"select[name=price_type]"
).
val
();
params
.
industry_type
=
$
(
"select[name=industry_type]"
).
val
();
params
.
first_login_start
=
$
(
"#first_login_start"
).
val
();
params
.
first_login_end
=
$
(
"#first_login_end"
).
val
();
//客方和邀请人搜索项不能并列
...
...
@@ -435,14 +437,17 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
data
:
params
,
dataType
:
'json'
,
success
:
function
(
data
)
{
console
.
log
(
data
);
var
temp
=
document
.
getElementById
(
'user_list_tpl'
).
innerHTML
;
var
doTtmpl
=
doT
.
template
(
temp
);
$
(
"#users_list"
).
html
(
doTtmpl
(
data
.
data
.
list
));
if
(
data
.
code
==
200
)
{
var
temp
=
document
.
getElementById
(
'user_list_tpl'
).
innerHTML
;
var
doTtmpl
=
doT
.
template
(
temp
);
$
(
"#users_list"
).
html
(
doTtmpl
(
data
.
data
.
list
));
/*分页代码*/
add_page
(
data
.
data
.
total
,
pageNo
,
user
.
pageSize
,
user
.
getList
);
$
(
"#total_page"
).
html
(
data
.
data
.
total
);
/*分页代码*/
add_page
(
data
.
data
.
total
,
pageNo
,
user
.
pageSize
,
user
.
getList
);
$
(
"#total_page"
).
html
(
data
.
data
.
total
);
}
else
{
alert
(
data
.
msg
);
}
}
});
},
...
...
public/resource/template/user_template_tpl.html
View file @
c124d813
<script
id=
"user_list_tpl"
type=
"text/template"
>
[
%
if
(
it
)
{
%
]
[
%
if
(
it
[
0
]
)
{
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
>
<
td
>
[
%=
it
[
item
][
'id'
]
%
]
<
/td
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment