From ce128c74ba99abf6edc1e7516714ed3fd14ccb0b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 26 Mar 2019 16:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=80=E4=BA=9B=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=96=B9=E6=B3=95=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0mixins=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/nav.js   | 19 +++++++++++++++++++
 src/pages/index.wpy | 18 +++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 src/mixins/nav.js

diff --git a/src/mixins/nav.js b/src/mixins/nav.js
new file mode 100644
index 0000000..a3b59aa
--- /dev/null
+++ b/src/mixins/nav.js
@@ -0,0 +1,19 @@
+import wepy from 'wepy';
+
+export default class navMixin extends wepy.mixin {
+  /**
+   * 跳转到游戏信息页面
+   * @param {string} gid 游戏短id
+   * */
+  $toGameInfo(gid) {
+    wepy.navigateTo({
+      url: '/pages/gameInfo?id=' + gid
+    })
+  }
+  // 登陆页面
+  $toLogin() {
+    wepy.navigateTo({
+      url: '/pages/login'
+    })
+  }
+}
diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index 28e0027..0b92b0b 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -75,9 +75,10 @@
   import base from '../mixins/base';
   import tips from '../mixins/tips';
   import cfg from '../mixins/cfg';
+  import nav from '../mixins/nav';
 
   export default class Index extends wepy.page {
-    mixins = [base, tips, cfg];
+    mixins = [base, tips, cfg, nav];
     config = {
       navigationBarTitleText: '游戏大厅',
       enablePullDownRefresh: true,
@@ -130,9 +131,7 @@
     methods = {
       gameTap(gid, e) {
         this.$parent.log('game_tap', {gid: gid});
-        wepy.navigateTo({
-          url: '/pages/gameInfo?id=' + gid
-        })
+        this.$toGameInfo(gid);
       },
       async toSearch() {
         wepy.navigateTo({
@@ -296,17 +295,12 @@
       }
       this.showAll = this.$showAll();
       let userInfo = this.$parent.getUserInfo();
-      console.log(userInfo);
       if (userInfo) {
         this.nickname = userInfo.nickName;
         this.avatar = userInfo.avatarUrl;
         this.$apply();
       }
-      if (this.$parent.checkAuthorize()) {
-        wepy.navigateTo({
-          url: '/pages/login'
-        })
-      }
+      (this.$parent.checkAuthorize()) && this.$toLogin();
     }
     initPageParam() {
       this.all_count = 999;
@@ -368,9 +362,7 @@
           cancelText: '继续'
         });
         if (modal.confirm) {
-          wepy.navigateTo({
-            url: '/pages/gameInfo?id=' + res.record.gid
-          })
+          self.$toGameInfo(res.record.gid);
         }
       } catch (err) {
         console.log('error get recent games');