Merge remote-tracking branch 'origin/main'

.eslintrc.js

 module.exports = {
-  root: true,
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "parser":"vue-eslint-parser",
-  // "extends": [
-  //     "eslint:recommended",
-  //     "plugin:vue/essential",
-  //     "plugin:@typescript-eslint/eslint-recommended"
-  // ]
+  "ecmaFeatures": {
+    "modules": true,
+    "spread" : true,
+    "restParams" : true
+},
+"env" : {
+    "browser" : true,
+    "node" : true,
+    "es6" : true
+},
+// "rules" : {
+//     "no-unused-vars" : 2,
+//     "no-undef" : 2
+// },
+"parserOptions": {
+    "sourceType": "module"
+}
 }

src/service/base.ts

@@ -38,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 = signAuth() || 'MOCK'
+        if(routerConfig.crediential) token =  'MOCK' 
         switch(routerConfig.method){
             case 'post':
                 routerConfig.crediential&&Object.assign(headerItems,{'FZM-SIGNATURE':token})

src/util/Bridge/index.ts

@@ -16,6 +16,16 @@ enum BridgeMethods{
     SIGN='sign'
 }
 
+export function isAppEnv(){
+    const env = window.navigator.userAgent || navigator.userAgent
+    if(env.includes(';FZM-3SYXIN;')){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+
 /**
  * 获取用户的资料
  * @returns 

src/views/team/add-department.vue

@@ -27,7 +27,7 @@
           @click="$router.push('/team/select-team')"
         />
       </group-cell>
-      <c-button round class="mt-10">
+      <c-button round class="mt-10" @click="addDepConfirm">
         确定
       </c-button>
     </div>
@@ -35,6 +35,8 @@
 </template>
 
 <script lang="ts">
+
+import { useRequest } from 'ahooks-vue'
 import Vue from 'vue'
 
 export default Vue.extend({
@@ -51,10 +53,35 @@ export default Vue.extend({
   data() {
     return {
       name: '产品部',
-      check: false
+      check: false,
+      addDepObj:{},
+      enterpriseInfoObj:{
+        data:null as any,
+        loading:true as any,
+        error:null as any
+      }
     }
   },
+  async mounted(){
+
+  },
   methods: {
+    // enterpriseInfo(){
+    //   const { data, loading, error} =useRequest(this.$service.enterprise.getEnterpriseInfo({
+    //     "id": "166961152260050944"
+    //   })) 
+    //   this.enterpriseInfoObj.data = data
+    //   this.enterpriseInfoObj.loading = loading
+    //   this.enterpriseInfoObj.error = error
+    // },
+    addDepConfirm(){
+      const { data, loading, error, run} =useRequest(this.$service.department.addDep({
+          "entId": "entId",
+          "leaderId": "leaderId",
+          "name": "name",
+          "parentId": "parentId"
+      })) 
+    },
     selectCharger() {
       this.$router.push({
         path: '/team/team-frame',