Merge pull request '用户页面实现 #37 dev-sanaesy' (#40 ) from dev-sanaesy into master

Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/40
(#37 )Add Function List
2022-01-18 22:34:12 +08:00 · 2022-01-18 22:30:05 +08:00 · 2022-01-18 21:36:37 +08:00 · 2022-01-18 21:18:46 +08:00 · 2022-01-18 21:16:08 +08:00 · 2022-01-18 20:32:01 +08:00
5 changed files with 216 additions and 60 deletions
--- a/miniprogram/pages/Account/Account.scss
+++ b/miniprogram/pages/Account/Account.scss
@ -2,6 +2,9 @@
@import "./MainFunction.scss";
@import "./FunctionList.scss";

-view.container {
-    padding-top: 20px;
+
+view.container{
+    padding-top: 50rpx;
 }
+
+
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@ -39,4 +39,77 @@
        </view>
    </view>

+    <!--主要功能-->
+    <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>
+                <image class="icon" src="../../image/account/Account_DateList.svg"></image>
+                <view>课表缓存</view>
+            </view>
+        </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">
+            <view>
+                <image class="icon func-icon" src="../../image/account/Account_Sponsor.svg" />
+                <view>赞助计划</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
+
+        <view class="function">
+            <view>
+                <image class="icon func-icon" src="../../image/account/Account_PubilcAccount.svg" />
+                <view>公众号</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
+
+        <view class="function">
+            <view>
+                <image class="icon func-icon" src="../../image/account/Account_FAQ.svg" />
+                <view>自助问答</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
+
+        <view class="function">
+            <view>
+                <image class="icon func-icon" src="../../image/account/Account_AboutUs.svg" />
+                <view>关于我们</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
+
+        <view class="function">
+            <view style="border-bottom: 0px;">
+                <image class="icon func-icon" src="../../image/account/Account_Support.svg" />
+                <view>联系客服</view>
+                <image class="icon-sub arrow" src="../../image/account/Account_Arrow.svg" />
+            </view>
+        </view>
+    </view>
 </view>
--- a/miniprogram/pages/Account/FunctionList.scss
+++ b/miniprogram/pages/Account/FunctionList.scss
@ -1 +1,43 @@
@import "../../app.scss";
+
+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;
+            }
+        }
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    view.function-list view.function > view {
+      border-bottom: 1px solid rgba($color: #ffffff, $alpha: .1);
+    }
+  }
--- a/miniprogram/pages/Account/MainFunction.scss
+++ b/miniprogram/pages/Account/MainFunction.scss
@ -1 +1,39 @@
@import "../../app.scss";
+
+//主要功能
+view.main-function {
+  display: flex;
+  margin-top: 50rpx;
+  padding: 0 !important;
+  width: 100% !important;
+
+  view.branch-funtion {
+    padding: 13px 0;
+    width: 100%;
+
+    > 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 {
+        text-align: center;
+        margin-top: 5px;
+        font-size: .9em;
+      }
+    }
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  view.main-function view.branch-funtion > view {
+    border-right: 1px solid rgba($color: #ffffff, $alpha: .1);
+  }
+}
--- 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": {}
 }
Author	SHA1	Message	Date
熊鲜森	3119c862b1	Merge pull request '用户页面实现 #37 dev-sanaesy' (#40 ) from dev-sanaesy into master Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/40	2022-01-18 22:34:12 +08:00
mrkbear	23f46a24c9	(#37 )Add Function List	2022-01-18 22:30:05 +08:00
mrkbear	fc8aa19c67	Merge 'master' into dev-sanaesy	2022-01-18 21:36:37 +08:00
熊鲜森	72448038d1	Merge pull request '用户界面实现(#37 )dev-gia_jie' (#41 ) from dev-gia_jie into master Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/41	2022-01-18 21:18:46 +08:00
mrkbear	196be3099a	(#37 )Add main funcion modular	2022-01-18 21:16:08 +08:00
mrkbear	87d33bb1df	Merge branch 'master' into dev-gia_jie	2022-01-18 20:32:01 +08:00
熊鲜森	efd9b9be57	Merge pull request '(#37 )Add icon' (#42 ) from dev-mrkbear into master Reviewed-on: http://git.mrkbear.com/MrKBear/mini-dlpu-v3/pulls/42	2022-01-18 20:30:53 +08:00
kochiyaSanaeSY	95f1f6d484	(#37 )	2022-01-18 11:47:25 +08:00
kochiyaSanaeSY	54d87fc5db	(#37 )	2022-01-18 11:39:15 +08:00
kochiyaSanaeSY	f434ad531c	(#37 )	2022-01-18 11:06:11 +08:00
gia_jie	3bb47109ed	(#37 )	2022-01-18 10:44:32 +08:00
111	a92f2d06ea	(#37 )	2022-01-18 00:43:38 +08:00
111	45e8ef9322	(#37 )	2022-01-17 23:03:48 +08:00
sanae kochiya	7c1e4e441a	(#37 )	2022-01-17 22:57:05 +08:00