fix: 小程序登录和小程序支付配置分开

crmeb/services/MiniProgramService.php

@@ -23,12 +23,25 @@ class MiniProgramService
 
     public static function options()
     {
-        $wechat = SystemConfigService::more(['site_url', 'pay_routine_appid', 'pay_routine_appsecret']);
-        $payment = SystemConfigService::more(['pay_routine_mchid', 'pay_routine_key', 'pay_routine_client_cert', 'pay_routine_client_key', 'pay_weixin_open']);
+        $wechat = SystemConfigService::more([
+            'site_url', 
+            'routine_appId', 
+            'routine_appsecret',
+            'wechat_token',
+            'wechat_encodingaeskey',
+        ]);
+        $payment = SystemConfigService::more([
+            'pay_routine_appid',
+            'pay_routine_mchid', 
+            'pay_routine_key', 
+            'pay_routine_client_cert', 
+            'pay_routine_client_key', 
+            'pay_weixin_open',
+        ]);
         $config = [];
         $config['mini_program'] = [
-            'app_id' => isset($wechat['pay_routine_appid']) ? trim($wechat['pay_routine_appid']) : '',
-            'secret' => isset($wechat['pay_routine_appsecret']) ? trim($wechat['pay_routine_appsecret']) : '',
+            'app_id' => isset($wechat['routine_appId']) ? trim($wechat['routine_appId']) : '',
+            'secret' => isset($wechat['routine_appsecret']) ? trim($wechat['routine_appsecret']) : '',
             'token' => isset($wechat['wechat_token']) ? trim($wechat['wechat_token']) : '',
             'aes_key' => isset($wechat['wechat_encodingaeskey']) ? trim($wechat['wechat_encodingaeskey']) : ''
         ];