Accept Merge Request #33: (feature/dgg -> develop)
Merge Request: fix: 调试接口 Created By: @大狗哥 Accepted By: @大狗哥 URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/33?initial=true
This commit is contained in:
commit
0617ba4ea7
|
|
@ -3,6 +3,7 @@
|
|||
namespace app\worker\controller;
|
||||
|
||||
use app\common\controller\WorkerApi;
|
||||
use think\Request;
|
||||
|
||||
class Worker extends WorkerApi
|
||||
{
|
||||
|
|
@ -10,7 +11,6 @@ class Worker extends WorkerApi
|
|||
|
||||
/**
|
||||
* 微信登录
|
||||
* @return void
|
||||
*/
|
||||
public function login()
|
||||
{
|
||||
|
|
@ -25,6 +25,13 @@ class Worker extends WorkerApi
|
|||
//存在师傅id,直接登录
|
||||
if ($workerVendor['worker_id']) {
|
||||
$this->workerLogin($workerVendor['worker_id']);
|
||||
$result = [
|
||||
'code' => 1,
|
||||
'msg' => '成功',
|
||||
'time' => Request::instance()->server('REQUEST_TIME'),
|
||||
'data' => $this->user,
|
||||
];
|
||||
return json($result);
|
||||
$this->success('登录成功', $this->user);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user