diff --git a/app/src/pages.json b/app/src/pages.json index eb35791f..ee04dcac 100644 --- a/app/src/pages.json +++ b/app/src/pages.json @@ -59,6 +59,12 @@ "style": { "navigationBarTitleText": "关于我们" } + }, + { + "path": "pages/agreement/agreement", + "style": { + "navigationBarTitleText": "协议" + } } ], "globalStyle": { diff --git a/app/src/pages/agreement/agreement.vue b/app/src/pages/agreement/agreement.vue new file mode 100644 index 00000000..34c949f7 --- /dev/null +++ b/app/src/pages/agreement/agreement.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java index df9f2f1a..0c54335e 100644 --- a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java @@ -12,7 +12,7 @@ public class GlobalConfig { public static Boolean isAddressEnabled = false; // 当前代码版本 - public static String version = "v1.2.0"; + public static String version = "v1.2.1"; // 系统加密字符 public static String secret = "UVTIyzCy"; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index d1a79a56..a46c4179 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -2,6 +2,7 @@ package com.mdd.front.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.mdd.common.config.GlobalConfig; import com.mdd.common.entity.article.Article; import com.mdd.common.entity.decorate.DecoratePage; import com.mdd.common.entity.decorate.DecorateTabbar; @@ -140,6 +141,7 @@ public class IndexServiceImpl implements IIndexService { websiteMap.put("logo", UrlUtil.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", ""))); // 响应数据 + response.put("version", GlobalConfig.version); response.put("domain", UrlUtil.domain()); response.put("style", ToolsUtil.jsonToMap(tabbarStyle)); response.put("tabbar", tabs);