miniprogram/pages/Account/Account.wxml

@@ -44,25 +44,40 @@
     </view>
 
     <!--主要功能-->
-    <view class="card main-function">
+    <view class="card main-function"><!--四个功能合在一起的容器-->
+        <view class="branch-funtion">
+            <view><!--每个功能的容器-->
+                <image class="icon" src="../../image/account/Account_UserInfo.svg"></image><!--每个功能的图片-->
+                <view>账号信息</view><!--每个功能的文字-->
+            </view>
+        </view>
 
-        <!--每个功能的容器-->
+        <view class="branch-funtion">
-        <view class="branch-funtion" wx:for="{{ mainFunction$mainFunctionList }}" wx:key="index">
+            <view>
-            <view style="{{ index == (mainFunction$mainFunctionList - 1) ? 'border-bottom: 0px' : '' }}">
+                <image class="icon" src="../../image/account/Account_DateList.svg"></image>
-                <!--每个功能的图片-->
+                <view>课表缓存</view>
-                <image class="icon" src="../../image/account/Account_{{ item.iconUrl }}.svg"></image>
+            </view>
-                <!--每个功能的文字-->
+        </view>
-                <view>{{ item.displayName }}</view>
+
+        <view class="branch-funtion">
+            <view>
+                <image class="icon" src="../../image/account/Account_Customer.svg"></image>
+                <view>功能定制</view>
+            </view>
+        </view>
+
+        <view class="branch-funtion">
+            <view style="border-right: 0px;">
+                <image class="icon" src="../../image/account/Account_Settings.svg"></image>
+                <view>更多设置</view>
             </view>
         </view>
     </view>
 
     <!-- 功能列表 -->
     <view class="card function-list">
-
+        <view class="function" wx:for="{{functionList$functionList}}" wx:for-index="index" wx:key="id">
-        <!-- 每一行 -->
+            <view style="{{item.id == (functionList$functionList.length - 1) ? 'border-bottom: 0px' : ''}}">
-        <view class="function" wx:for="{{ functionList$functionList }}" wx:key="index">
-            <view style="{{ index == (functionList$functionList.length - 1) ? 'border-bottom: 0px' : '' }}">
                 <image class="icon func-icon" src="../../image/account/Account_{{item.iconUrl}}.svg" />
                 <view>{{item.displayName}}</view>
                 <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />

miniprogram/pages/Account/FunctionList.ts

@@ -2,6 +2,11 @@ import { Modular, Manager } from "../../core/Module";
 
 interface IFunctionListItem {
 
+    /**
+     * id
+     */
+    id?: number
+
     /**
      * 显示名称
      */
@@ -13,6 +18,10 @@ interface IFunctionListItem {
     iconUrl: string;
 }
 
+interface IFunctionListData {
+    functionList?: IFunctionListItem[];
+};
+
 class FunctionList<M extends Manager> extends Modular<M> {
 
     public static readonly functionList: IFunctionListItem[] = [
@@ -23,12 +32,18 @@ class FunctionList<M extends Manager> extends Modular<M> {
         { displayName: "联系客服", iconUrl: "Support" }
     ];
 
-    public data = {
+    public data: IFunctionListData = {
-        functionList: FunctionList.functionList
+        functionList: undefined
     };
     
     public override onLoad() {
-        // Do something
+        console.log(FunctionList.functionList)
+        this.setData({
+            functionList: FunctionList.functionList.map((value, index) => {
+                value.id = index;
+                return value;
+            })
+        })
     }
 }
 

miniprogram/pages/Account/MainFunction.ts

@@ -1,31 +1,7 @@
 import { Modular, Manager } from "../../core/Module";
 
-interface IMainFunctionItem {
-
-    /**
-     * 显示名称
-     */
-    displayName: string;
-
-    /**
-     * 图标路径
-     */
-    iconUrl: string;
-}
-
 class MainFunction<M extends Manager> extends Modular<M> {
     
-    public static readonly MainFunctionList: IMainFunctionItem[] = [
-        { displayName: "账号信息", iconUrl: "UserInfo" },
-        { displayName: "课表缓存", iconUrl: "DateList" },
-        { displayName: "功能定制", iconUrl: "Customer" },
-        { displayName: "更多设置", iconUrl: "Settings" }
-    ];
-
-    public data? = {
-        mainFunctionList: MainFunction.MainFunctionList
-    }
-    
     public override onLoad() {
         // Do something
     }