Просмотр исходного кода

Merge branch 'master' of http://git.derkj.com:9095/waibao/NN2025081602

罗永浩 5 месяцев назад
Родитель
Сommit
da52b657f3

+ 2 - 0
app/Http/Controllers/Api/v1/IndexController.php

@@ -36,6 +36,8 @@ class IndexController extends webApp
                     'app_version' => ConfigService::make()->getConfigByCode('app_version'),
                     'wxpay_open' => ConfigService::make()->getConfigByCode('wxpay_open', 1),
                     'vip_buy_desc' => format_content(ConfigService::make()->getConfigByCode('vip_buy_desc', '')),
+                    'share_desc' => ConfigService::make()->getConfigByCode('share_desc', ''),
+                    'share_content' => ConfigService::make()->getConfigByCode('share_content', ''),
                     'custom_name' => ConfigService::make()->getConfigByCode('custom_name', ''),
                     'custom_desc' => format_content(ConfigService::make()->getConfigByCode('custom_desc', '')),
                     'video_vip_tips' => format_content(ConfigService::make()->getConfigByCode('video_vip_tips', '')),

+ 1 - 0
app/Services/Api/MemberService.php

@@ -208,6 +208,7 @@ class MemberService extends BaseService
                 'nickname' => $phone ? '用户' . substr($phone, -6, 6) : '用户' . $userId,
                 'openid' => $openid,
                 'mobile' => $phone,
+                'code' => get_random_code(9,'S', $userId),
                 'password' => $phone ? get_password(substr($phone, -6, 6)) : get_password('123456'),
                 'login_ip' => get_client_ip(),
                 'create_time' => time(),