From f8298595a0881daf98273bf83e70dd3b5d8288e7 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 16 Jan 2021 15:10:03 +0800
Subject: [PATCH] no message

---
 pages/article/point-index/index.wxml |  6 +-----
 pages/article/price-index/index.wxml |  2 +-
 pages/home/index/index.js            |  1 +
 pages/index/index.js                 | 24 ++++++++++++++----------
 pages/login/index.js                 | 19 ++++++++++---------
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/pages/article/point-index/index.wxml b/pages/article/point-index/index.wxml
index 5fc1bde..25717c0 100644
--- a/pages/article/point-index/index.wxml
+++ b/pages/article/point-index/index.wxml
@@ -1,7 +1,5 @@
 <!--pages/main/index.wxml-->
-<!-- <scroll-view scroll-y style="height: {{height}}rpx;" lower-threshold="200" bindscrolltolower="fetchMomentList"> -->
 <refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchMomentList">
-	<!----------------------------------------------------帖子列表---------------------------------------------------------------->
 	<view wx:if="{{userInfo && userInfo.isVIP}}">
 		<wux-skeleton active wx:if="{{!momentList.length}}">
 			<view class="cu-card dynamic no-card" wx:for="{{4}}" wx:key="index">
@@ -40,7 +38,6 @@
 		</view>
 	</view>
 	<view class="bg-white list-empty" style="height: {{height}}rpx;" wx:else>
-		<!-- <image class="img-empty" src="/assets/image/list_empty.png"></image> -->
 		<view class="flex" style="margin-bottom:48rpx">
 			<text class="cuIcon-info text-blue" style="font-size:42rpx;"></text>
 			<view style="width:540rpx;margin-left: 12rpx">
@@ -50,5 +47,4 @@
 		</view>
 		<wux-button type="positive" size="join" bind:click="toVip">立即开通</wux-button>
 	</view>
-</refresh-view>
-<!-- </scroll-view> -->
\ No newline at end of file
+</refresh-view>
\ No newline at end of file
diff --git a/pages/article/price-index/index.wxml b/pages/article/price-index/index.wxml
index bd95e37..9690725 100644
--- a/pages/article/price-index/index.wxml
+++ b/pages/article/price-index/index.wxml
@@ -4,7 +4,7 @@
 <refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchMomentList">
 	<!----------------------------------------------------帖子列表---------------------------------------------------------------->
 	<wux-skeleton active wx:if="{{!momentList.length}}">
-		<view class="cu-card dynamic no-card" wx:for="{{4}}" wx:key="index">
+		<view class="cu-card dynamic no-card" wx:for="{{6}}" wx:key="index">
 			<view class="cu-item shadow" style="padding-left:30rpx">
 				<view class="cu-list menu-avatar">
 					<view class="cu-item" style="justify-content: flex-start;">
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index eedc795..72a52b3 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -62,6 +62,7 @@ Component({
         if(!util.isEmpty(result.data.avatarUrl)){
           app.globalData.userInfo.avatarUrl = result.data.avatarUrl
         }
+        app.globalData.userInfo.isVIP = result.data.isVIP
         app.globalData.userInfo.hasStore = result.data.hasStore
         this.setData({
           avatarUrl: app.globalData.userInfo.avatarUrl,
diff --git a/pages/index/index.js b/pages/index/index.js
index ef2c013..29ccf15 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,5 +1,5 @@
 import { config, getUserInfo} from "../api/user"
-import { zconfig, loginToken, getPopupInfo } from "../api/ztb"
+import { zconfig, loginToken, getBaseInfo, getPopupInfo } from "../api/ztb"
 import { pconfig } from "../api/payment"
 import { mconfig } from "../api/moment"
 import { sconfig, getOrderExists } from "../api/saas"
@@ -93,7 +93,6 @@ Page({
   fetchUserInfo:function(){
     config.header = { 'Authorization': 'QNT ' + app.globalData.token }
     getUserInfo().then(result => {
-      app.globalData.userInfo = result.data
       this.toIndex()
     }).catch(err => {
       wx.hideLoading()
@@ -120,14 +119,19 @@ Page({
       zconfig.header = { 'Authorization': 'QNT ' + result.data.token }
       pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
       mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
-      
-      // 登录流程完成；
-      if(!util.isEmpty(result.data.userToken)){
-        this.handleUserToken(result.data.userToken)
-        return
-      } 
-      wx.hideLoading()
-      this.defaultIndex()
+      getBaseInfo().then(result => {
+        app.globalData.userInfo = result.data 
+        // 登录流程完成；
+        if(!util.isEmpty(result.data.userToken)){
+          this.handleUserToken(result.data.userToken)
+          return
+        } 
+        wx.hideLoading()
+        this.defaultIndex()
+      }).catch(err => {
+        wx.hideLoading()
+        this.defaultIndex()
+      })
     }).catch(err => {
       wx.hideLoading()
       this.defaultIndex()
diff --git a/pages/login/index.js b/pages/login/index.js
index fc67e44..44a8468 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -1,7 +1,7 @@
 //获取应用实例
 import { $wuxCountDown } from '../../components/index'
-import { config, postCaptcha, loginCaptcha, loginPwd, wechatApplet, getUserInfo, loginWechat } from "../api/user"
-import { zconfig, loginToken } from "../api/ztb"
+import { config, postCaptcha, loginCaptcha, loginPwd, wechatApplet, loginWechat } from "../api/user"
+import { zconfig, loginToken, getBaseInfo } from "../api/ztb"
 import { pconfig } from "../api/payment"
 import { mconfig } from "../api/moment"
 import { sconfig, getOrderExists } from "../api/saas"
@@ -56,13 +56,13 @@ Page({
     }
     app.globalData.token = authorization
     config.header = { 'Authorization': 'QNT ' + authorization }
-    getUserInfo().then(result => {
-      app.globalData.userInfo = result.data 
-      loginToken({loginToken: app.globalData.token}).then(result => {
-        zconfig.header = { 'Authorization': 'QNT ' + result.data.token }
-        pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
-        mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
-        // 登录流程完成；
+    loginToken({loginToken: app.globalData.token}).then(result => {
+      zconfig.header = { 'Authorization': 'QNT ' + result.data.token }
+      pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
+      mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
+      // 登录流程完成；
+      getBaseInfo().then(result => {
+        app.globalData.userInfo = result.data 
         if(!util.isEmpty(result.data.userToken)){
           this.handleUserToken(result.data.userToken)
         } else {
@@ -89,6 +89,7 @@ Page({
       this.setData({ loging: false})
       wx.navigateBack()
     })
+    
   },
   handleUserToken: function(userToken){
     storage.put('userToken', userToken)