From 2324148bde6e684dd04846a75a84a621a3d7f80a Mon Sep 17 00:00:00 2001
From: zmister <zmister@qq.com>
Date: Thu, 28 Oct 2021 21:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E9=9C=80=E6=A0=A1=E9=AA=8C=E5=8E=9F=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_admin/views.py                       |  6 ++++-
 template/app_doc/manage/manage_self.html | 33 +++++++++++++++---------
 template/app_doc/pro_list.html           | 32 +++++++++++++++--------
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/app_admin/views.py b/app_admin/views.py
index 6e3a7a9cc..b5b6e46c1 100644
--- a/app_admin/views.py
+++ b/app_admin/views.py
@@ -1009,9 +1009,13 @@ def admin_register_code(request):
 def change_pwd(request):
     if request.method == 'POST':
         try:
+            old_pwd = request.POST.get('old_pwd', None)
             password = request.POST.get('password',None)
             password2 = request.POST.get('password2',None)
-            print(password, password2)
+            # print(password, password2)
+            user = request.user.check_password(old_pwd)
+            if user is False:
+                return JsonResponse({'status':False,'data':_('密码错误！')})
             if password and password== password2:
                 if len(password) >= 6:
                     user = User.objects.get(id=request.user.id)
diff --git a/template/app_doc/manage/manage_self.html b/template/app_doc/manage/manage_self.html
index d25a47c18..b10df796d 100644
--- a/template/app_doc/manage/manage_self.html
+++ b/template/app_doc/manage/manage_self.html
@@ -66,25 +66,34 @@
                 title:'{% trans "修改密码" %}',
                 area:'300px;',
                 id:'changePwd',
-                content:'<div style="padding:10px 0 0 20px;">修改用户密码：</div><div style="padding: 20px;"><input class="layui-input" type="password" id="newPwd1" style="margin-bottom:10px;" placeholder="输入新密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd2" placeholder="再次确认新密码" required  lay-verify="required"></div>',
+                content:'<div style="padding:10px 0 0 20px;">修改用户密码：</div><div style="padding: 20px;"><input class="layui-input" type="password" id="oldPwd" style="margin-bottom:10px;" placeholder="输入原密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd1" style="margin-bottom:10px;" placeholder="输入新密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd2" placeholder="再次确认新密码" required  lay-verify="required"></div>',
                 btn:['{% trans "确认修改" %}','{% trans "取消" %}'],
                 yes:function (index,layero) {
                     layer.load(1);
                     data = {
+                        'old_pwd':$("#oldPwd").val(),
                         'password':$("#newPwd1").val(),
                         'password2':$("#newPwd2").val(),
                     }
-                    $.post("{% url 'modify_pwd' %}",data,function(r){
-                        layer.closeAll("loading");
-                        if(r.status){
-                            //修改成功
-                            // window.location.reload();
-                            layer.close(index)
-                            layer.msg("{% trans '修改成功' %}")
-                        }else{
-                            //修改失败，提示
-                            //console.log(r)
-                            layer.msg(r.data)
+                    $.ajax({
+                        url:"{% url 'modify_pwd' %}",
+                        type:"post",
+                        data:data,
+                        success:function(r){
+                            layer.closeAll('loading');
+                            if(r.status){
+                                //修改成功
+                                layer.close(index)
+                                layer.msg("{% trans '修改成功' %}")
+                            }else{
+                                //修改失败，提示
+                                //console.log(r)
+                                layer.msg(r.data,{icon:2})
+                            }
+                        },
+                        error:function(){
+                            layer.closeAll('loading');
+                            layer.msg("修改异常",{icon:2})
                         }
                     })
                 },
diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html
index 0344a7765..2586fa7bd 100644
--- a/template/app_doc/pro_list.html
+++ b/template/app_doc/pro_list.html
@@ -447,24 +447,34 @@
                 title:'{% trans "修改密码" %}',
                 area:'300px;',
                 id:'changePwd',
-                content:'<div style="padding:10px 0 0 20px;">修改用户[' + username + ']的密码：</div><div style="padding: 20px;"><input class="layui-input" type="password" id="newPwd1" style="margin-bottom:10px;" placeholder="输入新密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd2" placeholder="再次确认新密码" required  lay-verify="required"></div>',
+                content:'<div style="padding:10px 0 0 20px;">修改用户[' + username + ']的密码：</div><div style="padding: 20px;"><input class="layui-input" type="password" id="oldPwd" style="margin-bottom:10px;" placeholder="输入原密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd1" style="margin-bottom:10px;" placeholder="输入新密码" required  lay-verify="required"><input class="layui-input" type="password" id="newPwd2" placeholder="再次确认新密码" required  lay-verify="required"></div>',
                 btn:['{% trans "确认修改" %}','{% trans "取消" %}'],
                 yes:function (index,layero) {
                     layer.load(1);
                     data = {
+                        'old_pwd':$("#oldPwd").val(),
                         'password':$("#newPwd1").val(),
                         'password2':$("#newPwd2").val(),
                     }
-                    $.post("{% url 'modify_pwd' %}",data,function(r){
-                        layer.closeAll("loading");
-                        if(r.status){
-                            //修改成功
-                            window.location.reload();
-                            //layer.close(index)
-                        }else{
-                            //修改失败，提示
-                            //console.log(r)
-                            layer.msg(r.data)
+                    $.ajax({
+                        url:"{% url 'modify_pwd' %}",
+                        type:"post",
+                        data:data,
+                        success:function(r){
+                            layer.closeAll('loading');
+                            if(r.status){
+                                //修改成功
+                                window.location.reload();
+                                //layer.close(index)
+                            }else{
+                                //修改失败，提示
+                                //console.log(r)
+                                layer.msg(r.data,{icon:2})
+                            }
+                        },
+                        error:function(){
+                            layer.closeAll('loading');
+                            layer.msg("修改异常",{icon:2})
                         }
                     })
                 },