update 个人中心调整授权登录UI

pages/topics/index.js

@@ -70,20 +70,8 @@ Page({
       }
     } else {
       console.log('未绑定微信')
-      wx.showModal({
+      wx.redirectTo({
-        title: '温馨提示',
+        url: '/pages/weChatAuth/index',
-        content: '是否前往绑定微信？',
-        success(res) {
-          if (res.confirm) {
-            wx.redirectTo({
-              url: '/pages/weChatAuth/index',
-            })
-          } else if (res.cancel) {
-            wx.switchTab({
-              url: '/pages/home/index',
-            })
-          }
-        }
       })
     }
   },

pages/user/index.js

@@ -15,6 +15,7 @@ Page({
    */
   data: {
     messageTotal: Number,
+    isAuth:false,
   },
 
   
@@ -27,10 +28,16 @@ Page({
   onShow: function () {
     if (store.hasBindUserInfo()) {
       this.getUserInfo()
+      this.setData({
+        isAuth: true
+      })
     } else {
-      wx.redirectTo({
+      this.setData({
-        url: '/pages/weChatAuth/index',
+        isAuth: false
       })
+      // wx.redirectTo({
+      //   url: '/pages/weChatAuth/index',
+      // })
     }
   },
 
@@ -47,6 +54,7 @@ Page({
           userInfo: res.result,
           avatarUrl: res.result.avatarUrl,
           nickName: res.result.nickName,
+          isAuth:true,
         },()=>{
           if (store.hasPhone()) {
             //console.log('已经绑定手机号码')
@@ -93,13 +101,19 @@ Page({
   onTapItem (e) {
     const { type } = e.currentTarget.dataset
     //console.log(type)
-    if (type === 'myInfo'){
+    if(this.data.isAuth){
-      wx.navigateTo({
+      if (type === 'myInfo') {
-        url: `/pages/user/${type}/index?userIcon=${this.data.userInfo.avatarUrl}&userName=${this.data.userInfo.nickName}&userPhone=${this.data.userInfo.phone || ''}&company=${this.data.userInfo.company || ''}&position=${this.data.userInfo.position || ''}`,
+        wx.navigateTo({
-      })
+          url: `/pages/user/${type}/index?userIcon=${this.data.userInfo.avatarUrl}&userName=${this.data.userInfo.nickName}&userPhone=${this.data.userInfo.phone || ''}&company=${this.data.userInfo.company || ''}&position=${this.data.userInfo.position || ''}`,
+        })
+      } else {
+        wx.navigateTo({
+          url: `/pages/user/${type}/index`,
+        })
+      }
     } else {
-      wx.navigateTo({
+      wx.redirectTo({
-        url: `/pages/user/${type}/index`,
+        url: '/pages/weChatAuth/index',
       })
     }
   }

pages/user/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/user/index.wxml-->
 <view class="container">
-  <mp-cells ext-class="page_hd">
+  <mp-cells ext-class="page_hd" wx:if="{{isAuth}}">
     <mp-cell bindtap="onTapItem" data-type="myInfo">
       <view class="user_hd" wx:if="{{avatarUrl && nickName}}">
         <image slot="icon" class="user_logo" src="{{avatarUrl}}"/>
@@ -8,6 +8,14 @@
       </view>
     </mp-cell>
   </mp-cells>
+  <mp-cells ext-class="page_hd" wx:if="{{!isAuth}}">
+    <mp-cell bindtap="onTapItem" data-type="myInfo">
+      <view class="user_hd">
+        <image slot="icon" class="user_logo" src="/images/topic/avatar.png"/>
+        <view slot="title" class="user_name">登录/注册</view>
+      </view>
+    </mp-cell>
+  </mp-cells>
   <mp-cells ext-class="page_bd">
     <mp-cell 
       bindtap="onTapItem" data-type="myMessage"