From 24dd80adcc6a11b939fb8e45dc6f8c09e4f99a59 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 14 Jan 2021 10:59:32 +0800
Subject: [PATCH] no message

---
 app.js               | 12 +-----------
 pages/api/moment.js  |  2 +-
 pages/api/saas.js    |  2 +-
 pages/api/ztb.js     |  2 +-
 pages/login/index.js | 23 +++++++++++++++--------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app.js b/app.js
index 6ecce42..529be32 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,6 @@
 App({
    //----------------------------------------------globalData--------------------------------------
    release: 0,
-   httpUrl: 'https://api.qniao.cn',
    tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
    agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
    version: 152,
@@ -15,14 +14,5 @@ App({
      isIos: false,
      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
  })
\ No newline at end of file
diff --git a/pages/api/moment.js b/pages/api/moment.js
index a94340c..8d82a43 100644
--- a/pages/api/moment.js
+++ b/pages/api/moment.js
@@ -5,7 +5,7 @@ import { mGet, mPost } from "./request"
 const app = getApp()
 
 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 发文章
diff --git a/pages/api/saas.js b/pages/api/saas.js
index c485531..78f514c 100644
--- a/pages/api/saas.js
+++ b/pages/api/saas.js
@@ -5,7 +5,7 @@ import { mGet, mPost, mDelete, mPut } from "./request"
 const app = getApp()
 
 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)
diff --git a/pages/api/ztb.js b/pages/api/ztb.js
index 10b8718..5ae907f 100644
--- a/pages/api/ztb.js
+++ b/pages/api/ztb.js
@@ -5,7 +5,7 @@ import { mGet, mPost } from "./request"
 const app = getApp()
 
 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
diff --git a/pages/login/index.js b/pages/login/index.js
index 068c366..f4b0c96 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -34,8 +34,8 @@ Page({
       this.setData({ ['form.mobile']: options.mobile })
     }
     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) {
       this.setData({check: true})
     }
@@ -50,7 +50,7 @@ Page({
     })
   },
   fetchUserInfo: function () {
-    var authorization = app.globalData.token || wx.getStorageSync('Authorization')
+    var authorization = app.globalData.token || storage.get('Authorization')
     if (util.isEmpty(authorization)) {
       return
     }
@@ -64,9 +64,13 @@ Page({
         pconfig.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 => {
         console.log(err)
         app.globalData.token = null
@@ -82,6 +86,10 @@ Page({
       this.setData({ loging: false})
     })
   },
+  handleUserToken: function(userToken){
+    storage.put('accessToken', userToken)
+    sconfig.header = {'userToken': userToken }
+  },
   changePwd: function () {
     if (this.data.pwdType === 'password') {
       this.setData({ pwdType: 'text' })
@@ -125,9 +133,8 @@ Page({
     }
     wx.showLoading({ title: '登录中', mask: true })
     if (this.data.type == 1) {
-      // /authorize/by-captcha 验证码认证
       loginCaptcha(this.data.form).then(result => {
-        wx.setStorageSync('Authorization', result.data.token)
+        storage.put('Authorization', result.data.token)
         app.globalData.token = result.data.token
         this.fetchUserInfo()
       }).catch(error => {