no message

pages/api/saas.js

@@ -28,7 +28,7 @@ const getReceiveInfo = (id) => mGet(`/saas-trade/receive/v150/${id}`, null, scon
 const feedbackReceiveInfo = (params) => mPut(`/saas-trade/receive/feedback`, params, sconfig)
 const deleteReceive = (id) => mDelete(`/saas-trade/receive/v150/${id}`, null, sconfig)
 const getCancelReceive = (id) => mGet(`/saas-trade/receive/v150/cancel/${id}`, null, sconfig)
-const putReceive = (id) => mPut(`/saas-trade/receive/v150/cancel/${id}`, null, sconfig)
+const putReceive = (id) => mPut(`/saas-trade/receive/v150/${id}`, null, sconfig)
 const updateUserInfo = (params) => mPut(`/saas-user/user/updateUserInfo`, params, sconfig)
 const getTrades = (params) => mGet(`/trades`, params, sconfig)
 const personalAuth = (params) => mPost(`/user-centre/front/customer/personalAuth`, params, sconfig)

pages/index/index.js

@@ -119,13 +119,13 @@ 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
+      } 
       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 => {
@@ -140,11 +140,24 @@ Page({
   handleUserToken: function(userToken){
     sconfig.header = {'user-token': userToken }
     getOrderExists().then(result => {
-      wx.hideLoading()
       if (Number(result.data) != 1 || !app.release) {
-        wx.navigateBack()
+        getBaseInfo().then(result => {
+          app.globalData.userInfo = result.data 
+          wx.hideLoading()
+          this.defaultIndex()
+        }).catch(err => {
+          wx.hideLoading()
+          this.defaultIndex()
+        })
       } else {
-        wx.reLaunch({ url: '/pages/paper/index' })
+        getBaseInfo().then(result => {
+          app.globalData.userInfo = result.data 
+          wx.hideLoading()
+          wx.redirectTo({ url: '/pages/paper/index' })
+        }).catch(err => {
+          wx.hideLoading()
+          wx.redirectTo({ url: '/pages/paper/index' })
+        })
       }
     }).catch(err => {
       wx.hideLoading()
@@ -173,9 +186,11 @@ Page({
     }
   },
   onEvent: function (message) {
-     if(message.what == 250){
+    if(message.what == 250){
       this.setData({ pageIndex: 0 })
-     }
+    } else if(message.what == 884){
+      wx.navigateBack()
+    }
   },
   stopTouchMove: function(e){
     return false

pages/login/index.js

@@ -61,24 +61,28 @@ Page({
       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 {
+      if(!util.isEmpty(result.data.userToken)){
+        this.handleUserToken(result.data.userToken)
+      } else {
+        this.setData({ loging: false})
+        wx.hideLoading()
+        wx.navigateBack()
+        event.emit('EventMessage', {  what: 888, desc: 'Logined' })
+        getBaseInfo().then(result => {
+          app.globalData.userInfo = result.data 
           this.setData({ loging: false})
           wx.hideLoading()
           wx.navigateBack()
           event.emit('EventMessage', {  what: 888, desc: 'Logined' })
-        }
-      }).catch(err => {
-        wx.hideLoading()
-        util.showToast(err)
-        app.globalData.token = null
-        storage.remove('Authorization')
-        config.header = null
-        this.setData({ loging: false})
-      })
+        }).catch(err => {
+          wx.hideLoading()
+          util.showToast(err)
+          app.globalData.token = null
+          storage.remove('Authorization')
+          config.header = null
+          this.setData({ loging: false})
+        })
+      }
     }).catch(err => {
       wx.hideLoading()
       util.showToast(err)
@@ -94,9 +98,35 @@ Page({
     getOrderExists().then(result => {
       wx.hideLoading()
       if (Number(result.data) != 1 || !app.release) {
-        wx.navigateBack()
+        getBaseInfo().then(result => {
+          app.globalData.userInfo = result.data 
+          this.setData({ loging: false})
+          wx.hideLoading()
+          wx.navigateBack()
+          event.emit('EventMessage', {  what: 888, desc: 'Logined' })
+        }).catch(err => {
+          wx.hideLoading()
+          util.showToast(err)
+          app.globalData.token = null
+          storage.remove('Authorization')
+          config.header = null
+          this.setData({ loging: false})
+        })
       } else {
-        wx.reLaunch({ url: '/pages/paper/index' })
+        getBaseInfo().then(result => {
+          app.globalData.userInfo = result.data 
+          this.setData({ loging: false})
+          wx.hideLoading()
+          event.emit('EventMessage', {  what: 884, desc: 'Logined' })
+          wx.redirectTo({ 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})
+        })
       }
     }).catch(err => {
       wx.hideLoading()

pages/withdrawal/checkout/index.js

@@ -1,5 +1,5 @@
 // pages/withdrawal/checkout/index.js
-import { checkPayPassword, getBalanceInfo, getBankCardList, postWithdraw } from "../../api/payment"
+import { checkPayPassword, getBalanceInfo, getBankCardList, postWithdraw } from "../../api/saas"
 import { $wuxKeyBoard, $wuxDialog } from '../../../components/index'
 const util = require('../../../utils/util')
 // const md5 = require('../../../utils/md5')