From a92f2d06ea36153e1da082891979bc63099e9d99 Mon Sep 17 00:00:00 2001
From: 111 <111>
Date: Tue, 18 Jan 2022 00:43:38 +0800
Subject: [PATCH] (#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 @@
             <view class="student">1806240113</view>
         </view>
     </view>
+
+    
     <view class="user-card card">
-        <view class="userInfo">
-            <image src="../../image/account/Account_UserInfo.svg"></image>
-            <image src="../../image/account/Account_DateList.svg"></image>
-            <image src="../../image/account/Account_Customer.svg"></image>
-            <image src="../../image/account/Account_Settings.svg"></image>
-            <view class="view.text">账号信息</view>
-            <view class="view.text">课表缓存</view>
-            <view class="view.text">功能定制</view>
-            <view class="view.text">更多设置</view>
+        <table class="MFunc">
+        <view class="tabView1">
+            <th>
+                <td>
+                    <image class="MFuncImg" src="../../image/account/Account_Sponsor.svg"></image>
+                </td>
+                <td>
+                    <view class="tabTxt">赞助计划</view>
+                </td>
+            </th>
         </view>
+        <view class="tabView2">
+            <th>
+                <td>
+                    <image class="MFuncImg" src="../../image/account/Account_PubilcAccount.svg"></image>
+                </td>
+            <td>
+                <view class="tabTxt">公众号</view>
+            </td>
+            </th>
+        </view>
+        <view class="tabView3">
+            <th>
+                <td>
+                    <image class="MFuncImg" src="../../image/account/Account_FAQ.svg"></image>
+                </td>
+                <td>
+                    <view class="tabTxt">自助问答</view>
+                </td>
+            </th>
+        </view>       
+        <view class="tabView4">
+            <th>
+                <td>
+                    <image class="MFuncImg" src="../../image/account/Account_AboutUs.svg"></image>
+                </td>
+                <td>
+                    <view class="tabTxt">关于我们</view>
+                </td>
+            </th>
+        </view>    
+        <view class="tabView5">
+            <th>
+                <td>
+                    <image class="MFuncImg" src="../../image/account/Account_Support.svg"></image>
+                </td>
+                <td>
+                    <view class="tabTxt">联系客服</view>
+                </td>
+            </th>
+        </view>   
+        </table>
     </view>
 </view>
\ 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;
+    }
+
+}