diff --git a/application/plugins/view/wallet/admin/admin/index.html b/application/plugins/view/wallet/admin/admin/index.html index 114a5b853..0c67f955b 100755 --- a/application/plugins/view/wallet/admin/admin/index.html +++ b/application/plugins/view/wallet/admin/admin/index.html @@ -21,7 +21,7 @@
- {{if isset($data['is_recharge']) and $data['is_recharge'] eq 1}} + {{if !isset($data['is_enable_recharge']) or $data['is_enable_recharge'] eq 1}} 是 {{else /}} 否 @@ -33,7 +33,7 @@
- {{if isset($data['is_cash']) and $data['is_cash'] eq 1}} + {{if !isset($data['is_enable_cash']) or $data['is_enable_cash'] eq 1}} 是 {{else /}} 否 @@ -43,13 +43,14 @@
  • - +
    - {{if isset($data['is_pay']) and $data['is_pay'] eq 1}} - 是 + {{if empty($data['cash_time_limit'])}} + 30 {{else /}} - 否 + {{$data.cash_time_limit}} {{/if}} + 分钟
    • diff --git a/application/plugins/view/wallet/admin/admin/saveinfo.html b/application/plugins/view/wallet/admin/admin/saveinfo.html index 2159eab9f..0b93c85a8 100755 --- a/application/plugins/view/wallet/admin/admin/saveinfo.html +++ b/application/plugins/view/wallet/admin/admin/saveinfo.html @@ -11,48 +11,43 @@
    - +
    {{foreach $is_whether_list as $v}} {{/foreach}}
    - +
    {{foreach $is_whether_list as $v}} {{/foreach}}
    - -
    - {{foreach $is_whether_list as $v}} - - {{/foreach}} -
    -
    - -
    - -

    - 赠送金额规则，小于0或空则不赠送
    - - 固定金额：填写相应的金额即可
    - 比例：填写百分比数值，如 10% 则填写 10（小数保留两位、四舍五入） + +

    + + + -

    +
    +
    + +

    + 提现申请通过安全验证后，在规定时间内完提现申请操作，单位[ 分钟 ]，默认30分钟 +

    +
    +
    @@ -62,7 +57,17 @@ {{/foreach}}
    - + +
    + +

    + 赠送金额规则，小于0或空则不赠送
    + + 固定金额：填写相应的金额即可
    + 比例：填写百分比数值，如 10% 则填写 10（小数保留两位、四舍五入） +     +

    +
    diff --git a/application/plugins/view/wallet/admin/cash/index.html b/application/plugins/view/wallet/admin/cash/index.html index eb43dc7cc..cc5000b81 100644 --- a/application/plugins/view/wallet/admin/cash/index.html +++ b/application/plugins/view/wallet/admin/cash/index.html @@ -52,7 +52,7 @@ - +
    diff --git a/application/plugins/view/wallet/admin/recharge/index.html b/application/plugins/view/wallet/admin/recharge/index.html index 9a50f9d5f..7d300ee16 100644 --- a/application/plugins/view/wallet/admin/recharge/index.html +++ b/application/plugins/view/wallet/admin/recharge/index.html @@ -52,7 +52,7 @@ -
    用户信息
    +
    diff --git a/application/plugins/view/wallet/admin/wallet/index.html b/application/plugins/view/wallet/admin/wallet/index.html index 8cce1d8d1..0f53fe53b 100644 --- a/application/plugins/view/wallet/admin/wallet/index.html +++ b/application/plugins/view/wallet/admin/wallet/index.html @@ -52,7 +52,7 @@ -
    用户信息
    +
    diff --git a/application/plugins/view/wallet/admin/walletlog/index.html b/application/plugins/view/wallet/admin/walletlog/index.html index 86d0a5948..de4736784 100644 --- a/application/plugins/view/wallet/admin/walletlog/index.html +++ b/application/plugins/view/wallet/admin/walletlog/index.html @@ -60,7 +60,7 @@ -
    用户信息
    +
    diff --git a/application/plugins/view/wallet/index/cash/authinfo.html b/application/plugins/view/wallet/index/cash/authinfo.html index 605dbb73a..2eb874b13 100644 --- a/application/plugins/view/wallet/index/cash/authinfo.html +++ b/application/plugins/view/wallet/index/cash/authinfo.html @@ -35,7 +35,7 @@
  • 3. 如果您的手机已失效，可以 绑定邮箱 后通过接收邮件完成验证。
  • 4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。
  • 5. 收到安全验证码后，请在{{:Myc('common_verify_expire_time', 600, true)/60}}分钟内完成验证。
    • -
  • 6. 安全验证成功后，请在30分钟内完成提现申请。
    • +
  • 6. 安全验证成功后，请在{{if empty($plugins_base_data['cash_time_limit'])}}30{{else /}}{{$plugins_base_data.cash_time_limit}}{{/if}}分钟内完成提现申请。
    • diff --git a/application/plugins/view/wallet/index/public/nav.html b/application/plugins/view/wallet/index/public/nav.html index 0ce3dca18..aaa488b63 100755 --- a/application/plugins/view/wallet/index/public/nav.html +++ b/application/plugins/view/wallet/index/public/nav.html @@ -11,10 +11,10 @@
    - {{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 18e1a7844..1f8ad2d64 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 e46b22d39..5e28b7a66 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 6af88424d..7d740ff09 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 5359f2319..cb2e10796 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 e0dae2381..6146c48b0 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 eb40247c1..a305b45d4 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; }
    业务类型