赠送积分和角色管理

lihan
app/friendship/controller/FriendController.php
public/themes/simpleboot3/friendship/enter_password.html
public/themes/simpleboot3/friendship/sure_password.html
--- a/app/friendship/controller/FriendController.php
查看文件 @212db39
+++ b/app/friendship/controller/FriendController.php
查看文件 @212db39
@@ -196,7 +196,7 @@ class FriendController extends HomeBaseController
             if ($step == 'enter') {
                 session('user.pwd', $integral_pwd);
                 if (session('user.pwd')) {
-                    $this->success(session('user.pwd'), url('friendship/Friend/surePassword'), true);
+                    $this->success('', url('friendship/Friend/surePassword'), true);
                 }
             } elseif ($step == 'sure') {
                 if ($integral_pwd == session('user.pwd')) {
@@ -207,12 +207,12 @@ class FriendController extends HomeBaseController
                     if (Db::name('user')->update($data)) {
                         session('user.pwd', null);
                         $this->success('修改成功', url('user/center/myBalance'), true);
-                    }else {
+                    } else {
                         session('user.pwd', null);
                         $this->success('您未作出任何修改', url('user/center/myBalance'), true);
                     }
                 } else {
-                    $this->success($integral_pwd, '', false);
+                    $this->success('密码不一致', '', false);
                 }
             } else {
                 $this->success('未知错误', '', false);
--- a/public/themes/simpleboot3/friendship/enter_password.html
查看文件 @212db39
+++ b/public/themes/simpleboot3/friendship/enter_password.html
查看文件 @212db39
@@ -155,7 +155,6 @@
                 dataType: "JSON",
                 success: function (data) {
-                    alert(data.msg);
                     if (data.data === true) {
                         window.location.href = data.url
                     }
--- a/public/themes/simpleboot3/friendship/sure_password.html
查看文件 @212db39
+++ b/public/themes/simpleboot3/friendship/sure_password.html
查看文件 @212db39
@@ -128,7 +128,7 @@
                 t.onkeyup=function(){
                     arr.push($(this).val())
                     console.log(arr);
-                    var str=arr[0]+arr[1]+arr[2]+arr[3]+arr[4]+arr[5];
+                    str=arr[0]+arr[1]+arr[2]+arr[3]+arr[4]+arr[5];
                     console.log(str)
                 }
             }
@@ -148,7 +148,6 @@
                 dataType: "JSON",
                 success: function (data) {
-                    alert(data.msg);
                     if (data.data === true) {
                         window.location.href = data.url
                     }