From ffb4e76dce53f9d177c8504044f84f12f8190774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Thu, 6 Jun 2024 18:00:47 +0800
Subject: [PATCH] 1

---
 public/favicon.ico                    | Bin 16958 -> 9662 bytes
 src/layouts/components/Header.vue     |   1 +
 src/pages/activity/activity_index.vue |  12 ++
 src/pages/association/carousel.vue    |   8 +-
 src/pages/association/index.vue       |   9 ++
 src/pages/association/person.vue      | 201 ++++++++++++++++++++++++++
 src/pages/association/system.vue      |  10 +-
 src/pages/news/news_index.vue         |   9 ++
 src/pages/user/user_edit.vue          |  14 +-
 src/pages/user/user_edit_shen.vue     |  21 ++-
 src/pages/user/user_info.vue          |   2 +-
 src/pages/user/user_line.vue          |   2 +-
 src/router/modules/components.ts      |   6 +
 src/store/modules/user.ts             |  42 ++++--
 src/utils/request.ts                  |   2 +-
 15 files changed, 305 insertions(+), 34 deletions(-)
 create mode 100644 src/pages/association/person.vue

diff --git a/public/favicon.ico b/public/favicon.ico
index 086ac804a618e9bf16e23e7e5ce1407104c04add..47a62f630dbe178b591cc23a759d24441ba7a347 100644
GIT binary patch
literal 9662
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
ReSB`CQM=7uVC(+R{{w!Jf&%~m

literal 16958
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
I)r`RWH$?a1VgLXD

diff --git a/src/layouts/components/Header.vue b/src/layouts/components/Header.vue
index 2b7185e..292dec0 100644
--- a/src/layouts/components/Header.vue
+++ b/src/layouts/components/Header.vue
@@ -174,6 +174,7 @@ export default Vue.extend({
       this.$store.commit('user/removeAssociation');
       this.$store.commit('user/removeToken');
       this.$router.push(`/login?id=`+this.association.id);
+      this.$store.commit('user/setUserInfo',[]);
       //this.$router.push(`/login?redirect=${this.$router.history.current.fullPath}`);
     },
     changeCollapsed() {
diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue
index c130f71..9f0b71c 100644
--- a/src/pages/activity/activity_index.vue
+++ b/src/pages/activity/activity_index.vue
@@ -231,6 +231,7 @@
             :action="$store.state.user.apiUrl+'/api/common/upload'"
             v-model="addForm.activity_image_show"
             theme="image"
+            :data="{association_id:this.association.association_id}"
             tips="请选择单张图片文件上传"
             accept="image/*"
             :allowUploadDuplicateFile="true"
@@ -420,6 +421,10 @@ export default {
           uploadImage: {
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
+            metaWithUrl: false,
+            meta:{
+              association_id: 0,
+            },
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
               // customInsert(res, insertFn) {                  // JS 语法
               // res 即服务端的返回结果
@@ -443,6 +448,7 @@ export default {
       JuanTotal:0,
       JuanId:0,
       getType:3,
+      association:{}
     }
   },
   beforeDestroy() {
@@ -451,6 +457,12 @@ export default {
     editor.destroy() // 组件销毁时，及时销毁编辑器
   },
   mounted() {
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
+    this.editorConfig.MENU_CONF.uploadImage.meta.association_id=this.association.association_id;
     this.getList();
   },
   methods: {
diff --git a/src/pages/association/carousel.vue b/src/pages/association/carousel.vue
index ec29696..6daa024 100644
--- a/src/pages/association/carousel.vue
+++ b/src/pages/association/carousel.vue
@@ -56,8 +56,8 @@
             v-model="addForm.news_image_show"
             tips="请选择单张图片/视频文件上传"
             accept="image/*,video/*"
+            :data="{association_id:this.association.association_id}"
             :showImageFileName="true"
-            :imageViewerProps="true"
             :format-response="formatResponse"
           ></t-upload>
         </t-form-item>
@@ -91,10 +91,16 @@ export default {
         {colKey: 'url', title: '跳转链接', align: 'center'},
         {colKey: 'select', title: '操作', width: 200, align: 'center'},
       ],
+      association:{}
     }
   },
   mounted() {
     //this.member_id=this.$route.query.id;
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
     this.getList();
   },
   methods: {
diff --git a/src/pages/association/index.vue b/src/pages/association/index.vue
index e9cfa22..240dfd6 100644
--- a/src/pages/association/index.vue
+++ b/src/pages/association/index.vue
@@ -141,6 +141,9 @@ export default {
           uploadImage: {
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
+            meta:{
+              association_id: 0,
+            },
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
               // customInsert(res, insertFn) {                  // JS 语法
               // res 即服务端的返回结果
@@ -160,6 +163,12 @@ export default {
   },
   mounted() {
     //this.member_id=this.$route.query.id;
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
+    this.editorConfig.MENU_CONF.uploadImage.meta.association_id=this.association.association_id;
     this.getList();
   },
   methods: {
diff --git a/src/pages/association/person.vue b/src/pages/association/person.vue
new file mode 100644
index 0000000..bafa09c
--- /dev/null
+++ b/src/pages/association/person.vue
@@ -0,0 +1,201 @@
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+      <t-button @click="add">新增</t-button>
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+        <template #group="{ row }">
+          <t-tag theme="primary" v-if="row.group==1">超级管理员</t-tag>
+          <t-tag theme="success" v-if="row.group==2">办事员</t-tag>
+        </template>
+        <template #select="{ row }">
+          <t-space size="24px" v-if="row.group!=1">
+            <t-button theme="warning" @click="edit(row)">编辑</t-button>
+            <t-popconfirm  content="确认删除吗？" @confirm="del(row)">
+              <t-button theme="danger" >删除</t-button>
+            </t-popconfirm>
+          </t-space>
+        </template>
+      </t-table>
+    </div>
+    <t-dialog :header="isEdit?'编辑管理员':'新增管理员'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit">
+      <t-form>
+        <t-form-item label="管理员帐号" name="name">
+          <t-input placeholder="请输入管理员帐号" v-model="modData.zhanghu"/>
+        </t-form-item>
+        <t-form-item label="管理员密码" name="password">
+          <t-input placeholder="请输入管理员密码" v-model="modData.password"/>
+        </t-form-item>
+        <t-form-item label="绑定会员" name="password">
+          <t-select
+            v-model="modData.member_id"
+            :filterable="true"
+            placeholder="搜索会员"
+            style="width: 400px; display: inline-block"
+          >
+            <t-option v-for="(item,index) in options" :value="item.value" :key="index" :label="item.label"></t-option>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="权限类型" name="type">
+          <t-select  v-model="modData.group">
+            <t-option value="2" key="2" label="业务员"></t-option>
+          </t-select>
+        </t-form-item>
+      </t-form>
+    </t-dialog>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      modData:{
+        zhanghu:'',
+        password:'',
+        group:'2',
+        member_id:null,
+        pid:0
+      },
+      options: [],
+      addMode: false,
+      isEdit: false,
+      editID:0,
+      list: [],
+      columns: [
+        {colKey: 'zhanghu', title: '管理员帐号'},
+        {colKey: 'nikename', title: '绑定会员'},
+        {colKey: 'group', title: '权限类型'},
+        {colKey: 'select', title: '操作', width: 200},
+      ],
+      association:{},
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    if(typeof (this.$store.state.user.association)=='object'){
+      this.association=this.$store.state.user.association;
+    }else{
+      this.association=JSON.parse(this.$store.state.user.association);
+    }
+    this.getList();
+    this.getUserList();
+  },
+  methods: {
+    getList() {
+      this.$request
+        .post("/association")
+        .then( (res) => {
+          console.log(res);
+          this.list=res.data;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getUserList() {
+      this.$request
+        .post("/member",{if_xianshi:1,size:1000,page:1})
+        .then( (res) => {
+          console.log(res);
+          var key=res.data.ret;
+          var transformedSelectList = key.map(item => ({
+            value: item.member_id,
+            label: item.nikename
+          }));
+        this.options=transformedSelectList;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    del(d){
+      console.log(d);
+      this.$request
+        .post('/association/delAdmin',{id:d.id})
+        .then((res) => {
+          if(res.code==1){
+            this.$message.success(res.msg);
+            this.getList();
+          }else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    add(){
+      delete this.modData.id;
+      this.modData.zhanghu='';
+      this.modData.password= '';
+      this.modData.member_id=null;
+      this.addMode=true;
+      this.isEdit=false;
+    },
+    edit(d){
+      this.editID=d.id;
+      this.modData.zhanghu=d.zhanghu;
+      this.modData.password=d.password;
+      this.modData.member_id=d.member_id;
+      this.modData.group=String(d.group);
+      this.addMode=true;
+      this.isEdit=true;
+    },
+    onSubmit() {
+      if (this.modData.zhanghu == '') {
+        this.$message.error('账户不能为空');
+        return;
+      }
+      if (this.modData.password == '') {
+        this.$message.error('密码不能为空');
+        return;
+      }
+      if (this.modData.member_id == 0 || this.modData.member_id == null) {
+        this.$message.error('绑定会员不能为空');
+        return;
+      }
+      if (this.modData.group == '') {
+        this.$message.error('请选择权限类型');
+        return;
+      }
+      var url='/association/addAdmin';
+      if(this.isEdit){
+        url='/association/updateAdmin';
+        this.modData.id=this.editID;
+      }
+      this.modData.pid=this.association.id;
+      this.$request
+        .post(url,this.modData)
+        .then((res) => {
+          if(res.code==1){
+            this.$message.success(res.msg);
+            this.addMode=false;
+          }else {
+            this.$message.error(res.msg);
+          }
+          this.getList();
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCloseMy() {
+      this.addMode = false;
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
diff --git a/src/pages/association/system.vue b/src/pages/association/system.vue
index f4a1f31..378b5ad 100644
--- a/src/pages/association/system.vue
+++ b/src/pages/association/system.vue
@@ -48,20 +48,14 @@
   </div>
 </template>
 <script setup lang="ts">
-import {ChevronRightIcon} from 'tdesign-icons-vue';
 import store from "@/store";
 import * as echarts from "echarts/core";
-import {GridComponent, LegendComponent, TooltipComponent} from "echarts/components";
+import {GridComponent} from "echarts/components";
 import {LineChart, PieChart} from "echarts/charts";
 import {CanvasRenderer} from "echarts/renderers";
-import dayjs from "dayjs";
-import {getRandomArray} from "@/utils/charts";
 
-echarts.use([TooltipComponent, LegendComponent, PieChart, GridComponent, LineChart, CanvasRenderer]);
+echarts.use([PieChart, GridComponent, LineChart, CanvasRenderer]);
 export default {
-  components: {
-    ChevronRightIcon,
-  },
   data() {
     return {
       resizeTime: 1,
diff --git a/src/pages/news/news_index.vue b/src/pages/news/news_index.vue
index eccfbf9..4137ea3 100644
--- a/src/pages/news/news_index.vue
+++ b/src/pages/news/news_index.vue
@@ -153,6 +153,9 @@ export default {
           uploadImage: {
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
+            meta:{
+              association_id: 0,
+            },
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
               // customInsert(res, insertFn) {                  // JS 语法
               // res 即服务端的返回结果
@@ -183,6 +186,12 @@ export default {
   },
   mounted() {
     //this.member_id=this.$route.query.id;
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
+    this.editorConfig.MENU_CONF.uploadImage.meta.association_id=this.association.id;
     this.getList();
     this.getGory();
   },
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index b14f81f..9f63d0a 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -124,6 +124,7 @@
               :action="$store.state.user.apiUrl+'/api/common/upload'"
               v-model="formData.cardz_image_show"
               theme="image"
+              :data="{association_id:this.association.association_id}"
               tips="请选择身份证正面照"
               accept="image/*"
               :format-response="(response) => formatResponse(response, 1)"
@@ -133,6 +134,7 @@
             <t-upload
               :action="$store.state.user.apiUrl+'/api/common/upload'"
               v-model="formData.cardf_image_show"
+              :data="{association_id:this.association.association_id}"
               theme="image"
               tips="请选择身份证反面照"
               accept="image/*"
@@ -150,6 +152,7 @@
               :action="$store.state.user.apiUrl+'/api/common/upload'"
               v-model="formData.business_license_image_show"
               theme="image"
+              :data="{association_id:this.association.association_id}"
               tips="请选择营业执照"
               accept="image/*"
               :format-response="(response) => formatResponse(response, 3)"
@@ -160,6 +163,7 @@
               :action="$store.state.user.apiUrl+'/api/common/upload'"
               v-model="formData.company_image_show"
               theme="image"
+              :data="{association_id:this.association.association_id}"
               tips="请选择营业执照"
               accept="image/*"
               :format-response="(response) => formatResponse(response, 5)"
@@ -321,6 +325,7 @@ export default {
       caiMode: false,
       previews: {},
       caiImg: '',
+      association:{},
       formData: {
         phone: '',
         password: '',
@@ -390,6 +395,12 @@ export default {
     };
   },
   mounted() {
+    if(typeof (store.state.user.association)=='object'){
+      this.association=store.state.user.association;
+    }else{
+      this.association=JSON.parse(store.state.user.association);
+    }
+    console.log( this.association);
     this.id = this.$route.query.id;
     this.getInfo();
     this.getPlan();
@@ -404,6 +415,7 @@ export default {
         console.log(this.caiImg);
         let formData = new FormData();
         formData.append('file', data, 'image.jpg');
+        formData.append('association_id', this.association.association_id);
         console.log(formData);
         axios.post(store.state.user.apiUrl + '/api/common/upload', formData, {
           headers: {
@@ -508,7 +520,7 @@ getRegion() {
           console.log(res);
           if (res.code == 1) {
             this.industry_list = res.data;
-            this.industry_list.push({id: 0, industry_name: '其他行业'});
+            this.industry_list.push({id: -1, industry_name: '其他行业'});
           }
         })
         .catch((e) => {
diff --git a/src/pages/user/user_edit_shen.vue b/src/pages/user/user_edit_shen.vue
index ce57f2f..1b1c8bb 100644
--- a/src/pages/user/user_edit_shen.vue
+++ b/src/pages/user/user_edit_shen.vue
@@ -1,6 +1,11 @@
 <template>
   <t-card :bordered="false">
     <div class="form-step-container">
+      <t-tabs v-model="tabIndex" @change="tabIndexChange">
+        <t-tab-panel :value="0" label="待审核" :destroyOnHide="false"></t-tab-panel>
+        <t-tab-panel :value="1" label="已审核" :destroyOnHide="false"></t-tab-panel>
+        <t-tab-panel :value="2" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
+      </t-tabs>
       <t-table
         rowKey="index"
         :data="list"
@@ -68,7 +73,7 @@
                 <div style="height: 200px" v-if="typeof (updateInfo.member_log.introduction) !='undefined'">个人经历：</div>
                 <div style="height: 100px;text-align: center;line-height: 100px" v-if="typeof (updateInfo.member_log.company_image) !='undefined'">公司图标：</div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_name) !='undefined'">公司名称：</div>
-                <div v-if="typeof (updateInfo.member_log.industry_name) !='undefined'">公司行业：</div>
+                <div v-if="typeof (updateInfo.member_log.industry_id) !='undefined'">公司行业：</div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_location) !='undefined'">公司地址：</div>
                 <div style="height: 200px" v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">公司介绍：</div>
               </t-space>
@@ -102,7 +107,7 @@
                   </div>
                 </div>
                 <div v-if="typeof (updateInfo.member.enterprise_name) !='undefined'">{{ updateInfo.member.enterprise_name }}</div>
-                <div v-if="typeof (updateInfo.member.industry_name) !='undefined'">{{ updateInfo.member.industry_name }}</div>
+                <div v-if="typeof (updateInfo.member.industry_id) !='undefined'">{{updateInfo.member.industry_id==-1?'其他行业':updateInfo.member.industry_name }}</div>
                 <div v-if="typeof (updateInfo.member.enterprise_location) !='undefined'">{{ updateInfo.member.enterprise_location==''?'无':updateInfo.member.enterprise_location }}</div>
                 <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member.enterprise_Introduction) !='undefined'">{{ updateInfo.member.enterprise_Introduction }}</div>
               </t-space>
@@ -135,7 +140,7 @@
                   </div>
                 </div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_name) !='undefined'">{{ updateInfo.member_log.enterprise_name }}</div>
-                <div v-if="typeof (updateInfo.member_log.industry_name) !='undefined'">{{ updateInfo.member_log.industry_name }}</div>
+                <div v-if="typeof (updateInfo.member_log.industry_id) !='undefined'">{{updateInfo.member_log.industry_id==-1?'其他行业':updateInfo.member_log.industry_name }}</div>
                 <div v-if="typeof (updateInfo.member_log.enterprise_location) !='undefined'">{{ updateInfo.member_log.enterprise_location }}</div>
                 <div style="height: 200px;overflow: scroll;" v-if="typeof (updateInfo.member_log.enterprise_Introduction) !='undefined'">{{ updateInfo.member_log.enterprise_Introduction }}</div>
               </t-space>
@@ -173,7 +178,7 @@ export default {
       association: {},
       ShenMode: false,
       list: [],
-      tabIndex: 1,
+      tabIndex: 0,
       columns: [
         {colKey: 'nikename', title: '会员姓名'},
         {colKey: 'createtime', title: '申请时间'},
@@ -197,6 +202,12 @@ export default {
     this.getList();
   },
   methods: {
+    tabIndexChange(d){
+      console.log(d);
+      this.list = [];
+      this.total = 0;
+      this.getList();
+    },
     shenDo(dis) {
       if (dis == 2 && this.content == '') {
         this.$message.error('请填写拒绝理由！');
@@ -247,7 +258,7 @@ export default {
     },
     getList() {
       this.$request
-        .post("/member_log/index", {page: this.page, size: this.size})
+        .post("/member_log/index", {page: this.page, size: this.size,if_xianshi:this.tabIndex})
         .then((res) => {
           console.log(res);
           this.list = res.data.ret;
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 51f474e..d8b596e 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -15,7 +15,7 @@
         </t-descriptions-item>
         <t-descriptions-item label="会员姓名" :content="info.nikename"></t-descriptions-item>
         <t-descriptions-item label="职位" :content="info.position_name"></t-descriptions-item>
-        <t-descriptions-item label="行业" :content="info.industry_id==0?'其他行业':info.industry_name"></t-descriptions-item>
+        <t-descriptions-item label="行业" :content="info.industry_id==-1?'其他行业':info.industry_name"></t-descriptions-item>
         <t-descriptions-item label="区域" :content="info.region_name"></t-descriptions-item>
         <t-descriptions-item label="手机号" :content="info.phone"></t-descriptions-item>
         <t-descriptions-item label="性别">
diff --git a/src/pages/user/user_line.vue b/src/pages/user/user_line.vue
index 4a9991d..eacaf14 100644
--- a/src/pages/user/user_line.vue
+++ b/src/pages/user/user_line.vue
@@ -94,7 +94,7 @@ export default {
         .then((res) => {
           console.log(res);
           this.list = res.data;
-          this.list.push({id:0,industry_name:'其他行业'});
+          this.list.push({id:-1,industry_name:'其他行业'});
         })
         .catch((e) => {
           console.log(e);
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index 9b1b23b..464051d 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -90,6 +90,12 @@ export default [
     redirect: '/association/index',
     meta: { title: '协会管理', icon: HomeIcon },
     children: [
+      {
+        path: 'person ',
+        name: 'associationPerson',
+        component: () => import('@/pages/association/person.vue'),
+        meta: { title: '管理员' },
+      },
       {
         path: 'carousel ',
         name: 'associationCarousel',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 5e21a65..ffda0a0 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,9 +6,9 @@ const InitUserInfo = {
 const state = {
   token: localStorage.getItem('associationToken') || '', // 默认token不走权限
   userInfo: InitUserInfo,
-  association:localStorage.getItem('associationInfo') || '',
+  association: localStorage.getItem('associationInfo') || '',
   //apiUrl:'http://192.168.3.130',
-  apiUrl:'https://ysx.0rui.cn'
+  apiUrl: 'https://ysx.0rui.cn'
 };
 
 const mutations = {
@@ -24,7 +24,7 @@ const mutations = {
     state.userInfo = userInfo;
   },
   setAssociation(state, Association) {
-    localStorage.setItem('associationInfo',  JSON.stringify(Association) );
+    localStorage.setItem('associationInfo', JSON.stringify(Association));
     state.association = Association;
   },
   removeAssociation(state) {
@@ -39,49 +39,59 @@ const getters = {
 };
 
 const actions = {
-  async login({ commit }, userInfo) {
+  async login({commit}, userInfo) {
     const mockLogin = async (userInfo) => {
       // 登录请求流程
       console.log(userInfo);
-      commit('setAssociation',userInfo);
-      return{
+      commit('setAssociation', userInfo);
+      return {
         code: 200,
       }
     };
 
     const res = await mockLogin(userInfo);
     if (res.code === 200) {
-      console.log('token',userInfo.token);
-      commit('setToken',userInfo.token);
+      console.log('token', userInfo.token);
+      commit('setToken', userInfo.token);
     } else {
       return res;
     }
   },
-  async getUserInfo({ commit, state }) {
+  async getUserInfo({commit, state}) {
     const mockRemoteUserInfo = async (token) => {
+      if (typeof (token) == 'object') {
+        var key = token;
+      } else {
+        var key = JSON.parse(token);
+      }
+      if (key.group == 1) {
         return {
           name: 'td_main',
           roles: ['ALL_ROUTERS'],
         };
+      } else {
+        return {
+          name: 'td_dev',
+          roles: ['newsIndex', 'login', 'activityIndex', 'userEditShen', 'userIndex', 'userInfo', 'userEdit'],
+        };
+      }
+
       // if (token === 'main_token') {
       //   return {
       //     name: 'td_main',
       //     roles: ['ALL_ROUTERS'],
       //   };
       // }
-      // return {
-      //   name: 'td_dev',
-      //   roles: ['UserIndex', 'DashboardBase', 'login'],
-      // };
+
     };
 
-    const res = await mockRemoteUserInfo(state.token);
+    const res = await mockRemoteUserInfo(state.association);
 
     commit('setUserInfo', res);
   },
-  async logout({ commit }) {
+  async logout({commit}) {
     commit('removeToken');
-    commit('setUserInfo', InitUserInfo);
+    commit('setUserInfo', []);
   },
 };
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 3c778bf..586229e 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -33,7 +33,7 @@ instance.interceptors.request.use((config) => {
       // 添加token请求头
       config.headers.token = token;
     }
-    config.data = { ...config.data, association_id: association.id};
+    config.data = { ...config.data, association_id: association.association_id};
   }
 
   console.log(config.data);