wangyu / naturalPersonTax · 提交

提交 e06a6be6bc3a279dab2bc7fdb3d0bfdbbcbdce9d

作者 wangyu
1 个父辈 c5d37cd5
构建： 未知

调整聊天页面相关刷新token的逻辑

内嵌 并排对比
正在显示 4 个修改的文件 包含 105 行增加 和 75 行删除
1 1 //app.js
2 2 const appId = 'wxe91c67adba6ac02d';
3 3 App({
4   - onLaunch: function () {
  4 + onLaunch: function() {
5 5 var that = this;
6 6 console.log("onlaunch---", "onlaunch");
7 7 //调用API从本地缓存中获取数据
... ... @@ -9,44 +9,59 @@ App({
9 9 logs.unshift(Date.now())
10 10 wx.setStorageSync('logs', logs)
11 11 wx.login({
12   - success: function (res) {
  12 + success: function(res) {
13 13 if (res.code) {
14   - that.getTokenByCode(res.code, true)
  14 + var requestdata = {
  15 + "grant_type": "wx_app_code",
  16 + "code": res.code,
  17 + "scope": "global_access:end_user,tenant:" + appId
  18 + };
  19 + that.getTokenByCode(requestdata, true)
15 20 }
16 21 }
17 22 })
18 23 },
19 24
20   - onShow: function (res) {
  25 + onShow: function(res) {
21 26 console.log("onShow----", res);
22 27 var that = this;
23 28 that.globalData.onshow_count++;
24   - if (that.globalData.onshow_count > 1) {//除第一次进入小程序之外的打开时
25   - wx.login({
26   - success: function (res) {
27   - if (res.code) {
28   - that.getTokenByCode(res.code, false)
  29 + if (that.globalData.onshow_count > 1) { //除第一次进入小程序之外的打开时
  30 + if (res.path =="pages/main/smartchat/chat") {//聊天页面锁屏再打开，走该逻辑
  31 + var requestdata = {
  32 + "grant_type": "refresh_token",
  33 + "refresh_token": that.globalData.refresh_token,
  34 + "scope": "global_access:end_user,tenant:" + that.globalData.com_id
  35 + };
  36 + that.getTokenByCode(requestdata, false)
  37 + } else {
  38 + wx.login({
  39 + success: function(res) {
  40 + if (res.code) {
  41 + var requestdata = {
  42 + "grant_type": "wx_app_code",
  43 + "code": res.code,
  44 + "scope": "global_access:end_user,tenant:" + appId
  45 + };
  46 + that.getTokenByCode(requestdata, false)
  47 + }
29 48 }
30   - }
31   - })
  49 + })
  50 + }
32 51 }
33 52 },
34 53
35   - getTokenByCode: function (code, relaunch) {
  54 + getTokenByCode: function(requestdata, relaunch) {
36 55 var that = this;
37 56 var baseUrl = that.globalData.baseUrl;
38 57 wx.request({
39 58 url: baseUrl + 'uaa/v1/auth/tokens',
40   - data: {
41   - "grant_type": "wx_app_code",
42   - "code": code,
43   - "scope": "global_access:end_user,tenant:" + appId
44   - },
  59 + data: requestdata,
45 60 method: "POST",
46 61 header: {
47 62 'content-type': 'application/json'
48 63 },
49   - success: function (res) {
  64 + success: function(res) {
50 65 console.log("getTokenByCode", res.data)
51 66 var user = res.data.user;
52 67 var tenant = res.data.tenant;
... ... @@ -57,11 +72,11 @@ App({
57 72 that.globalData.wx_open_id = user.wx_open_id;
58 73 that.globalData.Authorization = "Bearer " + res.data.access_token;
59 74 that.globalData.refresh_token = res.data.refresh_token;
60   - if (user && user.type == "0") {//匿名用户
  75 + if (user && user.type == "0") { //匿名用户
61 76 wx.redirectTo({
62 77 url: '../../getPhone/getPhone'
63 78 })
64   - } else if (user && user.type == "1") {//注册用户
  79 + } else if (user && user.type == "1") { //注册用户
65 80 that.configOssUrl()
66 81 if (relaunch) {
67 82 wx.reLaunch({
... ... @@ -70,12 +85,12 @@ App({
70 85 }
71 86 }
72 87 },
73   - fail: function (res) {
  88 + fail: function(res) {
74 89 console.log("login-res-fail", res);
75 90 },
76 91 })
77 92 },
78   - getUserInfo: function (cb) {
  93 + getUserInfo: function(cb) {
79 94 var that = this
80 95 if (this.globalData.userInfo) {
81 96 typeof cb == "function" && cb(this.globalData.userInfo)
... ... @@ -83,7 +98,7 @@ App({
83 98 //调用登录接口
84 99 wx.getUserInfo({
85 100 withCredentials: false,
86   - success: function (res) {
  101 + success: function(res) {
87 102 console.log("userInfo---", res)
88 103 that.globalData.userInfo = res.userInfo
89 104 typeof cb == "function" && cb(that.globalData.userInfo)
... ... @@ -92,7 +107,7 @@ App({
92 107 }
93 108 },
94 109
95   - configOssUrl: function () {
  110 + configOssUrl: function() {
96 111 wx.showLoading()
97 112 var that = this
98 113 wx.request({
... ... @@ -101,18 +116,18 @@ App({
101 116 'Authorization': this.globalData.Authorization
102 117 },
103 118 method: 'GET',
104   - success: function (result) {
  119 + success: function(result) {
105 120 console.log('获取OSSURL 成功', result.data)
106 121 that.globalData.OSSUrl = result.data.app_url;
107 122 },
108   - fail: function (res) {
  123 + fail: function(res) {
109 124 console.log('获取OSSURL 失败', res)
110 125 wx.showToast({
111 126 icon: "none",
112 127 title: "云存储功能失效，请联系开发人员",
113 128 })
114 129 },
115   - complete: function () {
  130 + complete: function() {
116 131 wx.hideLoading()
117 132 }
118 133 })
... ... @@ -120,6 +135,7 @@ App({
120 135
121 136 globalData: {
122 137 appId: appId,
  138 + com_id: "",
123 139 onshow_count: 0,
124 140 // baseUrl: "http://47.99.47.16:20000/",
125 141 // baseUrl: "http://47.96.75.229:20000/",
... ... @@ -128,7 +144,7 @@ App({
128 144 // baseUrl: "http://47.110.250.177:20000/",
129 145 baseUrl: "http://47.110.158.110:20000/",
130 146 // baseUrl: "https://api.workai.com.cn/",
131   - OSSUrl: "",//"https://oss.workai.com.cn/",
  147 + OSSUrl: "", //"https://oss.workai.com.cn/",
132 148 userInfo: null,
133 149 hasLogin: false,
134 150 openid: null,
... ...
... ... @@ -205,6 +205,12 @@ Page({
205 205 shareMethod_Data.selected = data.share_method ? data.share_method : "";
206 206
207 207 for (var i = 0; i < newdata.length; i++) {
  208 + if (newdata[i].education_start) {
  209 + newdata[i].education_start = this.formatDate(newdata[i].education_start)
  210 + }
  211 + if (newdata[i].education_end) {
  212 + newdata[i].education_end = this.formatDate(newdata[i].education_end)
  213 + }
208 214 if (newdata[i].patient_birthday) {
209 215 newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday)
210 216 }
... ...
... ... @@ -12,7 +12,6 @@ Page({
12 12 comlist: [],
13 13 com_id: "",
14 14 choosed_index: 0,
15   - scrollview_h:0,
16 15 chat_idx:"Toview"+0,
17 16 chatlist: []
18 17 },
... ... @@ -22,15 +21,12 @@ Page({
22 21 */
23 22 onLoad: function(options) {
24 23 this.getComList()
25   - var that = this
26   - wx.getSystemInfo({
27   - success: function (res) {
28   - that.setData({
29   - scrollview_h: res.windowHeight-66
30   - })
31   - console.log("windowHeight",res.windowHeight)
32   - }
33   - })
  24 + // var that = this
  25 + // wx.getSystemInfo({
  26 + // success: function (res) {
  27 + // console.log("windowHeight",res.windowHeight)
  28 + // }
  29 + // })
34 30 },
35 31
36 32 /**
... ... @@ -43,8 +39,8 @@ Page({
43 39 /**
44 40 * Lifecycle function--Called when page show
45 41 */
46   - onShow: function() {
47   -
  42 + onShow: function(e) {
  43 + console.log("e---",e)
48 44 },
49 45
50 46 getComList: function() {
... ... @@ -128,37 +124,42 @@ Page({
128 124 })
129 125 },
130 126
131   - refreshToken: function() {
132   - var that = this;
133   - wx.request({
134   - url: baseUrl + 'uaa/v1/auth/tokens',
135   - data: {
136   - "grant_type": "refresh_token",
137   - "refresh_token": app.globalData.refresh_token,
138   - "scope": "global_access:end_user,tenant:" + that.data.com_id
139   - },
140   - method: "POST",
141   - header: {
142   - 'content-type': 'application/json'
143   - },
144   - success: function(res) {
145   - console.log("refreshToken", res.data)
  127 + // refreshToken: function() {
  128 + // var that = this;
  129 + // wx.request({
  130 + // url: baseUrl + 'uaa/v1/auth/tokens',
  131 + // data: {
  132 + // "grant_type": "refresh_token",
  133 + // "refresh_token": app.globalData.refresh_token,
  134 + // "scope": "global_access:end_user,tenant:" + that.data.com_id
  135 + // },
  136 + // method: "POST",
  137 + // header: {
  138 + // 'content-type': 'application/json'
  139 + // },
  140 + // success: function(res) {
  141 + // console.log("refreshToken", res.data)
146 142
147   - var user = res.data.user;
148   - var tenant = res.data.tenant;
149   - if (tenant) {
150   - app.globalData.tenant_id = tenant.id;
151   - }
152   - app.globalData.userInfo = res.data.user;
153   - app.globalData.wx_open_id = user.wx_open_id;
154   - app.globalData.Authorization = "Bearer " + res.data.access_token;
155   - app.globalData.refresh_token = res.data.refresh_token;
  143 + // var user = res.data.user;
  144 + // var tenant = res.data.tenant;
  145 + // if (tenant) {
  146 + // app.globalData.tenant_id = tenant.id;
  147 + // }
  148 + // app.globalData.userInfo = res.data.user;
  149 + // app.globalData.wx_open_id = user.wx_open_id;
  150 + // app.globalData.Authorization = "Bearer " + res.data.access_token;
  151 + // app.globalData.refresh_token = res.data.refresh_token;
156 152
157   - app.configOssUrl();
158   - that.getChatinfo();
159   - }
160   - })
161   - },
  153 + // app.configOssUrl();
  154 + // that.getChatinfo();
  155 + // },
  156 + // complete:function(res){
  157 + // wx.showLoading({
  158 + // title: '',
  159 + // })
  160 + // }
  161 + // })
  162 + // },
162 163
163 164 getChatinfo: function() {
164 165 var that = this;
... ... @@ -180,7 +181,7 @@ Page({
180 181 })
181 182 that.bottom()
182 183 }
183   - }
  184 + },
184 185 })
185 186 },
186 187
... ... @@ -200,7 +201,15 @@ Page({
200 201 this.setData({
201 202 showModal: false,
202 203 })
203   - this.refreshToken();
  204 + var requestdata = {
  205 + "grant_type": "refresh_token",
  206 + "refresh_token": app.globalData.refresh_token,
  207 + "scope": "global_access:end_user,tenant:" + this.data.com_id
  208 + };
  209 + setTimeout(() => {
  210 + app.getTokenByCode(requestdata, false);
  211 + }, 2000);
  212 + this.getChatinfo();
204 213 },
205 214
206 215 bindChange: function(e) {
... ... @@ -211,6 +220,7 @@ Page({
211 220 com_id: this.data.comlist[s].id,
212 221 choosed_index: s
213 222 })
  223 + app.globalData.com_id = this.data.comlist[s].id;
214 224 },
215 225
216 226 //聊天消息始终显示最底端
... ...
1 1 <!--pages/main/smartchat/chat.wxml-->
2   -<import src="../../../common/picker_cell" />
3   -
4 2 <view>
5 3 <view style='background:#fff;padding-bottom:65px;'>
6 4 <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'>
... ... @@ -33,7 +31,7 @@
33 31 <view class='modal_lg' hidden="{{!showModal}}">
34 32 <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
35 33 <view class='divide_line_f5f5f5'></view>
36   - <view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
  34 + <scroll-view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
37 35 <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}">
38 36 <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;'>
39 37 <view class='text_item_blue float_left'>{{item.name}}</view>
... ... @@ -44,7 +42,7 @@
44 42 </view>
45 43 <view class='divide_line_f5f5f5'></view>
46 44 </view>
47   - </view>
  45 + </scroll-view>
48 46
49 47 <view class='divide_line_f5f5f5'></view>
50 48 <view style='width:100%;display: flex;'>
... ...
请 注册 或 登录 后发表评论