Merge pull request '(#37) Optimize Account page' (#47) from dev-mrkbear into master

Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/47

miniprogram/core/Module.ts

@@ -491,6 +491,27 @@ class Manager<WXC extends AnyWXContext = AnyWXContext> {
         })
     }
 
+    /**
+     * 异步页面加载
+     * 
+     * *注意*
+     * 页面模块加载后，必须手动执行 loadAllModule
+     * loadAllModule Modular 才会真正的被加载
+     * 模块加载后可以处理逻辑绑定
+     */
+    public static async PageAsync(): Promise<{
+        manager: Manager<AnyWXContext>, 
+        query: Record<string, string | undefined>
+    }> {
+        return new Promise((solve) => {
+            Page({
+                async onLoad(query) {
+                    let manager = new Manager(this);
+                    await solve({ manager, query });
+                }
+            })
+        });
+    }
 }
 
 export { Manager, Modular, AnyWXContext, WXContext, ILifetime}

miniprogram/modular/Mask/Mask.scss

@@ -0,0 +1,8 @@
+
+view.mask {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background-color: rgba($color: #000000, $alpha: .2);
+	z-index: 1;
+}

miniprogram/modular/Mask/Mask.ts

@@ -0,0 +1,45 @@
+import { Modular, Manager } from "../../core/Module";
+
+class Mask<M extends Manager> extends Modular<M> {
+
+	public data? = {
+
+		/**
+		 * 蒙版的层级
+		 */
+		zIndex: 1,
+
+		/**
+		 * 蒙版是否显示
+		 */
+		isShow: false
+	};
+
+	private disappearTimer?: number;
+	
+	/**
+	 * 显示蒙版
+	 */
+	public showMask() {
+		this.setData({ isShow: true });
+	}
+
+	/**
+	 * 隐藏蒙版
+	 */
+	public hideMask() {
+		this.setData({ isShow: false });
+	}
+	
+	public override onLoad() {
+		this.setFunc(this.handleClickMask, "handleClickMask");
+        // Do something
+    }
+
+	private handleClickMask() {
+		this.hideMask();
+	}
+}
+
+export { Mask };
+export default Mask;

miniprogram/pages/Account/Account.scss

@@ -1,7 +1,10 @@
 @import "./UserCard.scss";
 @import "./MainFunction.scss";
 @import "./FunctionList.scss";
+@import "../../modular/Mask/Mask.scss";
 
-view.container {
-    padding-top: 20px;
+view.container{
+    padding-top: 50rpx;
 }
+
+

miniprogram/pages/Account/Account.ts

@@ -2,9 +2,25 @@ import { Manager } from "../../core/Module";
 import { UserCard } from "./UserCard";
 import { MainFunction } from "./MainFunction";
 import { FunctionList } from "./FunctionList";
+import { Mask } from "../../modular/Mask/Mask";
 
-Manager.Page((manager) => {
-    manager.addModule(UserCard, "userCard");
+(async () => {
+
+    // 初始化页面
+    const { manager, query } = await Manager.PageAsync();
+
+    // 添加蒙版 Modular
+    const mask = manager.addModule(Mask, "mask");
+
+    // 添加 UserCard Modular
+    manager.addModule(UserCard, "userCard", { mask });
+
+    // 添加 MainFunction Modular
     manager.addModule(MainFunction, "mainFunction");
+
+    // 添加 FunctionList Modular
     manager.addModule(FunctionList, "functionList");
-});
+
+    // 初始化全部 Modular
+    await manager.loadAllModule(query);
+})();

miniprogram/pages/Account/Account.wxml

@@ -1,3 +1,5 @@
+<!-- 蒙版 -->
+<view class="mask" bindtap="mask$handleClickMask" style="display:{{mask$isShow ? 'block' : 'none'}}"></view>
 
 <!-- 顶部的阴影 -->
 <view class="top-shadow"></view>
@@ -14,8 +16,10 @@
 
             <!-- 主题变换按钮 -->
             <view class="theme">
+                <view bindtap="userCard$changeTheme">
                     <image class="icon-sub" src="../../image/account/Account_Theme.svg" />
                 </view>
+            </view>
             
             <!-- 用户昵称 -->
             <view class="nick h1">
@@ -27,7 +31,7 @@
                 <view class="name">秦浩轩</view>
                 <view class="certified">
                     <view class="certifi-info">已认证</view>
-                    <view class="text-icon">√</view>
+                    <image class="text-icon" src="../../image/account/Account_OK.svg"></image>
                 </view>
             </view>
 
@@ -40,26 +44,29 @@
     </view>
 
     <!--主要功能-->
-    <view class="card main-function"><!--四个功能合在一起的容器-->
-        <view class="branch-funtion"><view><!--每个功能的容器-->
-            <image class="icon" src="../../image/account/Account_UserInfo.svg"></image><!--每个功能的图片-->
-            <view>账号信息</view><!--每个功能的文字-->
-        </view></view>
+    <view class="card main-function">
         
-        <view class="branch-funtion"><view>
-            <image class="icon" src="../../image/account/Account_DateList.svg"></image>
-            <view>课表缓存</view>
-        </view></view>
+        <!--每个功能的容器-->
+        <view class="branch-funtion" wx:for="{{ mainFunction$mainFunctionList }}" wx:key="index">
+            <view style="{{ index == (mainFunction$mainFunctionList - 1) ? 'border-bottom: 0px' : '' }}">
+                <!--每个功能的图片-->
+                <image class="icon" src="../../image/account/Account_{{ item.iconUrl }}.svg"></image>
+                <!--每个功能的文字-->
+                <view>{{ item.displayName }}</view>
+            </view>
+        </view>
+    </view>
 
-        <view class="branch-funtion"><view>
-            <image class="icon" src="../../image/account/Account_Customer.svg"></image>
-            <view>功能定制</view>
-        </view></view>
-
-        <view class="branch-funtion"><view style="border-right: 0px;">
-            <image class="icon" src="../../image/account/Account_Settings.svg"></image>
-            <view>更多设置</view>
-        </view></view>
+    <!-- 功能列表 -->
+    <view class="card function-list">
 
+        <!-- 每一行 -->
+        <view class="function" wx:for="{{ functionList$functionList }}" wx:key="index">
+            <view style="{{ index == (functionList$functionList.length - 1) ? 'border-bottom: 0px' : '' }}">
+                <image class="icon func-icon" src="../../image/account/Account_{{ item.iconUrl }}.svg" />
+                <view>{{ item.displayName }}</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
     </view>
 </view>

miniprogram/pages/Account/FunctionList.scss

@@ -1 +1,43 @@
 @import "../../app.scss";
+
+view.function-list {
+    margin-top: 50rpx;
+    margin-bottom: 50rpx;
+    padding: 0 0 !important;
+    width: 100% !important;
+
+    view.function {
+        padding: 0 20px;
+        width: calc( 100% - 40px );
+        height: 55px;
+        
+        > view {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid rgba($color: #000000, $alpha: .1);
+
+            image.func-icon {
+                width: 26px;
+                height: 26px;
+            }
+
+            view {
+                margin-left: 15px;
+                flex-grow: 1;
+                font-size: .9em;
+            }
+
+            image.arrow {
+                width: 10px;
+                height: 10px;
+            }
+        }
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    view.function-list view.function > view {
+      border-bottom: 1px solid rgba($color: #ffffff, $alpha: .1);
+    }
+  }

miniprogram/pages/Account/FunctionList.ts

@@ -1,7 +1,32 @@
 import { Modular, Manager } from "../../core/Module";
 
+interface IFunctionListItem {
+
+    /**
+     * 显示名称
+     */
+    displayName: string;
+
+    /**
+     * 图标路径
+     */
+    iconUrl: string;
+}
+
 class FunctionList<M extends Manager> extends Modular<M> {
 
+    public static readonly functionList: IFunctionListItem[] = [
+        { displayName: "赞助计划", iconUrl: "Sponsor" },
+        { displayName: "公众号", iconUrl: "PubilcAccount" },
+        { displayName: "自助问答", iconUrl: "FAQ" },
+        { displayName: "关于我们", iconUrl: "AboutUs" },
+        { displayName: "联系客服", iconUrl: "Support" }
+    ];
+
+    public data = {
+        functionList: FunctionList.functionList
+    };
+    
     public override onLoad() {
         // Do something
     }

miniprogram/pages/Account/MainFunction.scss

@@ -3,7 +3,7 @@
 //主要功能
 view.main-function {
   display: flex;
-  margin-top: 20px;
+  margin-top: 50rpx;
   padding: 0 !important;
   width: 100% !important;
 
@@ -26,7 +26,7 @@ view.main-function {
       view {
         text-align: center;
         margin-top: 5px;
-        font-size: .8em;
+        font-size: .9em;
       }
     }
   }

miniprogram/pages/Account/MainFunction.ts

@@ -1,7 +1,31 @@
 import { Modular, Manager } from "../../core/Module";
 
+interface IMainFunctionItem {
+
+    /**
+     * 显示名称
+     */
+    displayName: string;
+
+    /**
+     * 图标路径
+     */
+    iconUrl: string;
+}
+
 class MainFunction<M extends Manager> extends Modular<M> {
 
+    public static readonly MainFunctionList: IMainFunctionItem[] = [
+        { displayName: "账号信息", iconUrl: "UserInfo" },
+        { displayName: "课表缓存", iconUrl: "DateList" },
+        { displayName: "功能定制", iconUrl: "Customer" },
+        { displayName: "更多设置", iconUrl: "Settings" }
+    ];
+
+    public data? = {
+        mainFunctionList: MainFunction.MainFunctionList
+    }
+    
     public override onLoad() {
         // Do something
     }

miniprogram/pages/Account/UserCard.scss

@@ -27,9 +27,17 @@ view.user-card {
             display: flex;
             justify-content: flex-end;
 
-            image {
+            view {
                 width: 23px;
                 height: 23px;
+                padding: 20px;
+                margin: -20px;
+                border-radius: 20px;
+                
+                image {
+                    width: 100%;
+                    height: 100%;
+                }
             }
         }
         
@@ -41,6 +49,7 @@ view.user-card {
             text-overflow: ellipsis;
         }
 
+        // 学生信息
         view.student {
             display: flex;
             align-items: center;
@@ -57,8 +66,10 @@ view.user-card {
                 justify-content: center;
                 align-items: center;
 
-                view.text-icon {
-                    margin-left: .3em;
+                image.text-icon {
+                    margin-left: .25em;
+                    width: 10px;
+                    height: 10px;
                 }
             }
         }

miniprogram/pages/Account/UserCard.ts

@@ -1,9 +1,21 @@
 import { Modular, Manager } from "../../core/Module";
+import { Mask } from "../../modular/Mask/Mask";
 
-class UserCard<M extends Manager> extends Modular<M> {
+type IUserCardDependent<M extends Manager> = {
+    mask: Mask<M>
+}
+
+class UserCard<M extends Manager> extends Modular<M, IUserCardDependent<M>> {
 
     public override onLoad() {
-        // Do something
+        this.setFunc(this.handleChangeTheme, "changeTheme")
+    }
+    
+    /**
+     * 处理主题更换
+     */
+    private handleChangeTheme() {
+        this.depends?.mask.showMask();
     }
 }
 

miniprogram/pages/Timetable/TestCore.ts

@@ -28,12 +28,12 @@ implements Partial<ILifetime> {
             s.set("be", 12);
         }, 1000)
         
-        new Login().param({studentId: "1806240113", password: "qazxsw123"})
-        .request().wait({
-            ok: (w) => {console.log("ok", w)},
-            no: (w) => {console.log("no", w)},
-            done: (w) => {console.log("done", w)}
-        });
+        // new Login().param({studentId: "1806240113", password: ""})
+        // .request().wait({
+        //     ok: (w) => {console.log("ok", w)},
+        //     no: (w) => {console.log("no", w)},
+        //     done: (w) => {console.log("done", w)}
+        // });
     }
 }
 

miniprogram/pages/Timetable/Timetable.ts

@@ -6,7 +6,17 @@ import { TestCore } from "./TestCore";
  * 此页面使用 Manager 进行模块化管理
  * 若要添加先功能请先定义 Modular 并添加至 Manager
  */
-Manager.Page((manager)=>{
+(async () => {
+
+    // 初始化页面
+    const { manager, query } = await Manager.PageAsync();
+
+    // 添加 StatusBar Modular
     manager.addModule(StatusBar, "statusBar");
+    
+    // 添加 TestCore Modular
     manager.addModule(TestCore, "testCore");
-})
+
+    // 初始化全部 Modular
+    await manager.loadAllModule(query);
+})()