1

app/controller/admin/user/User.php

@@ -1094,9 +1094,9 @@ class User extends BaseController
                     'award_integral'=>$moto_user['award_integral'],
                     'award_range'=>$moto_user['award_range'],
                     'pack_count'=>$moto_user['pack_count'],
-                    'pack_count_all'=>$moto_user['pack_count_all'],
                     'unclaimed_range'=>$moto_user['unclaimed_range'],
                     'freeze_brokerage'=>$moto_user['freeze_brokerage'],
+                    'is_service'=>$moto_user['is_service']
                 ]);  //修改新用户数据
                 \app\common\model\user\User::where('uid',$moto_user['uid'])->update(['status'=>0,'award_integral'=>0]);  //修改老用户状态为冻结
                 UserMerchant::where('uid',$moto_user['uid'])->update(['uid'=>$uid]);  //商户用户表

app/controller/api/Auth.php

@@ -636,7 +636,7 @@ class Auth extends BaseController
      */
     public function authLogin()
     {
-        @file_put_contents('quanju3.txt',"-微信是否是走这里登录\r\n",8);
+//        @file_put_contents('quanju3.txt',"-微信是否是走这里登录\r\n",8);
         $auth = $this->request->param('auth');
         $users = $this->authInfo($auth, !systemConfig('is_phone_login'));
         if (!$users)
@@ -662,6 +662,7 @@ class Auth extends BaseController
         }
         $tokenInfo = $userRepository->createToken($user);
         $userRepository->loginAfter($user);
+        @file_put_contents('quanju3.txt',json_encode($user)."-微信是否是走这里登录\r\n",8);
         return app('json')->status(200, $userRepository->returnToken($user, $tokenInfo));
     }