- {{if in_array($plugins_control, ['wallet', 'recharge'])}}
+ {{if in_array($plugins_control, ['wallet', 'recharge']) and (!isset($plugins_base_data['is_enable_recharge']) or $plugins_base_data['is_enable_recharge'] eq 1)}}
{{/if}}
- {{if in_array($plugins_control, ['wallet', 'cash'])}}
+ {{if in_array($plugins_control, ['wallet', 'cash']) and (!isset($plugins_base_data['is_enable_cash']) or $plugins_base_data['is_enable_cash'] eq 1)}}
提现
{{/if}}
diff --git a/application/plugins/wallet/admin/Admin.php b/application/plugins/wallet/admin/Admin.php
index 18e1a7844c473af182ff5f652b1eaec0070134e8..1f8ad2d64813eb3ef7bf34fd7982771a13ad35b1 100755
--- a/application/plugins/wallet/admin/Admin.php
+++ b/application/plugins/wallet/admin/Admin.php
@@ -63,8 +63,8 @@ class Admin extends Controller
{
// 是否
$is_whether_list = [
- 0 => array('value' => 0, 'name' => '否', 'checked' => true),
- 1 => array('value' => 1, 'name' => '是'),
+ 0 => array('value' => 0, 'name' => '否'),
+ 1 => array('value' => 1, 'name' => '是', 'checked' => true),
];
$this->assign('is_whether_list', $is_whether_list);
diff --git a/application/plugins/wallet/index/Cash.php b/application/plugins/wallet/index/Cash.php
index e46b22d39b171af94f840c01e7439b57aa1ab8ef..5e28b7a66398ae475eef47fed289961872e2b3bc 100644
--- a/application/plugins/wallet/index/Cash.php
+++ b/application/plugins/wallet/index/Cash.php
@@ -96,6 +96,13 @@ class Cash extends Common
*/
public function authinfo($params = [])
{
+ // 是否开启提现申请
+ if(isset($this->plugins_base['is_enable_cash']) && $this->plugins_base['is_enable_cash'] == 0)
+ {
+ $this->assign('msg', '暂时关闭了提现申请');
+ return $this->fetch('public/tips_error');
+ }
+
// 手机号/邮箱
$check_account_list = [
['field' => 'mobile_security', 'value' => 'mobile', 'name' => '手机'],
@@ -118,9 +125,19 @@ class Cash extends Common
*/
public function createinfo($params = [])
{
+ // 是否开启提现申请
+ if(isset($this->plugins_base['is_enable_cash']) && $this->plugins_base['is_enable_cash'] == 0)
+ {
+ $this->assign('msg', '暂时关闭了提现申请');
+ return $this->fetch('public/tips_error');
+ }
+
+ // 安全验证后规定时间内时间限制
+ $cash_time_limit = empty($this->plugins_base['cash_time_limit']) ? 30 : $this->plugins_base['cash_time_limit']*60;
+
// 是否验证成功
$check_time = session('plugins_wallet_cash_check_success');
- $check_status = (!empty($check_time) && $check_time+1800 >= time()) ? 1 : 0;
+ $check_status = (!empty($check_time) && $check_time+$cash_time_limit >= time()) ? 1 : 0;
$this->assign('check_status', $check_status);
// 参数
diff --git a/application/plugins/wallet/index/Common.php b/application/plugins/wallet/index/Common.php
index 6af88424d33bdad65f19a1ba559462ce1ecff13f..7d740ff0975732cfe82dbe0e92216d3d35854af6 100644
--- a/application/plugins/wallet/index/Common.php
+++ b/application/plugins/wallet/index/Common.php
@@ -13,6 +13,7 @@ namespace app\plugins\wallet\index;
use think\Controller;
use app\service\UserService;
use app\service\PaymentService;
+use app\service\PluginsService;
use app\plugins\wallet\service\WalletService;
/**
@@ -26,6 +27,7 @@ class Common extends Controller
{
protected $user;
protected $user_wallet;
+ protected $plugins_base;
/**
* 构造方法
@@ -72,6 +74,11 @@ class Common extends Controller
// 用户钱包信息
$this->user_wallet = $user_wallet['data'];
$this->assign('user_wallet', $user_wallet['data']);
+
+ // 应用配置
+ $plugins_base = PluginsService::PluginsData('wallet');
+ $this->plugins_base = $plugins_base['data'];
+ $this->assign('plugins_base_data', $this->plugins_base);
}
}
?>
\ No newline at end of file
diff --git a/application/plugins/wallet/index/Recharge.php b/application/plugins/wallet/index/Recharge.php
index 5359f2319977364eb6cf2b80d5102d745a1a844f..cb2e107963de0bf1adbc3bb0c83c456abef42b7a 100755
--- a/application/plugins/wallet/index/Recharge.php
+++ b/application/plugins/wallet/index/Recharge.php
@@ -100,6 +100,12 @@ class Recharge extends Common
return $this->error('非法访问');
}
+ // 是否开启充值
+ if(isset($this->plugins_base['is_enable_recharge']) && $this->plugins_base['is_enable_recharge'] == 0)
+ {
+ return DataReturn('暂时关闭了在线充值', -1);
+ }
+
// 用户
$params['user'] = $this->user;
$params['user_wallet'] = $this->user_wallet;
diff --git a/application/tags.php b/application/tags.php
index e0dae238171c5728a72b910647de97cd64b544e6..6146c48b0f14a4e51993dc7400d35befd69dab79 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -45,39 +45,25 @@ return array (
'plugins_service_user_login_end' =>
array (
0 => 'app\\plugins\\userloginrewardintegral\\Hook',
- 1 => 'app\\plugins\\ucenter\\Hook',
),
'plugins_css' =>
array (
0 => 'app\\plugins\\commonrightnavigation\\Hook',
- 1 => 'app\\plugins\\commononlineservice\\Hook',
- 2 => 'app\\plugins\\freightfee\\Hook',
- 3 => 'app\\plugins\\share\\Hook',
- 4 => 'app\\plugins\\footercustomerservice\\Hook',
- 5 => 'app\\plugins\\membershiplevel\\Hook',
+ 1 => 'app\\plugins\\freightfee\\Hook',
+ 2 => 'app\\plugins\\share\\Hook',
+ 3 => 'app\\plugins\\footercustomerservice\\Hook',
+ 4 => 'app\\plugins\\membershiplevel\\Hook',
),
'plugins_js' =>
array (
0 => 'app\\plugins\\commonrightnavigation\\Hook',
- 1 => 'app\\plugins\\commononlineservice\\Hook',
- 2 => 'app\\plugins\\share\\Hook',
+ 1 => 'app\\plugins\\share\\Hook',
),
'plugins_view_common_bottom' =>
array (
0 => 'app\\plugins\\commonrightnavigation\\Hook',
- 1 => 'app\\plugins\\commononlineservice\\Hook',
- 2 => 'app\\plugins\\expressforkdn\\Hook',
- 3 => 'app\\plugins\\share\\Hook',
- ),
- 'plugins_service_goods_handle_end' =>
- array (
- 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
- 1 => 'app\\plugins\\membershiplevel\\Hook',
- ),
- 'plugins_service_goods_spec_base' =>
- array (
- 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
- 1 => 'app\\plugins\\membershiplevel\\Hook',
+ 1 => 'app\\plugins\\expressforkdn\\Hook',
+ 2 => 'app\\plugins\\share\\Hook',
),
'plugins_service_navigation_header_handle' =>
array (
@@ -140,22 +126,6 @@ return array (
array (
0 => 'app\\plugins\\freightfee\\Hook',
),
- 'plugins_service_user_register_end' =>
- array (
- 0 => 'app\\plugins\\ucenter\\Hook',
- ),
- 'plugins_service_user_logout_handle' =>
- array (
- 0 => 'app\\plugins\\ucenter\\Hook',
- ),
- 'plugins_service_user_login_pwd_update' =>
- array (
- 0 => 'app\\plugins\\ucenter\\Hook',
- ),
- 'plugins_service_user_accounts_update' =>
- array (
- 0 => 'app\\plugins\\ucenter\\Hook',
- ),
'plugins_view_goods_detail_photo_bottom' =>
array (
0 => 'app\\plugins\\share\\Hook',
@@ -168,6 +138,14 @@ return array (
array (
0 => 'app\\plugins\\footercustomerservice\\Hook',
),
+ 'plugins_service_goods_handle_end' =>
+ array (
+ 0 => 'app\\plugins\\membershiplevel\\Hook',
+ ),
+ 'plugins_service_goods_spec_base' =>
+ array (
+ 0 => 'app\\plugins\\membershiplevel\\Hook',
+ ),
'plugins_service_user_login_success_record' =>
array (
0 => 'app\\plugins\\membershiplevel\\Hook',
diff --git a/public/static/index/default/css/userintegral.css b/public/static/index/default/css/userintegral.css
index eb40247c19a1352f47fb35296fa2ccb5e6b6d81c..a305b45d4225b2c5a36f1d433a43fe0a0ce02bd1 100755
--- a/public/static/index/default/css/userintegral.css
+++ b/public/static/index/default/css/userintegral.css
@@ -4,9 +4,6 @@
.user-content-body .available .panel-value {
color: #4CAF50;
}
-.user-content-body .locking {
- margin-top: 5px;
-}
.user-content-body .locking .panel-value {
color: #FF9800;
}