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
ef6b808e
Commit
ef6b808e
authored
Jul 05, 2018
by
hujun
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0
parents
3416314b
fbf4e165
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
26 deletions
+13
-26
Broker.php
application/api_broker/controller/Broker.php
+13
-26
No files found.
application/api_broker/controller/Broker.php
View file @
ef6b808e
...
...
@@ -242,8 +242,7 @@ class Broker extends Basic
* 绑定或者解绑
* @return \think\Response
*/
public
function
updateDevice
()
public
function
updateDevice
()
{
$params
=
$this
->
params
;
/* $params = array(
...
...
@@ -279,8 +278,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getBroker
()
public
function
getBroker
()
{
$data
[
'status'
]
=
200
;
$data
[
'data'
]
=
''
;
...
...
@@ -313,8 +311,7 @@ class Broker extends Basic
*
* @return \think\Response
*/
public
function
add_phone_follow_up
()
public
function
add_phone_follow_up
()
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
...
...
@@ -363,8 +360,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
user_search
()
public
function
user_search
()
{
$Two_days_ago
=
date
(
"Y-m-d h:i:s"
,
strtotime
(
"-2 day"
));
//dump($Two_days_ago);
...
...
@@ -426,8 +422,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
useraction_search
()
public
function
useraction_search
()
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
...
...
@@ -487,8 +482,7 @@ class Broker extends Basic
* 搜索动态
* @return \think\Response
*/
public
function
userStateSearch
()
public
function
userStateSearch
()
{
$params
=
$this
->
params
;
/* $params = array(
...
...
@@ -507,8 +501,7 @@ class Broker extends Basic
/**
* 编辑密码
*/
public
function
editAgent
()
public
function
editAgent
()
{
$data
[
'code'
]
=
200
;
$data
[
'msg'
]
=
""
;
...
...
@@ -536,8 +529,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
forgetPwd
()
public
function
forgetPwd
()
{
$data
[
'code'
]
=
101
;
$data
[
'msg'
]
=
""
;
...
...
@@ -587,8 +579,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
uploadHeadImg
()
public
function
uploadHeadImg
()
{
$data
[
'status'
]
=
101
;
$data
[
'msg'
]
=
''
;
...
...
@@ -631,8 +622,7 @@ class Broker extends Basic
*
* @return \think\Response
*/
public
function
token
()
public
function
token
()
{
header
(
'Access-Control-Allow-Origin:*'
);
$jwt
=
new
JwtUntils
();
...
...
@@ -649,8 +639,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getAgentsByPhone
()
public
function
getAgentsByPhone
()
{
header
(
'Access-Control-Allow-Origin:*'
);
$agents
=
new
AAgents
();
...
...
@@ -668,8 +657,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
sendSms
()
public
function
sendSms
()
{
$data
[
'data'
]
=
[];
$data
[
'status'
]
=
101
;
...
...
@@ -731,8 +719,7 @@ class Broker extends Basic
* @throws \Endroid\QrCode\Exception\InvalidPathException
* @throws \Endroid\QrCode\Exception\InvalidWriterException
*/
public
function
qrCode
()
public
function
qrCode
()
{
$parms
=
$this
->
params
;
...
...
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