feat: 关于页面

arleyGuoLei · Feb 20, 2022 · 131d49a · 131d49a
1 parent 3e8631b
commit 131d49a
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 6 deletions.
diff --git a/miniprogram/app.json b/miniprogram/app.json
@@ -5,7 +5,8 @@
     "pages/learning/learning",
     "pages/review/review",
     "pages/ranking/ranking",
-    "pages/setting/setting"
+    "pages/setting/setting",
+    "pages/about/about"
   ],
   "window": {
     "backgroundColor": "#FFFFFF",

diff --git a/miniprogram/models/kv.ts b/miniprogram/models/kv.ts
@@ -10,6 +10,7 @@ export interface AppConfig {
   /** 对战背景音乐 */
   backgroundMusicUrl: string
   wechat: string
+  about: string
 }
 
 export interface IKV {

diff --git a/miniprogram/pages/about/about.json b/miniprogram/pages/about/about.json
@@ -0,0 +1,8 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "default",
+  "navigationBarTextStyle": "black",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTitleText": "关于",
+  "backgroundColor": "#f8f8f8"
+}
diff --git a/miniprogram/pages/about/about.ts b/miniprogram/pages/about/about.ts
@@ -0,0 +1 @@
+App.Page({})
diff --git a/miniprogram/pages/about/about.wxml b/miniprogram/pages/about/about.wxml
@@ -0,0 +1,3 @@
+<view class="rich-content">
+  <rich-text nodes="{{$state.appConfig.about}}" />
+</view>
diff --git a/miniprogram/pages/about/about.wxss b/miniprogram/pages/about/about.wxss
@@ -0,0 +1,4 @@
+.rich-content {
+  box-sizing: border-box;
+  padding: 16rpx 32rpx;
+}
diff --git a/miniprogram/pages/home/components/footer/footer.ts b/miniprogram/pages/home/components/footer/footer.ts
@@ -13,7 +13,7 @@ App.Component({
       void app.routes.pages.ranking.go({})
     },
     onAbout () {
-
+      void app.routes.pages.about.go({})
     }
   }
 })
diff --git a/miniprogram/pages/setting/setting.ts b/miniprogram/pages/setting/setting.ts
@@ -1,9 +1,11 @@
 import config from './../../utils/config'
 import userModel from './../../models/user'
 import userWordModel from './../../models/userWord'
-import { store } from './../../app'
+import { store, IAppOption } from './../../app'
 import { getUserInfo } from './../../utils/helper'
 
+const app = getApp<IAppOption>()
+
 App.Page({
   onSelect (event: WechatMiniprogram.BaseEvent<WechatMiniprogram.IAnyObject, {type: 'combatQuestionNumber' | 'backgroundMusic' | 'pronounce' | 'vibrate'} >) {
     const { type } = event.currentTarget.dataset
@@ -67,6 +69,6 @@ App.Page({
     void wx.setClipboardData({ data: store.$state.appConfig.wechat })
   },
   onAbout () {
-
+    void app.routes.pages.about.go({})
   }
 })
diff --git a/miniprogram/utils/routes.ts b/miniprogram/utils/routes.ts
@@ -9,7 +9,8 @@ export const routesConfig = [
   { path: '/combat', route: '/pages/combat/combat' },
   { path: '/review', route: '/pages/review/review' },
   { path: '/ranking', route: '/pages/ranking/ranking' },
-  { path: '/setting', route: '/pages/setting/setting' }
+  { path: '/setting', route: '/pages/setting/setting' },
+  { path: '/about', route: '/pages/about/about' }
 ]
 
 export interface ICombatRoute {
@@ -43,6 +44,8 @@ export interface IRoutes {
     ranking: Route<{}>
     /** 设置页 */
     setting: Route<{}>
+    /** 关于 */
+    about: Route<{}>
   }
 }
 

diff --git a/miniprogram/utils/state.ts b/miniprogram/utils/state.ts
@@ -108,7 +108,8 @@ const state: State = {
   learning: null,
   appConfig: {
     backgroundMusicUrl: '',
-    wechat: '34805850'
+    wechat: '34805850',
+    about: ''
   }
 }
 

diff --git a/project.private.config.json b/project.private.config.json
@@ -71,6 +71,12 @@
           "pathName": "pages/setting/setting",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "关于",
+          "pathName": "pages/about/about",
+          "query": "",
+          "scene": null
         }
       ]
     }