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/2] (#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 196be3099abf1d175ff26a61ad4e2d252086a33b Mon Sep 17 00:00:00 2001
From: mrkbear
Date: Tue, 18 Jan 2022 21:16:08 +0800
Subject: [PATCH 2/2] (#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