diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1afe9752..baac49b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
+## [0.1.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.1...v0.1.2) - 2019-08-17
+
+### 修复
+
+- 修复更新弹窗的内容显示问题
+
## [0.1.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.0...v0.1.1) - 2019-08-17
### 新增
diff --git a/package.json b/package.json
index 64ffdfed..60458b99 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "lx-music-desktop",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "一个免费的音乐下载助手",
"main": "./dist/electron/main.js",
"scripts": {
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 1bfc1850..a2622e29 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,13 +1,3 @@
-### 新增
-
-- QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)
-
-### 优化
-
-- 优化http请求机制
-- 更新关于本软件说明
-
### 修复
-- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
-- 修复切换歌曲时仍然播放上一首歌曲的问题
+- 修复更新弹窗的内容显示问题
diff --git a/publish/version.json b/publish/version.json
index 16921aee..352e356b 100644
--- a/publish/version.json
+++ b/publish/version.json
@@ -1,7 +1,11 @@
{
- "version": "0.1.1",
- "desc": "
新增
\n\n- QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)
\n
\n优化
\n\n- 优化http请求机制
\n- 更新关于本软件说明
\n
\n修复
\n\n- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
\n- 修复切换歌曲时仍然播放上一首歌曲的问题
\n
\n",
+ "version": "0.1.2",
+ "desc": "修复
\n\n",
"history": [
+ {
+ "version": "0.1.1",
+ "desc": "新增
\n\n- QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)
\n
\n优化
\n\n- 优化http请求机制
\n- 更新关于本软件说明
\n
\n修复
\n\n- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
\n- 修复切换歌曲时仍然播放上一首歌曲的问题
\n
\n"
+ },
{
"version": "0.1.0",
"desc": "0.1.0版本发布"
diff --git a/src/renderer/components/material/VersionModal.vue b/src/renderer/components/material/VersionModal.vue
index 31655f36..ddc4d9e8 100644
--- a/src/renderer/components/material/VersionModal.vue
+++ b/src/renderer/components/material/VersionModal.vue
@@ -8,8 +8,8 @@ material-modal(:show="version.showModal" @close="handleClose")
h3 最新版本:{{version.newVersion.version}}
h3 当前版本:{{version.version}}
h3 版本变化:
- p(v-html="version.newVersion.desc")
- div(:class="$style.history" v-if="history.length")
+ p(:class="$style.desc" v-html="version.newVersion.desc")
+ div(:class="[$style.history, $style.desc]" v-if="history.length")
h3 历史版本:
div(:class="$style.item" v-for="ver in history")
h4 v{{ver.version}}
@@ -73,6 +73,7 @@ export default {
display: flex;
flex-flow: column nowrap;
justify-content: center;
+ overflow: hidden;
// overflow-y: auto;
* {
box-sizing: border-box;
@@ -103,12 +104,30 @@ export default {
padding-left: 15px;
}
}
+
+.desc {
+ h3, h4 {
+ font-weight: bold;
+ }
+ h3 {
+ padding: 5px 0 3px;
+ }
+ ul {
+ list-style: initial;
+ padding-inline-start: 30px;
+ }
+}
+
.history {
h3 {
padding-top: 15px;
}
.item {
+ h3 {
+ padding: 5px 0 3px;
+ }
+ padding-left: 15px;
+ .item {
padding-top: 15px;
}
@@ -116,7 +135,7 @@ export default {
font-weight: 700;
}
> p {
- padding-left: 10px;
+ padding-left: 15px;
}
}
diff --git a/src/renderer/store/mutations.js b/src/renderer/store/mutations.js
index 2e813054..abd12389 100644
--- a/src/renderer/store/mutations.js
+++ b/src/renderer/store/mutations.js
@@ -16,7 +16,7 @@ export default {
val.history.forEach(ver => {
ver.desc = ver.desc.replace(/\n/g, '
')
})
- val.desc = val.desc.replace(/\n/g, '
')
+ // val.desc = val.desc.replace(/\n/g, '
')
state.version.newVersion = val
},
setVersionVisible(state, val) {