改用token1

packageUser/pages/user/orders/orders.js

@@ -38,6 +38,7 @@ Page({
 	  list: [],
 	  tabChange: false
 	})
+	
 	if (rid) {
 	  if (rid === 'unpay') {
 	    this.tabUnpay()

pages/projects/projects.wxml

@@ -24,6 +24,7 @@
 						<view class='select_box'>
 						    <view class='select' catchtap='selectTap'>
 						        <text class='select_text'>{{navData[currentTab]['name']}}</text>
+								<image src="../../images/footer/selectdown.png" style="margin-left: 15rpx;"/>
 						    </view>
 						    <view class='option_box' style='height:{{selectShow?navData.length*58:0}}rpx;top:{{statusBarHeight + 85}}px;'>
 						        <text class="option  {{currentTab == idx ?'active':''}}" wx:for='{{navData}}'  wx:for-index="idx" wx:for-item="navItem" wx:key='this' data-index='{{idx}}' data-current="{{idx}}" catchtap='optionTap'>{{navItem.name}}</text>

pages/user/all/all.js

@@ -59,7 +59,7 @@ Page({
     //   // this.info()
     // }
     
-	that.checkLogin();
+	// that.checkLogin();
     
 
     
@@ -73,7 +73,8 @@ Page({
 	  		    success: res => {
 	  		      getApp().globalData.try_login = true;
 	  		      console.log('checkLogin',res.code)
-	  		      var url = 'xcx/login'
+	  		      var url = 'xcx/login';
+				  invite = wx.getStorageSync('invite');
 	  				  var params = {
 	  				    code: res.code,
 						invite_id: invite//新token模式
@@ -83,9 +84,13 @@ Page({
 					  })
 	  				  var success = function (res) {
 	  				  	console.log('pageLogin',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)
+						console.log('nowtoken',res.data.token);
 	  				  	if(res.data.wx_user){
 	  				  		var userInfo = res.data.wx_user;
-							invite = wx.getStorageSync('invite');
+							
 							that.setData({
 								userInfo: userInfo
 							})
@@ -395,23 +400,23 @@ Page({
 	  }
     
   },
-  checkbindtel(){
-	  var that = this;
-	  if(that.data.info.user.tel == ''){
-		  setTimeout(function(){
-			  wx.navigateTo({
-			   	url: '/packageUser/pages/user/bind/bind'
-			  })
+  // checkbindtel(){
+	 //  var that = this;
+	 //  if(that.data.info.user.tel == ''){
+		//   setTimeout(function(){
+		// 	  wx.navigateTo({
+		// 	   	url: '/packageUser/pages/user/bind/bind'
+		// 	  })
 			     		
-			  wx.showToast({
-			     title: '请先绑定手机号~',
-			     icon: 'none',
-			     duration: 2000
-			  }) 
-		  },500)
+		// 	  wx.showToast({
+		// 	     title: '请先绑定手机号~',
+		// 	     icon: 'none',
+		// 	     duration: 2000
+		// 	  }) 
+		//   },500)
 	  		
-	  }
-  },
+	 //  }
+  // },
   toCashList () {
   	if(this.data.info.user.tel == ''){//未绑定手机号
   		wx.navigateTo({

utils/request.js

@@ -8,6 +8,7 @@ function $get (url, params, success, fail) {
   wx.showNavigationBarLoading()
   var session = wx.getStorageSync('lbt_session_key')
   var token = wx.getStorageSync('lbt_token_key')
+  // console.log('nowtoken',token);
   wx.request({
     url: apiHost + url,
     data: params,
@@ -140,16 +141,24 @@ function callBack (res, success, fail) {
         
         if (getApp().globalData.try_login) {
           getApp().globalData.try_login = false
-          wx.showToast({
-            title: '尝试登陆失败，请到个人中心进行授权登陆',
-            icon: 'none',
-            duration: 2000
-          })
-          setTimeout(function(){
-          	wx.switchTab({
-			    url: '/pages/user/all/all' 
-			  })
-          },1000)
+     //      wx.showToast({
+     //        title: '尝试登陆失败，请到个人中心进行授权登陆',
+     //        icon: 'none',
+     //        duration: 2000
+     //      })
+     //      setTimeout(function(){
+     //      	wx.switchTab({
+			  //   url: '/pages/user/all/all' 
+			  // })
+     //      },1000)
+	 
+			//新token
+			wx.login({
+			  success: res => {
+			    getApp().globalData.try_login = true;
+			    pageLogin(res, url)
+			  }
+			})
         } else {
           wx.login({
             success: res => {
@@ -171,14 +180,18 @@ function callBack (res, success, fail) {
 // 登陆接口
 function login (res) {
   var url = 'xcx/login'
+  var invite = wx.getStorageSync('invite');
   var params = {
-    code: res.code
+    code: res.code,
+	invite_id: invite//新token模式
   }
   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()
+	console.log('login:id=' + res.data.wx_user.id)
+	getApp().globalData.wx_id = res.data.wx_user.id;
   }
   $get(url, params, success)
 }
@@ -274,9 +287,11 @@ function pageLogin (res, str) {
   }
   var success = function (res) {
   	console.log('pageLogin',res);
+	res = res.data;
   	if(res.wx_user){
-  		wx.setStorageSync('lbt_session_key', res.data.session_key)
-  		wx.setStorageSync('lbt_token_key', res.data.token)
+		// console.log('newtoken---',res.token);
+  		wx.setStorageSync('lbt_session_key', res.session_key)
+  		wx.setStorageSync('lbt_token_key', res.token)
 	    wx.setStorageSync('lbt_session_time', Date.now())
 	    wx.redirectTo({
 	      url: str