修复打开页面后接口调用顺序

src/App.vue

@@ -69,34 +69,51 @@
       //获取
       await new Promise((resolve, reject) => {
         axios.get('/api/oauth/getTokenByCode', { params: data, headers: { 'clientType': 'app' } }).then(res => {
-          console.log(res);
-          if (res.code === 'M0000') {
+          console.log('/api/oauth/getTokenByCode', res);
+          if (res.data.code === 'M0000') {
             this.$ls.set('accessToken', res.data.data.access_token)
-            resolve()
-          } else {
-            reject()
-          }
-        })
-      })
-      await new Promise((resolve, reject) => {
-        sendUserCodeAndCorpId(data).then(res => {
-          if (res.code === 'M0000') {
-            let userList = res.data.corpUsers.filter((item) => {
-              return item.corpId == corpId
+            sendUserCodeAndCorpId(data).then(res => {
+              if (res.code === 'M0000') {
+                let userList = res.data.corpUsers.filter((item) => {
+                  return item.corpId == corpId
+                })
+                const userId = userList[0].id
+                const accessToken = res.data.access_token
+                const refreshToken = res.data.refresh_token
+                this.$ls.set('userId', userId)
+                this.$ls.set('accessToken', accessToken)
+                this.$ls.set('refreshToken', refreshToken)
+                resolve()
+              } else {
+                reject()
+                alert('获取失败')
+              }
             })
-            const userId = userList[0].id
-            const accessToken = res.data.access_token
-            const refreshToken = res.data.refresh_token
-            this.$ls.set('userId', userId)
-            this.$ls.set('accessToken', accessToken)
-            this.$ls.set('refreshToken', refreshToken)
-            resolve()
           } else {
             reject()
-            alert('获取失败')
           }
         })
       })
+      // await new Promise((resolve, reject) => {
+      //   console.log('sendUserCodeAndCorpId', data)
+      //   sendUserCodeAndCorpId(data).then(res => {
+      //     if (res.code === 'M0000') {
+      //       let userList = res.data.corpUsers.filter((item) => {
+      //         return item.corpId == corpId
+      //       })
+      //       const userId = userList[0].id
+      //       const accessToken = res.data.access_token
+      //       const refreshToken = res.data.refresh_token
+      //       this.$ls.set('userId', userId)
+      //       this.$ls.set('accessToken', accessToken)
+      //       this.$ls.set('refreshToken', refreshToken)
+      //       resolve()
+      //     } else {
+      //       reject()
+      //       alert('获取失败')
+      //     }
+      //   })
+      // })
     }
   };
 </script>

src/api/user.js

@@ -8,7 +8,7 @@ export default api;
 
 export function sendUserCodeAndCorpId(data) {
   return axios({
-    url: '/task/tb-user/loginByCode',
+    url: api.sendUserCodeAndCorpId,
     method: 'get',
     params: data
   });

src/utils/request.js

@@ -21,7 +21,10 @@ function getRefreshToken() {
   const params = {
     refreshToken: Vue.ls.get('refreshToken')
   };
-  return axios.get('http://192.168.5.41/api/task/v1/task/tb-user/refreshToken', { params, headers: { 'clientType': 'app' } });
+  return axios.get('http://192.168.5.41/api/task/v1/task/tb-user/refreshToken', {
+    params,
+    headers: { 'clientType': 'app' }
+  });
 }
 
 const err = (error) => {
@@ -58,7 +61,7 @@ service.interceptors.request.use(config => {
   // }
   config.headers['clientType'] = 'app';
   // 如果不为空的话就设置 因为一开始获取token的接口是没有的
-    config.headers['Authorization'] = 'Bearer ' + Vue.ls.get('accessToken');
+  config.headers['Authorization'] = 'Bearer ' + Vue.ls.get('accessToken');
   return config;
 }, err);
 

src/views/taskTemplate/taskDesign/taskFlow/component/role-select-tree-input/index.vue

@@ -131,6 +131,7 @@
             const obj = Object.assign({}, {
               key: role.id,
               title: role.name,
+              disableCheckbox: true,
               children: role.roles.map(cRole => {
                 const cObj = Object.assign({}, {
                   key: cRole.id,

src/views/taskTemplate/taskGrouping/components/group-list/index.vue

@@ -27,7 +27,7 @@
               </div>
               <div class="text-desc" style="padding-top: 8px;">
                 <!--{{ taskItem.templateExplain }}-->
-                <a-tooltip v-if="taskItem.templateExplain.length > 20" placement="left" :title="taskItem.templateExplain">
+                <a-tooltip v-if="taskItem.templateExplain  && taskItem.templateExplain.length > 20" placement="left" :title="taskItem.templateExplain">
                   {{ `${taskItem.templateExplain.substring(0, 19)}...` }}
                 </a-tooltip>
                 <span v-else>