diff --git a/miniprogram/image/account/Account_Complete.svg b/miniprogram/image/account/Account_Complete.svg new file mode 100644 index 0000000..b580b75 --- /dev/null +++ b/miniprogram/image/account/Account_Complete.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_Info.svg b/miniprogram/image/account/Account_Info.svg new file mode 100644 index 0000000..128704e --- /dev/null +++ b/miniprogram/image/account/Account_Info.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_PasswordHidden.svg b/miniprogram/image/account/Account_PasswordHidden.svg new file mode 100644 index 0000000..69d05c2 --- /dev/null +++ b/miniprogram/image/account/Account_PasswordHidden.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_PasswordShow.svg b/miniprogram/image/account/Account_PasswordShow.svg new file mode 100644 index 0000000..9026a94 --- /dev/null +++ b/miniprogram/image/account/Account_PasswordShow.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_Question.svg b/miniprogram/image/account/Account_Question.svg new file mode 100644 index 0000000..63b81ba --- /dev/null +++ b/miniprogram/image/account/Account_Question.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_UserName.svg b/miniprogram/image/account/Account_UserName.svg new file mode 100644 index 0000000..9c1c3ea --- /dev/null +++ b/miniprogram/image/account/Account_UserName.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/Account_Waitting.svg b/miniprogram/image/account/Account_Waitting.svg new file mode 100644 index 0000000..7c06e4c --- /dev/null +++ b/miniprogram/image/account/Account_Waitting.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/miniprogram/image/account/School_DLPU.png b/miniprogram/image/account/School_DLPU.png new file mode 100644 index 0000000..83c7d1a Binary files /dev/null and b/miniprogram/image/account/School_DLPU.png differ diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss index 6873423..04a83f3 100644 --- a/miniprogram/pages/Account/Account.scss +++ b/miniprogram/pages/Account/Account.scss @@ -1,6 +1,7 @@ @import "./UserCard.scss"; @import "./MainFunction.scss"; @import "./FunctionList.scss"; +@import "./Login.scss"; @import "../../modular/PopupLayer.scss"; view.container{ diff --git a/miniprogram/pages/Account/Account.ts b/miniprogram/pages/Account/Account.ts index b4206f4..c387bb5 100644 --- a/miniprogram/pages/Account/Account.ts +++ b/miniprogram/pages/Account/Account.ts @@ -2,8 +2,8 @@ import { Manager } from "../../core/Module"; import { UserCard } from "./UserCard"; import { MainFunction } from "./MainFunction"; import { FunctionList } from "./FunctionList"; +import { Login } from "./Login"; import { PopupLayer } from "../../modular/PopupLayer"; -import { TestLayerA } from "./TestLayerA"; (async () => { @@ -11,21 +11,20 @@ import { TestLayerA } from "./TestLayerA"; const { manager, query } = await Manager.PageAsync(); // 添加弹出层 Modular - const popupLayer: PopupLayer<"layerA" | "layerB"> = manager.addModule(PopupLayer, "mask") as any; + const popupLayer: PopupLayer<"loginLayer"> = manager.addModule(PopupLayer, "mask") as any; + + // 初始化弹出层 + popupLayer.initLayers(["loginLayer"]); // 添加 UserCard Modular const userCard = manager.addModule(UserCard, "userCard"); - //#region test layer - popupLayer.initLayers(["layerA", "layerB"]); - const testLayerA = manager.addModule(TestLayerA, "testLayerA"); + // 添加登录模块 + const loginLayer = manager.addModule(Login, "loginLayer"); + userCard.on("clickChangeTheme", () => { - popupLayer.emit("show", "layerA"); - }) - testLayerA.on("click", () => { - popupLayer.emit("show", "layerB"); - }) - //#endregion + popupLayer.emit("show", "loginLayer"); + }); // 添加 MainFunction Modular manager.addModule(MainFunction, "mainFunction"); diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 9b7a0d0..1220164 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -4,14 +4,37 @@ - - - layerA(点击显示layerB) - + + + - - - layerB + + + + + + + + + 秦浩轩 + + + 1806240113 + + + + + + diff --git a/miniprogram/pages/Account/Login.scss b/miniprogram/pages/Account/Login.scss new file mode 100644 index 0000000..a044448 --- /dev/null +++ b/miniprogram/pages/Account/Login.scss @@ -0,0 +1,99 @@ +@import "../../app.scss"; + +$logo-height: 100px; + +view.login-layer { + + view.school-logo { + height: 0; + padding-top: 20px; + width: 100%; + text-align: center; + + view { + z-index: 2; + display: inline-block; + position: relative; + border-radius: 1000px; + background-color: $theme-color-light-layout; + width: $logo-height; + height: $logo-height; + + image { + width: 100%; + height: 100%; + } + } + } + + view.line-bg { + display: flex; + box-sizing: border-box; + padding: 35px 0; + height: $logo-height; + width: calc( 100% + 40px ); + position: relative; + left: -20px; + flex-direction: column; + justify-content: space-around; + + view { + height: 0; + width: 100%; + border-top: 2px solid rgba(0,0,0,.1); + } + } + + view.student-name { + margin: 10px 0 1px 0; + text-align: center; + } + + view.student-id { + margin-bottom: 1px; + text-align: center; + } + + view.login-state { + width: 100%; + margin-bottom: 20px; + text-align: center; + + view.certified { + color: $theme-color-blue; + border: 1px solid $theme-color-blue; + border-radius: 4px; + margin-left: .3em; + font-size: .85em; + height: 1.2em; + padding: 0 2px; + display: inline-flex; + justify-content: center; + align-items: center; + + image.text-icon { + margin-left: .25em; + width: 10px; + height: 10px; + } + } + } +} + +@media (prefers-color-scheme: dark) { + + view.login-layer { + + view.school-logo view { + background-color: $theme-color-dark-layout; + + image { + filter: $white-filter; + } + } + + view.line-bg view { + border-top: 2px solid rgba(255,255,255,.1); + } + } +} \ No newline at end of file diff --git a/miniprogram/pages/Account/Login.ts b/miniprogram/pages/Account/Login.ts new file mode 100644 index 0000000..89ac49d --- /dev/null +++ b/miniprogram/pages/Account/Login.ts @@ -0,0 +1,15 @@ +import { Modular, Manager } from "../../core/Module"; + +type ILoginEvent = { + +} + +class Login extends Modular { + + public override onLoad() { + + } +} + +export { Login }; +export default Login; \ No newline at end of file diff --git a/miniprogram/pages/Account/TestLayerA.ts b/miniprogram/pages/Account/TestLayerA.ts deleted file mode 100644 index f45a2c2..0000000 --- a/miniprogram/pages/Account/TestLayerA.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Modular, Manager } from "../../core/Module"; - -type IUserCardEvent = { - - /** - * 主题更换按钮点击事件 - */ - click: void; -} - -class TestLayerA extends Modular { - - public override onLoad() { - this.setFunc(this.handleClick, "click"); - } - - /** - * 弹窗点击时 - */ - private handleClick() { - this.emit("click"); - } -} - -export { TestLayerA }; -export default TestLayerA; \ No newline at end of file