diff --git a/admin/src/views/setting/website/protocol.vue b/admin/src/views/setting/website/protocol.vue index cf45972..f342704 100644 --- a/admin/src/views/setting/website/protocol.vue +++ b/admin/src/views/setting/website/protocol.vue @@ -25,6 +25,18 @@ + + + + + + + + + + 保存 @@ -38,12 +50,16 @@ interface formDataObj { service_content: string privacy_title: string privacy_content: string + points_rule_title: string + points_rule_content: string } const formData = ref({ service_title: '', service_content: '', privacy_title: '', - privacy_content: '' + privacy_content: '', + points_rule_title: '积分规则', + points_rule_content: '' }) const protocolGet = async () => { formData.value = await getProtocol() diff --git a/server/app/adminapi/logic/setting/web/WebSettingLogic.php b/server/app/adminapi/logic/setting/web/WebSettingLogic.php index 673d294..1753fd5 100644 --- a/server/app/adminapi/logic/setting/web/WebSettingLogic.php +++ b/server/app/adminapi/logic/setting/web/WebSettingLogic.php @@ -139,10 +139,13 @@ class WebSettingLogic extends BaseLogic { $serviceContent = clear_file_domain($params['service_content'] ?? ''); $privacyContent = clear_file_domain($params['privacy_content'] ?? ''); + $pointsRuleContent = clear_file_domain($params['points_rule_content'] ?? ''); ConfigService::set('agreement', 'service_title', $params['service_title'] ?? ''); ConfigService::set('agreement', 'service_content', $serviceContent); ConfigService::set('agreement', 'privacy_title', $params['privacy_title'] ?? ''); ConfigService::set('agreement', 'privacy_content', $privacyContent); + ConfigService::set('agreement', 'points_rule_title', $params['points_rule_title'] ?? '积分规则'); + ConfigService::set('agreement', 'points_rule_content', $pointsRuleContent); } @@ -159,10 +162,13 @@ class WebSettingLogic extends BaseLogic 'service_content' => ConfigService::get('agreement', 'service_content'), 'privacy_title' => ConfigService::get('agreement', 'privacy_title'), 'privacy_content' => ConfigService::get('agreement', 'privacy_content'), + 'points_rule_title' => ConfigService::get('agreement', 'points_rule_title', '积分规则'), + 'points_rule_content' => ConfigService::get('agreement', 'points_rule_content'), ]; $config['service_content'] = get_file_domain($config['service_content']); $config['privacy_content'] = get_file_domain($config['privacy_content']); + $config['points_rule_content'] = get_file_domain($config['points_rule_content']); return $config; } diff --git a/uniapp/src/enums/agreementEnums.ts b/uniapp/src/enums/agreementEnums.ts index 7a717f4..27d324c 100644 --- a/uniapp/src/enums/agreementEnums.ts +++ b/uniapp/src/enums/agreementEnums.ts @@ -1,5 +1,6 @@ //菜单主题类型 export enum AgreementEnum { PRIVACY = 'privacy', - SERVICE = 'service' + SERVICE = 'service', + POINTS_RULE = 'points_rule' } diff --git a/uniapp/src/packages_community/pages/post_detail.vue b/uniapp/src/packages_community/pages/post_detail.vue index e3929b7..510855d 100644 --- a/uniapp/src/packages_community/pages/post_detail.vue +++ b/uniapp/src/packages_community/pages/post_detail.vue @@ -124,7 +124,7 @@ 当前余额 {{ userPointsText }} - + 积分规则 @@ -257,6 +257,7 @@ import { import { openChat } from '@/api/chat' import { useAppStore } from '@/stores/app' import { useUserStore } from '@/stores/user' +import { AgreementEnum } from '@/enums/agreementEnums' import { getToken } from '@/utils/auth' const LIUHE_TAGS = ['旧澳六合', '新澳六合'] @@ -810,9 +811,8 @@ const handleAiAnalysisBtn = () => { uni.navigateTo({ url: `/pages/ai_analysis/ai_analysis?type=post&id=${postId.value}&title=${title}` }) } -const openPoints = () => { - if (!checkLogin()) return - uni.navigateTo({ url: '/packages/pages/points_log/points_log' }) +const openPointsRule = () => { + uni.navigateTo({ url: `/pages/agreement/agreement?type=${AgreementEnum.POINTS_RULE}` }) } const goUserProfile = (userId: number) => {