Merge branch 'develop'

app/common/logic/UserLogic.php

@@ -24,4 +24,48 @@ class UserLogic
         
         return $user;
     }
+
+    /**
+     * 用户信息
+     */
+    public function edit(int $uid, array $data)
+    {
+        $user = User::find($uid);
+
+        if (!$user) {
+            throw new BusinessException('账户不存在', 404);
+        }
+
+        $user->fill($data);
+        $user->save();
+
+        return $user;
+    }
+
+    /**
+     * 修改密码
+     */
+    public function savePassword(int $uid, array $data)
+    {
+        $password = password_hash($data['password_new'], PASSWORD_DEFAULT);
+        $res = User::where('id',$uid)->update(['password' => $password]);
+
+        return $res;
+    }
+
+    /**
+     * 获取用户列表
+     */
+    public function getList()
+    {
+        $list = User::where('status', 1)->orderBy('id', 'desc')->get();
+        $arr = [];
+        foreach ($list->toArray() as $item) {
+            $arr[] = [
+                'name' => $item['name'],
+                'id' => $item['id'],
+            ];
+        }
+        return $arr;
+    }
 }