no message

pages/api/saas.js

@@ -8,6 +8,7 @@ const sconfig = {
   baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://8.129.231.7:9001`
 }
 // *******************************************************************账户业务***********************************************************
+const getOrderExists = () => mGet(`/saas-trade/receive/v150/get/OrderExists`, null, sconfig)
 const getFinanceLog = (id) => mGet(`/saas-user/account/financeLog/${id}`, null, sconfig)
 const getFinanceList = (params) => mGet(`/saas-user/account/financeLog/list`, params, sconfig)
 const sendVerifyCode = (params) => mPost(`/saas-user/user/sendVerifyCode`, params, sconfig)
@@ -38,6 +39,7 @@ const postWithdraw = (params) => mPost(`/saas-user/account/withdraw`, params, sc
 
 export {
   sconfig,
+  getOrderExists,
   getFinanceLog,
   getFinanceList,
   sendVerifyCode,

pages/index/index.js

@@ -2,7 +2,7 @@ import { config, getUserInfo} from "../api/user"
 import { zconfig, loginToken, getPopupInfo } from "../api/ztb"
 import { pconfig } from "../api/payment"
 import { mconfig } from "../api/moment"
-import { sconfig } from "../api/saas"
+import { sconfig, getOrderExists } from "../api/saas"
 const util = require('../../utils/util')
 const event = require('../../utils/event')
 const storage = require('../../utils/storage')
@@ -104,46 +104,53 @@ Page({
       wx.hideLoading()
     })
   },
+  defaultIndex: function(){
+    this.onResume()
+    if(this.data.path){
+      wx.navigateTo({ url: this.data.path })
+    }
+    getPopupInfo().then(result => {
+      if(result.data){
+        this.setData({ landInfo: result.data })
+      }
+    })
+  },
   toIndex: function(){
     if(!app.globalData.token){
       wx.hideLoading()
-      this.onResume()
-      if(this.data.path){
-        wx.navigateTo({ url: this.data.path })
-      }
-      getPopupInfo().then(result => {
-        if(result.data){
-          this.setData({ landInfo: result.data })
-        }
-      })
+      this.defaultIndex()
       return
     }
     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 }
-      // pconfig.header = { 'Authorization': 'QNT ' + result.data }
+      
+      // 登录流程完成；
+      if(!util.isEmpty(result.data.userToken)){
+        this.handleUserToken(result.data.userToken)
+        return
+      } 
       wx.hideLoading()
-      this.onResume()
-      if(this.data.path){
-        wx.navigateTo({ url: this.data.path })
-      }
-      getPopupInfo().then(result => {
-        if(result.data){
-          this.setData({ landInfo: result.data })
-        }
-      })
+      this.defaultIndex()
     }).catch(err => {
       wx.hideLoading()
-      this.onResume()
-      if(this.data.path){
-        wx.navigateTo({ url: this.data.path })
+      this.defaultIndex()
+    })
+  },
+  handleUserToken: function(userToken){
+    sconfig.header = {'user-token': userToken }
+    getOrderExists().then(result => {
+      wx.hideLoading()
+      if (Number(result.data) != 1 || !app.release) {
+        wx.navigateBack()
+      } else {
+        wx.reLaunch({ url: '/pages/paper/index' })
       }
-      getPopupInfo().then(result => {
-        if(result.data){
-          this.setData({ landInfo: result.data })
-        }
-      })
+    }).catch(err => {
+      wx.hideLoading()
+      util.showToast(err)
+      this.defaultIndex()
     })
   },
   onResume: function(){

pages/login/index.js

@@ -4,7 +4,7 @@ import { config, postCaptcha, loginCaptcha, wechatApplet, getUserInfo, loginWech
 import { zconfig, loginToken } from "../api/ztb"
 import { pconfig } from "../api/payment"
 import { mconfig } from "../api/moment"
-import { sconfig } from "../api/saas"
+import { sconfig, getOrderExists } from "../api/saas"
 const storage = require('../../utils/storage')
 const util = require('../../utils/util')
 const event = require('../../utils/event')
@@ -72,27 +72,43 @@ Page({
           event.emit('EventMessage', {  what: 888, desc: 'Logined' })
         }
       }).catch(err => {
-        this.setData({ loging: false})
+        wx.hideLoading()
+        util.showToast(err)
         app.globalData.token = null
         storage.remove('Authorization')
         config.header = null
-        wx.hideLoading()
-        util.showToast(err)
+        this.setData({ loging: false})
         wx.navigateBack()
       })
     }).catch(err => {
       wx.hideLoading()
-      this.setData({ loging: false})
+      util.showToast(err)
       app.globalData.token = null
       storage.remove('Authorization')
       config.header = null
       this.setData({ loging: false})
+      wx.navigateBack()
     })
   },
   handleUserToken: function(userToken){
-    storage.put('accessToken', userToken)
+    storage.put('userToken', userToken)
     sconfig.header = {'user-token': userToken }
-
+    getOrderExists().then(result => {
+      wx.hideLoading()
+      if (Number(result.data) != 1 || !app.release) {
+        wx.navigateBack()
+      } else {
+        wx.reLaunch({ url: '/pages/paper/index' })
+      }
+    }).catch(err => {
+      wx.hideLoading()
+      util.showToast(err)
+      app.globalData.token = null
+      storage.remove('Authorization')
+      config.header = null
+      this.setData({ loging: false})
+      wx.navigateBack()
+    })
   },
   changePwd: function () {
     if (this.data.pwdType === 'password') {