321

src/layout/main-page.vue

 <template>
-  <div class="main-page min-h-screen" :class="mainBg">
-    <van-overlay :show="loading" z-index="2000" class="flex items-center justify-center">
+  <div class="main-page  min-h-screen" :class="mainBg">
+    <van-overlay :show="loading" z-index="2000" :lock-scroll='false' class="flex items-center justify-center">
       <van-loading color="#fff" />
     </van-overlay>
     <div class="header-wrapper fixed top-0 left-0 w-screen z-50" :class="headerBg">

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/service/moudles/Apply.ts

@@ -19,7 +19,7 @@ export default class Enterprise extends BaseService {
    * @param {GetApplyDTO} data {GetApplyDTO}
    * @returns
    */
-  async getApply(data: GetApplyDTO) {
+  async getApply(data: GetApplyDTO){
     return await this.useService(this.router.getApply, data)
   }
 
@@ -55,7 +55,7 @@ export default class Enterprise extends BaseService {
    * @param {SubmitQuitApplyDTO} data {SubmitQuitApplyDTO}
    * @returns
    */
-  async submitQuit(data: SubmitQuitApplyDTO) {
+  async submitQuit(data: SubmitQuitApplyDTO){
     return await this.useService(this.router.submitQuit, data)
   }
 }

src/util/Bridge/index.ts

@@ -37,7 +37,8 @@ enum BridgeMethods{
     Back='back',
     GEN_JOIN_FORM= 'genJoinForm',
     SIGN='sign',
-    GET_PUBLIC_KEY = "getPublicKey"
+    GET_PUBLIC_KEY = "getPublicKey",
+    REFRESH_COMPANY_STATE = "refreshCompanyState"
 }
 
 export function isAppEnv() {
@@ -118,6 +119,14 @@ export function openCompanyUserInfo(address: string) {
   return data
 }
 
+
+export function refreshCompanyState(){
+  const data = dsbridge.call(BridgeMethods.REFRESH_COMPANY_STATE,{},res=>{
+    return res
+  })
+  return data
+}
+
 /**
  * 接受邀请验签hash
  * @returns

src/views/team/auth-management.vue

@@ -85,6 +85,7 @@ export default Vue.extend({
       ]
     }
   },
+
   methods: {
     removeManager(id: number | string) {
       this.list = this.list.filter(item => item.id !== id)

src/views/team/components/contact-selector.vue

 <template>
   <!-- 选择成员 -->
-  <van-overlay :show="show" z-index="2000">
-    <div class="select-team w-screen h-screen overflow-auto">
+  <van-overlay :show="show" z-index="2000" :lock-scroll='false'>
+    <div class="select-team w-screen h-full overflow-y-scroll">
       <main-page
         main-bg="bg-white"
         header-bg="bg-white"

src/views/team/components/dep-selector.vue

 <template>
   <!-- 选择部门 -->
   <van-overlay :show="show" z-index="2000">
-    <div class="select-team w-screen h-screen overflow-auto">
+    <div class="select-team w-screen h-screen overflow-y-hidden">
       <main-page
         title="所属团队"
         left-arrow

src/views/team/components/member-selector.vue

 <template>
   <!-- 选择成员 -->
   <van-overlay :show="show" z-index="2000">
-    <div class="select-team w-screen h-screen overflow-auto">
+    <div class="select-team w-screen h-screen overflow-y-hidden">
       <main-page
         main-bg="bg-white"
         header-bg="bg-white"

src/views/team/create-team/create-team.vue

@@ -68,7 +68,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { Dialog } from 'vant'
-import { getUserInfo, goBack } from '@/util/Bridge'
+import { getUserInfo, goBack, refreshCompanyState } from '@/util/Bridge'
 import { trim } from '@/util/Common'
 
 export default Vue.extend({
@@ -119,6 +119,7 @@ export default Vue.extend({
     })
   },
   methods: {
+    goBack,
     handleClickLeft() {
       console.log('click left')
       goBack()
@@ -139,13 +140,15 @@ export default Vue.extend({
         nodeServer,
         oaServer
       }
-      this.$service.enterprise.create(data).then((res: any) => {
+      this.$service.enterprise.create(data).then(async (res: any) => {
         const { data } = res
         if (data.code === this.$global.success) {
           this.$toast('创建成功')
           this.name = ''
           this.leaderName = ''
-          this.$router.push('/team/team-frame')
+          // this.$router.push('/team/team-frame')
+                   await refreshCompanyState()
+          goBack()
         } else {
           this.$toast(data.msg)
         }

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

@@ -77,7 +77,7 @@
 import Vue from 'vue'
 import {formatDate} from '@/util/FormatDate'
 import {AcceptJoinDTO} from '@/service/moudles/service.dto'
-import { appNavBack, getSign } from '@/util/Bridge'
+import { appNavBack, getSign, goBack, refreshCompanyState } from '@/util/Bridge'
 
 export default Vue.extend({
   name: 'JoinTeam',
@@ -126,13 +126,15 @@ export default Vue.extend({
     console.log(this.info);
     
      this.$service.enterprise.acceptJoin(req)
-        .then((res: any) => {
+        .then(async (res: any) => {
           const {data} = res
           this.loading = false
           if (data.code === this.$global.success) {
             this.$toast('加入成功')
             this.$store.commit('acceptJoin', {})
-            this.$router.replace('/team/team-frame')
+            // this.$router.replace('/team/team-frame')
+            await refreshCompanyState()
+            goBack()
           }else {
             this.$toast(data.msg)
           }

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

@@ -26,7 +26,7 @@
           <div class="bg-white w-full rounded pt-8 pb-4 flex flex-col items-center shadow-bg">
             <div class="font-medium">杭州复杂美科技有限公司</div>
             <div class="font-medium text-sm text-text-secondary mt-0.5">团队号 HZFZM0001</div>
-            <div class="h-20 overflow-auto text-xs text-text-secondary px-4 mt-3.5">
+            <div class="h-20 overflow-y-scroll text-xs text-text-secondary px-4 mt-3.5">
               公司成立于2008年，2013 年启动区块链、智能合约的研发与创新，2014年申请区块链发明专利：钱包找回功能。已申请区块链相关专利500余项，其中已获得授权超80项，2019年据德温特专利家族统计，复杂美区块链发明专利排名位于全球第三，仅次于阿里巴巴和IBM。 公司总部位于杭州，并在南京、广州、海南设有分部。目前，公司员工100余人，其中80%左右为技术人员，吸引了一批甲骨文、阿里、华为程序员。公司与多家世界500强开展区块链项目合作，在票据、供应链金融、积分、仓单有区块链应用落地。 2018年11月，复杂美区块链Chain33在Github上开源，是较早落地运行的平行链架构系统，并基于模块设计可协作开发，大幅降低区块链的开发维护成本，实现快捷易用的跨链交易，有近100个平行链项目落地，去中心化交易、去中心化社交、去中心化电商、去中心化溯源存证、去中心化借贷等一系列应用。
             </div>
           </div>

src/views/team/search-team.vue

 <template>
-  <div class="select-team min-h-screen bg-common-bg px-4">
+  <div class="select-team  bg-common-bg px-4">
     <div class="header px-4 fixed top-0 left-0 w-full z-10">
       <search-bar
         v-model="search"

src/views/team/team-frame.vue

@@ -40,7 +40,7 @@
           />
         </div>
         <!-- 底部操作 -->
-        <div class="py-2 px-4 bg-white w-screen fixed bottom-0 left-0 z-30"  v-if="getRole ">
+        <div class="py-2 px-4 bg-white w-screen fixed bottom-0 left-0 z-30"  v-if="role !=3">
           <div class="grid grid-cols-3 gap-2.5">
             <c-button round @click="addMember">添加成员</c-button>
             <c-button round @click="addDep">添加部门</c-button>
@@ -75,7 +75,7 @@ export default Vue.extend({
     })
   },
   data() {
-    const team: Array<Department> = []
+    const team: Department[]= []
     const currentDep: Department = {
       entId: '',
       id: '',
@@ -87,7 +87,7 @@ export default Vue.extend({
       title: '导航',
       team,
       loading: false,
-      contacts: [] as Array<Staff>,
+      contacts: [] as Staff[],
       parentId: '',
       entId: '',
       ifContainChildDep: true,
@@ -100,12 +100,14 @@ export default Vue.extend({
       role:null
     }
   },
-  mounted() {
+  async mounted() {
     const res = JSON.parse(getUserInfo() || "{}")
     this.role = process.env.NODE_ENV==='production'&&res.role  
-    this.entId = process.env.NODE_ENV==='production'?res.entId : '166961152260050944'
+    this.entId = process.env.NODE_ENV==='production'?res.entId : '168398222891421696'
     localStorage.setItem('USR_INFO', getUserInfo())
-    this.getEntInfo()
+    console.log(this.role,this.entId,'sdflokjsdklfjsdlkflsdjklfjsd;lkfjksld');
+    
+    await this.getEntInfo()
   },
   computed: {
     isDepDetail(): boolean {
@@ -179,8 +181,6 @@ export default Vue.extend({
       })
     },
     clickMember(member: Staff) {
-      console.log(member.id,'dfjdsfkl');
-      
       openCompanyUserInfo(String(member.id))
       // this.$router.push(`/team/team-member/${member.id}`)
     },
@@ -192,6 +192,7 @@ export default Vue.extend({
     handleSwitchChange(val: boolean) {
       this.getStaff()
     },
+
     // 部门设置
     setDepartment() {
       const id = this.currentDep.id

src/views/team/team-info/my-info.vue

@@ -32,7 +32,7 @@
           <div class="bg-white w-full rounded pt-8 pb-4 flex flex-col items-center shadow-bg">
             <div class="font-medium">杭州复杂美科技有限公司</div>
             <div class="font-medium text-sm text-text-secondary mt-0.5">团队号 HZFZM0001</div>
-            <div class="mx-5 mt-4 h-20 overflow-auto text-xs text-text-secondary">
+            <div class="mx-5 mt-4 h-20 overflow-y-scroll text-xs text-text-secondary">
               公司成立于2008年，2013年启动区块链、智能合约的研发与创新，
               2014年申请区块链发明专利:钱包找回功能已申请区块链相关专利500余项，
               其中已获得授权超80项，2019年据德温特专利家族统计，