Merge branch 'main' of https://gitlab.33.cn/HF_web/OKR

src/service/base.ts

@@ -5,6 +5,7 @@ import router from '@/router'
 
 import { Toast } from 'vant'
 import { generateToken } from "@/util/Sign";
+import { signAuth } from "@/util/Bridge";
 
 
 const Account = {
@@ -37,7 +38,7 @@ export default class BaseService {
         let token;
         let headerItems:{[key:string]:string|number} ={}
         if(!routerConfig.method) routerConfig.method = 'post'
-        if(routerConfig.crediential) token = "MOCK"
+        if(routerConfig.crediential) token = signAuth() || 'MOCK'
         switch(routerConfig.method){
             case 'post':
                 routerConfig.crediential&&Object.assign(headerItems,{'FZM-SIGNATURE':token})

src/util/Bridge/index.ts

@@ -3,6 +3,7 @@
 // 扫描二维码：scanCode 
 // 打开企业联系人详情页面：openCompanyUserInfo 参数：联系人地址，企业id
 
+import { AcceptJoinDTO } from '@/service/moudles/service.dto'
 import dsbridge from 'dsbridge'
 
 enum BridgeMethods{
@@ -10,7 +11,8 @@ enum BridgeMethods{
     GET_USERINFO='getUserInfo',
     SCAN_CODE="scanCode",
     OPEN_COMPANY_USER_INFO = 'openCompanyUserInfo',
-    Back='back'
+    Back='back',
+    GEN_JOIN_FORM= 'genJoinForm'
 }
 
 /**
@@ -75,10 +77,22 @@ export function scanCode(){
 }
 
 
+// /**
+//  * 提交
+//  */
+
+// export function genJoinForm(data: ){
+//     let req = dsbridge.register(BridgeMethods.GEN_JOIN_FORM,()=>{
+//         return data
+//     })
+//     return req
+// }
+
 
 export default{
     getUserInfo,
     signAuth,
     scanCode,
-    openCompanyUserInfo
+    openCompanyUserInfo,
+    goBack
 }
\ No newline at end of file

src/views/team/team-frame.vue

@@ -57,7 +57,8 @@
 import Vue from 'vue'
 import { team, contacts } from '@/DTO'
 import { Member } from '@/DTO'
-
+import {useLocalStorageState} from 'ahooks-vue'
+import { getUserInfo } from '@/util/Bridge'
 export default Vue.extend({
   name: 'TeamFrame',
   components: {
@@ -73,10 +74,7 @@ export default Vue.extend({
     this.showRadio = this.$route.query.showRadio === '1'
   },
   mounted(){
-    // let res = this.$service.department.getSub({
-    //   entId:'166910771849072640',
-    //   parentId:'166910771849072641'
-    // })
+    useLocalStorageState('USER_INFO',getUserInfo())
   },
   data() {
     return {