-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64 from School-of-Website-Engineering/main
合并主分支到Dev分支，同步项目
- Loading branch information
Showing
11 changed files
with
355 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,109 @@ | ||
| <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> | ||
| <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> | ||
|
|
||
| <style lang="scss" scoped> | ||
| @import "@/assets/scss/_media.scss"; | ||
| .event{ | ||
| background: cadetblue; | ||
| height: $event-height; | ||
| @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; | ||
| } | ||
| .text{ | ||
| background: rgb(160, 95, 95); | ||
| height: $event-height; | ||
| text-align: center; | ||
| .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; | ||
| 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> |
Oops, something went wrong.