diff --git a/app.js b/app.js index 9f231ee..6ecce42 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js - App({ +App({ //----------------------------------------------globalData-------------------------------------- - release: 1, + release: 0, httpUrl: 'https://api.qniao.cn', tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], diff --git a/pages/login/index.js b/pages/login/index.js index 87ae249..08c7835 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -148,7 +148,25 @@ Page({ } app.globalData.userInfo = result.data event.emit('EventMessage', { what: 888, desc: 'Logined' }) - wx.navigateBack() + if(app.globalData.userToken){ + // 判断该用户是否有订单存在 1存在 2不存在 + wx.reLaunch({ url: '/pages/paper/index' }) + } else { + wx.navigateBack() + } + // /receive/v150/get/OrderExists 判断该用户是否有订单存在 1存在 2不存在 + // request.get('/saas-trade/receive/v150/get/OrderExists').then(result => { + // wx.hideLoading() + // if (Number(result.data) != 1 || !app.release) { + // wx.navigateBack() + // } else { + // wx.reLaunch({ url: '/pages/paper/index' }) + // } + // }).catch(err => { + // //异常回调 + // wx.hideLoading() + // wx.navigateBack() + // }) }, changeType: function () { if (this.data.type == 1) {