diff --git a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql index 0d83d95..3a0dea4 100644 --- a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql +++ b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql @@ -34,7 +34,6 @@ INSERT INTO `tb_sys_config` (`id`, `config_key`, `config_name`, `config_value`, ('103', 'system.logo.home', '首页Logo', '', 'string', 'imgupload', '基础配置', '首页Logo', NULL, '存储文件ID,建议尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 103, 1, '1', now()), ('104', 'system.logo.admin', '管理后台Logo', '', 'string', 'imgupload', '基础配置', '管理后台Logo', NULL, '存储文件ID,建议尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 104, 1, '1', now()), ('105', 'system.favicon', '网站图标', '', 'string', 'imgupload', '基础配置', '网站图标', NULL, '存储文件ID,建议格式:ico/png,尺寸:36x36px', NULL, NULL, NULL, NULL, NULL, 105, 1, '1', now()), -('106', 'system.agreement.platform', '平台协议', '', 'string', 'fileupload', '基础配置', '平台协议文件', NULL, '支持PDF、TXT格式,用户点击后新开页面查看', NULL, NULL, NULL, NULL, NULL, 106, 1, '1', now()), ('107', 'system.agreement.user', '用户协议', '', 'string', 'fileupload', '基础配置', '用户协议文件', NULL, '支持PDF、TXT格式,用户点击后新开页面查看', NULL, NULL, NULL, NULL, NULL, 107, 1, '1', now()), ('108', 'system.agreement.privacy', '隐私协议', '', 'string', 'fileupload', '基础配置', '隐私协议文件', NULL, '支持PDF、TXT格式,用户点击后新开页面查看', NULL, NULL, NULL, NULL, NULL, 108, 1, '1', now()), diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java index 7168946..e8aa87a 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java @@ -388,7 +388,6 @@ public class SysConfigServiceImpl implements SysConfigService { baseInfo.put("favicon", getStringConfig("system.favicon")); // 登录协议文件ID - baseInfo.put("platformAgreement", getStringConfig("system.agreement.platform")); baseInfo.put("userAgreement", getStringConfig("system.agreement.user")); baseInfo.put("privacyAgreement", getStringConfig("system.agreement.privacy")); diff --git a/schoolNewsWeb/src/store/modules/system.ts b/schoolNewsWeb/src/store/modules/system.ts index 97e8c6b..019b625 100644 --- a/schoolNewsWeb/src/store/modules/system.ts +++ b/schoolNewsWeb/src/store/modules/system.ts @@ -49,12 +49,7 @@ export default { return (fileId && fileId.trim()) ? `${FILE_DOWNLOAD_URL}${fileId}` : '/favicon.ico'; }, - // 协议文件URL - platformAgreementUrl: (state: SystemState) => { - const fileId = state.baseInfo?.platformAgreement; - return (fileId && fileId.trim()) ? `${FILE_DOWNLOAD_URL}${fileId}` : ''; - }, - + // 协议文件URL userAgreementUrl: (state: SystemState) => { const fileId = state.baseInfo?.userAgreement; return (fileId && fileId.trim()) ? `${FILE_DOWNLOAD_URL}${fileId}` : ''; diff --git a/schoolNewsWeb/src/types/system/baseinfo.ts b/schoolNewsWeb/src/types/system/baseinfo.ts index 63a3a22..589eaf8 100644 --- a/schoolNewsWeb/src/types/system/baseinfo.ts +++ b/schoolNewsWeb/src/types/system/baseinfo.ts @@ -11,7 +11,6 @@ export interface SystemBaseInfo { favicon: string; // 网站图标(fileId) // 登录协议文件ID - platformAgreement: string; // 平台协议(fileId) userAgreement: string; // 用户协议(fileId) privacyAgreement: string; // 隐私协议(fileId) diff --git a/schoolNewsWeb/src/views/public/agreement/AgreementView.vue b/schoolNewsWeb/src/views/public/agreement/AgreementView.vue index e26d638..ed6a9fb 100644 --- a/schoolNewsWeb/src/views/public/agreement/AgreementView.vue +++ b/schoolNewsWeb/src/views/public/agreement/AgreementView.vue @@ -70,8 +70,6 @@ const fileId = computed(() => { if (!baseInfo) return ''; switch (agreementType.value) { - case 'platform': - return baseInfo.platformAgreement || ''; case 'user': return baseInfo.userAgreement || ''; case 'privacy': diff --git a/schoolNewsWeb/src/views/public/login/Login.mobile.vue b/schoolNewsWeb/src/views/public/login/Login.mobile.vue index cf7ef2c..5a32b9e 100644 --- a/schoolNewsWeb/src/views/public/login/Login.mobile.vue +++ b/schoolNewsWeb/src/views/public/login/Login.mobile.vue @@ -181,7 +181,7 @@