From 4ee6a1ab3dcdb6922098f227e8d276a71af5ccd7 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 14 Feb 2019 23:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E7=A7=AF=E5=88=86=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.php | 8 ++++---- .../Hook.php | 4 ++-- .../config.json | 10 +++++----- .../admin/index.html | 4 ++-- .../admin/saveinfo.html | 4 ++-- application/tags.php | 2 +- config/shopxo.sql | 6 +++--- .../admin.css | 4 ++-- .../2019/02/14/1550151082834629.png | Bin 9 files changed, 21 insertions(+), 21 deletions(-) rename application/plugins/{userlogingiveintegral => userloginrewardintegral}/Admin.php (91%) rename application/plugins/{userlogingiveintegral => userloginrewardintegral}/Hook.php (97%) rename application/plugins/{userlogingiveintegral => userloginrewardintegral}/config.json (53%) rename application/plugins/view/{userlogingiveintegral => userloginrewardintegral}/admin/index.html (87%) rename application/plugins/view/{userlogingiveintegral => userloginrewardintegral}/admin/saveinfo.html (87%) rename public/static/plugins/css/{userlogingiveintegral => userloginrewardintegral}/admin.css (76%) rename public/static/upload/images/{plugins_userlogingiveintegral => plugins_userloginrewardintegral}/2019/02/14/1550151082834629.png (100%) diff --git a/application/plugins/userlogingiveintegral/Admin.php b/application/plugins/userloginrewardintegral/Admin.php similarity index 91% rename from application/plugins/userlogingiveintegral/Admin.php rename to application/plugins/userloginrewardintegral/Admin.php index 47ddf4b67..e43d86efb 100644 --- a/application/plugins/userlogingiveintegral/Admin.php +++ b/application/plugins/userloginrewardintegral/Admin.php @@ -8,7 +8,7 @@ // +---------------------------------------------------------------------- // | Author: Devil // +---------------------------------------------------------------------- -namespace app\plugins\userlogingiveintegral; +namespace app\plugins\userloginrewardintegral; use app\service\PluginsService; @@ -31,7 +31,7 @@ class Admin */ public function index($params = []) { - $ret = PluginsService::PluginsData('userlogingiveintegral'); + $ret = PluginsService::PluginsData('userloginrewardintegral'); if($ret['code'] == 0) { // 数组组装 @@ -54,7 +54,7 @@ class Admin */ public function saveinfo($params = []) { - $ret = PluginsService::PluginsData('userlogingiveintegral'); + $ret = PluginsService::PluginsData('userloginrewardintegral'); if($ret['code'] == 0) { // 是否 @@ -84,7 +84,7 @@ class Admin */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'userlogingiveintegral', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'userloginrewardintegral', 'data'=>$params]); } } ?> \ No newline at end of file diff --git a/application/plugins/userlogingiveintegral/Hook.php b/application/plugins/userloginrewardintegral/Hook.php similarity index 97% rename from application/plugins/userlogingiveintegral/Hook.php rename to application/plugins/userloginrewardintegral/Hook.php index 268e07ce8..825c6528c 100644 --- a/application/plugins/userlogingiveintegral/Hook.php +++ b/application/plugins/userloginrewardintegral/Hook.php @@ -8,7 +8,7 @@ // +---------------------------------------------------------------------- // | Author: Devil // +---------------------------------------------------------------------- -namespace app\plugins\userlogingiveintegral; +namespace app\plugins\userloginrewardintegral; use think\Db; use app\service\PluginsService; @@ -71,7 +71,7 @@ class Hook private function LoginGiveIntegral($params) { // 获取应用数据 - $ret = PluginsService::PluginsData('userlogingiveintegral'); + $ret = PluginsService::PluginsData('userloginrewardintegral'); if($ret['code'] == 0) { // 限制时间是否已结束 diff --git a/application/plugins/userlogingiveintegral/config.json b/application/plugins/userloginrewardintegral/config.json similarity index 53% rename from application/plugins/userlogingiveintegral/config.json rename to application/plugins/userloginrewardintegral/config.json index bb39de96a..42ba38693 100644 --- a/application/plugins/userlogingiveintegral/config.json +++ b/application/plugins/userloginrewardintegral/config.json @@ -1,12 +1,12 @@ { "base":{ - "plugins":"userlogingiveintegral", - "name":"登录赠送积分", - "logo":"\/static\/upload\/images\/plugins_userlogingiveintegral\/2019\/02\/14\/1550151082834629.png", + "plugins":"userloginrewardintegral", + "name":"登录奖励积分", + "logo":"\/static\/upload\/images\/plugins_userloginrewardintegral\/2019\/02\/14\/1550151082834629.png", "author":"Devil", "author_url":"https:\/\/shopxo.net\/", "version":"1.0.0", - "desc":"用户登录后赠送积分", + "desc":"用户登录成功后奖励积分", "apply_terminal":[ "pc", "h5" @@ -18,7 +18,7 @@ }, "hook":{ "plugins_control_user_login_end":[ - "app\\plugins\\userlogingiveintegral\\Hook" + "app\\plugins\\userloginrewardintegral\\Hook" ] } } \ No newline at end of file diff --git a/application/plugins/view/userlogingiveintegral/admin/index.html b/application/plugins/view/userloginrewardintegral/admin/index.html similarity index 87% rename from application/plugins/view/userlogingiveintegral/admin/index.html rename to application/plugins/view/userloginrewardintegral/admin/index.html index 13a14bdd1..7fc37d86f 100644 --- a/application/plugins/view/userlogingiveintegral/admin/index.html +++ b/application/plugins/view/userloginrewardintegral/admin/index.html @@ -8,7 +8,7 @@ 返回 -
+
@@ -44,7 +44,7 @@ {{/if}}
- 编辑 + 编辑
diff --git a/application/plugins/view/userlogingiveintegral/admin/saveinfo.html b/application/plugins/view/userloginrewardintegral/admin/saveinfo.html similarity index 87% rename from application/plugins/view/userlogingiveintegral/admin/saveinfo.html rename to application/plugins/view/userloginrewardintegral/admin/saveinfo.html index c2a2be691..866bcda59 100644 --- a/application/plugins/view/userlogingiveintegral/admin/saveinfo.html +++ b/application/plugins/view/userloginrewardintegral/admin/saveinfo.html @@ -4,10 +4,10 @@
-
+ 登录赠送积分 - 返回 + 返回
diff --git a/application/tags.php b/application/tags.php index 89e43b8fb..7a99c7314 100755 --- a/application/tags.php +++ b/application/tags.php @@ -43,7 +43,7 @@ return array ( ), 'plugins_control_user_login_end' => array ( - 0 => 'app\\plugins\\userlogingiveintegral\\Hook', + 0 => 'app\\plugins\\userloginrewardintegral\\Hook', ), ); ?> \ No newline at end of file diff --git a/config/shopxo.sql b/config/shopxo.sql index 36ac1af87..9a9f9023c 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -9,7 +9,7 @@ Target Server Version : 50716 File Encoding : utf-8 - Date: 02/14/2019 23:07:04 PM + Date: 02/14/2019 23:33:56 PM */ SET NAMES utf8; @@ -822,7 +822,7 @@ CREATE TABLE `s_plugins` ( -- Records of `s_plugins` -- ---------------------------- BEGIN; -INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550049324'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550049314'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550152363'), ('14', 'userlogingiveintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userlogingiveintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1550156513'); +INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550157744'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550157742'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '0', '1550157741'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1550158380'); COMMIT; -- ---------------------------- @@ -1073,7 +1073,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '2088502175420842-', '', '', '0', '255773', '70da5937905ce1d1a8c6a8a4ab5c72b3', '', '龚哥哥', '13250814883', 'fuxiang.gong@qq.com', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '967', '0', '0', '0', '0', '1545099005'), ('90', '2088502175420842', '', '', '0', '548064', '3428ab57b8303e93c2d0190c1c99ddf0', '', '魔鬼', '17602128368', '', '2', '', '上海', '上海市', '666201600', '', '20', '0', '0', '0', '1539167253', '1550156516'); +INSERT INTO `s_user` VALUES ('77', '2088502175420842-', '', '', '0', '785817', 'bb3cf6432bf357682e1a5ab115e66b3d', '', '龚哥哥', '13250814883', 'fuxiang.gong@qq.com', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '977', '0', '0', '0', '0', '1550158398'), ('90', '2088502175420842', '', '', '0', '789261', '849e371e484cd4d39f55aefac55bc97c', '', '魔鬼', '17602128368', '', '2', '', '上海', '上海市', '666201600', '', '25', '0', '0', '0', '1539167253', '1550157964'); COMMIT; -- ---------------------------- diff --git a/public/static/plugins/css/userlogingiveintegral/admin.css b/public/static/plugins/css/userloginrewardintegral/admin.css similarity index 76% rename from public/static/plugins/css/userlogingiveintegral/admin.css rename to public/static/plugins/css/userloginrewardintegral/admin.css index 4808a28ac..e5ccd3b92 100644 --- a/public/static/plugins/css/userlogingiveintegral/admin.css +++ b/public/static/plugins/css/userloginrewardintegral/admin.css @@ -1,12 +1,12 @@ /** * 首页 */ -.userlogingiveintegral-content .items { +.userloginrewardintegral-content .items { margin: 10px 0 20px 0; border-bottom: 1px dashed #f1f1f1; padding-bottom: 20px; } -.userlogingiveintegral-content .edit-submit { +.userloginrewardintegral-content .edit-submit { margin-bottom: 20px; } diff --git a/public/static/upload/images/plugins_userlogingiveintegral/2019/02/14/1550151082834629.png b/public/static/upload/images/plugins_userloginrewardintegral/2019/02/14/1550151082834629.png similarity index 100% rename from public/static/upload/images/plugins_userlogingiveintegral/2019/02/14/1550151082834629.png rename to public/static/upload/images/plugins_userloginrewardintegral/2019/02/14/1550151082834629.png