登录注册调试

@@ -6,7 +6,7 @@
             <div class="tab-pane fade active in" id="one">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh')}
+                        {:build_toolbar('refresh,import')}
                         <!--<div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                         <!--<div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                             <ul class="dropdown-menu text-left" role="menu">

@@ -121,6 +121,7 @@ class User extends Api
     public function miniLogin()
     public function miniLogin()
     {
     {
         $code = $this->request->request('code');
         $code = $this->request->request('code');
+        $mobile = $this->request->request('mobile');
         if (!$code) {
         if (!$code) {
             $this->error(__('Invalid code'));
             $this->error(__('Invalid code'));
         }
         }
@@ -134,13 +135,22 @@ class User extends Api
 
 
         $openid = $session['openid'];
         $openid = $session['openid'];
 
 
+        if(isset($mobile)){
+            $user = new \app\admin\model\User;
+            $user->save(['openid'=>$openid],['mobile'=>$mobile,'openid'=>null]);
+        }
+
         $user = new \app\admin\model\User;
         $user = new \app\admin\model\User;
         $user = $user->where(['openid'=>$openid,'is_default'=>true])->find();
         $user = $user->where(['openid'=>$openid,'is_default'=>true])->find();
         if ($user) {
         if ($user) {
             //如果已经有账号则直接登录
             //如果已经有账号则直接登录
             $ret = $this->auth->direct($user->id);
             $ret = $this->auth->direct($user->id);
         } else {
         } else {
-            $ret = $this->register($openid);
+            $user = new \app\admin\model\User;
+            $user = $user->where(['openid'=>$openid])->find();
+            if(empty($user)){
+                $ret = $this->register($openid);
+            }
         }
         }
         if (!$ret) {
         if (!$ret) {
             $this->error($this->auth->getError());
             $this->error($this->auth->getError());