Merge branch 'release/5.6' into release/security

@@ -475,6 +475,12 @@ const modPwdByCodeAPI = (req, res, next) => {
         newPwd: body.newPwd,
         token: req.session.CSToken
     }).then(d => {
+
+        if (d.code === 200 && req.session) {
+            delete req.session.CSToken;
+            delete req.session.canSkip;
+        }
+
         res.json(d);
     }).catch(next);
 };

@@ -92,7 +92,7 @@ $('#pwd, #repwd').keydown(function(e) {
 });
 
 $next.on('click', function() {
-    var refer = $weakPwdPass.data('href') || '/';
+    var refer = $weakPwdPass.data('url') || '/';
     var $this = $(this);
 
     // is frequent click

@@ -1008,7 +1008,7 @@
             width: 15px;
             height: 14px;
             margin-top: -2px;
-            margin-right: 5px;
+            margin-right: 2px;
             vertical-align: middle;
         }
     }

@@ -113,6 +113,7 @@
                 right: -26px;
                 background: #f8f8f8;
                 display: none;
+                z-index: 2;
             }
 
             .qrcode-box:before {