From 3bb47109ed10e3c9a9235249e38f5d5d40c1d899 Mon Sep 17 00:00:00 2001
From: gia_jie <1427004391@qq.com>
Date: Tue, 18 Jan 2022 10:44:32 +0800
Subject: [PATCH 1/4] (#37)
---
miniprogram/pages/Account/Account.wxml | 28 ++++-
miniprogram/pages/Account/MainFunction.scss | 37 ++++++-
project.config.json | 110 ++++++++++----------
3 files changed, 118 insertions(+), 57 deletions(-)
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index a55abc5..7e43a1d 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -25,4 +25,30 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
+ 账号信息
+
+
+
+
+ 课表缓存
+
+
+
+
+ 功能定制
+
+
+
+
+ 更多设置
+
+
+
+
diff --git a/miniprogram/pages/Account/MainFunction.scss b/miniprogram/pages/Account/MainFunction.scss
index c582eaa..b80c130 100644
--- a/miniprogram/pages/Account/MainFunction.scss
+++ b/miniprogram/pages/Account/MainFunction.scss
@@ -1 +1,36 @@
-@import "../../app.scss";
\ No newline at end of file
+@import "../../app.scss";
+//主要功能
+view.MainFuction {
+ height: 80px;
+ display: flex;
+ padding-top: 10px;
+ padding-bottom: 8px;
+
+ view.BranchFuntion {
+ margin-top: 12px;
+ margin-bottom: 12px;
+ float: left;
+ width: 25%;
+ border-right: 1px solid gainsboro;
+
+ image.MFimage{
+ padding-top: 3%;
+ padding-left: 25%;
+ height: 50%;
+ width: 50%;
+ }
+
+ view.MFfont {
+ text-align: center;
+ font-size: 10px;
+ margin: 5px 0;
+ letter-spacing:2px;
+ }
+ }
+}
+
+@media (prefers-color-scheme: dark) {
+ view.container view.user-card view.avatar{
+ filter: brightness(.8);
+ }
+}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index de9e730..ec8c334 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,58 +1,58 @@
{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": []
+ "description": "项目配置文件",
+ "packOptions": {
+ "ignore": []
+ },
+ "miniprogramRoot": "miniprogram/",
+ "compileType": "miniprogram",
+ "libVersion": "2.16.1",
+ "projectname": "mini-dlpu-v3",
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "enhance": true,
+ "postcss": true,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "newFeature": false,
+ "coverView": true,
+ "nodeModules": false,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
+ "uglifyFileName": true,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
+ "uploadWithSourceMap": true,
+ "compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
+ "useMultiFrameRuntime": true,
+ "useApiHook": true,
+ "useApiHostProcess": true,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
},
- "miniprogramRoot": "miniprogram/",
- "compileType": "miniprogram",
- "libVersion": "2.16.1",
- "projectname": "mini-dlpu-v3",
- "setting": {
- "urlCheck": false,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": false,
- "coverView": true,
- "nodeModules": false,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": true,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
- "useMultiFrameRuntime": false,
- "useApiHook": false,
- "useApiHostProcess": false,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "enableEngineNative": false,
- "useIsolateContext": false,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "disableUseStrict": false,
- "minifyWXML": true,
- "showES6CompileOption": false,
- "useCompilerPlugins": [
- "typescript",
- "sass"
- ]
- },
- "simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
- "appid": "wx7d809f5e8955843d",
- "scripts": {
- "beforeCompile": ""
- },
- "condition": {}
+ "enableEngineNative": false,
+ "useIsolateContext": false,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "disableUseStrict": false,
+ "minifyWXML": true,
+ "showES6CompileOption": false,
+ "useCompilerPlugins": [
+ "typescript",
+ "sass"
+ ]
+ },
+ "simulatorType": "wechat",
+ "simulatorPluginLibVersion": {},
+ "appid": "wx7d809f5e8955843d",
+ "scripts": {
+ "beforeCompile": ""
+ },
+ "condition": {}
}
\ No newline at end of file
From d70ead2f77e8985d9251bf0bfbafab6a3cb0a82d Mon Sep 17 00:00:00 2001
From: MrKBear
Date: Tue, 18 Jan 2022 17:56:44 +0800
Subject: [PATCH 2/4] (#37)Style optimization
---
miniprogram/app.scss | 25 +++++++++----
miniprogram/pages/Account/Account.wxml | 20 +++++++++--
miniprogram/pages/Account/UserCard.scss | 47 +++++++++++++++++++++----
3 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/miniprogram/app.scss b/miniprogram/app.scss
index 5901d33..d6fb045 100644
--- a/miniprogram/app.scss
+++ b/miniprogram/app.scss
@@ -14,7 +14,7 @@ $theme-color-dark-text: rgba(255, 255, 255, .5);
$black-filter: brightness(0) opacity(.65);
$white-filter: brightness(100) opacity(.65);
-$blue-filter: opacity(.65);
+$blue-filter: opacity(1);
// 页面容器外边距
view.container {
@@ -24,18 +24,23 @@ view.container {
// 带阴影的 card
view.card {
- width: calc( 100% - 36px );
- padding: 0 18px;
+ width: calc( 100% - 40px );
+ padding: 0 20px;
border-radius: 15px;
background-color: $theme-color-light-layout;
box-shadow: 0 1.6px 3.6px 0 rgba(0, 0, 0, .08),
0 0.3px 0.9px 0 rgba(0, 0, 0, .05);
}
-image {
+image.icon {
filter: $black-filter;
}
+image.icon-sub {
+ filter: $black-filter;
+ opacity: .6;
+}
+
// 顶部导航栏阴影
view.top-shadow {
position: fixed;
@@ -52,23 +57,27 @@ page {
}
view, text {
- font-size: .99em;
+ font-size: .97em;
+ letter-spacing: .1em;
font-family: Hiragino Sans GB, MicroSoft YaHei;
}
view.h1 {
color: $theme-color-light-title;
font-size: 1.5em;
+ letter-spacing: .1em;
}
view.h2 {
color: $theme-color-light-title;
font-size: 1.3em;
+ letter-spacing: .1em;
}
view.h3 {
color: $theme-color-light-title;
font-size: 1em;
+ letter-spacing: .1em;
}
@media (prefers-color-scheme: dark){
@@ -81,7 +90,11 @@ view.h3 {
background-color: $theme-color-dark-layout;
}
- image {
+ image.icon {
+ filter: $white-filter;
+ }
+
+ image.icon-sub {
filter: $white-filter;
}
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index a55abc5..360eb96 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -14,14 +14,28 @@
-
+
+
- 秦浩轩
- 1806240113
+
+
+
+ 秦浩轩
+
+ 已认证
+ √
+
+
+
+
+ 1806240113
+
+
+ 大连工业大学
diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss
index 5626684..3ad14e8 100644
--- a/miniprogram/pages/Account/UserCard.scss
+++ b/miniprogram/pages/Account/UserCard.scss
@@ -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;
}
}
}
From 7dd46dbd159062cbf520f4724621d25a83a362ad Mon Sep 17 00:00:00 2001
From: mrkbear
Date: Tue, 18 Jan 2022 20:11:09 +0800
Subject: [PATCH 3/4] (#37)Add ok no arrow ICON
---
miniprogram/image/account/Account_Arrow.svg | 62 ++++++++++++++++++++
miniprogram/image/account/Account_NO.svg | 65 +++++++++++++++++++++
miniprogram/image/account/Account_OK.svg | 2 +-
3 files changed, 128 insertions(+), 1 deletion(-)
create mode 100644 miniprogram/image/account/Account_Arrow.svg
create mode 100644 miniprogram/image/account/Account_NO.svg
diff --git a/miniprogram/image/account/Account_Arrow.svg b/miniprogram/image/account/Account_Arrow.svg
new file mode 100644
index 0000000..985371e
--- /dev/null
+++ b/miniprogram/image/account/Account_Arrow.svg
@@ -0,0 +1,62 @@
+
+
+
diff --git a/miniprogram/image/account/Account_NO.svg b/miniprogram/image/account/Account_NO.svg
new file mode 100644
index 0000000..ad6bd6a
--- /dev/null
+++ b/miniprogram/image/account/Account_NO.svg
@@ -0,0 +1,65 @@
+
+
+
diff --git a/miniprogram/image/account/Account_OK.svg b/miniprogram/image/account/Account_OK.svg
index 00e4ca5..79614bb 100644
--- a/miniprogram/image/account/Account_OK.svg
+++ b/miniprogram/image/account/Account_OK.svg
@@ -18,7 +18,7 @@
.st12{fill:none;stroke:#B3B3B3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
.st13{fill:#B3B3B3;}
.st14{opacity:0.05;}
- .st15{clip-path:url(#SVGID_00000119811792014936471320000011453116645578675119_);}
+ .st15{clip-path:url(#SVGID_00000000193655916124849200000001531564748471850152_);}
.st16{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
.st17{opacity:0.4;fill:#3EA3D8;}
.st18{fill:none;stroke:#3EA3D8;stroke-miterlimit:10;}
From 196be3099abf1d175ff26a61ad4e2d252086a33b Mon Sep 17 00:00:00 2001
From: mrkbear
Date: Tue, 18 Jan 2022 21:16:08 +0800
Subject: [PATCH 4/4] (#37)Add main funcion modular
---
miniprogram/pages/Account/Account.wxml | 41 +++++++++----------
miniprogram/pages/Account/MainFunction.scss | 45 +++++++++++----------
2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index 4a66b38..a22f6ff 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -39,30 +39,27 @@
-
-
+
+
+
+
+ 账号信息
+
-
-
-
-
- 账号信息
-
+
+
+ 课表缓存
+
-
-
- 课表缓存
-
+
+
+ 功能定制
+
-
-
- 功能定制
-
-
-
-
- 更多设置
-
+
+
+ 更多设置
+
-
+
\ No newline at end of file
diff --git a/miniprogram/pages/Account/MainFunction.scss b/miniprogram/pages/Account/MainFunction.scss
index b80c130..da8a654 100644
--- a/miniprogram/pages/Account/MainFunction.scss
+++ b/miniprogram/pages/Account/MainFunction.scss
@@ -1,36 +1,39 @@
@import "../../app.scss";
+
//主要功能
-view.MainFuction {
- height: 80px;
+view.main-function {
display: flex;
- padding-top: 10px;
- padding-bottom: 8px;
+ margin-top: 20px;
+ padding: 0 !important;
+ width: 100% !important;
- view.BranchFuntion {
- margin-top: 12px;
- margin-bottom: 12px;
- float: left;
- width: 25%;
- border-right: 1px solid gainsboro;
+ view.branch-funtion {
+ padding: 13px 0;
+ width: 100%;
- image.MFimage{
- padding-top: 3%;
- padding-left: 25%;
- height: 50%;
- width: 50%;
+ > 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.MFfont {
+ view {
text-align: center;
- font-size: 10px;
- margin: 5px 0;
- letter-spacing:2px;
+ margin-top: 5px;
+ font-size: .8em;
}
+ }
}
}
@media (prefers-color-scheme: dark) {
- view.container view.user-card view.avatar{
- filter: brightness(.8);
+ view.main-function view.branch-funtion > view {
+ border-right: 1px solid rgba($color: #ffffff, $alpha: .1);
}
}
\ No newline at end of file