token修改3

app.js

@@ -4,7 +4,7 @@ var utils = require('utils/util.js')
 App({
   onLaunch: function (res) {
     console.log(res)
-    // this.login()
+    this.login()
   },
   onShow: function () {
     // this.check()

pages/user/all/all.js

@@ -88,7 +88,7 @@ Page({
 						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 && res.data.wx_user.full_head != ''){
+	  				  	if(res.data.wx_user && res.data.wx_user.head != ''){
 	  				  		var userInfo = res.data.wx_user;
 							
 							that.setData({
@@ -96,12 +96,12 @@ Page({
 							})
 							that.getBalanceInfo()
 							that.getIntegralInfo()
-							if (that.data.checkData.merchant_id > 0) {
-							  that.getmerchant()
-							}
+							// if (that.data.checkData.merchant_id > 0) {
+							//   that.getmerchant()
+							// }
 								//checkwxhead---start
 								// console.log('that.data.checkhead',that.data.checkhead);
-	  						    if(res.data.wx_user.full_head == '' ){
+	  						    if(res.data.wx_user.head == '' ){
 									that.setData({
 										checkhead: false
 									})
@@ -285,7 +285,7 @@ Page({
       })
 	  console.log('untel',res.data.user.tel)
 	  
-	  if(res.data.wx_user.full_head == ''){
+	  if(res.data.wx_user.head == ''){
 		  that.setData({
 		  	    userInfo: 'nologin'
 		  	  })

pages/user/all/all.wxml

@@ -174,7 +174,7 @@
       </view>
       -->
     </view>
-    <view class="user-padding" wx:if="{{ checkData.merchant_id > 0}}">
+    <!-- <view class="user-padding" wx:if="{{ checkData.merchant_id > 0}}">
       <view class="user-line" bindtap="toMerchant" style="{{checkData.is_super_admin ? 'margin-top: 20rpx;':'margin-top: 20rpx;border:0;'}}">
         <view class="user-line__title">订单管理</view>
         <view class="user-line__merchant"></view>
@@ -186,7 +186,7 @@
         <view class="user-line__merchant1"></view>
         <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>
-    </view>
+    </view> -->
   </view>
   <!--
   <view class="unbind" wx:if="{{!bindTel}}">