修改反馈

application/admin/model/user/User.php

@@ -59,7 +59,7 @@ class User extends Model
     }
     public function getStatusList()
     {
-        return ['normal' => __('Normal'), 'hidden' => __('Hidden')];
+        return ['normal' => __('Normal'), 'hidden' => __('Hidden'), 'logout' => '注销'];
     }
 
 

application/api/controller/User.php

@@ -129,6 +129,26 @@ class User extends Api
         $ret = $this->auth->register($username, $password, $email, $mobile, []);
         if ($ret) {
             $data = ['userinfo' => $this->auth->getUserinfo()];
+            //增加钻石
+            //开启事务
+            Db::startTrans();
+            //修改用户钻石余额
+            $res1 = Db::name('user')->where(['id' => $data['userinfo']['id']])->setField('diamond', 100);
+            // 添加钻石明细
+            $_data['user_id'] = $data['userinfo']['id'];
+            $_data['diamond'] = 100;
+            $_data['before'] = 0;
+            $_data['after'] = 100;
+            $_data['memo'] = '注册';
+            $_data['createtime'] = time();
+            $res2 = Db::name('user_diamond_log')->insertGetId($_data);
+            if ($res1 && $res2) {
+                Db::commit();
+            } else {
+                Db::rollback();
+            }
+
+            $data['userinfo']['diamond'] = 100;
             $this->success(__('Sign up successful'), $data);
         } else {
             $this->error($this->auth->getError());
@@ -1275,8 +1295,8 @@ class User extends Api
         }
 
         // 判断当前用户是否实名认证
-        $userAuthInfo = \app\common\model\UserAuth::userIsAuth($this->auth->id);
-        if($userAuthInfo['status'] == 0) $this->error($userAuthInfo['msg']);
+//        $userAuthInfo = \app\common\model\UserAuth::userIsAuth($this->auth->id);
+//        if($userAuthInfo['status'] == 0) $this->error($userAuthInfo['msg']);
 
         $res = \app\common\model\User::update(["pre_user_id"=>$inviteUserInfo->id,'invite_time'=>time()],["id"=>$user_id]);
         if($res) {
@@ -1836,5 +1856,10 @@ class User extends Api
         $this->error('支付失败');
     }
 
+    //注销账号
+    public function logoutaccount() {
+        $rs = Db::name('user')->where(['id' => $this->auth->id])->setField('status', 'logout');
 
+        $this->success('注销成功');
+    }
 }

application/common/library/Auth.php

@@ -107,10 +107,14 @@ class Auth
                 $this->setError('Account not exist');
                 return false;
             }
-            if ($user['status'] != 'normal') {
+            if ($user['status'] == 'hidden') {
                 $this->setError('Account is locked');
                 return false;
             }
+            if ($user['status'] == 'logout') {
+                $this->setError('账户已注销');
+                return false;
+            }
             $this->_user = $user;
             $this->_logined = true;
             $this->_token = $token;
@@ -244,10 +248,14 @@ class Auth
             return false;
         }
 
-        if ($user->status != 'normal') {
+        if ($user->status == 'hidden') {
             $this->setError('Account is locked');
             return false;
         }
+        if ($user->status == 'logout') {
+            $this->setError('账号已注销');
+            return false;
+        }
         if ($user->password != $this->getEncryptPassword($password, $user->salt)) {
             $this->setError('Password is incorrect');
             return false;

public/assets/js/backend/user/user.js

@@ -57,7 +57,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'declaration', title: __('Declaration'), operate: 'LIKE'},
                         {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), operate: 'LIKE', formatter: Table.api.formatter.status},
+                        {field: 'status', title: __('Status'), operate: 'LIKE', searchList: {"normal":__('正常'),"hidden":__('隐藏'), "logout":"注销"}, formatter: Table.api.formatter.normal},
                         {field: 'online', title: __('是否在线'), operate: false, searchList: {"1":__('在线'),"0":__('离线')}, formatter: Table.api.formatter.normal},
                         {field: 'active', title: __('是否活跃'), operate: false, searchList: {"1":__('活跃'),"0":__('不活跃')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}