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;
+ }
+
+}