From 4ee1112f765308cfa6552fcac9f091b1f942e99b Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 29 May 2021 17:58:44 +0800
Subject: [PATCH] no message

---
 components/sidebar-item/index.wxml | 16 ++++------------
 pages/index/index.js               |  3 ++-
 pages/login/index.js               | 22 +++++++++++++---------
 pages/login/index.wxml             |  5 ++++-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/components/sidebar-item/index.wxml b/components/sidebar-item/index.wxml
index ab8c6c4..1dfe4b0 100644
--- a/components/sidebar-item/index.wxml
+++ b/components/sidebar-item/index.wxml
@@ -2,18 +2,10 @@
 
 <view
   class="{{ utils.bem('sidebar-item', { selected, disabled }) }} {{ selected ? 'active-class' : '' }} {{ disabled ? 'disabled-class' : '' }} custom-class"
-  hover-class="van-sidebar-item--hover"
-  hover-stay-time="70"
-  bind:tap="onClick"
->
+  hover-class="van-sidebar-item--hover" hover-stay-time="70" bind:tap="onClick">
   <view class="van-sidebar-item__text">
-    <van-info
-      wx:if="{{ info !== null || dot }}"
-      dot="{{ dot }}"
-      info="{{ info }}"
-      custom-style="right: 4px"
-    />
-    <view wx:if="{{ title }}">{{ title }}</view>
+    <van-info wx:if="{{ info !== null || dot }}" dot="{{ dot }}" info="{{ info }}" custom-style="right: 4px" />
+    <view style="text-overflow: ellipsis;white-space: nowrap;width:100%" wx:if="{{ title }}">{{ title }}</view>
     <slot wx:else name="title" />
   </view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 40f7d53..a7c8e2e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -43,7 +43,8 @@ Scene({
     this.data.items = []
     for (let mIndex = 0; mIndex < app.userInfo.enterpriseInfos.length; mIndex++) {
       const element = app.userInfo.enterpriseInfos[mIndex]
-      var enterprise = { text: util.substring(element.enterpriseName, 8) }
+      // var enterprise = { text: util.substring(element.enterpriseName, 8) }
+      var enterprise = { text: element.enterpriseName }
       var children = []
       if(mIndex >= 1){
         this.data.arrow = true
diff --git a/pages/login/index.js b/pages/login/index.js
index 3f60d45..1380262 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -26,8 +26,8 @@ Page({
     loging: false,
     regist: false,
     metaData: null,
-    code: null
-    // code: '?mark=ztb_saas&QrCodeRecordId=595295714456768512'
+    // code: null
+    code: '?mark=ztb_saas&QrCodeRecordId=596073429854195712'
   },
   /************************************** 初始化登录流程  ********************************************/
   onLoad: function (options) {
@@ -73,12 +73,12 @@ Page({
         app.globalData.safeFragmentHeight = windowHeight - statusBarHeight - app.globalData.safeBottom
         app.globalData.windowWidth = e.windowWidth
 
-        var authorization = app.globalData.token || storage.get('Authorization')
+        app.globalData.token = app.globalData.token || storage.get('Authorization')
         if(this.data.code){
           this.fetchQrCode(this.data.code)
-        } else if(!util.isEmpty(authorization)){
+        } else if(!util.isEmpty(app.globalData.token)){
           this.setData({ loging: true})
-          this.fetchUserInfo(authorization)
+          this.fetchUserInfo(app.globalData.token)
         }
       }
     })
@@ -369,7 +369,11 @@ Page({
       } else {
         this.data.metaData = result.data.metaData
         this.data.metaData.qrPage = result.data.redirectUrl
-        this.setData({ loging: false})
+        if(!util.isEmpty(app.globalData.token)){
+          this.fetchUserInfo(app.globalData.token)
+        } else {
+          this.setData({ loging: false})
+        }
       }
     }).catch(err => {
       util.showToast('二维码解析失败，请重新扫码')
@@ -382,10 +386,10 @@ Page({
       return
     }
     this.setData({loging: true})
-    if(this.data.metaData.qrPage == '/page/inde/ztbsaas/yaoqing'){
+    if(this.data.metaData.qrPage == 'page/inde/ztbsaas/yaoqing'){
       // 绑定企业主账号
-      var param = {joiningEnterprisePublicInvitationId: this.data.enterpriseId, userName: this.data.metaData.userName}
-      bindAccount(param).then(result => {
+      // var param = {joiningEnterprisePublicInvitationId: this.data.metaData.enterpriseId, userName: this.data.metaData.userName}
+      bindAccount(this.data.metaData).then(result => {
         this.data.metaData = null
         this.fetchUserInfo(app.globalData.token)
       }).catch(error => {
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 774c805..195ed0a 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -12,12 +12,15 @@
 		<view class="text-df" style="padding:20rpx 0rpx" wx:elif="{{metaData.qrPage == '/page/index/shenqing'}}">
 			<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.factoryName}}</text>的员工</text>
 		</view>
+		<view class="text-df" style="padding:20rpx 0rpx" wx:elif="{{metaData.qrPage == 'page/inde/ztbsaas/yaoqing'}}">
+			<text class="text-df">现邀请您成为<text class="text-bold text-blue">{{metaData.name}}</text>的管理员</text>
+		</view>
 		<view class="text-df" style="padding:20rpx 0rpx" wx:elif="{{metaData.qrPage == '/page/index/register'}}">
 			<text class="text-df"><text class="text-bold text-blue">{{metaData.factoryName}}</text>邀请您成为纸通宝注册会员</text>
 		</view>
 		<input id="userName" style="padding:0rpx 30rpx;border:1rpx solid #eee;height:80rpx;margin-top:64rpx" placeholder-style="color:#aaa"
 			maxlength="20" placeholder="请输入您的姓名，以便于识别" bindinput="bindInput" disabled="{{loging}}" bindfocus="inputFocus" 
-			wx:if="{{ metaData.qrPage == '/page/index/yaoqing' || metaData.qrPage == '/page/index/shenqing' }}"/>
+			wx:if="{{ metaData.qrPage != '/page/index/register' }}"/>
 </view>
 <view style="padding: 30rpx 80rpx;height:480rpx;width: 100%;" wx:elif="{{ regist }}">
 	<view class="flex">