From 1fb77a5fd04a59f503f0fee59edbbceb3af5a8c0 Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Thu, 17 Oct 2019 14:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/auth.js          |  7 ++++++-
 pages/home/index.js     |  3 ---
 pages/register/index.js |  2 +-
 pages/topics/index.js   | 38 ++++++++++++++++++++++++--------------
 utils/http.js           | 14 +++++++++-----
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/models/auth.js b/models/auth.js
index d531e0d..9b67d90 100644
--- a/models/auth.js
+++ b/models/auth.js
@@ -41,7 +41,12 @@ class AuthModel extends HTTP {
       url: AuthConst.verify_update_phone_url,
       method: Method.POST,
       data: {
-        code: res
+        isRegister: 1,
+        phone: phone, 
+        position: '',
+        company: '',
+        realName: name,
+        verificationCode: vscode
       },
       success: (data) => {
         console.log(data)
diff --git a/pages/home/index.js b/pages/home/index.js
index f3b258f..b1142ec 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -136,9 +136,6 @@ Page({
   clickListItem(e) {
     console.log(e.detail)
     this.gotoArticePage(e.detail.id)
-    // wx.redirectTo({
-    //   url: '/pages/register/index',
-    // })
   },
   gotoArticePage(id) {
     wx.navigateTo({
diff --git a/pages/register/index.js b/pages/register/index.js
index 9077897..005465a 100644
--- a/pages/register/index.js
+++ b/pages/register/index.js
@@ -1,5 +1,5 @@
 // pages/register/index.js
-import {AuthModel} from '../..//models/auth.js'
+import {AuthModel} from '../../models/auth.js'
 let auth = new AuthModel()
 
 Page({
diff --git a/pages/topics/index.js b/pages/topics/index.js
index 794a7a5..05703e8 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -1,8 +1,10 @@
 // pages/topics/index.js
 import dayjs from '../../utils/dayjs/index.js'
 import relativeTime from '../../utils/dayjs/relativeTime.js'
-dayjs.extend(relativeTime);
 import { TopicModel } from '../../models/topic.js'
+import { store } from '../../utils/store.js'
+
+dayjs.extend(relativeTime)
 let topicModel = new TopicModel()
 
 Page({
@@ -15,18 +17,26 @@ Page({
     segmentIndex: 0,
     currPage: 1,
     topicList: [],
-    goodIdeaList:[]
+    goodIdeaList: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function () {
-    this.fetchTopicList();
+    if (store.hasPhone()) {
+      console.log('已经绑定手机号码')
+      this.fetchTopicList();
+    } else {
+      console.log('未绑定手机号码')
+      wx.redirectTo({
+        url: '/pages/register/index',
+      })
+    }
   },
-  fetchTopicList(){
+  fetchTopicList() {
     let page = this.data.currPage
-    topicModel.getTopicList(page,res=>{
+    topicModel.getTopicList(page, res => {
       console.log('议题列表')
       console.log(res)
 
@@ -38,7 +48,7 @@ Page({
           title: item.title,
           userName: item.author,
           commentNum: item.commentNum,
-          topicImg:item.image,
+          topicImg: item.image,
           time: item.createTime,
         })
       })
@@ -67,10 +77,10 @@ Page({
       wx.stopPullDownRefresh()
     })
   },
-  onRefreshList(){
+  onRefreshList() {
     this.fetchGoodIdeaList()
   },
-  fetchGoodIdeaList(){
+  fetchGoodIdeaList() {
     let page = this.data.currPage
     topicModel.goldenList(page, res => {
       console.log('金点子列表')
@@ -81,19 +91,19 @@ Page({
       datas.forEach(item => {
         tempDatas.push({
           id: item.id,
-          userIcon:item.image,
+          userIcon: item.image,
           groupId: item.groupId,
           userName: item.username,
           time: item.createTime,
           comment: item.comment,
           praiseNum: item.supportNum,
           isPraise: false,
-          detail:{
+          detail: {
             userIcon: item.groupAvator,
             userName: item.author,
             commentNum: item.commentNum,
             title: item.title,
-            text:item.content,
+            text: item.content,
 
           }
         })
@@ -192,13 +202,13 @@ Page({
   tapSegment: function (e) {
     console.log(e)
     this.setData({
-      currPage:1
+      currPage: 1
     })
     const item = e.detail;
     this.setData({
-      segmentIndex: item.index 
+      segmentIndex: item.index
     });
-    switch(item.index){
+    switch (item.index) {
       case 0:
         return this.fetchTopicList()
       case 1:
diff --git a/utils/http.js b/utils/http.js
index 20edbf3..2af182e 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,12 +1,12 @@
 import { config } from '../config.js'
+import {store} from './store.js'
+
 const Method = {
   GET: 'GET',
   POST: 'POST'
 }
 // 定义一些通用常量
 const HTTPConst = {
-  TokenStoreKey: 'ETokenKey',
-  UserInfoStoreKey: 'EUserInfo',
   TokenURL: '/api/miniuser/getToken'
 }
 class HTTP {
@@ -15,7 +15,9 @@ class HTTP {
   }
   request = (params) => {
     // 从缓存中读取 token
-    let token = wx.getStorageSync(HTTPConst.TokenStoreKey) || ''
+
+    // let token = wx.getStorageSync(HTTPConst.TokenStoreKey) || ''
+    const token = store.readToken()
     let url = this.baseUrl + params.url
     console.log(params.url)
     if (!params.method) {
@@ -90,8 +92,10 @@ class HTTP {
         success: (data) => {
           // 将获取到的token存放起来
           const { token, userInfo } = data.result
-          wx.setStorageSync(HTTPConst.UserInfoStoreKey, userInfo)
-          wx.setStorageSync(HTTPConst.TokenStoreKey, token)
+          store.saveToken(token)
+          store.saveUserInfo(userInfo)
+          // wx.setStorageSync(HTTPConst.UserInfoStoreKey, userInfo)
+          // wx.setStorageSync(HTTPConst.TokenStoreKey, token)
           success(data)
         },
       }