From 212db3970d72eb90358d23eef4311b31707f8e6b Mon Sep 17 00:00:00 2001
From: lihan <3398341942@qq.com>
Date: Thu, 8 Nov 2018 11:45:28 +0800
Subject: [PATCH] 赠送积分和角色管理
---
app/friendship/controller/FriendController.php | 6 +++---
public/themes/simpleboot3/friendship/enter_password.html | 1 -
public/themes/simpleboot3/friendship/sure_password.html | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/friendship/controller/FriendController.php b/app/friendship/controller/FriendController.php
index 22d12b4..e861681 100644
--- a/app/friendship/controller/FriendController.php
+++ b/app/friendship/controller/FriendController.php
@@ -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);
diff --git a/public/themes/simpleboot3/friendship/enter_password.html b/public/themes/simpleboot3/friendship/enter_password.html
index 3c552fc..b3b9da3 100644
--- a/public/themes/simpleboot3/friendship/enter_password.html
+++ b/public/themes/simpleboot3/friendship/enter_password.html
@@ -155,7 +155,6 @@
dataType: "JSON",
success: function (data) {
- alert(data.msg);
if (data.data === true) {
window.location.href = data.url
}
diff --git a/public/themes/simpleboot3/friendship/sure_password.html b/public/themes/simpleboot3/friendship/sure_password.html
index 863d9cc..811a1a9 100644
--- a/public/themes/simpleboot3/friendship/sure_password.html
+++ b/public/themes/simpleboot3/friendship/sure_password.html
@@ -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
}
--
libgit2 0.24.0