Compare commits

..

No commits in common. "afedb81633059c89b1a9e3eefe04fe7910c714d9" and "3119c862b1573f4c1243b257e8d880b9ad5c1997" have entirely different histories.

7 changed files with 10 additions and 92 deletions

View File

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

View File

@ -1,45 +0,0 @@
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;

View File

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

View File

@ -2,11 +2,9 @@ import { Manager } from "../../core/Module";
import { UserCard } from "./UserCard"; import { UserCard } from "./UserCard";
import { MainFunction } from "./MainFunction"; import { MainFunction } from "./MainFunction";
import { FunctionList } from "./FunctionList"; import { FunctionList } from "./FunctionList";
import { Mask } from "../../modular/Mask/Mask";
Manager.Page((manager) => { Manager.Page((manager) => {
const mask = manager.addModule(Mask, "mask"); manager.addModule(UserCard, "userCard");
manager.addModule(UserCard, "userCard", { mask });
manager.addModule(MainFunction, "mainFunction"); manager.addModule(MainFunction, "mainFunction");
manager.addModule(FunctionList, "functionList"); manager.addModule(FunctionList, "functionList");
}); });

View File

@ -1,5 +1,3 @@
<!-- 蒙版 -->
<view class="mask" bindtap="mask$handleClickMask" style="display:{{mask$isShow ? 'block' : 'none'}}"></view>
<!-- 顶部的阴影 --> <!-- 顶部的阴影 -->
<view class="top-shadow"></view> <view class="top-shadow"></view>
@ -16,9 +14,7 @@
<!-- 主题变换按钮 --> <!-- 主题变换按钮 -->
<view class="theme"> <view class="theme">
<view bindtap="userCard$changeTheme"> <image class="icon-sub" src="../../image/account/Account_Theme.svg" />
<image class="icon-sub" src="../../image/account/Account_Theme.svg" />
</view>
</view> </view>
<!-- 用户昵称 --> <!-- 用户昵称 -->
@ -31,7 +27,7 @@
<view class="name">秦浩轩</view> <view class="name">秦浩轩</view>
<view class="certified"> <view class="certified">
<view class="certifi-info">已认证</view> <view class="certifi-info">已认证</view>
<image class="text-icon" src="../../image/account/Account_OK.svg"></image> <view class="text-icon"></view>
</view> </view>
</view> </view>

View File

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

View File

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