修改为使用token

pages/home/home.js

@@ -143,7 +143,7 @@ Page ({
     var success = function (res) {
       console.log('res',res.data.list);
   	  that.setData({
-  		  word:res.data.list[0].title
+  		  word:res.data.list[0]?res.data.list[0].title:''
   	  })
   	  
     }

pages/projects/projects.js

@@ -99,7 +99,7 @@ Page({
     var success = function (res) {
       console.log('res',res.data.list);
   	  that.setData({
-  		  word:res.data.list[0].title
+  		  word:res.data.list[0]?res.data.list[0].title:''
   	  })
   	  
     }

pages/user/all/all.js

@@ -75,7 +75,8 @@ Page({
 	  		      console.log('checkLogin',res.code)
 	  		      var url = 'xcx/login'
 	  				  var params = {
-	  				    code: res.code
+	  				    code: res.code,
+						invite_id: invite//新token模式
 	  				  }
 					  that.setData({
 					  	wxlogincode: res.code
@@ -83,7 +84,8 @@ Page({
 	  				  var success = function (res) {
 	  				  	console.log('pageLogin',res);
 	  				  	if(res.data.wx_user){
-	  				  		var userInfo = res.data.wx_user
+	  				  		var userInfo = res.data.wx_user;
+							invite = wx.getStorageSync('invite');
 							that.setData({
 								userInfo: userInfo
 							})

utils/request.js

@@ -7,6 +7,7 @@ const apiHost = 'https://tfohowapi.hiwavo.com/'
 function $get (url, params, success, fail) {
   wx.showNavigationBarLoading()
   var session = wx.getStorageSync('lbt_session_key')
+  var token = wx.getStorageSync('lbt_token_key')
   wx.request({
     url: apiHost + url,
     data: params,
@@ -14,7 +15,8 @@ function $get (url, params, success, fail) {
     header: {
       "content-type": "application/json",
       "terminal": 'mini-program',
-      "Cookie": 'fohow_sid=' + session
+      // "Cookie": 'fohow_sid=' + session
+	  "Authorization":"Bearer " + token
     },
     success: function (res) {
       callBack(res, success, fail)
@@ -30,7 +32,8 @@ function $get (url, params, success, fail) {
 
 function $post (url, params, success, fail) {
   wx.showNavigationBarLoading()
-  var session = wx.getStorageSync('lbt_session_key')
+  var session = wx.getStorageSync('lbt_session_key');
+  var token = wx.getStorageSync('lbt_token_key');
   wx.request({
     url: apiHost + url,
     data: params,
@@ -38,7 +41,8 @@ function $post (url, params, success, fail) {
     header: {
       "content-type": "application/x-www-form-urlencoded",
       "terminal": 'mini-program',
-      "Cookie": 'fohow_sid=' + session
+      // "Cookie": 'fohow_sid=' + session
+	  "Authorization":"Bearer " + token
     },
     success: function (res) {
       callBack(res, success, fail)
@@ -53,7 +57,8 @@ function $post (url, params, success, fail) {
 
 function $put (url, params, success, fail) {
   wx.showNavigationBarLoading()
-  var session = wx.getStorageSync('lbt_session_key')
+  var session = wx.getStorageSync('lbt_session_key');
+  var token = wx.getStorageSync('lbt_token_key');
   wx.request({
     url: apiHost + url,
     data: params,
@@ -61,7 +66,8 @@ function $put (url, params, success, fail) {
     header: {
       "content-type": "application/x-www-form-urlencoded",
       "terminal": 'mini-program',
-      "Cookie": 'fohow_sid=' + session
+      // "Cookie": 'fohow_sid=' + session
+	  "Authorization":"Bearer " + token
     },
     success: function (res) {
       callBack(res, success, fail)
@@ -76,7 +82,8 @@ function $put (url, params, success, fail) {
 
 function $del (url, params, success, fail) {
   wx.showNavigationBarLoading()
-  var session = wx.getStorageSync('lbt_session_key')
+  var session = wx.getStorageSync('lbt_session_key');
+  var token = wx.getStorageSync('lbt_token_key');
   wx.request({
     url: apiHost + url,
     data: params,
@@ -84,7 +91,8 @@ function $del (url, params, success, fail) {
     header: {
       "content-type": "application/x-www-form-urlencoded",
       "terminal": 'mini-program',
-      "Cookie": 'fohow_sid=' + session
+      // "Cookie": 'fohow_sid=' + session,
+	  "Authorization":"Bearer " + token
     },
     success: function (res) {
       callBack(res, success, fail)
@@ -169,6 +177,7 @@ function login (res) {
   var success = function (res) {
     wx.setStorageSync('lbt_session_key', res.data.session_key)
     wx.setStorageSync('lbt_session_time', Date.now())
+	wx.setStorageSync('lbt_token_key', res.data.token)
     check()
   }
   $get(url, params, success)
@@ -267,6 +276,7 @@ function pageLogin (res, str) {
   	console.log('pageLogin',res);
   	if(res.wx_user){
   		wx.setStorageSync('lbt_session_key', res.data.session_key)
+  		wx.setStorageSync('lbt_token_key', res.data.token)
 	    wx.setStorageSync('lbt_session_time', Date.now())
 	    wx.redirectTo({
 	      url: str
@@ -330,7 +340,8 @@ function share (val, timline) {
 
 function $uploadFile(url, name, file, params, success, fail){
 	wx.showNavigationBarLoading()
-	var session = wx.getStorageSync('lbt_session_key')
+	var session = wx.getStorageSync('lbt_session_key');
+	var token = wx.getStorageSync('lbt_token_key');
 	wx.uploadFile({
 		url: apiHost + url, //仅为示例，非真实的接口地址
 		filePath: file,
@@ -339,7 +350,8 @@ function $uploadFile(url, name, file, params, success, fail){
 		header: {
 		  "content-type": "application/x-www-form-urlencoded",
 		  "terminal": 'mini-program',
-		  "Cookie": 'fohow_sid=' + session
+		  // "Cookie": 'fohow_sid=' + session,
+		  "Authorization":"Bearer " + token
 		},
 		success(res) {
 			callBack(res, success, fail)