321

src/main.ts

@@ -20,7 +20,7 @@ Vue.use(utils).use(service)
 Vue.prototype.$dsbridge = dsbridge
 Vue.prototype.$global = global
 
-// new VConsole()
+new VConsole()
 
 new Vue({
   router,

src/util/Bridge/index.ts

@@ -42,8 +42,9 @@ export function isAppEnv() {
 }
 
 export function appNavBack(){
+  console.log(111);
     const appEnv = isAppEnv()
-    console.log(111);
+
     
     if(appEnv){
         goBack()
@@ -127,6 +128,8 @@ export function getSign(obj: object) {
 
 export function getPublicKey(){
   const data = dsbridge.call(BridgeMethods.GET_PUBLIC_KEY,{},res=>{
+    console.log(res);
+    
     return res
   })
   return data

src/views/team/add-member.vue

@@ -216,7 +216,8 @@ export default Vue.extend({
         this.acceptJoin.entId = this.entId
         this.acceptJoin.depId = this.selectedDepId
         this.acceptJoin.expiration = this.acceptJoin.joinTime + 6000000
-
+        console.log(getPublicKey(),'getPublicKey');
+        
         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

src/views/team/team-detail.vue

@@ -59,7 +59,7 @@ import Vue from 'vue'
 import { team, contacts } from '@/DTO'
 import { Member } from '@/DTO'
 import { getContacts } from '@/util/Contact'
-import { openCompanyUserInfo } from '@/util/Bridge'
+import { openCompanyUserInfo ,appNavBack} from '@/util/Bridge'
 
 export default Vue.extend({
   name: 'TeamDetail',
@@ -109,6 +109,7 @@ export default Vue.extend({
     this.getStaff(this.parentId)
   },
   methods: {
+    appNavBack,
     // 获取成员
     getStaff(id: string) {
       this.loading = true

src/views/team/team-frame.vue

@@ -114,10 +114,11 @@ export default Vue.extend({
       this.parentId = dep.id
       this.getStaff()
     },
-    appNavBack(){
-      this.$router.go(-1)
-      // appNavBack()
-    },
+         appNavBack,
+    // appNavBack(){
+    //   this.$router.go(-1)
+    //   // appNavBack()
+    // },
     getEntInfo() {
       this.loading = true
       return this.$service.enterprise.getEnterpriseInfo({