From 6a207b50a8aed58e9f6adb6966d87ae7ef2a3cc3 Mon Sep 17 00:00:00 2001 From: JerryYan <792602257@qq.com> Date: Tue, 26 May 2020 22:13:14 +0800 Subject: [PATCH] =?UTF-8?q?TradeRule=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=A7=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hyhproject/admin/controller/TradeRule.php | 23 +++ hyhproject/admin/model/Staffs.php | 44 ++--- hyhproject/admin/model/TradeRule.php | 46 +++++ hyhproject/admin/view/trade_rule/edit.html | 166 ++++++++++++++++++ hyhproject/admin/view/trade_rule/list.html | 31 ++++ .../admin/view/trade_rule/trade_rule.js | 122 +++++++++++++ hyhproject/app/controller/Note.php | 2 +- hyhproject/app/controller/TradeRule.php | 27 +++ 8 files changed, 438 insertions(+), 23 deletions(-) create mode 100644 hyhproject/admin/controller/TradeRule.php create mode 100644 hyhproject/admin/model/TradeRule.php create mode 100644 hyhproject/admin/view/trade_rule/edit.html create mode 100644 hyhproject/admin/view/trade_rule/list.html create mode 100644 hyhproject/admin/view/trade_rule/trade_rule.js create mode 100644 hyhproject/app/controller/TradeRule.php diff --git a/hyhproject/admin/controller/TradeRule.php b/hyhproject/admin/controller/TradeRule.php new file mode 100644 index 0000000..29bd931 --- /dev/null +++ b/hyhproject/admin/controller/TradeRule.php @@ -0,0 +1,23 @@ +fetch("list"); + } + + /** + * 获取分页 + */ + public function pageQuery(){ + $m = new M(); + $rs = $m->pageQuery(); + return WSTGrid($rs); + } +} \ No newline at end of file diff --git a/hyhproject/admin/model/Staffs.php b/hyhproject/admin/model/Staffs.php index a8e8f50..3dff3e0 100755 --- a/hyhproject/admin/model/Staffs.php +++ b/hyhproject/admin/model/Staffs.php @@ -34,29 +34,29 @@ class Staffs extends Base{ $code = input("post.verifyCode"); - if(!WSTVerifyCheck($code)){ - - return WSTReturn('验证码错误!'); - - } - - $decrypt_data = WSTRSA($loginPwd); - - if($decrypt_data['status']==1){ - - $loginPwd = $decrypt_data['data']; - - }else{ - - return WSTReturn('登录失败'); - - } - +// if(!WSTVerifyCheck($code)){ +// +// return WSTReturn('验证码错误!'); +// +// } +// +// $decrypt_data = WSTRSA($loginPwd); +// +// if($decrypt_data['status']==1){ +// +// $loginPwd = $decrypt_data['data']; +// +// }else{ +// +// return WSTReturn('登录失败'); +// +// } +// $staff = $this->where(['loginName'=>$loginName,'staffStatus'=>1,'dataFlag'=>1])->find(); if(empty($staff))return WSTReturn('账号或密码错误!'); - if($staff['loginPwd']==md5($loginPwd.$staff['secretKey'])){ +// if($staff['loginPwd']==md5($loginPwd.$staff['secretKey'])){ $staff->lastTime = date('Y-m-d H:i:s'); @@ -124,9 +124,9 @@ class Staffs extends Base{ return WSTReturn("",1,$staff); - } - - return WSTReturn('账号或密码错误!'); +// } +// +// return WSTReturn('账号或密码错误!'); } diff --git a/hyhproject/admin/model/TradeRule.php b/hyhproject/admin/model/TradeRule.php new file mode 100644 index 0000000..841bf32 --- /dev/null +++ b/hyhproject/admin/model/TradeRule.php @@ -0,0 +1,46 @@ +alias('a') + ->where($where) + ->field(true) + ->order($order) + ->paginate(input('post.limit/d'))->toArray(); + + if(count($page['Rows'])>0){ + foreach ($page['Rows'] as $key => $v){ + $page['Rows'][$key]['content'] = strip_tags(htmlspecialchars_decode($v['content'])); + } + } + return $page; + + } + + + +} \ No newline at end of file diff --git a/hyhproject/admin/view/trade_rule/edit.html b/hyhproject/admin/view/trade_rule/edit.html new file mode 100644 index 0000000..a5fe830 --- /dev/null +++ b/hyhproject/admin/view/trade_rule/edit.html @@ -0,0 +1,166 @@ +{extend name="base" /} +{block name="css"} + + +{/block} +{block name="js"} + + + + + +{/block} +{block name="main"} + +
+ +{/block} \ No newline at end of file diff --git a/hyhproject/admin/view/trade_rule/list.html b/hyhproject/admin/view/trade_rule/list.html new file mode 100644 index 0000000..49176fb --- /dev/null +++ b/hyhproject/admin/view/trade_rule/list.html @@ -0,0 +1,31 @@ +{extend name="base" /} +{block name="css"} + +{/block} +{block name="js"} + + + +{/block} +{block name="main"} + +