Browse Source

no message

featrue/v4.1
xpz2018 5 years ago
parent
commit
24dd80adcc
5 changed files with 19 additions and 22 deletions
  1. 12
      app.js
  2. 2
      pages/api/moment.js
  3. 2
      pages/api/saas.js
  4. 2
      pages/api/ztb.js
  5. 23
      pages/login/index.js

12
app.js

@ -2,7 +2,6 @@
App({ App({
//----------------------------------------------globalData-------------------------------------- //----------------------------------------------globalData--------------------------------------
release: 0, release: 0,
httpUrl: 'https://api.qniao.cn',
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152, version: 152,
@ -15,14 +14,5 @@ App({
isIos: false, isIos: false,
kg: 0 kg: 0
}, },
inited: false,
//-----------------------------------------onLaunch---------------------------------------------
onLaunch: function () {
if (this.release) {
this.httpUrl = 'https://api.qniao.cn'
} else {
this.httpUrl = 'http://47.113.118.47:9000'
// this.httpUrl = 'https://api-test.qniao.cn'
}
}
inited: false
}) })

2
pages/api/moment.js

@ -5,7 +5,7 @@ import { mGet, mPost } from "./request"
const app = getApp() const app = getApp()
const mconfig = { const mconfig = {
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-dev.qniao.cn`
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://8.129.231.7:9001`
} }
// *******************************************************************账户业务*********************************************************** // *******************************************************************账户业务***********************************************************
// /article/save/Article 发文章 // /article/save/Article 发文章

2
pages/api/saas.js

@ -5,7 +5,7 @@ import { mGet, mPost, mDelete, mPut } from "./request"
const app = getApp() const app = getApp()
const sconfig = { const sconfig = {
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-dev.qniao.cn`
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://8.129.231.7:9001`
} }
// *******************************************************************账户业务*********************************************************** // *******************************************************************账户业务***********************************************************
const getFinanceLog = (id) => mGet(`/saas-user/account/financeLog/${id}`, null, sconfig) const getFinanceLog = (id) => mGet(`/saas-user/account/financeLog/${id}`, null, sconfig)

2
pages/api/ztb.js

@ -5,7 +5,7 @@ import { mGet, mPost } from "./request"
const app = getApp() const app = getApp()
const zconfig = { const zconfig = {
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `https://api-client-ztb-dev.qniao.cn`
baseUrl: app.release ? `https://api-client-ztb.qniao.cn` : `http://8.129.231.7:9001`
} }
// *******************************************************************账户业务*********************************************************** // *******************************************************************账户业务***********************************************************
// /authorize/get/product-line-token/by/login-token通过登录token获取产品线token // /authorize/get/product-line-token/by/login-token通过登录token获取产品线token

23
pages/login/index.js

@ -34,8 +34,8 @@ Page({
this.setData({ ['form.mobile']: options.mobile }) this.setData({ ['form.mobile']: options.mobile })
} }
this.wxLogin() this.wxLogin()
var check = wx.getStorageSync('AgreeCheck')
app.globalData.kg = wx.getStorageSync('ztb-kg')
var check = storage.get('AgreeCheck')
app.globalData.kg = storage.get('ztb-kg')
if (check) { if (check) {
this.setData({check: true}) this.setData({check: true})
} }
@ -50,7 +50,7 @@ Page({
}) })
}, },
fetchUserInfo: function () { fetchUserInfo: function () {
var authorization = app.globalData.token || wx.getStorageSync('Authorization')
var authorization = app.globalData.token || storage.get('Authorization')
if (util.isEmpty(authorization)) { if (util.isEmpty(authorization)) {
return return
} }
@ -64,9 +64,13 @@ Page({
pconfig.header = { 'Authorization': 'QNT ' + result.data.token } pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
mconfig.header = { 'Authorization': 'QNT ' + result.data.token } mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
// 登录流程完成; // 登录流程完成;
wx.hideLoading()
wx.navigateBack()
event.emit('EventMessage', { what: 888, desc: 'Logined' })
if(!util.isEmpty(result.data.userToken)){
this.handleUserToken(result.data.userToken)
} else {
wx.hideLoading()
wx.navigateBack()
event.emit('EventMessage', { what: 888, desc: 'Logined' })
}
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
app.globalData.token = null app.globalData.token = null
@ -82,6 +86,10 @@ Page({
this.setData({ loging: false}) this.setData({ loging: false})
}) })
}, },
handleUserToken: function(userToken){
storage.put('accessToken', userToken)
sconfig.header = {'userToken': userToken }
},
changePwd: function () { changePwd: function () {
if (this.data.pwdType === 'password') { if (this.data.pwdType === 'password') {
this.setData({ pwdType: 'text' }) this.setData({ pwdType: 'text' })
@ -125,9 +133,8 @@ Page({
} }
wx.showLoading({ title: '登录中', mask: true }) wx.showLoading({ title: '登录中', mask: true })
if (this.data.type == 1) { if (this.data.type == 1) {
// /authorize/by-captcha 验证码认证
loginCaptcha(this.data.form).then(result => { loginCaptcha(this.data.form).then(result => {
wx.setStorageSync('Authorization', result.data.token)
storage.put('Authorization', result.data.token)
app.globalData.token = result.data.token app.globalData.token = result.data.token
this.fetchUserInfo() this.fetchUserInfo()
}).catch(error => { }).catch(error => {

Loading…
Cancel
Save