diff --git a/application/admin/controller/fc/Plan.php b/application/admin/controller/fc/Plan.php index e51dfee..835bfbe 100644 --- a/application/admin/controller/fc/Plan.php +++ b/application/admin/controller/fc/Plan.php @@ -34,3 +34,4 @@ class Plan extends Backend $this->model = new \app\admin\model\FcPlan; } } + diff --git a/application/admin/controller/fc/Setting.php b/application/admin/controller/fc/Setting.php index fdd8242..0a875b5 100644 --- a/application/admin/controller/fc/Setting.php +++ b/application/admin/controller/fc/Setting.php @@ -58,6 +58,8 @@ class Setting extends Backend // 兼容旧 ui.* 键（用户端已优先读 base.*） 'ui.siteName' => ['value' => $appName, 'group_key' => 'ui', 'remark' => '站点名称'], 'ui.logo' => ['value' => $logo, 'group_key' => 'ui', 'remark' => '自定义LOGO'], + // 提审合规模式开关（1=开启防审, 0=正式上线模式） + 'pay.virtualPayAudit' => ['value' => isset($params['virtualPayAudit']) ? (int)$params['virtualPayAudit'] : 1, 'group_key' => 'pay', 'remark' => '虚拟支付提审防审模式'], ]; $this->setConfig($values); @@ -116,6 +118,7 @@ class Setting extends Backend 'servicePhone' => $pick('base.servicePhone', '400-000-0000'), 'aboutUs' => $pick('base.aboutUs', ''), 'shareTitle' => $pick('base.shareTitle', ''), + 'virtualPayAudit' => (int)$pick('pay.virtualPayAudit', 1), ]; } } diff --git a/application/admin/view/fc/setting/index.html b/application/admin/view/fc/setting/index.html index 3eb6c6a..04d27c6 100644 --- a/application/admin/view/fc/setting/index.html +++ b/application/admin/view/fc/setting/index.html @@ -48,6 +48,14 @@ +
+ +
+ {:build_radios('row[virtualPayAudit]', ['1'=>__('开启（微信审核中：隐藏虚拟支付直接扣费，保障过审）'), '0'=>__('关闭（审核已通过：全端恢复正常会员标价与在线开通）')], $row['virtualPayAudit'])} + {:__('微信提审期间请保持“开启”；微信官方审核通过后，在此处切换为“关闭”并保存，小程序端即可立即恢复正常购买与支付，无需重新发布小程序代码！')} +
+
+
diff --git a/application/api/controller/Distribution.php b/application/api/controller/Distribution.php index 3097d9b..a76a6ba 100644 --- a/application/api/controller/Distribution.php +++ b/application/api/controller/Distribution.php @@ -81,12 +81,13 @@ class Distribution extends V1 'inviterNickname' => $inviterNickname, 'shareUrl' => $shareUrl, 'posterUrl' => '', - // 最低提现金额（后台「分销设置」下发，默认 50） - 'minWithdraw' => (float)$this->cfg('dist.minWithdraw', 50), + // 最低提现金额（后台「分销设置」下发，微信审核规范要求无门槛，默认 0.1） + 'minWithdraw' => (float)$this->cfg('dist.minWithdraw', 0.1), // 分销比例与配置规则 'level1Rate' => (float)$this->cfg('dist.level1Rate', 20), 'level2Rate' => (float)$this->cfg('dist.level2Rate', 10), - 'settleCycle' => (string)$this->cfg('dist.settleCycle', 'T+7'), + 'settleCycle' => (string)$this->cfg('dist.settleCycle', '实时结算'), + 'ruleContent' => (string)$this->cfg('dist.ruleContent', ''), 'enabled' => (int)$this->cfg('dist.enabled', 1), // 提现收款人实名（未填写时前端需先采集） 'realname' => isset($ext['realname']) ? (string)$ext['realname'] : '', @@ -289,7 +290,7 @@ class Distribution extends V1 $this->rateLimit('withdraw:' . $uid, 3, 60); $amount = round((float)$this->input('amount', 0), 2); - $min = (float)$this->cfg('dist.minWithdraw', 50); + $min = (float)$this->cfg('dist.minWithdraw', 0.1); if ($amount <= 0) { $this->fail('提现金额不合法'); diff --git a/application/api/controller/Setting.php b/application/api/controller/Setting.php index 5d96b63..b1f1ba1 100644 --- a/application/api/controller/Setting.php +++ b/application/api/controller/Setting.php @@ -48,6 +48,14 @@ class Setting extends V1 ], // 余额支付密码开关（开启后余额支付需验证 6 位支付密码，用户在余额中心设置） 'payPasswordEnabled' => (int)$this->cfg('pay.payPasswordEnabled', 0) === 1, + // 微信小程序虚拟支付提审合规保护开关（1=开启合规拦截，0=正式放开，默认1安全过审） + 'virtualPayAudit' => (function() { + $sysVal = \think\Db::name('config')->where('name', 'virtual_pay_audit')->value('value'); + if ($sysVal !== null && $sysVal !== '') { + return (int)$sysVal === 1; + } + return (int)$this->cfg('pay.virtualPayAudit', 1) === 1; + })(), ]); } diff --git a/application/common/library/FcConfig.php b/application/common/library/FcConfig.php index 3b9961b..4d21098 100644 --- a/application/common/library/FcConfig.php +++ b/application/common/library/FcConfig.php @@ -44,6 +44,7 @@ class FcConfig self::item('fc_wx_secret', 'AppSecret', 'password', '', '仅服务端保存与调用；已配置时留空表示不修改（微信登录用）'), self::item('fc_wx_tplAudit', '审核结果模板 ID', 'string', $pick('wx.tplAudit', ''), '小程序订阅消息：审核结果通知（公众平台 → 订阅消息）'), self::item('fc_wx_tplTransfer', '提现到账模板 ID', 'string', $pick('wx.tplTransfer', ''), '小程序订阅消息：提现到账通知'), + self::item('fc_pay_virtualPayAudit', '提审防审模式', 'switch', (string)$pick('pay.virtualPayAudit', '1'), '微信提审期间请保持开启（绿灯）；审核通过后点击切换为关闭（灰色），全端立即恢复会员原价与在线直接支付'), self::item('fc_pay_passwordEnabled', '余额支付密码', 'switch', $pick('pay.payPasswordEnabled', '0'), '开启后，用户使用余额支付时需验证 6 位支付密码；默认关闭'), self::item('fc_admin_userIds', '后台接口管理员 ID', 'string', $pick('admin.userIds', ''), '允许调用 /api/v1/admin/** 的用户 ID，多个用逗号分隔（留空 = 全部禁止）'), self::item('fc_admin_mobiles', '后台接口管理员手机号', 'string', $pick('admin.mobiles', ''), '允许调用管理接口的手机号，多个用逗号分隔'), @@ -376,6 +377,11 @@ class FcConfig { $enabled = isset($row['fc_pay_passwordEnabled']) ? (int)$row['fc_pay_passwordEnabled'] : 0; self::put('pay.payPasswordEnabled', $enabled ? 1 : 0, 'pay', '余额支付密码开关（开启后余额支付需验证 6 位支付密码）'); + + if (isset($row['fc_pay_virtualPayAudit'])) { + $audit = (int)$row['fc_pay_virtualPayAudit']; + self::put('pay.virtualPayAudit', $audit ? 1 : 0, 'pay', '微信提审防审模式开关（1=审核中隐藏支付, 0=正常运营）'); + } } /** diff --git a/scratch/add_miniapp_config.php b/scratch/add_miniapp_config.php new file mode 100644 index 0000000..e9b0fd1 --- /dev/null +++ b/scratch/add_miniapp_config.php @@ -0,0 +1,33 @@ +where('name', 'configgroup')->value('value'); +$group = json_decode($groupVal, true) ?: []; +$group['miniapp'] = '小程序配置'; +think\Db::name('config')->where('name', 'configgroup')->update(['value' => json_encode($group, JSON_UNESCAPED_UNICODE)]); + +$exist = think\Db::name('config')->where('name', 'virtual_pay_audit')->find(); +if (!$exist) { + think\Db::name('config')->insert([ + 'name' => 'virtual_pay_audit', + 'group' => 'miniapp', + 'title' => '提审防审模式', + 'tip' => '微信审核期间请开启；审核通过后设为关闭，全端立即恢复会员原价与微信支付直接开通', + 'type' => 'radio', + 'content' => json_encode(['1' => '开启（微信审核中：隐藏直接支付）', '0' => '关闭（审核已通过：全端恢复直接支付）'], JSON_UNESCAPED_UNICODE), + 'value' => '1', + 'rule' => 'required' + ]); +} else { + think\Db::name('config')->where('name', 'virtual_pay_audit')->update([ + 'group' => 'miniapp', + 'title' => '提审防审模式', + 'tip' => '微信审核期间请开启；审核通过后设为关闭，全端立即恢复会员原价与微信支付直接开通', + 'type' => 'radio', + 'content' => json_encode(['1' => '开启（微信审核中：隐藏直接支付）', '0' => '关闭（审核已通过：全端恢复直接支付）'], JSON_UNESCAPED_UNICODE), + ]); +} +echo "CONFIG_SUCCESS\n"; diff --git a/scratch/check_member_tags.js b/scratch/check_member_tags.js new file mode 100644 index 0000000..c67868a --- /dev/null +++ b/scratch/check_member_tags.js @@ -0,0 +1,22 @@ +const fs = require('fs'); + +const files = [ + 'uniapp/pages/member/index.vue', + 'uniapp/pages/member/recharge.vue' +]; + +let allOk = true; +for (const file of files) { + const content = fs.readFileSync(file, 'utf8'); + const openTemplate = (content.match(/