From 7c1e4e441ae3f222b769baa29778cd062a74cc7c Mon Sep 17 00:00:00 2001 From: sanae kochiya <1471863514@qq.com> Date: Mon, 17 Jan 2022 22:57:05 +0800 Subject: [PATCH 1/6] (#37) --- miniprogram/pages/Account/Account.scss | 7 ++++++- miniprogram/pages/Account/Account.wxml | 13 ++++++++++++- miniprogram/pages/Account/FunctionList.scss | 20 +++++++++++++++++++- miniprogram/pages/Account/UserCard.scss | 4 ++-- project.config.json | 6 +++--- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss index 685a369..77e61f0 100644 --- a/miniprogram/pages/Account/Account.scss +++ b/miniprogram/pages/Account/Account.scss @@ -1,3 +1,8 @@ @import "./UserCard.scss"; @import "./MainFunction.scss"; -@import "./FunctionList.scss"; \ No newline at end of file +@import "./FunctionList.scss"; + +view.container{ + padding-top:20px ; +} + diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 9b41eea..9b7024f 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -18,5 +18,16 @@ 1806240113 - + + + + + + + 账号信息 + 课表缓存 + 功能定制 + 更多设置 + + \ No newline at end of file diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index c582eaa..1d49a3e 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -1 +1,19 @@ -@import "../../app.scss"; \ No newline at end of file +@import "../../app.scss"; + +$functionList-icon-width: 50px; + + +view.userInfo{ + padding-top:10px; + image{ + width: $functionList-icon-width; + height: $functionList-icon-width; + padding-left: 20px; + filter: opacity(1); + } + view.text{ + float: left; + font-size: 15px; + padding-left: 20px; + } +} \ No newline at end of file diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss index 81bff8e..d2b4736 100644 --- a/miniprogram/pages/Account/UserCard.scss +++ b/miniprogram/pages/Account/UserCard.scss @@ -9,8 +9,8 @@ view.user-card { padding-bottom: 20px; view.avatar { - width: 80px; - height: 80px; + width: 70px; + height: 70px; border-radius: 1000px; overflow: hidden; } diff --git a/project.config.json b/project.config.json index de9e730..590e778 100644 --- a/project.config.json +++ b/project.config.json @@ -26,9 +26,9 @@ "uploadWithSourceMap": true, "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": false, - "useApiHook": false, - "useApiHostProcess": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], From a92f2d06ea36153e1da082891979bc63099e9d99 Mon Sep 17 00:00:00 2001 From: 111 <111> Date: Tue, 18 Jan 2022 00:43:38 +0800 Subject: [PATCH 2/6] (#37) --- miniprogram/pages/Account/Account.scss | 10 +--- miniprogram/pages/Account/Account.wxml | 62 ++++++++++++++++++--- miniprogram/pages/Account/FunctionList.scss | 17 ------ miniprogram/pages/Account/MainFunction.scss | 26 ++++++++- 4 files changed, 81 insertions(+), 34 deletions(-) diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss index d1963de..8817c00 100644 --- a/miniprogram/pages/Account/Account.scss +++ b/miniprogram/pages/Account/Account.scss @@ -2,13 +2,9 @@ @import "./MainFunction.scss"; @import "./FunctionList.scss"; -<<<<<<< HEAD -view.container{ - padding-top:20px ; -} -======= -view.container { +view.container{ padding-top: 20px; } ->>>>>>> 4d3c44be6ef3624277a81f1692c1f6ef4b3a480c + + diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 4c0a98a..706b4ab 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -24,16 +24,60 @@ 1806240113 + + - - - - - - 账号信息 - 课表缓存 - 功能定制 - 更多设置 + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + 赞助计划 + + + + + 公众号 + + + + + 自助问答 + + + + + 关于我们 + + + + + 联系客服 +
\ No newline at end of file diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index 1d49a3e..116941b 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -1,19 +1,2 @@ @import "../../app.scss"; -$functionList-icon-width: 50px; - - -view.userInfo{ - padding-top:10px; - image{ - width: $functionList-icon-width; - height: $functionList-icon-width; - padding-left: 20px; - filter: opacity(1); - } - view.text{ - float: left; - font-size: 15px; - padding-left: 20px; - } -} \ No newline at end of file diff --git a/miniprogram/pages/Account/MainFunction.scss b/miniprogram/pages/Account/MainFunction.scss index c582eaa..4b547f9 100644 --- a/miniprogram/pages/Account/MainFunction.scss +++ b/miniprogram/pages/Account/MainFunction.scss @@ -1 +1,25 @@ -@import "../../app.scss"; \ No newline at end of file +@import "../../app.scss"; + +table.MFunc{ + width: 100%; + + image.MFuncImg{ + width: 20px; + height: 20px; + float: left; + padding-right: 20px; +} + view.tabView1,view.tabView2,view.tabView3,view.tabView4,view.tabView5{ + padding-top: 20px; + padding-bottom: 20px; + } + view.tabView1,view.tabView2,view.tabView3,view.tabView4{ + border-bottom:1px solid gainsboro ; + padding-top: 20px; + padding-bottom: 20px; + } + view.tabTxt{ + letter-spacing: 1px; + } + +} From f434ad531ce749d0d1320649e521437c47c05fa1 Mon Sep 17 00:00:00 2001 From: kochiyaSanaeSY Date: Tue, 18 Jan 2022 11:06:11 +0800 Subject: [PATCH 3/6] (#37) --- miniprogram/pages/Account/FunctionList.scss | 24 +++++++++++++++++++++ miniprogram/pages/Account/MainFunction.scss | 23 +------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index 116941b..943ecdc 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -1,2 +1,26 @@ @import "../../app.scss"; +table.MFunc{ + width: 100%; + + image.MFuncImg{ + width: 25px; + height: 25px; + float: left; + padding-right: 20px; +} + view.tabView1,view.tabView2,view.tabView3,view.tabView4,view.tabView5{ + padding-top: 20px; + padding-bottom: 20px; + } + view.tabView1,view.tabView2,view.tabView3,view.tabView4{ + border-bottom:1px solid gainsboro ; + padding-top: 20px; + padding-bottom: 20px; + } + view.tabTxt{ + letter-spacing: 1px; + + } + +} \ No newline at end of file diff --git a/miniprogram/pages/Account/MainFunction.scss b/miniprogram/pages/Account/MainFunction.scss index 4b547f9..512bfb5 100644 --- a/miniprogram/pages/Account/MainFunction.scss +++ b/miniprogram/pages/Account/MainFunction.scss @@ -1,25 +1,4 @@ @import "../../app.scss"; -table.MFunc{ - width: 100%; - - image.MFuncImg{ - width: 20px; - height: 20px; - float: left; - padding-right: 20px; -} - view.tabView1,view.tabView2,view.tabView3,view.tabView4,view.tabView5{ - padding-top: 20px; - padding-bottom: 20px; - } - view.tabView1,view.tabView2,view.tabView3,view.tabView4{ - border-bottom:1px solid gainsboro ; - padding-top: 20px; - padding-bottom: 20px; - } - view.tabTxt{ - letter-spacing: 1px; - } -} + From 54d87fc5dbcba2a9ab59c764be5affb0b4b7f9e9 Mon Sep 17 00:00:00 2001 From: kochiyaSanaeSY Date: Tue, 18 Jan 2022 11:39:15 +0800 Subject: [PATCH 4/6] (#37) --- miniprogram/pages/Account/Account.wxml | 31 ++++++++++----------- miniprogram/pages/Account/FunctionList.scss | 10 +++++-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 706b4ab..42ae37e 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -24,17 +24,17 @@ 1806240113 + - + - @@ -42,39 +42,36 @@ - - + - - diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index 943ecdc..2101be9 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -12,15 +12,19 @@ table.MFunc{ view.tabView1,view.tabView2,view.tabView3,view.tabView4,view.tabView5{ padding-top: 20px; padding-bottom: 20px; + } view.tabView1,view.tabView2,view.tabView3,view.tabView4{ border-bottom:1px solid gainsboro ; padding-top: 20px; padding-bottom: 20px; } - view.tabTxt{ + text.tabTxt{ letter-spacing: 1px; - } - + image.MFuncImgT{ + float: right; + width: 25px; + height: 25px; + } } \ No newline at end of file From 95f1f6d4849c7cfb70a93895ebd38bc3455b48d5 Mon Sep 17 00:00:00 2001 From: kochiyaSanaeSY Date: Tue, 18 Jan 2022 11:47:25 +0800 Subject: [PATCH 5/6] (#37) --- miniprogram/pages/Account/Account.wxml | 22 ++++++++++----------- miniprogram/pages/Account/FunctionList.scss | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 42ae37e..5fe36ad 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -28,31 +28,31 @@ -
- - 赞助计划 + 赞助计划 + + 公众号 + - 公众号 - + 自助问答 + - 自助问答 - - - 关于我们 + 关于我们 + - - - 联系客服 + + 联系客服 +
+
@@ -60,18 +60,18 @@ diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index 2101be9..a9a3e70 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -1,9 +1,9 @@ @import "../../app.scss"; -table.MFunc{ +table.FuncList{ width: 100%; - image.MFuncImg{ + image.FuncListImg{ width: 25px; height: 25px; float: left; @@ -22,7 +22,7 @@ table.MFunc{ text.tabTxt{ letter-spacing: 1px; } - image.MFuncImgT{ + image.FuncListImgT{ float: right; width: 25px; height: 25px; From 23f46a24c99770b25d26008a7cde27fd7f698ed6 Mon Sep 17 00:00:00 2001 From: mrkbear Date: Tue, 18 Jan 2022 22:30:05 +0800 Subject: [PATCH 6/6] (#37)Add Function List --- miniprogram/pages/Account/Account.scss | 2 +- miniprogram/pages/Account/Account.wxml | 126 ++++++++++---------- miniprogram/pages/Account/FunctionList.scss | 63 ++++++---- miniprogram/pages/Account/MainFunction.scss | 4 +- 4 files changed, 104 insertions(+), 91 deletions(-) diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss index 8817c00..f75c075 100644 --- a/miniprogram/pages/Account/Account.scss +++ b/miniprogram/pages/Account/Account.scss @@ -4,7 +4,7 @@ view.container{ - padding-top: 20px; + padding-top: 50rpx; } diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml index 85da67d..5970839 100644 --- a/miniprogram/pages/Account/Account.wxml +++ b/miniprogram/pages/Account/Account.wxml @@ -41,75 +41,75 @@ - - - 账号信息 - + + + + 账号信息 + + - - - 课表缓存 - + + + + 课表缓存 + + - - - 功能定制 - + + + + 功能定制 + + - - - 更多设置 - + + + + 更多设置 + + - -
- + 赞助计划 - + - + 公众号 - + - + 自助问答 - + - + 关于我们 - + - + 联系客服 - +
- - - + + + + + + 赞助计划 + - - - + + + + + + 公众号 + - - - - - - - - - - - - - -
- - - 赞助计划 - - - - - 公众号 - - - - - 自助问答 - - - - - 关于我们 - - - - - 联系客服 - -
+ + + + + + 自助问答 + + + + + + + + 关于我们 + + + + + + + + 联系客服 + + + \ No newline at end of file diff --git a/miniprogram/pages/Account/FunctionList.scss b/miniprogram/pages/Account/FunctionList.scss index a9a3e70..036a8b4 100644 --- a/miniprogram/pages/Account/FunctionList.scss +++ b/miniprogram/pages/Account/FunctionList.scss @@ -1,30 +1,43 @@ @import "../../app.scss"; -table.FuncList{ - width: 100%; - - image.FuncListImg{ - width: 25px; - height: 25px; - float: left; - padding-right: 20px; -} - view.tabView1,view.tabView2,view.tabView3,view.tabView4,view.tabView5{ - padding-top: 20px; - padding-bottom: 20px; +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; + } + } } - view.tabView1,view.tabView2,view.tabView3,view.tabView4{ - border-bottom:1px solid gainsboro ; - padding-top: 20px; - padding-bottom: 20px; +} + +@media (prefers-color-scheme: dark) { + view.function-list view.function > view { + border-bottom: 1px solid rgba($color: #ffffff, $alpha: .1); } - text.tabTxt{ - letter-spacing: 1px; - } - image.FuncListImgT{ - float: right; - width: 25px; - height: 25px; - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/miniprogram/pages/Account/MainFunction.scss b/miniprogram/pages/Account/MainFunction.scss index 76e9d18..c2466df 100644 --- a/miniprogram/pages/Account/MainFunction.scss +++ b/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; } } }