From 165bb5de99c3510780dfea414131f8dce4ad7def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=96=E5=8F=AB?= <392494244@qq.com>
Date: Thu, 30 Nov 2023 14:36:59 +0800
Subject: [PATCH] 1

---
 modules/admin/views/user/edit.php          |  5 ++-
 modules/api/controllers/UserController.php | 43 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/modules/admin/views/user/edit.php b/modules/admin/views/user/edit.php
index cdf139a..0fc5dbb 100644
--- a/modules/admin/views/user/edit.php
+++ b/modules/admin/views/user/edit.php
@@ -101,8 +101,11 @@ $this->params['breadcrumbs'][] = $this->title;
                                 </div>
                             </div>
                         </div>
-                        
 
+
+
+
+                        <div style="overflow-x: auto; overflow-y: auto;height: 400px"></div>
                     </div>
                 </div>
             </div>
diff --git a/modules/api/controllers/UserController.php b/modules/api/controllers/UserController.php
index 3e17981..77a77d7 100644
--- a/modules/api/controllers/UserController.php
+++ b/modules/api/controllers/UserController.php
@@ -12,6 +12,7 @@
 
 namespace app\modules\api\controllers;
 
+use function AlibabaCloud\Client\value;
 use app\components\EncryptHelper;
 use app\models\Order;
 use app\models\OrderDetail;
@@ -34,6 +35,8 @@ class UserController extends Controller
                 'class' => LoginBehavior::className(),
                 'ignore' => [
                     'api/user/add-qrcode-find',
+                    'api/user/find',
+
 //                    'api/user/user-collect-list',
                     'api/user/user-collect-hot',
 //                    'api/user/user-collect',
@@ -77,6 +80,46 @@ class UserController extends Controller
         return $this->responseHandler($data);
     }
 
+
+    /**
+     * showdoc
+     * @catalog 用户信息
+     * @title 基础信息
+     * @description 获取个人基础信息
+     * @method get
+     * @url /api/user/index
+     * @return {"code":0,"msg":"ok","data":{"user_id":"1","nickname":"admin","avatar_url":"http://app.tpl.dev.1nww.com/statics/images/avatar.jpg","gender":0,"gender_cn":"未知","is_modify_un":false,"type_cn":"管理员","is_admin":true}}
+     * @return_param is_modify_un boolean 是否可以修改用户名
+     * @return_param is_admin boolean 是否为管理员
+     * @return_param is_view int 是否已观看视频,0未观看，1已观看
+     * @return_param is_logout int 是否可提交注销,0可以提交，1可以撤销
+     * @return_param account_balance string 账户余额
+     * @return_param account_balance_with string 可提现余额
+     * @return_param account_balance_freeze string 冻结金额
+     * @return_param account_integral string 账户积分,整数
+     * @return_param account_integral_floor string 账户积分,浮点型
+     * @return_param level.cover string 背景卡片
+     * @return_param level.desc string 介绍
+     * @return_param level.level_exp string 经验值
+     * @return_param level.recharge_number string 所需升级经验
+     * @return_param level.level_id string 会员等级,0普通用户1见习会员2进阶会员3高阶会员
+     * @remark
+     */
+    public function actionFind()
+    {
+        $user_id = \Yii::$app->user->identity->id;
+        $data = [
+            'code' => 0,
+            'msg' => 'ok',
+            'data' => true
+        ];
+        if ($user_id == null) {
+            $data['data'] = false;
+        }
+        return $this->responseHandler($data);
+    }
+
+
     /**
      * hidedoc
      * @catalog 用户信息