diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index 03b2df7a28a79fdf481147e8b182587e762235b0..0c8a1ae755bba080fd6d2dce19d34abdd95c4c70 100755 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -129,14 +129,23 @@ class Plugins extends Common // 当前操作名称 $module_name = 'plugins'; + // 模块组 + $group = 'admin'; + // 控制器静态文件状态css,js - $module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$plugins_control; + $module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.$plugins_control; $module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$plugins_action.'.css') ? '.'.$plugins_action.'.css' : '.css'; $this->assign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : ''); - $module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$plugins_control; + $module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.$plugins_control; $module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$plugins_action.'.js') ? '.'.$plugins_action.'.js' : '.js'; $this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : ''); + + // 应用公共css,js + $plugins_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.'common.css'; + $this->assign('plugins_css', file_exists(ROOT_PATH.'static'.DS.$plugins_css) ? $plugins_css : ''); + $plugins_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.'common.js'; + $this->assign('plugins_js', file_exists(ROOT_PATH.'static'.DS.$plugins_js) ? $plugins_js : ''); } } ?> \ No newline at end of file diff --git a/application/admin/view/default/public/footer.html b/application/admin/view/default/public/footer.html index 4d5f3fd458a366f344e33b0ba4766743540c11bd..6a18be278bfd2299ebd1ec10221995f5b61aa741 100755 --- a/application/admin/view/default/public/footer.html +++ b/application/admin/view/default/public/footer.html @@ -62,9 +62,14 @@ - + +{{if !empty($plugins_js)}} + +{{/if}} + + {{if !empty($module_js)}} - + {{/if}} diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html index ffa76ed8e8563cd6d702ae973f87a36c1145f1dd..9537a61824c1a71ad078d38f890c43b16844b7a9 100755 --- a/application/admin/view/default/public/header.html +++ b/application/admin/view/default/public/header.html @@ -12,6 +12,9 @@ + {{if !empty($plugins_css)}} + + {{/if}} {{if !empty($module_css)}} {{/if}} diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php index 2ccc9982e87aaca63041ec9892f9e22fd26f71ca..9f842989e96ce8d09bbd571c6da561033ccaf529 100755 --- a/application/index/controller/Plugins.php +++ b/application/index/controller/Plugins.php @@ -123,14 +123,23 @@ class Plugins extends Common // 当前操作名称 $module_name = 'plugins'; + // 模块组 + $group = 'index'; + // 控制器静态文件状态css,js - $module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$plugins_control; + $module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.$plugins_control; $module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$plugins_action.'.css') ? '.'.$plugins_action.'.css' : '.css'; $this->assign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : ''); - $module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$plugins_control; + $module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.$plugins_control; $module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$plugins_action.'.js') ? '.'.$plugins_action.'.js' : '.js'; $this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : ''); + + // 应用公共css,js + $plugins_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.'common.css'; + $this->assign('plugins_css', file_exists(ROOT_PATH.'static'.DS.$plugins_css) ? $plugins_css : ''); + $plugins_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.'common.js'; + $this->assign('plugins_js', file_exists(ROOT_PATH.'static'.DS.$plugins_js) ? $plugins_js : ''); } } ?> \ No newline at end of file diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html index e4ca18eb28221dd4054684cb93abe1a9572f2bcc..7e4268819764f23494d55e435ffa58bdc1766cbf 100755 --- a/application/index/view/default/public/footer.html +++ b/application/index/view/default/public/footer.html @@ -75,7 +75,12 @@ - + +{{if !empty($plugins_js)}} + +{{/if}} + + {{if !empty($module_js)}} {{/if}} diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html index ca9e895cf103cd082e5f87ec0f617f457c512e99..9429437ce41c6ee8951220fe08b0a9546e5798d3 100755 --- a/application/index/view/default/public/header.html +++ b/application/index/view/default/public/header.html @@ -24,6 +24,9 @@ + {{if !empty($plugins_css)}} + + {{/if}} {{if !empty($module_css)}} {{/if}} diff --git a/application/index/view/default/userfavor/goods.html b/application/index/view/default/userfavor/goods.html index 7d44bf8e354f4f681ac8cb415042331515509e9e..8d39c0525403fe638b11e834ac85355c0354eeca 100755 --- a/application/index/view/default/userfavor/goods.html +++ b/application/index/view/default/userfavor/goods.html @@ -64,7 +64,7 @@

￥{{$v.price}}

- + {{/foreach}} diff --git a/application/index/view/default/usergoodsbrowse/index.html b/application/index/view/default/usergoodsbrowse/index.html index 0560248b5091eb777c79ea7892e4253bd5acdb2c..6977784530b354f469952266952157bff6dca1c1 100755 --- a/application/index/view/default/usergoodsbrowse/index.html +++ b/application/index/view/default/usergoodsbrowse/index.html @@ -64,7 +64,7 @@

￥{{$v.price}}

- + {{/foreach}} diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php index f0393374c70d02d2c655a70b3ad2121ff387f3cc..66c46bb51fea18d98bfe1e766636f74403e06fac 100755 --- a/application/plugins/commononlineservice/Hook.php +++ b/application/plugins/commononlineservice/Hook.php @@ -49,11 +49,11 @@ class Hook extends Controller switch($params['hook_name']) { case 'plugins_css' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/commononlineservice/style.css'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/commononlineservice/index/style.css'; break; case 'plugins_js' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/commononlineservice/style.js'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/commononlineservice/index/style.js'; break; case 'plugins_view_common_bottom' : diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php index adc13e26cff31c4776ef171f53919c5a25a0eee1..fdb7564958e053c627e5851cf2ef1553c1694323 100755 --- a/application/plugins/commonrightnavigation/Hook.php +++ b/application/plugins/commonrightnavigation/Hook.php @@ -50,11 +50,11 @@ class Hook extends Controller switch($params['hook_name']) { case 'plugins_css' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/commonrightnavigation/style.css'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/commonrightnavigation/index/style.css'; break; case 'plugins_js' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/commonrightnavigation/style.js'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/commonrightnavigation/index/style.js'; break; case 'plugins_view_common_bottom' : diff --git a/application/plugins/footercustomerservice/Hook.php b/application/plugins/footercustomerservice/Hook.php index 175ec061e9eccf4cb088f0d94ce8f778e58cce8e..440680860b80f3e7ea21a4b8f28bbfee01a54eb4 100755 --- a/application/plugins/footercustomerservice/Hook.php +++ b/application/plugins/footercustomerservice/Hook.php @@ -85,7 +85,7 @@ class Hook extends Controller $ret = $this->IsNormal($params); if($ret['code'] == 0) { - return __MY_ROOT_PUBLIC__.'static/plugins/css/footercustomerservice/style.css'; + return __MY_ROOT_PUBLIC__.'static/plugins/css/footercustomerservice/index/style.css'; } return ''; } diff --git a/application/plugins/freightfee/Hook.php b/application/plugins/freightfee/Hook.php index fc720b956179c71d4be4acf80ae55c048b196703..89cd8d72fb8d1929b51ff26010527bf319fe3a5f 100755 --- a/application/plugins/freightfee/Hook.php +++ b/application/plugins/freightfee/Hook.php @@ -37,7 +37,7 @@ class Hook { // css case 'plugins_css' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/freightfee/style.css'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/freightfee/index/style.css'; break; // 运费计算 diff --git a/application/plugins/membershiplevel/Hook.php b/application/plugins/membershiplevel/Hook.php index b2645181833b4ecb0da444e372e04bbebeea6416..e71ac90bdd949efe476a3575ff5bd366b32b0e98 100755 --- a/application/plugins/membershiplevel/Hook.php +++ b/application/plugins/membershiplevel/Hook.php @@ -53,7 +53,7 @@ class Hook extends Controller switch($params['hook_name']) { case 'plugins_css' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/membershiplevel/style.css'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/css/membershiplevel/index/style.css'; break; // 商品数据处理后 diff --git a/application/plugins/share/Hook.php b/application/plugins/share/Hook.php index 9b7117ff1e3add909b8ac12e77940525a2f802f0..4a205d9affff367cab2ac1348c6c961c4f294416 100755 --- a/application/plugins/share/Hook.php +++ b/application/plugins/share/Hook.php @@ -39,13 +39,13 @@ class Hook extends Controller { case 'plugins_css' : $ret = [ - __MY_ROOT_PUBLIC__.'static/plugins/css/share/iconfont.css', - __MY_ROOT_PUBLIC__.'static/plugins/css/share/style.css', + __MY_ROOT_PUBLIC__.'static/plugins/css/share/index/iconfont.css', + __MY_ROOT_PUBLIC__.'static/plugins/css/share/index/style.css', ]; break; case 'plugins_js' : - $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/share/style.js'; + $ret = __MY_ROOT_PUBLIC__.'static/plugins/js/share/index/style.js'; break; case 'plugins_view_common_bottom' : diff --git a/application/plugins/view/wallet/wallet/cash.html b/application/plugins/view/wallet/cash/index.html similarity index 94% rename from application/plugins/view/wallet/wallet/cash.html rename to application/plugins/view/wallet/cash/index.html index 8bc67efed09722b5ad7146daf59b7d9b163ef973..d648926ed473b17637611728bf9798cb82e5d70e 100755 --- a/application/plugins/view/wallet/wallet/cash.html +++ b/application/plugins/view/wallet/cash/index.html @@ -23,10 +23,10 @@
- {{include file="../../../plugins/view/wallet/wallet/nav" /}} + {{include file="../../../plugins/view/wallet/public/nav" /}} -
+
@@ -56,7 +56,7 @@ - 清除条件 + 清除条件 diff --git a/application/plugins/view/wallet/wallet/nav.html b/application/plugins/view/wallet/public/nav.html similarity index 63% rename from application/plugins/view/wallet/wallet/nav.html rename to application/plugins/view/wallet/public/nav.html index 578fb432fb3c3b50e1187a69b96a1f0316fa6174..bfc5a95cc59bc0ed7bd581fcd76a21281ab8b36f 100755 --- a/application/plugins/view/wallet/wallet/nav.html +++ b/application/plugins/view/wallet/public/nav.html @@ -1,40 +1,46 @@ -
-
- 可用金额 - {{$user.integral}} - 元 - 正常可以使用的金额 +{{if empty($wallet_error)}} +
+
+ 可用金额 + {{$user_wallet.normal_money}} + 元 + 正常可以使用的金额 +
+
+ 冻结金额 + {{$user_wallet.frozen_money}} + 元 + 一般积分交易中、提现、交易并未完成，锁定相应的积分 +
-
- 冻结金额 - {{$user.locking_integral}} - 元 - 一般积分交易中、提现、交易并未完成，锁定相应的积分 +{{else /}} +
+ {{$wallet_error}}
-
+{{/if}}
@@ -43,7 +49,7 @@ ×
- +
@@ -52,7 +58,7 @@
- +
@@ -62,12 +68,17 @@
-

支付方式

+

支付确认

×
-
-
+ +
+

充值单号：...

+

充值金额：...

+
+
+ {{if !empty($buy_payment_list)}}
    {{foreach $buy_payment_list as $payment}} @@ -77,6 +88,7 @@ {{/if}} {{$payment.name}} + {{/if}} {{/foreach}} @@ -90,7 +102,7 @@
    - +
@@ -108,7 +120,11 @@ function PluginsRechargeBack(e) { $('#plugins-recharge-pay-modal').modal('close'); var $popup = $('#plugins-recharge-pay-popup'); + $popup.find('.business-item ul li').removeClass('selected'); + $popup.find('input[name="payment_id"]').val(''); $popup.find('input[name="recharge_id"]').val(e.data.recharge_id); + $popup.find('.base .recharge-no').text(e.data.recharge_no); + $popup.find('.base .price strong').text('￥'+e.data.money); $popup.modal('open'); } else { Prompt(e.msg); diff --git a/application/plugins/view/wallet/wallet/recharge.html b/application/plugins/view/wallet/recharge/index.html similarity index 84% rename from application/plugins/view/wallet/wallet/recharge.html rename to application/plugins/view/wallet/recharge/index.html index 215ae6aed2c3cbf721830749c60fae8fe6e6ba8b..65e9a5d52fc72556f869dceca2add1c3d560b9ea 100755 --- a/application/plugins/view/wallet/wallet/recharge.html +++ b/application/plugins/view/wallet/recharge/index.html @@ -23,7 +23,7 @@
- {{include file="../../../plugins/view/wallet/wallet/nav" /}} + {{include file="../../../plugins/view/wallet/public/nav" /}}
@@ -54,15 +54,16 @@ {{if !empty($data_list)}} {{foreach $data_list as $v}} - + {{$v.recharge_no}} - {{$v.money}} + +{{$v.money}} {{$v.status_text}} {{$v.payment_name}} {{$v.pay_time_text}} {{$v.add_time_text}} - + + {{/foreach}} diff --git a/application/plugins/view/wallet/wallet/index.html b/application/plugins/view/wallet/wallet/index.html index 43800cdf87ebc6cfcb67d9917e043694940e177e..0abe24e79a905ff968aaf5ba763bbc7f1819b905 100755 --- a/application/plugins/view/wallet/wallet/index.html +++ b/application/plugins/view/wallet/wallet/index.html @@ -23,7 +23,7 @@
- {{include file="../../../plugins/view/wallet/wallet/nav" /}} + {{include file="../../../plugins/view/wallet/public/nav" /}} diff --git a/application/plugins/wallet/Cash.php b/application/plugins/wallet/Cash.php new file mode 100644 index 0000000000000000000000000000000000000000..f14936df90af053bfb60c9967ae8fd5310d11cc4 --- /dev/null +++ b/application/plugins/wallet/Cash.php @@ -0,0 +1,61 @@ +user; + + $this->assign('data_list', []); + + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/cash/index'); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Common.php b/application/plugins/wallet/Common.php new file mode 100644 index 0000000000000000000000000000000000000000..186a46c2164cd415b188098a9fe796194f44a5eb --- /dev/null +++ b/application/plugins/wallet/Common.php @@ -0,0 +1,83 @@ +user = UserService::LoginUserInfo(); + + // 登录校验 + if(empty($this->user)) + { + if(IS_AJAX) + { + exit(json_encode(DataReturn('登录失效，请重新登录', -400))); + } else { + return $this->redirect('index/user/logininfo'); + } + } + + // 发起支付 - 支付方式 + $this->assign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); + + // 用户钱包信息 + $this->user_wallet = WalletService::UserWallet(['user'=>$this->user]); + $this->assign('user_wallet', $this->user_wallet['data']); + + // 用户钱包状态 + $wallet_error = ''; + if(isset($this->user_wallet['code']) and $this->user_wallet['code'] == 0) + { + if(!isset($this->user_wallet['data']['status']) || $this->user_wallet['data']['status'] != 0) + { + $wallet_error = array_key_exists($this->user_wallet['data']['status'], WalletService::$wallet_status_list) ? '用户钱包[ '.WalletService::$wallet_status_list[$this->user_wallet['data']['status']]['name'].' ]' : '用户钱包状态异常错误'; + } + } else { + $wallet_error = isset($this->user_wallet['msg']) ? $this->user_wallet['msg'] : '用户钱包异常错误'; + } + $this->assign('wallet_error', $wallet_error); + + // 所有ajax请求校验用户钱包状态 + if(IS_AJAX && !empty($wallet_error)) + { + exit(json_encode(DataReturn($wallet_error, -50))); + } + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Level.php b/application/plugins/wallet/Level.php deleted file mode 100755 index 1eeff5e2055ded802ed08e8d2ac80a954eb09a56..0000000000000000000000000000000000000000 --- a/application/plugins/wallet/Level.php +++ /dev/null @@ -1,135 +0,0 @@ -assign('data_list', $ret['data']); - $this->assign('params', $params); - return $this->fetch('../../../plugins/view/membershiplevel/level/index'); - } else { - return $ret['msg']; - } - } - - /** - * 等级编辑 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-02-07T08:21:54+0800 - * @param [array] $params [输入参数] - */ - public function saveinfo($params = []) - { - // 数据 - $data = []; - if(!empty($params['id'])) - { - $data_params = [ - 'get_id' => $params['id'], - ]; - $ret = Service::LevelDataList($data_params); - $data = empty($ret['data']) ? [] : $ret['data']; - } - $this->assign('data', $data); - - return $this->fetch('../../../plugins/view/membershiplevel/level/saveinfo'); - } - - /** - * 等级保存 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-02-07T08:21:54+0800 - * @param [array] $params [输入参数] - */ - public function save($params = []) - { - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 开始处理 - return Service::LevelDataSave($params); - } - - /** - * 等级状态更新 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-01-12T22:23:06+0800 - * @param [array] $params [输入参数] - */ - public function statusupdate($params = []) - { - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 开始处理 - $params['data_field'] = 'level_list'; - return Service::DataStatusUpdate($params); - } - - /** - * 等级删除 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-15T11:03:30+0800 - * @param [array] $params [输入参数] - */ - public function delete($params = []) - { - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 开始处理 - $params['data_field'] = 'level_list'; - return Service::DataDelete($params); - } -} -?> \ No newline at end of file diff --git a/application/plugins/wallet/Recharge.php b/application/plugins/wallet/Recharge.php new file mode 100755 index 0000000000000000000000000000000000000000..1cbfd83740e3811b93679c110ee0670e6ddf0f8d --- /dev/null +++ b/application/plugins/wallet/Recharge.php @@ -0,0 +1,193 @@ +user; + + // 分页 + $number = MyC('admin_page_number', 10, true); + + // 条件 + $where = BaseService::RechargeListWhere($params); + + // 获取总数 + $total = BaseService::RechargeTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => PluginsHomeUrl('wallet', 'recharge', 'index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = BaseService::RechargeList($data_params); + $this->assign('data_list', $data['data']); + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/recharge/index'); + } + + /** + * 充值订单创建 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function create($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 用户 + $params['user'] = $this->user; + return BaseService::RechargeCreate($params); + } + + /** + * 支付 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function pay($params = []) + { + // 用户 + $params['user'] = $this->user; + return BaseService::Pay($params); + } + + /** + * 支付状态校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function paycheck($params = []) + { + if(input('post.')) + { + $params['user'] = $this->user; + return BaseService::RechargePayCheck($params); + } else { + $this->assign('msg', '非法访问'); + return $this->fetch('public/tips_error'); + } + } + + /** + * 支付同步页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-29 + * @desc description + * @param [array] $params [输入参数] + */ + public function respond($params = []) + { + $this->assign('msg', '支付失败'); + return $this->fetch('public/pay_error'); + } + + /** + * 支付异步通知 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-29 + * @desc description + * @param [array] $params [输入参数] + */ + public function notify($params = []) + { + $this->assign('msg', '支付成功'); + return $this->fetch('public/pay_success'); + } + + /** + * 充值纪录删除 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-14 + * @desc description + * @param [array] $params [输入参数] + */ + public function delete($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error('非法访问'); + } + + // 开始处理 + $params['user'] = $this->user; + return BaseService::RechargeDelete($params); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Wallet.php b/application/plugins/wallet/Wallet.php old mode 100755 new mode 100644 index 0c36fce2b77167bd86d1702bcec19c877c88d337..b0e9d48bb3122e75eec684e0595f7c59a0929a7e --- a/application/plugins/wallet/Wallet.php +++ b/application/plugins/wallet/Wallet.php @@ -10,25 +10,20 @@ // +---------------------------------------------------------------------- namespace app\plugins\wallet; -use think\Controller; -use app\plugins\wallet\Service; +use app\plugins\wallet\Common; +use app\plugins\wallet\BusinessService; use app\service\PluginsService; -use app\service\UserService; use app\service\IntegralService; -use app\service\PaymentService; - /** - * 我的钱包 - 钱包 + * 钱包 - 账户明细 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Wallet extends Controller +class Wallet extends Common { - private $user; - /** * 构造方法 * @author Devil @@ -40,23 +35,6 @@ class Wallet extends Controller public function __construct() { parent::__construct(); - - // 用户信息 - $this->user = UserService::LoginUserInfo(); - - // 登录校验 - if(empty($this->user)) - { - if(IS_AJAX) - { - exit(json_encode(DataReturn('登录失效，请重新登录', -400))); - } else { - return $this->redirect('index/user/logininfo'); - } - } - - // 发起支付 - 支付方式 - $this->assign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); } /** @@ -109,201 +87,5 @@ class Wallet extends Controller $this->assign('params', $params); return $this->fetch('../../../plugins/view/wallet/wallet/index'); } - - /** - * 充值明细 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function recharge($params = []) - { - // 参数 - $params['user'] = $this->user; - - // 分页 - $number = MyC('admin_page_number', 10, true); - - // 条件 - $where = Service::RechargeListWhere($params); - - // 获取总数 - $total = Service::RechargeTotal($where); - - // 分页 - $page_params = array( - 'number' => $number, - 'total' => $total, - 'where' => $params, - 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => PluginsHomeUrl('wallet', 'wallet', 'recharge'), - ); - $page = new \base\Page($page_params); - $this->assign('page_html', $page->GetPageHtml()); - - // 获取列表 - $data_params = array( - 'm' => $page->GetPageStarNumber(), - 'n' => $number, - 'where' => $where, - ); - $data = Service::RechargeList($data_params); - $this->assign('data_list', $data['data']); - - // 参数 - $this->assign('params', $params); - return $this->fetch('../../../plugins/view/wallet/wallet/recharge'); - } - - /** - * 余额提现 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function cash($params = []) - { - // 参数 - $params = input(); - $params['user'] = $this->user; - - $this->assign('data_list', []); - - - // 参数 - $this->assign('params', $params); - return $this->fetch('../../../plugins/view/wallet/wallet/cash'); - } - - /** - * 充值订单创建 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function rechargecreate($params = []) - { - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 用户 - $params['user'] = $this->user; - return Service::RechargeCreate($params); - } - - /** - * 支付 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function pay($params = []) - { - // 用户 - $params['user'] = $this->user; - return Service::Pay($params); - } - - /** - * 支付状态校验 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function paycheck($params = []) - { - if(input('post.')) - { - $params['user'] = $this->user; - return Service::RechargePayCheck($params); - } else { - $this->assign('msg', '非法访问'); - return $this->fetch('public/tips_error'); - } - } - - /** - * 支付同步页面 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-04-29 - * @desc description - * @param [array] $params [输入参数] - */ - public function respond($params = []) - { - $this->assign('msg', '支付失败'); - return $this->fetch('public/pay_error'); - } - - /** - * 支付异步通知 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-04-29 - * @desc description - * @param [array] $params [输入参数] - */ - public function notify($params = []) - { - $this->assign('msg', '支付成功'); - return $this->fetch('public/pay_success'); - } - - /** - * 宠物解绑 - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-15T11:03:30+0800 - */ - public function untying($params = []) - { - // 是否ajax - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 用户 - $params['user_id'] = $this->user['id']; - return Service::PetsUntying($params); - } - - /** - * 丢失提供信息添加/编辑 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-03-15T23:51:50+0800 - * @param [array] $params [输入参数] - */ - public function helpsave($params = []) - { - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 用户 - $params['user_id'] = $this->user['id']; - return Service::HelpSave($params); - } } ?> \ No newline at end of file diff --git a/application/plugins/wallet/install.sql b/application/plugins/wallet/install.sql index 379ec3b994c9eec418ecb5a3c9ebeee076b38c3e..30af8d22aea68bdb2ed5963bb4994d7274ee9983 100644 --- a/application/plugins/wallet/install.sql +++ b/application/plugins/wallet/install.sql @@ -14,4 +14,35 @@ CREATE TABLE `s_plugins_wallet_recharge` ( UNIQUE KEY `recharge_no` (`recharge_no`), KEY `status` (`status`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='钱包充值 - 应用'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='钱包充值 - 应用'; + +# 钱包 +CREATE TABLE `s_plugins_wallet` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id', + `user_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户id', + `status` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0正常, 1异常, 2已注销）', + `normal_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '有效金额（包含赠送金额）', + `frozen_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '冻结金额', + `give_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '赠送金额（所有赠送金额总计）', + `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', + `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `status` (`status`), + KEY `user_id` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='钱包 - 应用'; + +# 钱包日志 +CREATE TABLE `s_plugins_wallet_log` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id', + `user_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户id', + `wallet_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '钱包id', + `business_type` tinyint(2) NOT NULL DEFAULT '-1' COMMENT '业务类型（-1未知, 0充值, 1提现, 2消费）', + `operation_type` tinyint(2) NOT NULL DEFAULT '-1' COMMENT '操作类型（-1未知, 0减少, 1增加）', + `money_type` tinyint(2) NOT NULL DEFAULT '-1' COMMENT '操作类型（-1未知, 0正常, 1冻结）', + `money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '操作金额', + `msg` char(200) NOT NULL DEFAULT '' COMMENT '变更说明', + `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', + PRIMARY KEY (`id`), + KEY `wallet_id` (`wallet_id`), + KEY `user_id` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='钱包日志 - 应用'; \ No newline at end of file diff --git a/application/plugins/wallet/Service.php b/application/plugins/wallet/service/BaseService.php similarity index 87% rename from application/plugins/wallet/Service.php rename to application/plugins/wallet/service/BaseService.php index a2c892e6a76f8b59788b3a0a66c173c23db3bd4d..ef359f651a40efb369849116c370f9c64ffac93b 100755 --- a/application/plugins/wallet/Service.php +++ b/application/plugins/wallet/service/BaseService.php @@ -8,7 +8,7 @@ // +---------------------------------------------------------------------- // | Author: Devil // +---------------------------------------------------------------------- -namespace app\plugins\wallet; +namespace app\plugins\wallet\service; use think\Db; use app\service\PluginsService; @@ -16,13 +16,13 @@ use app\service\ResourcesService; use app\service\PaymentService; /** - * 会员等级服务层 + * 基础服务层 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Service +class BaseService { // 基础数据附件字段 public static $base_config_attachment_field = [ @@ -41,7 +41,7 @@ class Service * @blog http://gong.gg/ * @version 1.0.0 * @datetime 2019-04-30T00:13:14+0800 - * @param array $params [description] + * @param [array] $params [输入参数] */ public static function RechargeList($params = []) { @@ -118,7 +118,7 @@ class Service // 关键字 if(!empty($params['keywords'])) { - $where[] = ['recharge_no', 'like', '%'.$params['keywords'].'%']; + $where[] = ['recharge_no', '=', $params['keywords']]; } return $where; @@ -176,8 +176,8 @@ class Service return DataReturn('添加成功',0, [ 'recharge_id' => $recharge_id, 'recharge_no' => $data['recharge_no'], + 'money' => $data['money'], ]); - //return self::Pay($params); } return DataReturn('添加失败', -100); } @@ -269,7 +269,7 @@ class Service { $call_back_url = $url.'_respond.php'; } else { - $call_back_url = PluginsHomeUrl('wallet', 'wallet', 'respond', ['paymentname'=>$payment[0]['payment']]); + $call_back_url = PluginsHomeUrl('wallet', 'recharge', 'respond', ['paymentname'=>$payment[0]['payment']]); if(stripos($call_back_url, '?') !== false) { $call_back_url = $url.'_respond.php'; @@ -287,7 +287,7 @@ class Service 'notify_url' => $url.'_notify.php', 'call_back_url' => $call_back_url, 'site_name' => MyC('home_site_name', 'ShopXO', true), - 'ajax_url' => PluginsHomeUrl('wallet', 'wallet', 'paycheck') + 'ajax_url' => PluginsHomeUrl('wallet', 'recharge', 'paycheck') ); $pay_name = 'payment\\'.$payment[0]['payment']; $ret = (new $pay_name($payment[0]['config']))->Pay($pay_data); @@ -337,9 +337,51 @@ class Service } if($recharge['status'] == 1) { - return DataReturn('支付成功', 0, ['url'=>PluginsHomeUrl('wallet', 'wallet', 'recharge')]); + return DataReturn('支付成功', 0, ['url'=>PluginsHomeUrl('wallet', 'recharge', 'index')]); } return DataReturn('支付中', -300); } + + /** + * 充值纪录删除 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-14 + * @desc description + * @param [array] $params [输入参数] + */ + public static function RechargeDelete($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '删除数据id有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'user', + 'error_msg' => '用户信息有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 删除 + $where = [ + 'id' => intval($params['id']), + 'user_id' => $params['user']['id'] + ]; + if(Db::name('PluginsWalletRecharge')->where($where)->delete()) + { + return DataReturn('删除成功', 0); + } + return DataReturn('删除失败或资源不存在', -100); + } } ?> \ No newline at end of file diff --git a/application/plugins/wallet/service/WalletService.php b/application/plugins/wallet/service/WalletService.php new file mode 100644 index 0000000000000000000000000000000000000000..a1e7e40e48d88c85df3fb0525e9067ac35fc6930 --- /dev/null +++ b/application/plugins/wallet/service/WalletService.php @@ -0,0 +1,80 @@ + ['value' => 0, 'name' => '正常', 'checked' => true], + 1 => ['value' => 1, 'name' => '异常'], + 2 => ['value' => 2, 'name' => '已注销'], + ]; + + /** + * 用户钱包 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-30 + * @desc description + * @param [array] $params [输入参数] + */ + public static function UserWallet($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'user', + 'error_msg' => '用户信息有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 获取钱包, 不存在则创建 + $wallet = Db::name('PluginsWallet')->where(['user_id' => $params['user']['id']])->find(); + if(empty($wallet)) + { + $data = [ + 'user_id' => $params['user']['id'], + 'status' => 0, + 'add_time' => time(), + ]; + $wallet_id = Db::name('PluginsWallet')->insertGetId($data); + if($wallet_id > 0) + { + $wallet = Db::name('PluginsWallet')->find($wallet_id); + } else { + return DataReturn('钱包添加失败', -100); + } + } + + return DataReturn('操作成功', 0, $wallet); + } +} +?> \ No newline at end of file diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index d1dbd2a65f5fd447625613c75b6922dad1ef0d8f..1841c91548d208a4ebfd3d5b1c3790ba42dd7c2b 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -658,6 +658,12 @@ php; if(\base\FileUtil::CreateDir($app_static_css_dir) !== true) { return DataReturn('应用静态目录创建失败[css]', -10); + } else { + // 后端css目录创建 + if(\base\FileUtil::CreateDir($app_static_css_dir.DS.'admin') !== true) + { + return DataReturn('应用静态目录创建失败[css/admin]', -10); + } } // 编辑模式下不生成后端文件 @@ -685,7 +691,7 @@ php; } // css创建 - if(@file_put_contents($app_static_css_dir.DS.'admin.css', $admin_css) === false) + if(@file_put_contents($app_static_css_dir.DS.'admin'.DS.'admin.css', $admin_css) === false) { return DataReturn('应用静态文件创建失败[admin-css]', -11); } @@ -712,8 +718,14 @@ php; return DataReturn('应用视图文件创建失败[index-view]', -11); } + // 前端css目录创建 + if(\base\FileUtil::CreateDir($app_static_css_dir.DS.'index') !== true) + { + return DataReturn('应用静态目录创建失败[css/index]', -10); + } + // css创建 - if(@file_put_contents($app_static_css_dir.DS.'index.css', $index_css) === false) + if(@file_put_contents($app_static_css_dir.DS.'index'.DS.'index.css', $index_css) === false) { return DataReturn('应用静态文件创建失败[index-css]', -11); } @@ -722,7 +734,7 @@ php; } else { \base\FileUtil::UnlinkFile($app_dir.DS.'Index.php'); \base\FileUtil::UnlinkDir(APP_PATH.'plugins'.DS.'view'.DS.trim($params['plugins']).DS.'index'); - \base\FileUtil::UnlinkFile($app_static_css_dir.DS.'index.css'); + \base\FileUtil::UnlinkFile($app_static_css_dir.DS.'index'.DS.'index.css'); } return DataReturn('创建成功', 0); diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index ad4701b4b49d9df9b7ee3b6f21cb9b37e08d6203..1989189b13d145a9f587298405a9aaa7e93c0632 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -992,7 +992,7 @@ function ConfirmNetworkAjax(e) AMUI.dialog.confirm({ title: title, content: msg, - onConfirm: function(e) + onConfirm: function(result) { AjaxRequest(e); }, diff --git a/public/static/plugins/css/answers/admin.css b/public/static/plugins/css/answers/admin/admin.css similarity index 100% rename from public/static/plugins/css/answers/admin.css rename to public/static/plugins/css/answers/admin/admin.css diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index/index.css similarity index 100% rename from public/static/plugins/css/answers/index.css rename to public/static/plugins/css/answers/index/index.css diff --git a/public/static/plugins/css/commongobacktop/admin.css b/public/static/plugins/css/commongobacktop/admin/admin.css similarity index 100% rename from public/static/plugins/css/commongobacktop/admin.css rename to public/static/plugins/css/commongobacktop/admin/admin.css diff --git a/public/static/plugins/css/commononlineservice/admin.css b/public/static/plugins/css/commononlineservice/admin/admin.css similarity index 100% rename from public/static/plugins/css/commononlineservice/admin.css rename to public/static/plugins/css/commononlineservice/admin/admin.css diff --git a/public/static/plugins/css/commononlineservice/style.css b/public/static/plugins/css/commononlineservice/index/style.css similarity index 100% rename from public/static/plugins/css/commononlineservice/style.css rename to public/static/plugins/css/commononlineservice/index/style.css diff --git a/public/static/plugins/css/commonrightnavigation/admin.css b/public/static/plugins/css/commonrightnavigation/admin/admin.css similarity index 100% rename from public/static/plugins/css/commonrightnavigation/admin.css rename to public/static/plugins/css/commonrightnavigation/admin/admin.css diff --git a/public/static/plugins/css/commonrightnavigation/style.css b/public/static/plugins/css/commonrightnavigation/index/style.css similarity index 100% rename from public/static/plugins/css/commonrightnavigation/style.css rename to public/static/plugins/css/commonrightnavigation/index/style.css diff --git a/public/static/plugins/css/commontopmaxpicture/admin.css b/public/static/plugins/css/commontopmaxpicture/admin/admin.css similarity index 100% rename from public/static/plugins/css/commontopmaxpicture/admin.css rename to public/static/plugins/css/commontopmaxpicture/admin/admin.css diff --git a/public/static/plugins/css/commontopnotice/admin.css b/public/static/plugins/css/commontopnotice/admin/admin.css similarity index 100% rename from public/static/plugins/css/commontopnotice/admin.css rename to public/static/plugins/css/commontopnotice/admin/admin.css diff --git a/public/static/plugins/css/expressforkdn/admin.css b/public/static/plugins/css/expressforkdn/admin/admin.css similarity index 100% rename from public/static/plugins/css/expressforkdn/admin.css rename to public/static/plugins/css/expressforkdn/admin/admin.css diff --git a/public/static/plugins/css/footercustomerservice/admin.css b/public/static/plugins/css/footercustomerservice/admin/admin.css similarity index 100% rename from public/static/plugins/css/footercustomerservice/admin.css rename to public/static/plugins/css/footercustomerservice/admin/admin.css diff --git a/public/static/plugins/css/footercustomerservice/style.css b/public/static/plugins/css/footercustomerservice/index/style.css similarity index 100% rename from public/static/plugins/css/footercustomerservice/style.css rename to public/static/plugins/css/footercustomerservice/index/style.css diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin/admin.css similarity index 100% rename from public/static/plugins/css/freightfee/admin.css rename to public/static/plugins/css/freightfee/admin/admin.css diff --git a/public/static/plugins/css/freightfee/style.css b/public/static/plugins/css/freightfee/index/style.css similarity index 100% rename from public/static/plugins/css/freightfee/style.css rename to public/static/plugins/css/freightfee/index/style.css diff --git a/public/static/plugins/css/homemiddleadv/admin.css b/public/static/plugins/css/homemiddleadv/admin/admin.css similarity index 100% rename from public/static/plugins/css/homemiddleadv/admin.css rename to public/static/plugins/css/homemiddleadv/admin/admin.css diff --git a/public/static/plugins/css/membershiplevel/admin.css b/public/static/plugins/css/membershiplevel/admin/admin.css similarity index 100% rename from public/static/plugins/css/membershiplevel/admin.css rename to public/static/plugins/css/membershiplevel/admin/admin.css diff --git a/public/static/plugins/css/membershiplevel/level.css b/public/static/plugins/css/membershiplevel/admin/level.css similarity index 100% rename from public/static/plugins/css/membershiplevel/level.css rename to public/static/plugins/css/membershiplevel/admin/level.css diff --git a/public/static/plugins/css/membershiplevel/style.css b/public/static/plugins/css/membershiplevel/index/style.css similarity index 100% rename from public/static/plugins/css/membershiplevel/style.css rename to public/static/plugins/css/membershiplevel/index/style.css diff --git a/public/static/plugins/css/newuserreduction/admin.css b/public/static/plugins/css/newuserreduction/admin/admin.css similarity index 100% rename from public/static/plugins/css/newuserreduction/admin.css rename to public/static/plugins/css/newuserreduction/admin/admin.css diff --git a/public/static/plugins/css/share/admin.css b/public/static/plugins/css/share/admin/admin.css similarity index 100% rename from public/static/plugins/css/share/admin.css rename to public/static/plugins/css/share/admin/admin.css diff --git a/public/static/plugins/css/share/iconfont.css b/public/static/plugins/css/share/index/iconfont.css similarity index 100% rename from public/static/plugins/css/share/iconfont.css rename to public/static/plugins/css/share/index/iconfont.css diff --git a/public/static/plugins/css/share/style.css b/public/static/plugins/css/share/index/style.css similarity index 100% rename from public/static/plugins/css/share/style.css rename to public/static/plugins/css/share/index/style.css diff --git a/public/static/plugins/css/touristbuy/admin.css b/public/static/plugins/css/touristbuy/admin/admin.css similarity index 100% rename from public/static/plugins/css/touristbuy/admin.css rename to public/static/plugins/css/touristbuy/admin/admin.css diff --git a/public/static/plugins/css/touristbuy/index.css b/public/static/plugins/css/touristbuy/index/index.css similarity index 100% rename from public/static/plugins/css/touristbuy/index.css rename to public/static/plugins/css/touristbuy/index/index.css diff --git a/public/static/plugins/css/touristbuy/index.detail.css b/public/static/plugins/css/touristbuy/index/index.detail.css similarity index 100% rename from public/static/plugins/css/touristbuy/index.detail.css rename to public/static/plugins/css/touristbuy/index/index.detail.css diff --git a/public/static/plugins/css/ucenter/admin.css b/public/static/plugins/css/ucenter/admin/admin.css similarity index 100% rename from public/static/plugins/css/ucenter/admin.css rename to public/static/plugins/css/ucenter/admin/admin.css diff --git a/public/static/plugins/css/usercentertopnotice/admin.css b/public/static/plugins/css/usercentertopnotice/admin/admin.css similarity index 100% rename from public/static/plugins/css/usercentertopnotice/admin.css rename to public/static/plugins/css/usercentertopnotice/admin/admin.css diff --git a/public/static/plugins/css/userloginrewardintegral/admin.css b/public/static/plugins/css/userloginrewardintegral/admin/admin.css similarity index 100% rename from public/static/plugins/css/userloginrewardintegral/admin.css rename to public/static/plugins/css/userloginrewardintegral/admin/admin.css diff --git a/public/static/plugins/css/usernotloginhidegoodsprice/admin.css b/public/static/plugins/css/usernotloginhidegoodsprice/admin/admin.css similarity index 100% rename from public/static/plugins/css/usernotloginhidegoodsprice/admin.css rename to public/static/plugins/css/usernotloginhidegoodsprice/admin/admin.css diff --git a/public/static/plugins/css/wallet/admin/admin.css b/public/static/plugins/css/wallet/admin/admin.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/public/static/plugins/css/wallet/index/cash.css b/public/static/plugins/css/wallet/index/cash.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/public/static/plugins/css/wallet/wallet.css b/public/static/plugins/css/wallet/index/common.css similarity index 84% rename from public/static/plugins/css/wallet/wallet.css rename to public/static/plugins/css/wallet/index/common.css index afe149e7f4ac9feec1f1d08c032aadaa88b09881..082c066255a65a0e83926535d3cd3286da872c4c 100644 --- a/public/static/plugins/css/wallet/wallet.css +++ b/public/static/plugins/css/wallet/index/common.css @@ -1,5 +1,5 @@ /* 筛选 */ -.thin, .pay-list { overflow:hidden; } +.thin { overflow:hidden; } .thin .so { width:66%; } .thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; } .so-list { width:100%; margin-top: 10px; } @@ -32,10 +32,32 @@ } /** - * 列表 + * 导航 */ -.user-content-body .data-list { - margin-top: 10px; +.user-content-body .am-nav { + border-bottom: 1px solid #eee; +} +.user-content-body .am-nav li { + margin-bottom: -1px; +} +.user-content-body .am-nav li a { + font-size: 14px; +} +.user-content-body .am-nav .am-active { + border-bottom: 2px solid #ed5565; + +} +.user-content-body .am-nav > li > a:hover, .user-content-body .am-nav > li > a:focus { + background: transparent; +} +.user-content-body .am-nav .am-topbar-right { + margin-right: 0; +} +.user-content-body .am-nav .am-topbar-right .am-btn:not(:last-child) { + margin-right: 5px; +} +.user-content-body .am-nav .am-topbar-right .am-topbar-btn { + margin-top: 0; } /** @@ -67,35 +89,6 @@ margin-left: 10px; } -/** - * 导航 - */ -.user-content-body .am-nav { - border-bottom: 1px solid #eee; -} -.user-content-body .am-nav li { - margin-bottom: -1px; -} -.user-content-body .am-nav li a { - font-size: 14px; -} -.user-content-body .am-nav .am-active { - border-bottom: 2px solid #ed5565; - -} -.user-content-body .am-nav > li > a:hover, .user-content-body .am-nav > li > a:focus { - background: transparent; -} -.user-content-body .am-nav .am-topbar-right { - margin-right: 0; -} -.user-content-body .am-nav .am-topbar-right .am-btn:not(:last-child) { - margin-right: 5px; -} -.user-content-body .am-nav .am-topbar-right .am-topbar-btn { - margin-top: 0; -} - /** * 业务弹窗 */ @@ -104,7 +97,8 @@ .user-content-body .business-item ul { padding: 5px 1px; overflow: hidden; } .user-content-body .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; background: #fff; } .user-content-body .business-item ul li img { width: 36px; height: 36px; } -.user-content-body .business-item ul li:hover, .user-content-body .business-item ul li.selected { border-color: #e23f36 ; position: relative; box-shadow: 0px 0 0px 1px #e23f36; } +.user-content-body .business-item ul li:hover, .user-content-body .business-item ul li.selected { border-color: #e4383c ; position: relative; box-shadow: 0px 0 0px 1px #e4383c; } +.user-content-body .business-item li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../../images/wallet/sys_item_selected.gif) no-repeat right bottom; } @media only screen and (min-width:640px) { .user-content-body .business-item ul li {width:calc(33% - 5px); } .user-content-body .business-item ul li:nth-child(3n) { margin-right: 0; } @@ -128,4 +122,28 @@ #plugins-recharge-pay-popup input[name="payment_id"] { margin-left: -10000px; position: absolute; +} +#plugins-recharge-pay-popup .base { + margin-bottom: 15px; + padding: 5px 10px; + background: #f6f6f6; + border: 1px solid #efefef; +} +#plugins-recharge-pay-popup .base p { + line-height: 24px; +} +#plugins-recharge-pay-popup .base .recharge-no { + font-weight: 700; + color: #666; +} + + +/** + * 列表 + */ +.user-content-body .data-list { + margin-top: 10px; +} +.user-content-body .data-list .money { + color: #E4393C; } \ No newline at end of file diff --git a/public/static/plugins/css/wallet/index/recharge.css b/public/static/plugins/css/wallet/index/recharge.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/public/static/plugins/css/wallet/index/wallet.css b/public/static/plugins/css/wallet/index/wallet.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/public/static/plugins/images/wallet/default-images.jpg b/public/static/plugins/images/wallet/default-images.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c3eb8295d5dccdf43cc0f267496b92adecb86493 Binary files /dev/null and b/public/static/plugins/images/wallet/default-images.jpg differ diff --git a/public/static/plugins/images/wallet/index.html b/public/static/plugins/images/wallet/index.html new file mode 100755 index 0000000000000000000000000000000000000000..0519ecba6ea913e21689ec692e81e9e4973fbf73 --- /dev/null +++ b/public/static/plugins/images/wallet/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/static/plugins/images/wallet/sys_item_selected.gif b/public/static/plugins/images/wallet/sys_item_selected.gif new file mode 100644 index 0000000000000000000000000000000000000000..704bbf53595b63716bcb4aecfb57100455cbdddb Binary files /dev/null and b/public/static/plugins/images/wallet/sys_item_selected.gif differ diff --git a/public/static/plugins/js/answers/admin.js b/public/static/plugins/js/answers/admin/admin.js similarity index 100% rename from public/static/plugins/js/answers/admin.js rename to public/static/plugins/js/answers/admin/admin.js diff --git a/public/static/plugins/js/answers/index.js b/public/static/plugins/js/answers/index/index.js similarity index 100% rename from public/static/plugins/js/answers/index.js rename to public/static/plugins/js/answers/index/index.js diff --git a/public/static/plugins/js/commononlineservice/style.js b/public/static/plugins/js/commononlineservice/index/style.js similarity index 100% rename from public/static/plugins/js/commononlineservice/style.js rename to public/static/plugins/js/commononlineservice/index/style.js diff --git a/public/static/plugins/js/commonrightnavigation/style.js b/public/static/plugins/js/commonrightnavigation/index/style.js similarity index 100% rename from public/static/plugins/js/commonrightnavigation/style.js rename to public/static/plugins/js/commonrightnavigation/index/style.js diff --git a/public/static/plugins/js/freightfee/admin.js b/public/static/plugins/js/freightfee/admin/admin.js similarity index 100% rename from public/static/plugins/js/freightfee/admin.js rename to public/static/plugins/js/freightfee/admin/admin.js diff --git a/public/static/plugins/js/share/style.js b/public/static/plugins/js/share/index/style.js similarity index 100% rename from public/static/plugins/js/share/style.js rename to public/static/plugins/js/share/index/style.js diff --git a/public/static/plugins/js/wallet/index/common.js b/public/static/plugins/js/wallet/index/common.js new file mode 100644 index 0000000000000000000000000000000000000000..dd663bb4c3d052f6e4be1d58d0e98eed97509e4d --- /dev/null +++ b/public/static/plugins/js/wallet/index/common.js @@ -0,0 +1,26 @@ +$(function() +{ + // 表单初始化 + if($('form.form-validation-plugins-recharge-modal').length > 0) + { + FromInit('form.form-validation-plugins-recharge-modal'); + } + if($('form.form-validation-plugins-recharge-popup').length > 0) + { + FromInit('form.form-validation-plugins-recharge-popup'); + } + + // 混合列表选择 + $('.business-item ul li').on('click', function() + { + var value = ''; + if($(this).hasClass('selected')) + { + $(this).removeClass('selected'); + } else { + value = $(this).data('value'); + $(this).addClass('selected').siblings('li').removeClass('selected'); + } + $('form.form-validation-plugins-recharge-popup input[name='+$(this).parent().data('type')+'_id]').val(value).blur(); + }); +}); \ No newline at end of file diff --git a/public/static/plugins/js/wallet/index/recharge.js b/public/static/plugins/js/wallet/index/recharge.js new file mode 100644 index 0000000000000000000000000000000000000000..97d8287f4f8195db3671aaef1b872dafd10c3242 --- /dev/null +++ b/public/static/plugins/js/wallet/index/recharge.js @@ -0,0 +1,22 @@ +$(function() +{ + // 充值列表支付发起事件 + $('.recharge-submit').on('click', function() + { + var recharge_id = $(this).data('value') || null; + var recharge_no = $(this).data('recharge-no') || null; + var money = $(this).data('money') || null; + var $popup = $('#plugins-recharge-pay-popup'); + if(recharge_id != null && recharge_no != null && money != null) + { + $popup.find('.business-item ul li').removeClass('selected'); + $popup.find('input[name="payment_id"]').val(''); + $popup.find('input[name="recharge_id"]').val(recharge_id); + $popup.find('.base .recharge-no').text(recharge_no); + $popup.find('.base .price strong').text('￥'+money); + $popup.modal('open'); + } else { + Prompt('充值参数有误'); + } + }); +}); \ No newline at end of file diff --git a/public/static/plugins/js/wallet/wallet.js b/public/static/plugins/js/wallet/wallet.js deleted file mode 100644 index 52ff62580ba6038284395c921daedcca6df0a545..0000000000000000000000000000000000000000 --- a/public/static/plugins/js/wallet/wallet.js +++ /dev/null @@ -1,34 +0,0 @@ -$(function() -{ - // 表单初始化 - FromInit('form.form-validation-plugins-recharge-modal'); - FromInit('form.form-validation-plugins-recharge-popup'); - - // 混合列表选择 - $('.business-item ul li').on('click', function() - { - var value = ''; - if($(this).hasClass('selected')) - { - $(this).removeClass('selected'); - } else { - value = $(this).data('value'); - $(this).addClass('selected').siblings('li').removeClass('selected'); - } - $('form.form-validation-plugins-recharge-popup input[name='+$(this).parent().data('type')+'_id]').val(value).blur(); - }); - - // 充值列表支付发起事件 - $('.recharge-submit').on('click', function() - { - var recharge_id = $(this).data('value') || null; - var $popup = $('#plugins-recharge-pay-popup'); - if(recharge_id != null) - { - $popup.find('input[name="recharge_id"]').val(recharge_id); - $popup.modal('open'); - } else { - Prompt('充值id有误'); - } - }); -}); \ No newline at end of file