From cff2dc911a7d5fcbd2ac6e851f7aa138f4df6890 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 21 Oct 2019 15:41:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 694e82c7c..28830bcc8 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -2134,14 +2134,8 @@ class QueryController extends BaseController public function getChildPromoteList() { - $promoteId = I('post.promote_id', 0); - if ($promoteId == 0) { - $data['status'] = 0; - $data['msg'] = '数据异常'; - - $this->ajaxReturn($data); - } - + $promoteId = intval(I('post.promote_id', 0)); + $promoteId = empty($promoteId) ? PID : $promoteId; $promoteList = getAllPromoteListByType(3, false, $promoteId); $data['status'] = 1; $data['data'] = $promoteList; From a29d1535814a2847ea7ee63622a1b01ac58b0da5 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 21 Oct 2019 15:43:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ios13.1=E7=BB=91=E5=AE=9A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/UserController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index de17feae5..7e32cf78e 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -237,13 +237,13 @@ class UserController extends BaseController $saveRes = M('User', 'tab_')->where(array('id' => $userData['id']))->save($saveData); if ($saveRes) { - $data = array('status' => 2, 'msg' => '登录成功!绑定成功'); + $data = array('status' => 2, 'msg' => '登录成功'); } else { $data = array('status' => 0, 'msg' => '绑定失败'); } } else { if ($userData['promote_id'] == $promoteId) { - $data = array('status' => 2, 'msg' => '登录成功!绑定成功'); + $data = array('status' => 2, 'msg' => '登录成功'); } else { $data = array('status' => 2, 'msg' => '登录成功'); }