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

pages/article/index.js

@@ -26,18 +26,30 @@ Page({
   },
   onClickCollect () {
     // 收藏功能
+    if (store.hasBindUserInfo()) {
       this.addOrRemoveCollectionApi()
+    } else {
+      wx.redirectTo({
+        url: '/pages/weChatAuth/index',
+      })
+    }
   },
   onlineSubmit () {
     //console.log('在线报名')
-    if (store.hasPhone()) {
+    if (store.hasBindUserInfo()) {
       this.onlineSignApi() // 在线报名
     } else {
       wx.redirectTo({
-        url: `/pages/register/index`,
+        url: '/pages/weChatAuth/index',
       })
     }
-
+    // if (store.hasPhone()) {
+    //   this.onlineSignApi() // 在线报名
+    // } else {
+    //   wx.redirectTo({
+    //     url: `/pages/register/index`,
+    //   })
+    // }
   },
   onShareAppMessage (res) {
     return {