From 1369a8447250d5e9866517aa29059abdf53f78b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 27 Feb 2023 15:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A0=8D=E4=BB=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/adminapi/controller/v1/user/User.php  | 25 +++++++++----------
 .../pages/marketing/storeBargain/index.vue    |  2 +-
 .../src/pages/user/list/handle/userEdit.vue   |  4 +--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/user/User.php b/crmeb/app/adminapi/controller/v1/user/User.php
index f6da30cb6..0502aa336 100644
--- a/crmeb/app/adminapi/controller/v1/user/User.php
+++ b/crmeb/app/adminapi/controller/v1/user/User.php
@@ -123,20 +123,19 @@ class User extends AuthController
         if ($data['card_id']) {
             if (!check_card($data['card_id'])) return app('json')->fail(400315);
         }
-        if ($data['pwd']) {
-            if (!$data['true_pwd']) {
-                return app('json')->fail(400263);
-            }
-            if ($data['pwd'] != $data['true_pwd']) {
-                return app('json')->fail(400264);
-            }
-            if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) {
-                return app('json')->fail(400762);
-            }
-            $data['pwd'] = md5($data['pwd']);
-        } else {
-            unset($data['pwd']);
+        if (!$data['pwd']) {
+            return app('json')->fail(400256);
         }
+        if (!$data['true_pwd']) {
+            return app('json')->fail(400263);
+        }
+        if ($data['pwd'] != $data['true_pwd']) {
+            return app('json')->fail(400264);
+        }
+        if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) {
+            return app('json')->fail(400762);
+        }
+        $data['pwd'] = md5($data['pwd']);
         unset($data['true_pwd']);
         $data['avatar'] = sys_config('h5_avatar');
         $data['adminId'] = $this->adminId;
diff --git a/template/admin/src/pages/marketing/storeBargain/index.vue b/template/admin/src/pages/marketing/storeBargain/index.vue
index 077ae0bc4..4e16a1680 100644
--- a/template/admin/src/pages/marketing/storeBargain/index.vue
+++ b/template/admin/src/pages/marketing/storeBargain/index.vue
@@ -194,7 +194,7 @@ export default {
           title: '操作',
           slot: 'action',
           fixed: 'right',
-          minWidth: 130,
+          minWidth: 160,
         },
       ],
       tableList: [],
diff --git a/template/admin/src/pages/user/list/handle/userEdit.vue b/template/admin/src/pages/user/list/handle/userEdit.vue
index 1e469c4e8..43f3b181f 100644
--- a/template/admin/src/pages/user/list/handle/userEdit.vue
+++ b/template/admin/src/pages/user/list/handle/userEdit.vue
@@ -40,7 +40,7 @@
           class="form-sty"
           type="password"
           v-model="formItem.pwd"
-          placeholder="请输入登录密码"
+          placeholder="请输入登录密码（修改用户可不填写，不填写不修改原密码）"
           style="width: 80%"
         ></Input>
       </FormItem>
@@ -49,7 +49,7 @@
           class="form-sty"
           type="password"
           v-model="formItem.true_pwd"
-          placeholder="请输入确认密码"
+          placeholder="请输入确认密码（修改用户可不填写，不填写不修改原密码）"
           style="width: 80%"
         ></Input>
       </FormItem>