Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

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)

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({

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({

pages/register/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/register/index.wxml-->
 <view class="container">
-  <navigator open-type="reLaunch" url="/pages/home/index">
+  <navigator open-type="switchTab" url="/pages/home/index">
     <image class="register_cancel" src="/images/common/close.png"></image>
   </navigator>
   <view class="page_bd">

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
     });
-    switch(item.index){
+    switch (item.index) {
       case 0:
         return this.fetchTopicList()
       case 1:

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)
+          store.saveToken(token)
-          wx.setStorageSync(HTTPConst.TokenStoreKey, token)
+          store.saveUserInfo(userInfo)
+          // wx.setStorageSync(HTTPConst.UserInfoStoreKey, userInfo)
+          // wx.setStorageSync(HTTPConst.TokenStoreKey, token)
           success(data)
         },
       }

utils/store.js

@@ -0,0 +1,46 @@
+const StoreKey = {
+  UserStoreKey: 'UserInfoStoreKey',
+  TokenStoreKey: 'TokenStoreKey'
+}
+class Store {
+  constructor () {
+
+  }
+  // public
+
+  // Token的存取方法
+  saveToken(data) {
+    this._save(StoreKey.TokenStoreKey, data)
+  }
+  readToken() {
+    return this._read(StoreKey.TokenStoreKey) || ''
+  }
+  // User的存取
+  saveUserInfo(data) {
+    this._save(StoreKey.UserStoreKey, data)
+  }
+  readUserInfo(){
+    return this._read(StoreKey.UserStoreKey) || ''
+  }
+  // 是否有手机号码
+  hasPhone () {
+    const {phone} = this.readUserInfo()
+    return phone ? true : false
+  }
+  // 是否绑定微信和人才库
+  hasBindUserInfo () {
+    const {avatarUrl, nickName} = this.readUserInfo()
+    console.log(avatarUrl, nickName)
+    return (avatarUrl && nickName) ? true : false
+  }
+
+  // 私有存取方法
+  _save(key, data) {
+    wx.setStorageSync(key, data)
+  }
+  _read(key) {
+    return wx.getStorageSync(key)
+  }
+}
+let store = new Store()  // 唯一个对象实例
+export {store}