From 5d7e268b2a6333bc0cd2eff810a7a3c3bd2937b8 Mon Sep 17 00:00:00 2001
From: liusxs <1694181697@qq.com>
Date: Fri, 3 Feb 2023 16:51:03 +0800
Subject: [PATCH 01/32] update

---
 src/assets/scss/_media.scss               | 16 +++++--
 src/views/index/bottomMenu/index.vue      | 57 +++++++++++++++++------
 src/views/index/event/index.vue           | 55 +++++++++++++++++-----
 src/views/index/globalStatusBar/index.vue | 28 +++++++++--
 src/views/index/index.vue                 |  5 +-
 src/views/index/shortcutBar/index.vue     | 24 ++++++++--
 src/views/index/textOutput/index.vue      | 25 ++++++++--
 7 files changed, 169 insertions(+), 41 deletions(-)

diff --git a/src/assets/scss/_media.scss b/src/assets/scss/_media.scss
index f55fb27..910ad4e 100644
--- a/src/assets/scss/_media.scss
+++ b/src/assets/scss/_media.scss
@@ -1,8 +1,14 @@
-$bottomMenu-height: 30vh;
-$event-height: 34vh;
-$globalStatusBar-height: 12vh;
-$shortcutBar-height: 12vh;
-$textOutput-height: 12vh;
+$bottomMenu-height: 26vh;
+$Menu-height: 22vh;
+$eventMenu-height: 32vh;
+$event-height: 28vh;
+$globalStatusBar-height: 10vh;
+$shortcutBar-height: 8vh;
+$textOutput-height: 8vh;
+
+$body-width: 90%;
+$border-radius: 5px;
+$border: .5px;
 
 @media screen and (min-width: 480px) { // 移动设备
 }
diff --git a/src/views/index/bottomMenu/index.vue b/src/views/index/bottomMenu/index.vue
index fa82b11..7db65d4 100644
--- a/src/views/index/bottomMenu/index.vue
+++ b/src/views/index/bottomMenu/index.vue
@@ -1,8 +1,12 @@
 <template>
 	<div>
 		<van-row type="flex" justify="space-around" class="bottomMenu">
-			<van-col span="12" class="textOutput">文本输出</van-col>
-			<van-col span="12" class="more">更多</van-col>
+			<van-col span="12" class="textOutput">
+				<div class="menu-head">文本输出</div>
+			</van-col>
+			<van-col span="12" class="more">
+				<div class="menu-head">更多</div>
+			</van-col>
 		</van-row>
 	</div>
 
@@ -14,20 +18,43 @@ export default {name: "bottomMenu"}
 
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
-.textOutput {
-	background: #2b579a;
+@import "@/assets/scss/_color.scss";
+.bottomMenu {
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	width: $body-width;
 	height: $bottomMenu-height;
-	text-align: center;
-}
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-around;
+	margin-top: .125rem;
+	.textOutput {
+	    height: $Menu-height;
+		border: $border solid $tip-color;
+		border-radius: $border-radius;
+		position: relative;
+		width: 40%;
+		margin-top: .15rem;
+        }
 
-.more {
-	background: #05a6f0;
-	height: $bottomMenu-height;
-	text-align: center;
-}
-.bottomMenu {
-	position: relative;
-	bottom: 0;
-	width: 100%;
+    .more {
+    	height: $Menu-height;
+		border: $border solid $tip-color;
+		border-radius: 5px;
+		position: relative;
+		width: 50%;
+		margin-top: .15rem;
+        }
+		.menu-head{
+			width: 1.5rem;
+		    font-size: .1rem;
+		    text-align: center;
+		    border: $border solid $tip-color;
+	        border-radius: 5px;
+		    position: absolute;
+		    top: -3px;
+		    left: 6px;
+			background-color: #fff;
+		}
 }
 </style>
diff --git a/src/views/index/event/index.vue b/src/views/index/event/index.vue
index 16a76b2..c87600f 100644
--- a/src/views/index/event/index.vue
+++ b/src/views/index/event/index.vue
@@ -1,8 +1,12 @@
 <template>
 	<div>
 		<van-row type="flex" class="eventMenu">
-			<van-col span="8" class="text">快捷栏</van-col>
-			<van-col span="16" class="event">文字栏</van-col>
+			<van-col span="8" class="text">
+				<div class="events-head">地图</div>
+			</van-col>
+			<van-col span="16" class="event">
+				<div class="events-head">文字栏</div>
+			</van-col>
 		</van-row>
 	</div>
 </template>
@@ -13,14 +17,43 @@ export default {name: "event"}
 
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
-.event{
-	background: cadetblue;
-	height: $event-height;
-	text-align: center;
-}
-.text{
-	background: rgb(160, 95, 95);
-	height: $event-height;
-	text-align: center;
+@import "@/assets/scss/_color.scss";
+
+.eventMenu{
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	width: $body-width;
+	height: $eventMenu-height;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-around;
+	margin-top: .125rem;
+	.text{
+	    height: $event-height;
+		border: $border solid $tip-color;
+		border-radius: $border-radius;
+		position: relative;
+		width: 40%;
+		margin-top: .15rem;
+    }
+	.event{
+	    height: $event-height;
+		border: $border solid $tip-color;
+		border-radius: $border-radius;
+		position: relative;
+		width: 50%;
+		margin-top: .15rem;
+    }
+	.events-head{
+		    width: 1.5rem;
+		    font-size: .1rem;
+		    text-align: center;
+		    border: $border solid $tip-color;
+	        border-radius: 5px;
+		    position: absolute;
+		    top: -3px;
+		    left: 6px;
+			background-color: #fff;
+		}
 }
 </style>
diff --git a/src/views/index/globalStatusBar/index.vue b/src/views/index/globalStatusBar/index.vue
index ba70dde..5533273 100644
--- a/src/views/index/globalStatusBar/index.vue
+++ b/src/views/index/globalStatusBar/index.vue
@@ -1,7 +1,16 @@
 <template>
 	<div>
 		<van-row type="flex" justify="space-around">
-			<van-col span="24" class="globalStatus">全局状态栏</van-col>
+			<van-col span="24" class="globalStatus">
+				<div class="property">
+					<div class="attribute-name">生命<span>666</span></div>
+					<div class="attribute-name">生命<span>666</span></div>
+					<div class="attribute-name">生命<span>666</span></div>
+					<div class="attribute-name">生命<span>666</span></div>
+					<div class="attribute-name">生命<span>666</span></div>
+					<div class="attribute-name">辐射<span>666</span></div>
+				</div>
+			</van-col>
 		</van-row>
 	</div>
 </template>
@@ -12,9 +21,22 @@ export default {name: "globalStatusBar"}
 
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
+@import "@/assets/scss/_color.scss";
 .globalStatus {
-	background: cadetblue;
 	height: $globalStatusBar-height;
-	text-align: center;
+	width: $body-width;
+	margin: 5px;
+	border-bottom: $border solid $tip-color;
+	.property{
+		display: flex;
+		justify-content: flex-start;
+		.attribute-name{
+		    border: $border solid $tip-color;
+			border-radius: 2px;
+			text-align: center;
+			padding: 1px 0px;
+			font-size: .1rem;
+		}
+	}
 }
 </style>
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 3ae42e4..49fd766 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -33,5 +33,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+@import "@/assets/scss/_color.scss";
+    body{
+		background: $white;
+	}
 </style>
diff --git a/src/views/index/shortcutBar/index.vue b/src/views/index/shortcutBar/index.vue
index 63f5a1e..57c2434 100644
--- a/src/views/index/shortcutBar/index.vue
+++ b/src/views/index/shortcutBar/index.vue
@@ -1,7 +1,11 @@
 <template>
 	<div>
 		<van-row type="flex" justify="space-around">
-			<van-col span="24" class="quick">快捷栏</van-col>
+			<van-col span="24" class="quick">
+				<div class="quick_goods">
+					快捷栏
+				</div>
+			</van-col>
 		</van-row>
 	</div>
 </template>
@@ -12,9 +16,23 @@ export default {name: "shortcutBar"}
 
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
+@import "@/assets/scss/_color.scss";
 .quick{
-	background: rgb(15, 90, 91);
 	height: $shortcutBar-height;
-	text-align: center;
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	width: $body-width;
+	position: relative;
+	.quick_goods{
+		width: 1.5rem;
+		font-size: .1rem;
+		text-align: center;
+		border: $border solid $tip-color;
+	    border-radius: $border-radius;
+		position: absolute;
+		top: -3px;
+		left: 6px;
+		background-color: #fff;
+	}
 }
 </style>
diff --git a/src/views/index/textOutput/index.vue b/src/views/index/textOutput/index.vue
index 0aaff52..b9835dd 100644
--- a/src/views/index/textOutput/index.vue
+++ b/src/views/index/textOutput/index.vue
@@ -1,7 +1,11 @@
 <template>
 	<div>
 		<van-row type="flex" justify="space-around">
-			<van-col span="24" class="textOutput">文本输出</van-col>
+			<van-col span="24" class="textOutput">
+				<div class="textOut">
+					文本输出
+				</div>
+			</van-col>
 		</van-row>
 	</div>
 </template>
@@ -12,9 +16,24 @@ export default {name: "textOutput"}
 
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
+@import "@/assets/scss/_color.scss";
 .textOutput{
-	background: rgb(82, 125, 126);
 	height: $textOutput-height;
-	text-align: center;
+	width: $body-width;
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	position: relative;
+	margin-top: .125rem;
+	.textOut{
+		width: 1.5rem;
+		font-size: .1rem;
+		text-align: center;
+		border: $border solid $tip-color;
+	    border-radius: $border-radius;
+		position: absolute;
+		top: -3px;
+		left: 6px;
+		background-color: #fff;
+	}
 }
 </style>

From b7a357243b2b39511316fa86c1ec3a4b3e3729c5 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:51:21 +0800
Subject: [PATCH 02/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ac3446a..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -115,17 +115,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/ImgBotApp">
-            <img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="100;" alt="ImgBotApp"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>Imgbot</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/ImgBotApp">
+            <img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="100;" alt="ImgBotApp"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>Imgbot</b></sub>
         </a>
     </td></tr>
 </table>

From 6bdade4104d7b76d18f8d2d2215aadada21d7504 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:51:49 +0800
Subject: [PATCH 03/32] chore(main): release 1.2.1

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e8b320..a6f406a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.1](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.0...v1.2.1) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([b7a3572](https://github.com/School-of-Website-Engineering/TinyWaste/commit/b7a357243b2b39511316fa86c1ec3a4b3e3729c5))
+
 ## [1.2.0](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.1.2...v1.2.0) (2023-02-02)
 
 
diff --git a/package-lock.json b/package-lock.json
index 23f268d..4cfa042 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index 1ffb4d7..07f20b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 71a988392f0f421739f614b0516f7108ef43f282 Mon Sep 17 00:00:00 2001
From: liusxs <1694181697@qq.com>
Date: Fri, 3 Feb 2023 16:58:42 +0800
Subject: [PATCH 04/32] Update _media.scss

---
 src/assets/scss/_media.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/scss/_media.scss b/src/assets/scss/_media.scss
index 910ad4e..7d16585 100644
--- a/src/assets/scss/_media.scss
+++ b/src/assets/scss/_media.scss
@@ -2,7 +2,7 @@ $bottomMenu-height: 26vh;
 $Menu-height: 22vh;
 $eventMenu-height: 32vh;
 $event-height: 28vh;
-$globalStatusBar-height: 10vh;
+$globalStatusBar-height: 4vh;
 $shortcutBar-height: 8vh;
 $textOutput-height: 8vh;
 

From 57d1515cc74c3c7ace7733519d3d80ab425eca77 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:58:58 +0800
Subject: [PATCH 05/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From 9966df61904cc1f9a8d5a43939543b37be64d22d Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:59:12 +0800
Subject: [PATCH 06/32] chore(main): release 1.2.2

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f406a..5925376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([57d1515](https://github.com/School-of-Website-Engineering/TinyWaste/commit/57d1515cc74c3c7ace7733519d3d80ab425eca77))
+
 ## [1.2.1](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.0...v1.2.1) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4cfa042..55d374e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.1",
+      "version": "1.2.2",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index 07f20b3..8bc6435 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 5241bfd515e2a7da85b79766af6021fd6ddfc9a4 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:59:29 +0800
Subject: [PATCH 07/32] chore(main): release 1.2.2

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5925376..bdffdd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 ## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03)
 
 
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([57d1515](https://github.com/School-of-Website-Engineering/TinyWaste/commit/57d1515cc74c3c7ace7733519d3d80ab425eca77))
+
+## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03)
+
+
 ### Docs
 
 * **contributor:** contrib-readme-action has updated readme ([57d1515](https://github.com/School-of-Website-Engineering/TinyWaste/commit/57d1515cc74c3c7ace7733519d3d80ab425eca77))

From 5bd65c01b33a71ac2f8b02b2ded63a0831687d84 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:59:36 +0800
Subject: [PATCH 08/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 462f8bc266ba9ce625c7f4eacc02611bd1249083 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 16:59:54 +0800
Subject: [PATCH 09/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From f375bbda067090330112896c9bd979a5f9c8e381 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:00:07 +0800
Subject: [PATCH 10/32] chore(main): release 1.2.3

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdffdd8..d3d3a9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.3](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.2...v1.2.3) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([462f8bc](https://github.com/School-of-Website-Engineering/TinyWaste/commit/462f8bc266ba9ce625c7f4eacc02611bd1249083))
+* **contributor:** contrib-readme-action has updated readme ([5bd65c0](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5bd65c01b33a71ac2f8b02b2ded63a0831687d84))
+
 ## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 55d374e..8289013 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.2",
+      "version": "1.2.3",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index 8bc6435..d245bc3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From fc89a0903592dcbfc5fa467c34f76a090f029ec8 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:00:07 +0800
Subject: [PATCH 11/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 4a3a2b565a37d40f822b1e91618a8adb84ddc57e Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:00:22 +0800
Subject: [PATCH 12/32] chore(main): release 1.2.3

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d3a9c..4a4f1d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Docs
 
+* **contributor:** contrib-readme-action has updated readme ([fc89a09](https://github.com/School-of-Website-Engineering/TinyWaste/commit/fc89a0903592dcbfc5fa467c34f76a090f029ec8))
 * **contributor:** contrib-readme-action has updated readme ([462f8bc](https://github.com/School-of-Website-Engineering/TinyWaste/commit/462f8bc266ba9ce625c7f4eacc02611bd1249083))
 * **contributor:** contrib-readme-action has updated readme ([5bd65c0](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5bd65c01b33a71ac2f8b02b2ded63a0831687d84))
 

From 16bd6329c48812f71db524a03018d0fc7e5def99 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:00:37 +0800
Subject: [PATCH 13/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From 9fe184135902afc99bcfc53e9617fc491eff9b48 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:00:50 +0800
Subject: [PATCH 14/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 38e12b495021332acd6a5260e44751ee8adec5bb Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:01:04 +0800
Subject: [PATCH 15/32] chore(main): release 1.2.4

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a4f1d1..bfda4fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.4](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.3...v1.2.4) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([9fe1841](https://github.com/School-of-Website-Engineering/TinyWaste/commit/9fe184135902afc99bcfc53e9617fc491eff9b48))
+* **contributor:** contrib-readme-action has updated readme ([16bd632](https://github.com/School-of-Website-Engineering/TinyWaste/commit/16bd6329c48812f71db524a03018d0fc7e5def99))
+
 ## [1.2.3](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.2...v1.2.3) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8289013..0775987 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.3",
+      "version": "1.2.4",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index d245bc3..5eb40e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 4349f09648664339d8f7d343f2876e23ba3d9bf2 Mon Sep 17 00:00:00 2001
From: liusxs <1694181697@qq.com>
Date: Fri, 3 Feb 2023 17:11:29 +0800
Subject: [PATCH 16/32] Update index.vue

---
 src/views/index/globalStatusBar/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/index/globalStatusBar/index.vue b/src/views/index/globalStatusBar/index.vue
index 5533273..b96a0ca 100644
--- a/src/views/index/globalStatusBar/index.vue
+++ b/src/views/index/globalStatusBar/index.vue
@@ -28,14 +28,17 @@ export default {name: "globalStatusBar"}
 	margin: 5px;
 	border-bottom: $border solid $tip-color;
 	.property{
-		display: flex;
-		justify-content: flex-start;
 		.attribute-name{
 		    border: $border solid $tip-color;
 			border-radius: 2px;
 			text-align: center;
-			padding: 1px 0px;
+			padding: .015rem 0;
+			margin: 0 .1rem;
 			font-size: .1rem;
+			float: left;
+			&:nth-child(6){
+				float: right;
+			}
 		}
 	}
 }

From 628fa6f8092102a8cd64fc0f9f461638a9a250df Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:15 +0800
Subject: [PATCH 17/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From 5ee728a9ee1bae2c079ed36735ec14bce6af3880 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:26 +0800
Subject: [PATCH 18/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 5bc557646900e184cb86ccc0a0ef034e910a7e3c Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:38 +0800
Subject: [PATCH 19/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From 20981a06b53e8deeb5bb3e56fdfe3c8376e7b12b Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:42 +0800
Subject: [PATCH 20/32] chore(main): release 1.2.5

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfda4fa..adacaa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([5ee728a](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5ee728a9ee1bae2c079ed36735ec14bce6af3880))
+* **contributor:** contrib-readme-action has updated readme ([628fa6f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/628fa6f8092102a8cd64fc0f9f461638a9a250df))
+
 ## [1.2.4](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.3...v1.2.4) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 0775987..0d59000 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.4",
+      "version": "1.2.5",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index 5eb40e9..e43e60f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 33f21fbf857d4cf20f0283a535e17918d4cc2023 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:52 +0800
Subject: [PATCH 21/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 04293807c7bb0aaac385821d8482e8bf27007a2f Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:12:57 +0800
Subject: [PATCH 22/32] chore(main): release 1.2.5

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adacaa6..ce9742b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
 ## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03)
 
 
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([5bc5576](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5bc557646900e184cb86ccc0a0ef034e910a7e3c))
+* **contributor:** contrib-readme-action has updated readme ([5ee728a](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5ee728a9ee1bae2c079ed36735ec14bce6af3880))
+* **contributor:** contrib-readme-action has updated readme ([628fa6f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/628fa6f8092102a8cd64fc0f9f461638a9a250df))
+
+## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03)
+
+
 ### Docs
 
 * **contributor:** contrib-readme-action has updated readme ([5ee728a](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5ee728a9ee1bae2c079ed36735ec14bce6af3880))

From f8aaab3e809481244f4310386936fbdc272e8346 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:05 +0800
Subject: [PATCH 23/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From 899076f28fe1fd5d3f4b6b6c3f82851eb04227a2 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:15 +0800
Subject: [PATCH 24/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From 126032f97173535c8473c341940e8dfe1ac058fe Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:28 +0800
Subject: [PATCH 25/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From cbbe6f89f9c9086acc48d6a5b74f1b0c804d9c22 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:36 +0800
Subject: [PATCH 26/32] chore(main): release 1.2.6

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce9742b..9b8fdee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([899076f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/899076f28fe1fd5d3f4b6b6c3f82851eb04227a2))
+* **contributor:** contrib-readme-action has updated readme ([f8aaab3](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f8aaab3e809481244f4310386936fbdc272e8346))
+
 ## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 0d59000..4983b49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.5",
+      "version": "1.2.6",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index e43e60f..62c66dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 3e6ab24c9bfad5814b464188299540ee40777184 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:48 +0800
Subject: [PATCH 27/32] chore(main): release 1.2.6

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b8fdee..00375b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
 ## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03)
 
 
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([126032f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/126032f97173535c8473c341940e8dfe1ac058fe))
+* **contributor:** contrib-readme-action has updated readme ([899076f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/899076f28fe1fd5d3f4b6b6c3f82851eb04227a2))
+* **contributor:** contrib-readme-action has updated readme ([f8aaab3](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f8aaab3e809481244f4310386936fbdc272e8346))
+
+## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03)
+
+
 ### Docs
 
 * **contributor:** contrib-readme-action has updated readme ([899076f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/899076f28fe1fd5d3f4b6b6c3f82851eb04227a2))

From f18f3a0b9f4cd2ffd50f41207ae1075d9a4b0284 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:13:54 +0800
Subject: [PATCH 28/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c44206..4325ad3 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">

From d7afc69ca8258af92b8d6f4948e2ee1f2d17a291 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:14:22 +0800
Subject: [PATCH 29/32] chore(main): release 1.2.7

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00375b8..5d2c6bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.7](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.6...v1.2.7) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([f18f3a0](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f18f3a0b9f4cd2ffd50f41207ae1075d9a4b0284))
+
 ## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4983b49..d0d2ba8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.6",
+      "version": "1.2.7",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index 62c66dc..b26b3ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From bd5117ff2c6f471322e4e4e3e5df127af4c3292a Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:14:49 +0800
Subject: [PATCH 30/32] docs(contributor): contrib-readme-action has updated
 readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4325ad3..2c44206 100644
--- a/README.md
+++ b/README.md
@@ -108,17 +108,17 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/LingASDJ">
-            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
+        <a href="https://github.com/liusxs">
+            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
             <br />
-            <sub><b>JDSA Ling</b></sub>
+            <sub><b>Liuliu66</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusxs">
-            <img src="https://avatars.githubusercontent.com/u/101164913?v=4" width="100;" alt="liusxs"/>
+        <a href="https://github.com/LingASDJ">
+            <img src="https://avatars.githubusercontent.com/u/70191651?v=4" width="100;" alt="LingASDJ"/>
             <br />
-            <sub><b>Liuliu66</b></sub>
+            <sub><b>JDSA Ling</b></sub>
         </a>
     </td>
     <td align="center">

From a35f694d1ec32f4b9d9835530668ba3466c102e2 Mon Sep 17 00:00:00 2001
From: Mason <1960638223@qq.com>
Date: Fri, 3 Feb 2023 17:15:16 +0800
Subject: [PATCH 31/32] chore(main): release 1.2.8

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d2c6bb..76f3e4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.8](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.7...v1.2.8) (2023-02-03)
+
+
+### Docs
+
+* **contributor:** contrib-readme-action has updated readme ([bd5117f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/bd5117ff2c6f471322e4e4e3e5df127af4c3292a))
+
 ## [1.2.7](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.6...v1.2.7) (2023-02-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index d0d2ba8..88c8540 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tinywaste",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tinywaste",
-      "version": "1.2.7",
+      "version": "1.2.8",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
         "axios": "^1.2.6",
diff --git a/package.json b/package.json
index b26b3ff..122f4aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinywaste",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",

From 79573c22dac3d8755abbc56cfd4109eadedd31d8 Mon Sep 17 00:00:00 2001
From: LingASDJ <2735951230@qq.com>
Date: Fri, 3 Feb 2023 19:52:12 +0800
Subject: [PATCH 32/32] =?UTF-8?q?=E6=94=B9=E5=96=84=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/bottomMenu/index.vue      | 43 +++++++++++++++++++
 src/views/index/event/index.vue           | 52 ++++++++++++++++++++++-
 src/views/index/globalStatusBar/index.vue |  9 ++--
 3 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/src/views/index/bottomMenu/index.vue b/src/views/index/bottomMenu/index.vue
index 7db65d4..52ba1bf 100644
--- a/src/views/index/bottomMenu/index.vue
+++ b/src/views/index/bottomMenu/index.vue
@@ -8,6 +8,14 @@
 				<div class="menu-head">更多</div>
 			</van-col>
 		</van-row>
+		<van-row type="flex" justify="space-around" class="bottomLine">
+			<div class="time-list">
+				11：45
+			</div>
+			<div class="pause">
+				暂停游戏
+			</div>
+	</van-row>
 	</div>
 
 </template>
@@ -19,6 +27,41 @@ export default {name: "bottomMenu"}
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
 @import "@/assets/scss/_color.scss";
+
+.bottomLine {
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	width: $body-width;
+	height: 10vh;
+	margin: 0 auto;
+	top: 5px;
+	display: flex;
+	justify-content: space-around;
+	margin-top: 1px;
+	.time-list{
+		width: 0.5rem;
+		height: 5px;
+		font-size: .1rem;
+		margin: auto;
+		text-align: center;
+		border: $border solid $tip-color;
+		border-radius: 5px;
+		padding:0.1rem;
+		background-color: #fff;
+	}
+	.pause{
+		width: 0.5rem;
+		height: 5px;
+		font-size: .1rem;
+		margin: auto;
+		text-align: center;
+		border: $border solid $tip-color;
+		border-radius: 5px;
+		padding:0.1rem;
+		background-color: #fff;
+	}
+}
+
 .bottomMenu {
 	border: $border solid $tip-color;
 	border-radius: $border-radius;
diff --git a/src/views/index/event/index.vue b/src/views/index/event/index.vue
index c87600f..8ee6a97 100644
--- a/src/views/index/event/index.vue
+++ b/src/views/index/event/index.vue
@@ -5,12 +5,30 @@
 				<div class="events-head">地图</div>
 			</van-col>
 			<van-col span="16" class="event">
-				<div class="events-head">文字栏</div>
+				<div class="events-head">文字栏(事件区)
+				</div>
+			<div class="mainflex">
+				<!-- 主菜单界面 -->
+				<div class="menu-main">
+					<!-- TODO 事件区 -->
+					<div class="menu-list">
+						制作物品
+					</div>
+					<div class="menu-list">
+						天赋加点
+					</div>
+					<div class="menu-list">
+						睡觉休息
+					</div>
+				</div>
+				
+			</div>
 			</van-col>
 		</van-row>
 	</div>
 </template>
 
+
 <script>
 export default {name: "event"}
 </script>
@@ -18,6 +36,38 @@ export default {name: "event"}
 <style lang="scss" scoped>
 @import "@/assets/scss/_media.scss";
 @import "@/assets/scss/_color.scss";
+//菜单模板
+.menu-list{
+	width: 0.5rem;
+	height: 5px;
+	font-size: .1rem;
+	margin: auto;
+	top: 1px;
+	margin-left: 128px;
+	margin-top: 1px;
+	text-align: center;
+	border: $border solid $tip-color;
+	border-radius: 5px;
+	padding:0.1rem;
+	background-color: #fff;
+}
+
+.mainflex{
+	display: flex;
+}
+
+.menu-main{
+	border: $border solid $tip-color;
+	border-radius: $border-radius;
+	width: 100vh;
+	height: 23vh;
+	margin: 0 auto;
+	top: -3px;
+	left: 6px;
+	margin-top: .125rem;
+	margin-left: .125rem;
+	margin-right: .125rem;
+}
 
 .eventMenu{
 	border: $border solid $tip-color;
diff --git a/src/views/index/globalStatusBar/index.vue b/src/views/index/globalStatusBar/index.vue
index b96a0ca..215cd87 100644
--- a/src/views/index/globalStatusBar/index.vue
+++ b/src/views/index/globalStatusBar/index.vue
@@ -3,12 +3,9 @@
 		<van-row type="flex" justify="space-around">
 			<van-col span="24" class="globalStatus">
 				<div class="property">
-					<div class="attribute-name">生命<span>666</span></div>
-					<div class="attribute-name">生命<span>666</span></div>
-					<div class="attribute-name">生命<span>666</span></div>
-					<div class="attribute-name">生命<span>666</span></div>
-					<div class="attribute-name">生命<span>666</span></div>
-					<div class="attribute-name">辐射<span>666</span></div>
+					<!-- 动态定义这里的数据，而不是硬编码 -->
+					<div class="attribute-name">天气：<span>暴风雨</span></div>
+					<div class="attribute-name">生命：<span>100</span></div>
 				</div>
 			</van-col>
 		</van-row>