Commit ef6b808e authored by hujun's avatar hujun

Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

parents 3416314b fbf4e165
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment