321

src/util/Bridge/index.ts

@@ -28,7 +28,8 @@ enum BridgeMethods{
     OPEN_COMPANY_USER_INFO = 'openCompanyUserInfo',
     Back='back',
     GEN_JOIN_FORM= 'genJoinForm',
-    SIGN='sign'
+    SIGN='sign',
+    GET_PUBLIC_KEY = "getPublicKey"
 }
 
 export function isAppEnv() {
@@ -122,6 +123,14 @@ export function getSign(obj: object) {
   return data
 }
 
+
+
+export function getPublicKey(){
+  const data = dsbridge.call(BridgeMethods.GET_PUBLIC_KEY,{},res=>{
+    return res
+  })
+  return data
+}
 // /**
 //  * 提交
 //  */

src/views/team/add-member.vue

@@ -86,7 +86,7 @@ import { Department, LocalStore } from '@/Interface'
 import { useLocalStorageState } from 'ahooks-vue'
 import { formatDate } from '@/util/FormatDate'
 import DepSelector from '@/views/team/components/dep-selector.vue'
-import { getSign, getUserInfo } from '@/util/Bridge'
+import { getPublicKey, getSign, getUserInfo } from '@/util/Bridge'
 Vue.use(Calendar).use(Overlay)
 
 export default Vue.extend({
@@ -216,12 +216,13 @@ export default Vue.extend({
         this.acceptJoin.depId = this.selectedDepId
         this.acceptJoin.expiration = this.acceptJoin.joinTime + 6000000
 
-        this.acceptJoin.inviterId =  process.env.NODE_ENV ==='production'? getUserInfo().id: "1FKxgaEh5fuSm7a35BfUnKYAmradowpiTR"
+        this.acceptJoin.inviterId =  process.env.NODE_ENV ==='production'? getPublicKey(): "1FKxgaEh5fuSm7a35BfUnKYAmradowpiTR"
         this.acceptJoin.oaServer = localStorage.getItem('ENT_INFO')? JSON.parse(localStorage.getItem('ENT_INFO') as any).oaServer : 'http://172.16.101.107:20000'
         const {depId,entId,expiration,inviterId,joinTime,name,oaServer,phone,position} = this.acceptJoin
         this.acceptJoin.hash = getSign({
             depId,entId,expiration,inviterId,joinTime,name,oaServer,phone,position
         })
+        
         this.$store.commit('setAcceptJoin', this.acceptJoin)
         this.$router.push('/team/two-code')
       }).catch(() => { })

src/views/team/join-team/confirm-join.vue

@@ -119,9 +119,11 @@ export default Vue.extend({
     async submit() {
     console.log('申请')
     this.loading = true
- 
-     
-     this.$service.enterprise.acceptJoin(this.info)
+    const {depId,entId,expiration,hash,inviterId,joinTime,name,oaServer,phone,position} = this.info as AcceptJoinDTO
+    let req = {
+    depId,entId,expiration: Number(expiration)/1000,hash,inviterId,joinTime:Number(joinTime)/1000,name,oaServer,phone,position
+    }
+     this.$service.enterprise.acceptJoin(req)
         .then((res: any) => {
           const {data} = res
           this.loading = false

src/views/team/two-code.vue

@@ -94,9 +94,12 @@ export default Vue.extend({
     // console.log(Mock, 'mock')
     this.joinInfo = this.$store.state.acceptJoin 
     const urloutput = this.outputUrl(this.joinInfo)
+    
     this.qrCodeText = JSON.stringify(this.joinInfo) 
     let url = window.location.origin + '/team/confirm-join'
     this.qrCodeText = `${url}?${urloutput}`
+    console.log(this.qrCodeText);
+    
     this.dpr()
     // this.drawCanvas()
   },