优化

@@ -16,7 +16,7 @@ App({
             "code": res.code,
             "scope": "global_access:end_user,tenant:" + appId
           };
-          that.getTokenByCode(requestdata, true)
+          that.getTokenByCode(requestdata, true,"")
         }
       }
     })
@@ -33,7 +33,7 @@ App({
           "refresh_token": that.globalData.refresh_token,
           "scope": "global_access:end_user,tenant:" + that.globalData.com_id
         };
-        that.getTokenByCode(requestdata, false)
+        that.getTokenByCode(requestdata, false,"")
       } else {
         wx.login({
           success: function(res) {
@@ -43,7 +43,7 @@ App({
                 "code": res.code,
                 "scope": "global_access:end_user,tenant:" + appId
               };
-              that.getTokenByCode(requestdata, false)
+              that.getTokenByCode(requestdata, false,"chat")
             }
           }
         })
@@ -51,7 +51,7 @@ App({
     }
   },
 
-  getTokenByCode: function(requestdata, relaunch) {
+  getTokenByCode: function(requestdata, relaunch,str) {
     var that = this;
     var baseUrl = that.globalData.baseUrl;
     wx.request({
@@ -88,8 +88,14 @@ App({
       fail: function(res) {
         console.log("login-res-fail", res);
       },
+      complete:function(res){
+        if(str=="chat"){
+          that.globalData.refresh_complete = true
+        }
+      }
     })
   },
+  
   getUserInfo: function(cb) {
     var that = this
     if (this.globalData.userInfo) {
@@ -137,6 +143,7 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
+    refresh_complete:false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",

@@ -231,6 +231,8 @@ Page({
           inputdisable = false
           issinglechild_Data.disabled = false;
           shareMethod_Data.disabled = false;
+          issinglechild_Data.selected = '' ;
+          shareMethod_Data.selected = '';
         }else{
           btn_show = false
           inputdisable = true
@@ -324,7 +326,7 @@ Page({
         })
       }
       this.setData({
-        reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
+        reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : -1,
         input_disable: inputdisable,
 
         btn_show: btn_show,

@@ -12,7 +12,7 @@ Page({
     comlist: [],
     com_id: "",
     choosed_index: 0,
-    chat_idx:"Toview"+0,
+    chat_idx: "Toview" + 0,
     chatlist: []
   },
 
@@ -40,7 +40,7 @@ Page({
    * Lifecycle function--Called when page show
    */
   onShow: function(e) {
-      console.log("e---",e)
+    console.log("e---", e)
   },
 
   getComList: function() {
@@ -107,7 +107,7 @@ Page({
           that.data.chatlist.push(res.data)
           that.setData({
             inputValue: "",
-            chat_idx: "Toview"+that.data.chatlist.length,
+            chat_idx: "Toview" + that.data.chatlist.length,
             chatlist: that.data.chatlist
           })
           console.log("chatlist", that.data.chatlist)
@@ -116,54 +116,55 @@ Page({
           //   duration: 300
           // })
           // that.getChatinfo()
-          setTimeout(function(){
+          setTimeout(function() {
             that.bottom()
-          },400);
-          
+          }, 400);
+
         }
       }
     })
   },
 
-  // refreshToken: function() {
-  //   var that = this;
-  //   wx.request({
-  //     url: baseUrl + 'uaa/v1/auth/tokens',
-  //     data: {
-  //       "grant_type": "refresh_token",
-  //       "refresh_token": app.globalData.refresh_token,
-  //       "scope": "global_access:end_user,tenant:" + that.data.com_id
-  //     },
-  //     method: "POST",
-  //     header: {
-  //       'content-type': 'application/json'
-  //     },
-  //     success: function(res) {
-  //       console.log("refreshToken", res.data)
+  refreshToken: function() {
+    var that = this;
+    wx.request({
+      url: baseUrl + 'uaa/v1/auth/tokens',
+      data: {
+        "grant_type": "refresh_token",
+        "refresh_token": app.globalData.refresh_token,
+        "scope": "global_access:end_user,tenant:" + that.data.com_id
+      },
+      method: "POST",
+      header: {
+        'content-type': 'application/json'
+      },
+      success: function(res) {
+        console.log("refreshToken", res.data)
 
-  //       var user = res.data.user;
-  //       var tenant = res.data.tenant;
-  //       if (tenant) {
-  //         app.globalData.tenant_id = tenant.id;
-  //       }
-  //       app.globalData.userInfo = res.data.user;
-  //       app.globalData.wx_open_id = user.wx_open_id;
-  //       app.globalData.Authorization = "Bearer " + res.data.access_token;
-  //       app.globalData.refresh_token = res.data.refresh_token;
+        var user = res.data.user;
+        var tenant = res.data.tenant;
+        if (tenant) {
+          app.globalData.tenant_id = tenant.id;
+        }
+        app.globalData.userInfo = res.data.user;
+        app.globalData.wx_open_id = user.wx_open_id;
+        app.globalData.Authorization = "Bearer " + res.data.access_token;
+        app.globalData.refresh_token = res.data.refresh_token;
 
-  //       app.configOssUrl();
-  //       that.getChatinfo();
-  //     },
-  //     complete:function(res){
-  //         wx.showLoading({
-  //           title: '',
-  //         })
-  //     }
-  //   })
-  // },
+        app.configOssUrl();
+        that.getChatinfo();
+      },
+      complete:function(res){
+          wx.showLoading({
+            title: '',
+          })
+      }
+    })
+  },
 
   getChatinfo: function() {
     var that = this;
+    console.log("refresh_complete", app.globalData.refresh_complete)
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'chatbot/v1/chats',
@@ -177,7 +178,7 @@ Page({
         if (res && res.data) {
           console.log("getChatinfo", res)
           that.setData({
-            chat_idx: "Toview"+res.data.items.length,
+            chat_idx: "Toview" + res.data.items.length,
             chatlist: res.data.items.reverse()
           })
           that.bottom()
@@ -202,15 +203,13 @@ Page({
     this.setData({
       showModal: false,
     })
-    var requestdata = {
-        "grant_type": "refresh_token",
-        "refresh_token": app.globalData.refresh_token,
-        "scope": "global_access:end_user,tenant:" + this.data.com_id
-    };
-    setTimeout(() => {
-      app.getTokenByCode(requestdata, false);
-    }, 2000);
-    this.getChatinfo();
+    // var requestdata = {
+    //   "grant_type": "refresh_token",
+    //   "refresh_token": app.globalData.refresh_token,
+    //   "scope": "global_access:end_user,tenant:" + this.data.com_id
+    // };
+    this.refreshToken()
+    // this.getChatinfo();
   },
 
   bindChange: function(e) {
@@ -225,7 +224,7 @@ Page({
   },
 
   //聊天消息始终显示最底端
-  bottom: function () {
+  bottom: function() {
     // var query = wx.createSelectorQuery()
     // query.select('#flag').boundingClientRect()
     // query.selectViewport().scrollOffset()
@@ -235,11 +234,11 @@ Page({
     //   })
     //   res[1].scrollTop // 显示区域的竖直滚动位置
     // })
-    wx.createSelectorQuery().select('#flag').boundingClientRect(function (rect) {
+    wx.createSelectorQuery().select('#flag').boundingClientRect(function(rect) {
       // 使页面滚动到底部
       wx.pageScrollTo({
-        scrollTop: rect.height+99999,
-        duration:100
+        scrollTop: rect.height + 99999,
+        duration: 100
       })
     }).exec()
   },