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

@@ -50,10 +50,9 @@ export function isAppEnv() {
 }
 
 export function appNavBack(){
-  console.log(111);
-    const appEnv = isAppEnv()
-
 
+    const appEnv = isAppEnv()
+    console.log(111,appEnv);
     if(appEnv){
         goBack()
     }else{

src/views/team/add-department.vue

@@ -109,7 +109,7 @@ export default Vue.extend({
   },
   created(){
     this.entId=JSON.parse(localStorage.getItem('ENT_INFO') as string).id
-    const leaderId = JSON.parse(localStorage.getItem('UER_INFO') as string)?.id
+    const leaderId = JSON.parse(localStorage.getItem('USR_INFO') as string)?.id
     this.selectedLeaderId = [leaderId]
     this.getStaffInfo(this.selectedLeaderId[0])
     const depId = this.$route.query.id as string

src/views/team/import.vue

@@ -80,6 +80,7 @@ import Staff from '@/service/moudles/Staff';
 import { Account } from '@/service/base';
 import { formatDate } from '@/util/FormatDate';
 import { formatFileSize } from '@/util/Common';
+import { getUserInfo } from '@/util/Bridge';
 
 
 Vue.use(Popup);
@@ -128,7 +129,7 @@ export default Vue.extend({
       this.show = true;
       this.show1 = true;
       this.progress = 0;
-      Staff.getInstance().addExcel(this.file, Account.entId, this.onProgressChange).then(() => {
+      Staff.getInstance().addExcel(this.file, JSON.parse(getUserInfo()).entId, this.onProgressChange).then(() => {
         this.$router.push({ name: "Team" })
       }).catch((err) => {
         Toast.fail(err)

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

@@ -111,18 +111,20 @@ export default Vue.extend({
   },
   created() {
     this.info = this.$route.query as unknown as AcceptJoinDTO
+    console.log(this.info);
     
     this.getDepInfo(this.info)
   },
   methods: {
     appNavBack,
     async submit() {
-    console.log('申请')
     this.loading = true
     const {depId,entId,expiration,hash,inviterId,joinTime,name,oaServer,phone,position} = this.info as AcceptJoinDTO
     let req = {
     depId,entId,expiration:  Number(expiration) ,hash,inviterId,joinTime: Number(joinTime),name,oaServer,phone,position
     }
+    console.log(this.info);
+    
      this.$service.enterprise.acceptJoin(req)
         .then((res: any) => {
           const {data} = res

src/views/team/team-frame.vue

@@ -6,7 +6,7 @@
       header-bg="bg-white"
       :loading="loading"
       left-arrow
-      @click-left="appNavBack"
+      @click-left="goBack"
     >
       <template slot="right">
         <app-icon
@@ -55,7 +55,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { useLocalStorageState } from 'ahooks-vue'
-import { appNavBack, getUserInfo, openCompanyUserInfo } from '@/util/Bridge'
+import { appNavBack, getUserInfo, goBack, openCompanyUserInfo } from '@/util/Bridge'
 import { Department, Staff } from '@/Interface'
 // import {openCompanyUserInfo} from '@/util/Bridge'
 
@@ -115,7 +115,7 @@ export default Vue.extend({
       this.parentId = dep.id
       this.getStaff()
     },
-    appNavBack,
+    goBack,
     getEntInfo() {
       this.loading = true
       return this.$service.enterprise.getEnterpriseInfo({

src/views/team/two-code.vue

@@ -53,7 +53,7 @@
           <code-icon :path="require('@/assets/icons/y-downlode.png')" class-name="h-9 w-9"/>保存
         </div>  
       </div>
-      <c-button type="secondary" class="mt-16" @click="$router.push('/team/team-frame')">进入团队工作台</c-button>
+      <c-button type="secondary" class="mt-16" @click="handleClickLeft">进入团队工作台</c-button>
     </div>  
     </main-page>
   </div>
@@ -135,7 +135,7 @@ export default Vue.extend({
       return res
     },
     handleClickLeft() {
-      this.$router.push('/team/team-frame')
+      this.$router.replace('/team/team-frame')
     },
     dpr() {
       console.log(window.devicePixelRatio, 'pixel')