mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
洪树泽 2022-09-08 18:58:17 +08:00
parent 11f85bd955 669b91a99e
commit f1872f53ba
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/pages.json
View File

@ -59,6 +59,12 @@
"style": {
"navigationBarTitleText": "关于我们"
}
},
{
"path": "pages/agreement/agreement",
"style": {
"navigationBarTitleText": "协议"
}
}
],
"globalStyle": {

20
app/src/pages/agreement/agreement.vue Normal file
View File

@ -0,0 +1,20 @@
<template>
<view class="as-us flex flex-1 flex-col items-center">
<image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1665225789&t=d830459ba12f6416e919dd8082fc9d12" mode="" class="img"></image>
<view class="text-content mt-[20rpx]">当前版本v1.5.0</view>
</view>
</template>
<script setup lang="ts">
</script>
<style lang="scss" scoped>
.as-us {
.img {
width: 160rpx;
height: 160rpx;
border-radius: 20rpx;
margin-top: 96rpx;
}
}
</style>

2
server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java
View File

@ -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";

2
server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java
View File

@ -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);