Merge 'master' into dev-sanaesy

This commit is contained in:
2022-01-18 21:36:37 +08:00
8 changed files with 364 additions and 119 deletions
+86 -51
View File
@@ -14,67 +14,102 @@
<!-- 主题变换按钮 -->
<view class="theme">
<image src="../../image/account/Account_Theme.svg" />
<image class="icon-sub" src="../../image/account/Account_Theme.svg" />
</view>
<!-- 用户昵称 -->
<view class="nick h1">
<open-data type="userNickName" />
</view>
<view class="student">秦浩轩</view>
<view class="student">1806240113</view>
<!-- 学生信息 -->
<view class="student">
<view class="name">秦浩轩</view>
<view class="certified">
<view class="certifi-info">已认证</view>
<view class="text-icon">√</view>
</view>
</view>
<!-- 学号信息 -->
<view class="student-id">1806240113</view>
<!-- 学校 -->
<view class="school">大连工业大学</view>
</view>
</view>
</view>
<view class="container">
<!--主要功能-->
<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="branch-funtion"><view>
<image class="icon" src="../../image/account/Account_DateList.svg"></image>
<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>
<view class="user-card card">
<table class="FuncList">
<view class="tabView1">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_Sponsor.svg"></image>
<text class="tabTxt">赞助计划</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView2">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_PubilcAccount.svg"></image>
<text class="tabTxt">公众号</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView3">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_FAQ.svg"></image>
<text class="tabTxt">自助问答</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView4">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_AboutUs.svg"></image>
<text class="tabTxt">关于我们</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView5">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_Support.svg"></image>
<text class="tabTxt">联系客服</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView1">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_Sponsor.svg"></image>
<text class="tabTxt">赞助计划</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView2">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_PubilcAccount.svg"></image>
<text class="tabTxt">公众号</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView3">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_FAQ.svg"></image>
<text class="tabTxt">自助问答</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView4">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_AboutUs.svg"></image>
<text class="tabTxt">关于我们</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
<view class="tabView5">
<th>
<td>
<image class="FuncListImg" src="../../image/account/Account_Support.svg"></image>
<text class="tabTxt">联系客服</text>
<image class="FuncListImgT"src="../../image/account/Account_PubilcAccount.svg"></image>
</td>
</th>
</view>
</table>
</view>
</view>
@@ -1,4 +1,39 @@
@import "../../app.scss";
//主要功能
view.main-function {
display: flex;
margin-top: 20px;
padding: 0 !important;
width: 100% !important;
view.branch-funtion {
padding: 13px 0;
width: 100%;
> view {
display: flex;
flex-direction: column;
align-items: center;
justify-self: center;
border-right: 1px solid rgba($color: #000000, $alpha: .1);
image {
height: 35px;
width: 35px;
}
view {
text-align: center;
margin-top: 5px;
font-size: .8em;
}
}
}
}
@media (prefers-color-scheme: dark) {
view.main-function view.branch-funtion > view {
border-right: 1px solid rgba($color: #ffffff, $alpha: .1);
}
}
+41 -6
View File
@@ -8,33 +8,68 @@ view.user-card {
padding-bottom: 20px;
view.avatar {
width: 70px;
height: 70px;
flex-basis: 80px;
width: 80px;
height: 80px;
border-radius: 1000px;
flex-shrink: 0;
overflow: hidden;
}
view.info {
flex-grow: 1;
padding-left: 20px;
max-width: calc(100% - 80px - 20px);
view.theme {
width: 100%;
padding: 20px 0 10px 0;
display: flex;
justify-content: flex-end;
image {
width: 25px;
height: 25px;
width: 23px;
height: 23px;
}
}
view.nick {
margin: 4px 0;
margin-bottom: 6px;
word-break: keep-all;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
view.student {
margin: 1px 0;
display: flex;
align-items: 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: flex;
justify-content: center;
align-items: center;
view.text-icon {
margin-left: .3em;
}
}
}
view.student-id {
margin-bottom: 3px;
}
view.school {
text-align: right;
padding: 10px 0 20px 0;
}
}
}