diff --git a/src/App.vue b/src/App.vue
index 2eecfc4..b81e67d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-view :class="[mode]" />
+  <router-view :key="$route.fullPath" :class="[mode]" />
 </template>
 
 <script>
diff --git a/src/layouts/components/MenuContent.vue b/src/layouts/components/MenuContent.vue
index 2ba62e3..0d2207a 100644
--- a/src/layouts/components/MenuContent.vue
+++ b/src/layouts/components/MenuContent.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="key">
     <template v-for="item in list">
       <template v-if="!item.children || !item.children.length || item.meta?.single">
         <t-menu-item
@@ -15,6 +15,7 @@
           </template>
           {{ item.title }}
         </t-menu-item>
+
         <t-menu-item
           v-else
           :key="`${item.path}`"
@@ -30,10 +31,12 @@
         </t-menu-item>
       </template>
       <t-submenu v-else :name="item.path" :value="item.path" :title="item.title" :key="item.path">
+
         <template #icon>
           <t-icon v-if="typeof item.icon === 'string' && item.icon" :name="item.icon" />
           <renderFnIcon :item="item" />
         </template>
+
         <menu-content v-if="item.children" :nav-data="item.children" />
       </t-submenu>
     </template>
@@ -107,3 +110,8 @@ export default Vue.extend({
   },
 });
 </script>
+<style>
+.key .key .key{
+  padding-left: 20px;
+}
+</style>
diff --git a/src/pages/activity/activity_add.vue b/src/pages/activity/activity_add.vue
new file mode 100644
index 0000000..e703aec
--- /dev/null
+++ b/src/pages/activity/activity_add.vue
@@ -0,0 +1,334 @@
+<template>
+  <t-card :bordered="false">
+    <div style="color: #2E2E2E;font-size: 20px;height: 50px">
+      <span>新增</span>
+      <span v-if="addForm.activity_type==1">协会活动</span>
+      <span v-if="addForm.activity_type==2">调查问卷</span>
+      <span v-if="addForm.activity_type==3">公益捐赠</span>
+      <span v-if="addForm.activity_type==4">学习培训</span>
+    </div>
+    <div>
+      <t-form layout="inline">
+        <t-form-item label="活动标题" name="activity_name">
+          <t-input size="large" placeholder="请输入活动标题" v-model="addForm.activity_name"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动简介" name="activity_desc">
+          <t-input size="large" placeholder="请输入活动简介" v-model="addForm.activity_desc"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动地址" name="activity_location">
+          <t-input size="large" placeholder="请输入活动地址" v-model="addForm.activity_location"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <!--        <t-form-item label="活动类别" name="activity_type">-->
+        <!--          <t-select size="large" v-model="addForm.activity_type" :style="{ width: '480px' }">-->
+        <!--            <t-option key="1" label="协会活动" value="1"/>-->
+        <!--            <t-option key="2" label="调查问卷" value="2"/>-->
+        <!--            <t-option key="3" label="公益捐赠" value="3"/>-->
+        <!--            <t-option key="4" label="学习培训" value="4"/>-->
+        <!--          </t-select>-->
+        <!--        </t-form-item>-->
+        <t-form-item label="显示报名人" name="if_display_registrants">
+          <t-select size="large" v-model="addForm.if_display_registrants" :style="{ width: '480px' }">
+            <t-option key="1" label="显示" value="1"/>
+            <t-option key="2" label="不显示" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名范围" name="range">
+          <t-select size="large" v-model="addForm.range" :style="{ width: '480px' }">
+            <t-option key="1" label="会员" value="1"/>
+            <!--            <t-option key="2" label="非会员" value="2"/>-->
+            <t-option key="3" label="不限制" value="3"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名审核" name="if_auditing">
+          <t-select size="large" v-model="addForm.if_auditing" :style="{ width: '480px' }">
+            <t-option key="1" label="否" value="1"/>
+            <t-option key="2" label="是" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名人数" name="number">
+          <t-input size="large" placeholder="请输入报名人数（0）为不限制" v-model="addForm.number"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+
+        <t-form-item label="签到" name="if_sign">
+          <t-select size="large" v-model="addForm.if_sign" :style="{ width: '480px' }">
+            <t-option label="否" value="1"/>
+            <t-option label="是" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item v-if="addForm.if_sign==2" label="签到积分" name="custom_points">
+          <t-input size="large" placeholder="请输入签到积分" v-model="addForm.custom_points"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item v-if="addForm.activity_type==4" label="付费金额" name="money">
+          <t-input size="large" placeholder="请输入付费金额（0为免费）" v-model="addForm.money"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动主图" :style="{ width: '100%' }">
+          <t-upload
+            ref="uploadRef2"
+            :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"
+            :format-response="formatResponse"
+          ></t-upload>
+        </t-form-item>
+        <t-form-item label="视频" v-if="addForm.activity_type==4" :style="{ width: '100%' }">
+          <t-upload
+            :action="$store.state.user.apiUrl+'/api/common/upload'"
+            v-model="activity_video_show"
+            tips="请选择单个视频文件上传"
+            accept="video/*"
+            :showImageFileName="true"
+            :imageViewerProps="true"
+            :format-response="formatResponseVideo"
+          ></t-upload>
+        </t-form-item>
+        <t-form-item label="活动简介" name="activity_desc">
+          <div style="border: 1px solid #ccc;width: 100%;">
+            <!-- 工具栏 -->
+            <Toolbar
+              style="border-bottom: 1px solid #ccc"
+              mode="default"
+              :editor="editor"
+              :defaultConfig="toolbarConfig"
+            />
+
+            <Editor
+              style="height: 400px;"
+              v-model="addForm.activity_content"
+              :defaultConfig="editorConfig"
+              mode="default"
+              @onCreated="(e) => onCreated(e)"
+            />
+          </div>
+        </t-form-item>
+
+      </t-form>
+      <!--        <t-form-item label="活动排序" name="weigh">-->
+      <!--          <t-input placeholder="请输入排序" v-model="addForm.weigh" :style="{ width: '480px' }"/>-->
+      <!--        </t-form-item>-->
+      <t-form layout="inline" style="margin-top: 20px;">
+        <t-form-item label="报名开始时间" name="signup_start_time">
+          <t-date-picker size="large" :clearable="true" placeholder="报名开始时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.signup_start_time"></t-date-picker>
+        </t-form-item>
+        <t-form-item label="报名结束时间" name="signup_end_time">
+          <t-date-picker size="large" :clearable="true" placeholder="报名结束时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.signup_end_time"></t-date-picker>
+        </t-form-item>
+      </t-form>
+      <t-form layout="inline" style="margin-top: 20px;">
+        <t-form-item label="活动开始时间" name="activity_start_time">
+          <t-date-picker size="large" :clearable="true" placeholder="活动开始时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.activity_start_time"></t-date-picker>
+        </t-form-item>
+        <t-form-item label="活动结束时间" name="activity_end_time">
+          <t-date-picker size="large" :clearable="true" placeholder="活动结束时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.activity_end_time"></t-date-picker>
+        </t-form-item>
+      </t-form>
+      <div style="text-align: center;width: 30%;margin: 0px auto;padding-top: 50px;">
+        <t-button @click="onSubmit" theme="primary" block size="large">
+          提交
+        </t-button>
+      </div>
+    </div>
+  </t-card>
+</template>
+<script lang="ts">
+
+import store from "@/store";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
+import {CloudDownloadIcon} from "tdesign-icons-vue";
+import axios from "axios";
+import {toInteger} from "lodash";
+
+export default {
+  components: {Editor, Toolbar, CloudDownloadIcon},
+  data() {
+    return {
+      addForm: {
+        // weigh:0,
+        money: '0',
+        activity_name: '',
+        activity_desc: '',
+        activity_image_show: [],
+        activity_image: '',
+        activity_start_time: '',
+        activity_end_time: '',
+        activity_content: '',
+        activity_location: '',
+        activity_type: null,
+        if_display_registrants: null,
+        signup_start_time: '',
+        signup_end_time: '',
+        if_auditing: '1',
+        range: '3',
+        number: '',
+        if_sign: '1',
+        custom_points: ''
+      },
+      activity_video: '',
+      activity_video_show: [],
+      addMode: false,
+      editor: null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'uploadVideo',
+          'group-video',
+          'insertImage',// 删除网络图片上传
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+        MENU_CONF: {
+          uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
+            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 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+            onError: (file, err, res) => {
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('限制为50M，请调整好再上传！', 2000);
+              }
+            },
+          }
+        }
+      },
+      association: {},
+      typeName:0,
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    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;
+    var tab=this.$route.name.slice(-1);
+    this.addForm.activity_type = toInteger(tab);
+  },
+
+  methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor);
+    },
+    formatResponseVideo(res) {
+      console.log(res);
+      this.activity_video = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    formatResponse(res) {
+      console.log(res);
+      this.addForm.activity_image = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    onSubmit() {
+      console.log(this.addForm);
+      if (this.addForm.activity_name == '') {
+        this.$message.error('活动标题不能为空');
+        return;
+      }
+      if (this.addForm.activity_desc == '') {
+        this.$message.error('活动简介不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == null) {
+        this.$message.error('活动类别不能为空');
+        return;
+      }
+      if (this.addForm.activity_image == '') {
+        this.$message.error('活动图片不能为空');
+        return;
+      }
+      if (this.addForm.activity_content == '') {
+        this.$message.error('活动详情不能为空');
+        return;
+      }
+      if (this.addForm.activity_start_time == '') {
+        this.$message.error('活动开始时间不能为空');
+        return;
+      }
+      if (this.addForm.activity_end_time == '') {
+        this.$message.error('活动结束时间不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == 1 || this.addForm.activity_type == 4) {
+        if (this.addForm.signup_start_time == '') {
+          this.$message.error('报名开始时间不能为空');
+          return;
+        }
+        if (this.addForm.signup_end_time == '') {
+          this.$message.error('报名结束时间不能为空');
+          return;
+        }
+      }
+      if (this.addForm.activity_location == '') {
+        this.$message.error('活动地址不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == 2 || this.addForm.activity_type == 3) {
+        this.addForm.signup_start_time = this.addForm.activity_start_time;
+        this.addForm.signup_end_time = this.addForm.activity_end_time;
+      }
+      console.log(this.addForm);
+      var url = '/activity/add';
+      this.addForm.video = this.activity_video;
+      this.$request
+        .post(url, this.addForm)
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.$message.success('添加活动成功！');
+            this.$router.push({
+              path: '/activity'+this.addForm.activity_type+'/activity_index'+this.addForm.activity_type,
+            },500);
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+
+  }
+}
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/activity/activity_edit.vue b/src/pages/activity/activity_edit.vue
new file mode 100644
index 0000000..90a318b
--- /dev/null
+++ b/src/pages/activity/activity_edit.vue
@@ -0,0 +1,370 @@
+<template>
+  <t-card :bordered="false">
+    <div style="color: #2E2E2E;font-size: 20px;height: 50px">修改协会活动</div>
+    <div>
+      <t-form layout="inline">
+        <t-form-item label="活动标题" name="activity_name">
+          <t-input size="large" placeholder="请输入活动标题" v-model="addForm.activity_name"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动简介" name="activity_desc">
+          <t-input size="large" placeholder="请输入活动简介" v-model="addForm.activity_desc"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动地址" name="activity_location">
+          <t-input size="large" placeholder="请输入活动地址" v-model="addForm.activity_location"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <!--        <t-form-item label="活动类别" name="activity_type">-->
+        <!--          <t-select size="large" v-model="addForm.activity_type" :style="{ width: '480px' }">-->
+        <!--            <t-option key="1" label="协会活动" value="1"/>-->
+        <!--            <t-option key="2" label="调查问卷" value="2"/>-->
+        <!--            <t-option key="3" label="公益捐赠" value="3"/>-->
+        <!--            <t-option key="4" label="学习培训" value="4"/>-->
+        <!--          </t-select>-->
+        <!--        </t-form-item>-->
+        <t-form-item label="显示报名人" name="if_display_registrants">
+          <t-select size="large" v-model="addForm.if_display_registrants" :style="{ width: '480px' }">
+            <t-option key="1" label="显示" value="1"/>
+            <t-option key="2" label="不显示" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名范围" name="range">
+          <t-select size="large" v-model="addForm.range" :style="{ width: '480px' }">
+            <t-option key="1" label="会员" value="1"/>
+            <!--            <t-option key="2" label="非会员" value="2"/>-->
+            <t-option key="3" label="不限制" value="3"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名审核" name="if_auditing">
+          <t-select size="large" v-model="addForm.if_auditing" :style="{ width: '480px' }">
+            <t-option key="1" label="否" value="1"/>
+            <t-option key="2" label="是" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="报名人数" name="number">
+          <t-input size="large" placeholder="请输入报名人数（0）为不限制" v-model="addForm.number"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+
+        <t-form-item label="签到" name="if_sign">
+          <t-select size="large" v-model="addForm.if_sign" :style="{ width: '480px' }">
+            <t-option label="否" value="1"/>
+            <t-option label="是" value="2"/>
+          </t-select>
+        </t-form-item>
+        <t-form-item v-if="addForm.if_sign==2" label="签到积分" name="custom_points">
+          <t-input size="large" placeholder="请输入签到积分" v-model="addForm.custom_points"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item v-if="addForm.activity_type==4" label="付费金额" name="money">
+          <t-input size="large" placeholder="请输入付费金额（0为免费）" v-model="addForm.money"
+                   :style="{ width: '480px' }"/>
+        </t-form-item>
+        <t-form-item label="活动主图" :style="{ width: '100%' }">
+          <t-upload
+            ref="uploadRef2"
+            :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"
+            :format-response="formatResponse"
+          ></t-upload>
+        </t-form-item>
+        <t-form-item label="视频" v-if="addForm.activity_type==4" :style="{ width: '100%' }">
+          <t-upload
+            :action="$store.state.user.apiUrl+'/api/common/upload'"
+            v-model="activity_video_show"
+            tips="请选择单个视频文件上传"
+            accept="video/*"
+            :showImageFileName="true"
+            :imageViewerProps="true"
+            :format-response="formatResponseVideo"
+          ></t-upload>
+        </t-form-item>
+        <t-form-item label="活动简介" name="activity_desc">
+          <div style="border: 1px solid #ccc;width: 100%;">
+            <!-- 工具栏 -->
+            <Toolbar
+              style="border-bottom: 1px solid #ccc"
+              mode="default"
+              :editor="editor"
+              :defaultConfig="toolbarConfig"
+            />
+
+            <Editor
+              style="height: 400px;"
+              v-model="addForm.activity_content"
+              :defaultConfig="editorConfig"
+              mode="default"
+              @onCreated="(e) => onCreated(e)"
+            />
+          </div>
+        </t-form-item>
+
+      </t-form>
+      <!--        <t-form-item label="活动排序" name="weigh">-->
+      <!--          <t-input placeholder="请输入排序" v-model="addForm.weigh" :style="{ width: '480px' }"/>-->
+      <!--        </t-form-item>-->
+      <t-form layout="inline" style="margin-top: 20px;">
+        <t-form-item label="报名开始时间" name="signup_start_time">
+          <t-date-picker size="large" :clearable="true" placeholder="报名开始时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.signup_start_time"></t-date-picker>
+        </t-form-item>
+        <t-form-item label="报名结束时间" name="signup_end_time">
+          <t-date-picker size="large" :clearable="true" placeholder="报名结束时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.signup_end_time"></t-date-picker>
+        </t-form-item>
+      </t-form>
+      <t-form layout="inline" style="margin-top: 20px;">
+        <t-form-item label="活动开始时间" name="activity_start_time">
+          <t-date-picker size="large" :clearable="true" placeholder="活动开始时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.activity_start_time"></t-date-picker>
+        </t-form-item>
+        <t-form-item label="活动结束时间" name="activity_end_time">
+          <t-date-picker size="large" :clearable="true" placeholder="活动结束时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.activity_end_time"></t-date-picker>
+        </t-form-item>
+      </t-form>
+      <div style="text-align: center;width: 30%;margin: 0px auto;padding-top: 50px;">
+        <t-button @click="onSubmit" theme="primary" block size="large">
+          提交
+        </t-button>
+      </div>
+    </div>
+  </t-card>
+</template>
+<script lang="ts">
+
+import store from "@/store";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
+import {CloudDownloadIcon} from "tdesign-icons-vue";
+import axios from "axios";
+
+export default {
+  components: {Editor, Toolbar, CloudDownloadIcon},
+  data() {
+    return {
+      addForm: {
+        // weigh:0,
+        money: '0',
+        activity_name: '',
+        activity_desc: '',
+        activity_image_show: [],
+        activity_image: '',
+        activity_start_time: '',
+        activity_end_time: '',
+        activity_content: '',
+        activity_location: '',
+        activity_type: 1,
+        if_display_registrants: null,
+        signup_start_time: '',
+        signup_end_time: '',
+        if_auditing: '1',
+        range: '3',
+        number: '',
+        if_sign: '1',
+        custom_points: ''
+      },
+      addMode: false,
+      editID: 0,
+      editor: null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'uploadVideo',
+          'group-video',
+          'insertImage',// 删除网络图片上传
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      activity_video: '',
+      activity_video_show: [],
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+        MENU_CONF: {
+          uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
+            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 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+            onError: (file, err, res) => {
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('限制为50M，请调整好再上传！', 2000);
+              }
+            },
+          }
+        }
+      },
+      association: {},
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    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;
+
+    if (typeof (this.$route.query.id) !== 'undefined') {
+      console.log(this.$route.query);
+      this.editID = this.$route.query.id;
+      this.getActInfo();
+    }
+  },
+
+  methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor);
+    },
+    formatResponseVideo(res) {
+      console.log(res);
+      this.activity_video = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    formatResponse(res) {
+      console.log(res);
+      this.addForm.activity_image = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    getActInfo() {
+      this.$request
+        .post('/activity/find', {id: this.editID})
+        .then((res) => {
+          this.edit(res.data);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    edit(d) {
+      this.addForm.id = d.id;
+      this.activity_video = d.video;
+      if (d.video == '') {
+        this.activity_video_show = [];
+      } else {
+        this.activity_video_show = [{url: store.state.user.apiUrl + d.video, name: d.video}];
+      }
+      // this.addForm.weigh = d.weigh;
+      this.addForm.activity_name = d.activity_name;
+      this.addForm.activity_desc = d.activity_desc;
+      this.addForm.activity_image_show = [{url: store.state.user.apiUrl + d.activity_image}];
+      this.addForm.activity_image = d.activity_image;
+      this.addForm.activity_start_time = d.activity_start_time;
+      this.addForm.activity_end_time = d.activity_end_time;
+      this.addForm.activity_location = d.activity_location;
+      this.addForm.activity_content = d.activity_content;
+      this.addForm.activity_type = d.activity_type;
+      this.addForm.if_display_registrants = d.if_display_registrants;
+      this.addForm.money = d.money;
+      this.addForm.signup_start_time = d.signup_start_time;
+      this.addForm.signup_end_time = d.signup_end_time;
+
+      this.addForm.if_auditing = String(d.if_auditing);
+      this.addForm.range = String(d.range);
+      this.addForm.number = String(d.number);
+      this.addForm.if_sign = String(d.if_sign);
+      this.addForm.custom_points = String(d.custom_points);
+    },
+    onSubmit() {
+      console.log(this.addForm);
+      if (this.addForm.activity_name == '') {
+        this.$message.error('活动标题不能为空');
+        return;
+      }
+      if (this.addForm.activity_desc == '') {
+        this.$message.error('活动简介不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == null) {
+        this.$message.error('活动类别不能为空');
+        return;
+      }
+      if (this.addForm.activity_image == '') {
+        this.$message.error('活动图片不能为空');
+        return;
+      }
+      if (this.addForm.activity_content == '') {
+        this.$message.error('活动详情不能为空');
+        return;
+      }
+      if (this.addForm.activity_start_time == '') {
+        this.$message.error('活动开始时间不能为空');
+        return;
+      }
+      if (this.addForm.activity_end_time == '') {
+        this.$message.error('活动结束时间不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == 1 || this.addForm.activity_type == 4) {
+        if (this.addForm.signup_start_time == '') {
+          this.$message.error('报名开始时间不能为空');
+          return;
+        }
+        if (this.addForm.signup_end_time == '') {
+          this.$message.error('报名结束时间不能为空');
+          return;
+        }
+      }
+      if (this.addForm.activity_location == '') {
+        this.$message.error('活动地址不能为空');
+        return;
+      }
+      if (this.addForm.activity_type == 2 || this.addForm.activity_type == 3) {
+        this.addForm.signup_start_time = this.addForm.activity_start_time;
+        this.addForm.signup_end_time = this.addForm.activity_end_time;
+      }
+      console.log(this.addForm);
+      var url = '/activity/update';
+      this.addForm.video = this.activity_video;
+      this.$request
+        .post(url, this.addForm)
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.$message.success('修改活动成功！');
+            this.$router.push({
+              path: '/activity'+this.addForm.activity_type+'/activity_index'+this.addForm.activity_type,
+            },500);
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+
+  }
+}
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue
index 4050497..bcf1cf9 100644
--- a/src/pages/activity/activity_index.vue
+++ b/src/pages/activity/activity_index.vue
@@ -1,13 +1,13 @@
 <template>
   <t-card :bordered="false">
     <div class="form-step-container">
-      <t-button @click="add">新增</t-button>
-      <t-tabs v-model="tabIndex" @change="tabIndexChange">
-        <t-tab-panel value="1" label="协会活动" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel value="2" label="调查问卷" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel value="3" label="公益捐赠" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel value="4" label="学习培训" :destroyOnHide="false"></t-tab-panel>
-      </t-tabs>
+      <!--      <t-button @click="add">新增</t-button>-->
+<!--      <t-tabs v-model="tabIndex" @change="tabIndexChange">-->
+<!--        <t-tab-panel value="1" label="协会活动" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel value="2" label="调查问卷" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel value="3" label="公益捐赠" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel value="4" label="学习培训" :destroyOnHide="false"></t-tab-panel>-->
+<!--      </t-tabs>-->
       <t-table
         rowKey="index"
         :data="list"
@@ -20,28 +20,28 @@
         cellEmptyContent="-"
         :pagination="pagination"
       >
-<!--        <template #activity_image="{ row }">-->
-<!--          <div style="text-align: center;">-->
-<!--            <t-image-->
-<!--              :src="$store.state.user.apiUrl+row.activity_image"-->
-<!--              fit="contain"-->
-<!--              :style="{ width: '120px',margin:'0 auto'}"-->
-<!--            />-->
-<!--          </div>-->
-<!--        </template>-->
+        <!--        <template #activity_image="{ row }">-->
+        <!--          <div style="text-align: center;">-->
+        <!--            <t-image-->
+        <!--              :src="$store.state.user.apiUrl+row.activity_image"-->
+        <!--              fit="contain"-->
+        <!--              :style="{ width: '120px',margin:'0 auto'}"-->
+        <!--            />-->
+        <!--          </div>-->
+        <!--        </template>-->
         <template #start="{ row }">
-          <div>{{row.activity_start_time}}</div>
+          <div>{{ row.activity_start_time }}</div>
           <div>-</div>
-          <div>{{row.activity_end_time}}</div>
+          <div>{{ row.activity_end_time }}</div>
         </template>
         <template #sign="{ row }">
-        <div v-if="row.activity_type==1||row.activity_type==4">
-          <div>{{row.signup_start_time}}</div>
-          <div>-</div>
-          <div>{{row.signup_end_time}}</div>
-        </div>
+          <div v-if="row.activity_type==1||row.activity_type==4">
+            <div>{{ row.signup_start_time }}</div>
+            <div>-</div>
+            <div>{{ row.signup_end_time }}</div>
+          </div>
           <div v-if="row.activity_type!=1&&row.activity_type!=4">
-           -
+            -
           </div>
         </template>
         <template #top="{ row }">
@@ -49,26 +49,26 @@
           <t-button theme="warning" size="small" v-if="row.weigh>0" @click="topNewsDel(row)">取消置顶</t-button>
         </template>
         <template #money="{ row }">
-         <div v-if="row.activity_type==4">
-           <div v-if="row.money>0">
-             <span>￥</span>
-             <span>{{row.money}}</span>
-           </div>
-           <div v-if="row.money==0">
+          <div v-if="row.activity_type==4">
+            <div v-if="row.money>0">
+              <span>￥</span>
+              <span>{{ row.money }}</span>
+            </div>
+            <div v-if="row.money==0">
 
-             <span>免费</span>
-           </div>
-         </div>
+              <span>免费</span>
+            </div>
+          </div>
           <div v-if="row.activity_type!=4">
             -
           </div>
         </template>
         <template #qr_code="{ row }">
-          <div style="text-align: center;"  v-if="row.activity_type==4 || row.activity_type==1">
+          <div style="text-align: center;">
             <vue-qr v-if="row.if_sign==2"
-              :text="$store.state.user.apiUrl+'?type=1&id='+row.id+'&association_id='+association.association_id"
-              width="100"
-              height="100"
+                    :text="$store.state.user.apiUrl+'?type=1&id='+row.id+'&association_id='+association.association_id"
+                    width="100"
+                    height="100"
             ></vue-qr>
           </div>
           <div v-if="row.activity_type!=4 && row.activity_type!=1 && row.if_sign==1">
@@ -85,10 +85,13 @@
         </template>
         <template #select="{ row }">
           <t-space size="24px">
-            <t-button v-if="row.activity_type==1"  @click="openInfo(row)">报名详情</t-button>
-            <t-button v-if="row.activity_type==2" theme="default" @click="openQuestionnairefind(row)">新增题目</t-button>
-            <t-button v-if="row.activity_type==2"  theme="primary" @click="openQuestionnaireUpdate(row)">编辑题目</t-button>
-            <t-button v-if="row.activity_type==2" theme="success" @click="openQuestionnaireMode(row)">问卷统计</t-button>
+            <t-button v-if="row.activity_type==1" @click="openInfo(row)">报名详情</t-button>
+            <t-button v-if="row.activity_type==2" theme="default" @click="openQuestionnairefind(row)">新增题目
+            </t-button>
+            <t-button v-if="row.activity_type==2" theme="primary" @click="openQuestionnaireUpdate(row)">编辑题目
+            </t-button>
+            <t-button v-if="row.activity_type==2" theme="success" @click="openQuestionnaireMode(row)">问卷统计
+            </t-button>
             <t-button v-if="row.activity_type==3" @click="openJuanMode(row)">捐赠详情</t-button>
             <t-button v-if="row.activity_type==4" @click="openJuanMode(row)">付费详情</t-button>
             <t-button theme="warning" @click="edit(row)">编辑</t-button>
@@ -110,64 +113,73 @@
     <t-dialog header="报名详情" :confirmBtn="null" :visible="infoMode" :onClose="onCloseMy" width="65%" top="50px">
       <div style="height: 650px;overflow-y: scroll;">
         <div style="text-align: right">
-          <t-button @click="exportList(0)"><CloudDownloadIcon slot="icon" />导出</t-button>
+          <t-button @click="exportList(0)">
+            <CloudDownloadIcon slot="icon"/>
+            导出
+          </t-button>
         </div>
-       <div v-if="infoIfAuditing==2">
-         <t-tabs v-model="InfotabIndex" @change="InfotabIndexChange">
-           <t-tab-panel value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>
-           <t-tab-panel value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>
-           <t-tab-panel value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
-         </t-tabs>
-       </div>
-      <t-table
-        rowKey="index"
-        :data="info_list"
-        :columns="info_columns"
-        :stripe="false"
-        :bordered="false"
-        :hover="true"
-        size="large"
-        table-layout="auto"
-        cellEmptyContent="-"
-      >
-        <template #nikename="{ row }">
-          <a :href="$store.state.user.apiUrl+'/dist/#/user/user_info?id='+row.member_id" target="_blank">{{row.nikename}}</a>
-        </template>
-        <template #sign="{ row }">
+        <div v-if="infoIfAuditing==2">
+          <t-tabs v-model="InfotabIndex" @change="InfotabIndexChange">
+            <t-tab-panel value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>
+            <t-tab-panel value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>
+            <t-tab-panel value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
+          </t-tabs>
+        </div>
+        <t-table
+          rowKey="index"
+          :data="info_list"
+          :columns="info_columns"
+          :stripe="false"
+          :bordered="false"
+          :hover="true"
+          size="large"
+          table-layout="auto"
+          cellEmptyContent="-"
+        >
+          <template #nikename="{ row }">
+            <a :href="$store.state.user.apiUrl+'/dist/#/user/user_info?id='+row.member_id"
+               target="_blank">{{ row.nikename }}</a>
+          </template>
+          <template #sign="{ row }">
             <t-tag v-if="row.sign==1" theme="success">已签到</t-tag>
             <t-tag v-if="row.sign==2" theme="warning">未签到</t-tag>
-        </template>
-        <template #photo_image="{ row }">
-          <img v-if="row.photo_image!=''&&row.photo_image!=null" :src="$store.state.user.apiUrl+row.photo_image" style="width: 50px;height: 50px">
-          <div v-if="row.photo_image==''||row.photo_image==null">无</div>
-        </template>
-        <template #select="{ row }">
-          <div  v-if="infoIfAuditing==2&&InfotabIndex==1">
-            <t-popconfirm content="确认要拒绝吗？" @confirm="updateType(row,3)">
-              <t-button  theme="danger" variant="base">拒绝</t-button>
-            </t-popconfirm>
-            <t-popconfirm content="确认要通过吗？" @confirm="updateType(row,2)">
-              <t-button  theme="success" style="margin-left: 15px">通过</t-button>
-            </t-popconfirm>
-          </div>
-        </template>
-      </t-table>
-      <div style="margin-top: 30px">
-        <t-pagination
-          :total="info_pagination.total"
-          :page-size="info_pagination.size"
-          @current-change="onCurrentChangeInfo"
-          :showPageSize="false"
-        ></t-pagination>
-      </div>
+          </template>
+          <template #photo_image="{ row }">
+            <img v-if="row.photo_image!=''&&row.photo_image!=null" :src="$store.state.user.apiUrl+row.photo_image"
+                 style="width: 50px;height: 50px">
+            <div v-if="row.photo_image==''||row.photo_image==null">无</div>
+          </template>
+          <template #select="{ row }">
+            <div v-if="infoIfAuditing==2&&InfotabIndex==1">
+              <t-popconfirm content="确认要拒绝吗？" @confirm="updateType(row,3)">
+                <t-button theme="danger" variant="base">拒绝</t-button>
+              </t-popconfirm>
+              <t-popconfirm content="确认要通过吗？" @confirm="updateType(row,2)">
+                <t-button theme="success" style="margin-left: 15px">通过</t-button>
+              </t-popconfirm>
+            </div>
+          </template>
+        </t-table>
+        <div style="margin-top: 30px">
+          <t-pagination
+            :total="info_pagination.total"
+            :page-size="info_pagination.size"
+            @current-change="onCurrentChangeInfo"
+            :showPageSize="false"
+          ></t-pagination>
+        </div>
       </div>
     </t-dialog>
-    <t-dialog header="问卷统计" :confirmBtn="null" :visible="QuestionnaireMode" :onClose="onCloseMy" width="65%" top="50px">
+    <t-dialog header="问卷统计" :confirmBtn="null" :visible="QuestionnaireMode" :onClose="onCloseMy" width="65%"
+              top="50px">
       <div style="height: 600px;overflow-y: scroll;">
         <div style="display: flex; justify-content: space-between;">
           <div style="font-size: 18px;font-weight: 600;color: #e60000;margin: 15px 0px"></div>
           <div>
-            <t-button @click="exportList(1)"><CloudDownloadIcon slot="icon" />导出</t-button>
+            <t-button @click="exportList(1)">
+              <CloudDownloadIcon slot="icon"/>
+              导出
+            </t-button>
           </div>
         </div>
         <table class="layui-table" v-for="(item,index) in questionnaireDaAnList" style="margin: 10px 0px">
@@ -179,42 +191,43 @@
               <span v-if="item.type==2">（多选题）</span>
               <span v-if="item.type==3">（问答题）</span>
             </th>
-            <th class="my-fw-bold my-fs-14">{{item.title}}</th>
+            <th class="my-fw-bold my-fs-14">{{ item.title }}</th>
             <th class="my-fw-bold my-fs-14" v-if="item.type!=3">票数</th>
-            <th class="my-fw-bold my-fs-14" v-if="item.type==3">答题数：{{item.quantity}}</th>
+            <th class="my-fw-bold my-fs-14" v-if="item.type==3">答题数：{{ item.quantity }}</th>
           </tr>
           </thead>
           <tbody>
           <tr v-if="item.type!=3" v-for="(d,i) in item.option">
-            <td style="text-align: center">{{d.name}}</td>
-            <td>{{d.val}}</td>
-            <td>{{d.num}}</td>
+            <td style="text-align: center">{{ d.name }}</td>
+            <td>{{ d.val }}</td>
+            <td>{{ d.num }}</td>
           </tr>
           <tr v-if="item.type==3" v-for="(d,i) in item.list">
             <td style="text-align: center">-</td>
-            <td style="text-align: center" :colspan="2">{{d.option}}</td>
+            <td style="text-align: center" :colspan="2">{{ d.option }}</td>
           </tr>
           </tbody>
         </table>
       </div>
     </t-dialog>
-    <t-dialog :header="getType==3?'捐赠详情':'付费详情'" :confirmBtn="null" :visible="JuanMode" :onClose="onCloseMy" width="65%" top="50px">
+    <t-dialog :header="getType==3?'捐赠详情':'付费详情'" :confirmBtn="null" :visible="JuanMode" :onClose="onCloseMy"
+              width="65%" top="50px">
       <div style="height: 600px;overflow-y: scroll;">
         <table class="layui-table" style="margin: 10px 0px">
           <thead>
           <tr>
             <th class="my-fw-bold my-fs-14">
-              <span>{{getType==3?'捐赠人':'付费姓名'}}</span>
+              <span>{{ getType == 3 ? '捐赠人' : '付费姓名' }}</span>
             </th>
             <th class="my-fw-bold my-fs-14">金额</th>
-            <th class="my-fw-bold my-fs-14">{{getType==3?'捐赠时间':'付费时间'}}</th>
+            <th class="my-fw-bold my-fs-14">{{ getType == 3 ? '捐赠时间' : '付费时间' }}</th>
           </tr>
           </thead>
           <tbody>
-          <tr v-for="(item,index) in JuanModeList" >
-            <td style="text-align: center">{{item.nikename}}</td>
-            <td style="text-align: center">{{item.money}}元</td>
-            <td style="text-align: center">{{item.createtime}}</td>
+          <tr v-for="(item,index) in JuanModeList">
+            <td style="text-align: center">{{ item.nikename }}</td>
+            <td style="text-align: center">{{ item.money }}元</td>
+            <td style="text-align: center">{{ item.createtime }}</td>
           </tr>
           </tbody>
         </table>
@@ -228,138 +241,14 @@
         </div>
       </div>
     </t-dialog>
-    <t-dialog :header="isEdit?'编辑活动':'新增活动'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"
-              width="45%" top="20px">
-      <t-form  layout="inline">
-        <t-form-item label="活动标题" name="activity_name">
-          <t-input placeholder="请输入活动标题" v-model="addForm.activity_name" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item label="活动简介" name="activity_desc">
-          <t-input placeholder="请输入活动简介" v-model="addForm.activity_desc" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item label="活动地址" name="activity_location">
-          <t-input placeholder="请输入活动地址" v-model="addForm.activity_location" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item label="活动类别" name="activity_type" >
-          <t-select v-model="addForm.activity_type" :style="{ width: '480px' }">
-            <t-option key="1" label="协会活动" value="1"/>
-            <t-option key="2" label="调查问卷" value="2"/>
-            <t-option key="3" label="公益捐赠" value="3"/>
-            <t-option key="4" label="学习培训" value="4"/>
-          </t-select>
-        </t-form-item>
-        <t-form-item label="显示报名人" name="if_display_registrants" >
-          <t-select v-model="addForm.if_display_registrants" :style="{ width: '480px' }">
-            <t-option key="1" label="显示" value="1"/>
-            <t-option key="2" label="不显示" value="2"/>
-          </t-select>
-        </t-form-item>
-        <t-form-item label="报名范围" name="range" >
-          <t-select v-model="addForm.range" :style="{ width: '480px' }">
-            <t-option key="1" label="会员" value="1"/>
-<!--            <t-option key="2" label="非会员" value="2"/>-->
-            <t-option key="3" label="不限制" value="3"/>
-          </t-select>
-        </t-form-item>
-        <t-form-item label="报名审核" name="if_auditing" >
-          <t-select v-model="addForm.if_auditing" :style="{ width: '480px' }">
-            <t-option key="1" label="否" value="1"/>
-            <t-option key="2" label="是" value="2"/>
-          </t-select>
-        </t-form-item>
-        <t-form-item label="报名人数" name="number" >
-          <t-input placeholder="请输入报名人数（0）为不限制" v-model="addForm.number" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item label="签到" name="if_sign" >
-          <t-select v-model="addForm.if_sign" :style="{ width: '480px' }">
-            <t-option  label="否" value="1"/>
-            <t-option  label="是" value="2"/>
-          </t-select>
-        </t-form-item>
-        <t-form-item v-if="addForm.if_sign==2" label="签到积分" name="custom_points">
-          <t-input placeholder="请输入签到积分" v-model="addForm.custom_points" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item v-if="addForm.activity_type==4" label="付费金额" name="money">
-          <t-input placeholder="请输入付费金额（0为免费）" v-model="addForm.money" :style="{ width: '480px' }"/>
-        </t-form-item>
-        <t-form-item label="活动简介" name="activity_desc">
-          <div style="border: 1px solid #ccc;" >
-            <!-- 工具栏 -->
-            <Toolbar
-              style="border-bottom: 1px solid #ccc"
-              mode="default"
-              :editor="editor"
-              :defaultConfig="toolbarConfig"
-            />
 
-            <Editor
-              style="height: 200px"
-              v-model="addForm.activity_content"
-              :defaultConfig="editorConfig"
-              mode="default"
-              @onCreated="(e) => onCreated(e)"
-            />
-          </div>
-        </t-form-item>
-        <t-form-item label="视频" v-if="addForm.activity_type==4">
-          <t-upload
-            :action="$store.state.user.apiUrl+'/api/common/upload'"
-            v-model="activity_video_show"
-            tips="请选择单个视频文件上传"
-            accept="video/*"
-            :showImageFileName="true"
-            :imageViewerProps="true"
-            :format-response="formatResponseVideo"
-          ></t-upload>
-        </t-form-item>
-        <t-form-item label="活动主图" >
-          <t-upload
-            ref="uploadRef2"
-            :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"
-            :format-response="formatResponse"
-          ></t-upload>
-        </t-form-item>
-        <div style="width: 100%"></div>
-<!--        <t-form-item label="活动排序" name="weigh">-->
-<!--          <t-input placeholder="请输入排序" v-model="addForm.weigh" :style="{ width: '480px' }"/>-->
-<!--        </t-form-item>-->
-        <template v-if="addForm.activity_type==1||addForm.activity_type==4">
-          <t-form-item label="报名开始时间" name="signup_start_time">
-            <t-date-picker :clearable="true"  placeholder="报名开始时间"
-                           :enableTimePicker="true" :allow-input="false"
-                           v-model="addForm.signup_start_time"></t-date-picker>
-          </t-form-item>
-          <t-form-item label="报名结束时间" name="signup_end_time">
-            <t-date-picker :clearable="true"  placeholder="报名结束时间"
-                           :enableTimePicker="true" :allow-input="false"
-                           v-model="addForm.signup_end_time"></t-date-picker>
-          </t-form-item>
-        </template>
-          <t-form-item label="活动开始时间" name="activity_start_time">
-            <t-date-picker :clearable="true"  placeholder="活动开始时间"
-                           :enableTimePicker="true" :allow-input="false"
-                           v-model="addForm.activity_start_time"></t-date-picker>
-          </t-form-item>
-          <t-form-item label="活动结束时间" name="activity_end_time">
-            <t-date-picker :clearable="true"  placeholder="活动结束时间"
-                           :enableTimePicker="true" :allow-input="false"
-                           v-model="addForm.activity_end_time"></t-date-picker>
-          </t-form-item>
-      </t-form>
-    </t-dialog>
 
     <t-dialog header="新增题目" :visible="questionnaireAddMode" :onClose="onCloseMy" @confirm="onSubmitQuestionnaire"
               width="45%" top="20px">
       <div style="height: 600px;overflow-y: scroll;">
         <t-form>
           <t-card v-for="(item,index) in questionnaireData" style="margin-bottom: 10px">
-            <template >
+            <template>
               <t-form-item label="类型">
                 <t-radio-group v-model="item.type">
                   <t-radio :value="1">单选题</t-radio>
@@ -375,13 +264,17 @@
               </t-form-item>
               <t-form-item :label="op.name" v-for="(op,opi) in item.option" v-if="item.type!=3">
                 <t-input v-model="op.val" placeholder="请输入选项答案"></t-input>
-                <t-button @click="delOptionItem(index,opi)" theme="danger" size="small" variant="base" style="margin-left: 20px">X</t-button>
+                <t-button @click="delOptionItem(index,opi)" theme="danger" size="small" variant="base"
+                          style="margin-left: 20px">X
+                </t-button>
               </t-form-item>
               <div style="text-align: center" v-if="item.type!=3">
                 <t-button @click="addOption(index)" theme="primary" variant="base">添加一个选项</t-button>
               </div>
               <div style="position:absolute;right: 20px;top: 20px">
-                <t-button @click="delOptionTop(index)" theme="danger" size="small" variant="base" style="margin-left: 20px">删除题目</t-button>
+                <t-button @click="delOptionTop(index)" theme="danger" size="small" variant="base"
+                          style="margin-left: 20px">删除题目
+                </t-button>
               </div>
             </template>
           </t-card>
@@ -392,12 +285,13 @@
         </t-form>
       </div>
     </t-dialog>
-    <t-dialog header="编辑题目" :visible="questionnaireUpdateMode" :confirmBtn="null"  :onClose="onCloseMy" @confirm="onCloseMy"
+    <t-dialog header="编辑题目" :visible="questionnaireUpdateMode" :confirmBtn="null" :onClose="onCloseMy"
+              @confirm="onCloseMy"
               width="45%" top="20px">
       <div style="height: 600px;overflow-y: scroll;">
         <t-form>
           <t-card v-for="(item,index) in questionnaire" style="margin-bottom: 10px">
-            <template >
+            <template>
               <t-form-item label="类型">
                 <t-radio-group v-model="item.type">
                   <t-radio :value="1">单选题</t-radio>
@@ -411,9 +305,11 @@
               <t-form-item label="题目">
                 <t-input v-model="item.title" placeholder="请输入题目"></t-input>
               </t-form-item>
-              <t-form-item  v-for="(op,opi) in item.option" :label="op.name" v-if="item.type!=3">
+              <t-form-item v-for="(op,opi) in item.option" :label="op.name" v-if="item.type!=3">
                 <t-input v-model="op.val" placeholder="请输入选项答案"></t-input>
-                <t-button @click="delUpdateOptionItem(index,opi)" theme="danger" size="small" variant="base" style="margin-left: 20px">X</t-button>
+                <t-button @click="delUpdateOptionItem(index,opi)" theme="danger" size="small" variant="base"
+                          style="margin-left: 20px">X
+                </t-button>
               </t-form-item>
               <div style="text-align: center" v-if="item.type!=3">
                 <t-button @click="addOption(index)" theme="primary" variant="base">添加一个选项</t-button>
@@ -442,20 +338,22 @@ import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
 import {CloudDownloadIcon} from "tdesign-icons-vue";
 import VueQr from 'vue-qr'
 import axios from "axios";
+import {toInteger} from "lodash";
+
 export default {
-  components: {Editor, Toolbar,CloudDownloadIcon,VueQr},
+  components: {Editor, Toolbar, CloudDownloadIcon, VueQr},
   data() {
     return {
       questionnaireData: [{
-        type: 1, title: '', wight:0,option: [{name: 'A', val: ""}, {name: 'B', val: ""}]
+        type: 1, title: '', wight: 0, option: [{name: 'A', val: ""}, {name: 'B', val: ""}]
       }],
-      InfotabIndex:'2',
+      InfotabIndex: '2',
       tabIndex: '1',
       visible: false,
       infoMode: false,
       addForm: {
         // weigh:0,
-        money:'0',
+        money: '0',
         activity_name: '',
         activity_desc: '',
         activity_image_show: [],
@@ -465,17 +363,17 @@ export default {
         activity_content: '',
         activity_location: '',
         activity_type: null,
-        if_display_registrants:null,
-        signup_start_time:'',
-        signup_end_time:'',
-        if_auditing:'1',
-        range:'3',
-        number:'',
-        if_sign:'1',
-        custom_points:''
+        if_display_registrants: null,
+        signup_start_time: '',
+        signup_end_time: '',
+        if_auditing: '1',
+        range: '3',
+        number: '',
+        if_sign: '1',
+        custom_points: ''
       },
-      activity_video:'',
-      activity_video_show:[],
+      activity_video: '',
+      activity_video_show: [],
       addMode: false,
       isEdit: false,
       editID: 0,
@@ -496,17 +394,7 @@ export default {
         total: 0,
       },
       list: [],
-      columns: [
-        {colKey: 'activity_name', title: '活动标题', align: 'center',width: 150,},
-        {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
-        {colKey: 'qr_code', title: '签到二维码', width: 200, align: 'center'},
-        {colKey: 'start', title: '活动时间', align: 'center'},
-        {colKey: 'sign', title: '报名时间', align: 'center'},
-        {colKey: 'money', title: '付费金额', align: 'center'},
-        {colKey: 'activity_location', title: '活动地点', align: 'center'},
-        {colKey: 'top', title: '置顶', align: 'center'},
-        {colKey: 'select', title: '操作', width: 200, align: 'center'},
-      ],
+      columns: [],
       pagination: {
         page: 1,
         size: 10,
@@ -536,7 +424,7 @@ export default {
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             metaWithUrl: false,
-            meta:{
+            meta: {
               association_id: 0,
             },
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
@@ -546,9 +434,9 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
-            onError:(file, err, res)=>{
-              if(err.message.indexOf('exceeds maximum allowed size') !== -1){
-                this.$message.error('限制为50M，请调整好再上传！',2000);
+            onError: (file, err, res) => {
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('限制为50M，请调整好再上传！', 2000);
               }
             },
           }
@@ -556,19 +444,19 @@ export default {
       },
       questionnaireAddMode: false,//问题模态框
       questionnaire: [],//问题列表
-      questionnaireId:0,
-      questionnaireUpdateMode:false,
-      QuestionnaireMode:false,
-      QuestionnaireModeId:0,
-      questionnaireDaAnList:[],
-      JuanModeList:[],
-      JuanMode:false,
-      JuanPage:1,
-      JuanTotal:0,
-      JuanId:0,
-      getType:3,
-      infoIfAuditing:1,//否
-      association:{},
+      questionnaireId: 0,
+      questionnaireUpdateMode: false,
+      QuestionnaireMode: false,
+      QuestionnaireModeId: 0,
+      questionnaireDaAnList: [],
+      JuanModeList: [],
+      JuanMode: false,
+      JuanPage: 1,
+      JuanTotal: 0,
+      JuanId: 0,
+      getType: 3,
+      infoIfAuditing: 1,//否
+      association: {},
     }
   },
   beforeDestroy() {
@@ -577,18 +465,65 @@ 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);
+    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;
+    var tab=this.$route.name.slice(-1);
+    this.tabIndex = toInteger(tab);
+    if(tab==1){
+      this.columns=[
+        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 150,},
+        {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
+        {colKey: 'qr_code', title: '签到二维码', width: 200, align: 'center'},
+        {colKey: 'start', title: '活动时间', align: 'center'},
+        {colKey: 'sign', title: '报名时间', align: 'center'},
+        // {colKey: 'money', title: '付费金额', align: 'center'},
+        {colKey: 'activity_location', title: '活动地点', align: 'center'},
+        {colKey: 'top', title: '置顶', align: 'center'},
+        {colKey: 'select', title: '操作', width: 200, align: 'center'},
+      ];
+    }else if(tab==2){
+      this.columns=[
+        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 150,},
+        {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
+        {colKey: 'qr_code', title: '签到二维码', width: 200, align: 'center'},
+        {colKey: 'start', title: '活动时间', align: 'center'},
+        {colKey: 'activity_location', title: '活动地点', align: 'center'},
+        {colKey: 'top', title: '置顶', align: 'center'},
+        {colKey: 'select', title: '操作', width: 200, align: 'center'},
+      ];
+    }else if(tab==3){
+      this.columns=[
+        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 150,},
+        {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
+        {colKey: 'qr_code', title: '签到二维码', width: 200, align: 'center'},
+        {colKey: 'start', title: '活动时间', align: 'center'},
+        {colKey: 'activity_location', title: '活动地点', align: 'center'},
+        {colKey: 'top', title: '置顶', align: 'center'},
+        {colKey: 'select', title: '操作', width: 200, align: 'center'},
+      ];
+    }else{
+      this.columns=[
+        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 150,},
+        {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
+        {colKey: 'qr_code', title: '签到二维码', width: 200, align: 'center'},
+        {colKey: 'start', title: '活动时间', align: 'center'},
+        {colKey: 'sign', title: '报名时间', align: 'center'},
+        {colKey: 'money', title: '付费金额', align: 'center'},
+        {colKey: 'activity_location', title: '活动地点', align: 'center'},
+        {colKey: 'top', title: '置顶', align: 'center'},
+        {colKey: 'select', title: '操作', width: 200, align: 'center'},
+      ];
     }
-    this.editorConfig.MENU_CONF.uploadImage.meta.association_id=this.association.association_id;
     this.getList();
   },
   methods: {
-    updateType(d,type){
+    updateType(d, type) {
       this.$request
-        .post('/application/updateType', {id: d.id,type:type})
+        .post('/application/updateType', {id: d.id, type: type})
         .then((res) => {
           if (res.code == 1) {
             this.$message.success('审核成功');
@@ -603,19 +538,19 @@ export default {
           console.log(e);
         });
     },
-    openJuanMode(d){
-      this.JuanModeList=[];
-      this.JuanMode=true;
-      this.JuanTotal=0;
-      this.JuanPage=1;
-      this.JuanId=d.id;
-      this.getType=d.activity_type;
+    openJuanMode(d) {
+      this.JuanModeList = [];
+      this.JuanMode = true;
+      this.JuanTotal = 0;
+      this.JuanPage = 1;
+      this.JuanId = d.id;
+      this.getType = d.activity_type;
       this.openJuanModeList();
     },
-    topNewsDel(row){
+    topNewsDel(row) {
       console.log(row);
       this.$request
-        .post('/common/listcancel', {id: row.id,type:'activity'})
+        .post('/common/listcancel', {id: row.id, type: 'activity'})
         .then((res) => {
           if (res.code == 1) {
             this.$message.success('取消置顶成功');
@@ -629,10 +564,10 @@ export default {
           console.log(e);
         });
     },
-    topNews(row){
+    topNews(row) {
       console.log(row);
       this.$request
-        .post('/common/listtopping', {id: row.id,type:'activity'})
+        .post('/common/listtopping', {id: row.id, type: 'activity'})
         .then((res) => {
           if (res.code == 1) {
             this.$message.success('置顶成功');
@@ -646,42 +581,42 @@ export default {
           console.log(e);
         });
     },
-    openJuanModeList(){
+    openJuanModeList() {
       this.$request
         .post("/money_log/find", {
-          activity_id:  this.JuanId,
-          page:this.JuanPage,
-          size:15
+          activity_id: this.JuanId,
+          page: this.JuanPage,
+          size: 15
         })
         .then((res) => {
           console.log(res);
-          if(res.code==1){
-            this.JuanModeList=res.data.ret;
-            this.JuanTotal=res.data.count;
+          if (res.code == 1) {
+            this.JuanModeList = res.data.ret;
+            this.JuanTotal = res.data.count;
           }
         })
         .catch((e) => {
           console.log(e);
         });
     },
-    onJuanChange(d){
-      this.JuanPage=d;
+    onJuanChange(d) {
+      this.JuanPage = d;
       this.openJuanModeList();
     },
-    openQuestionnaireMode(d){
-      this.QuestionnaireMode=true;
-      this.QuestionnaireModeId=d.id;
+    openQuestionnaireMode(d) {
+      this.QuestionnaireMode = true;
+      this.QuestionnaireModeId = d.id;
       this.openQuestionnaireModeDo();
     },
-    openQuestionnaireModeDo(d){
+    openQuestionnaireModeDo(d) {
       this.$request
         .post("/questionnaire/questionnaireStatistics", {
-          activity_id:  this.QuestionnaireModeId
+          activity_id: this.QuestionnaireModeId
         })
         .then((res) => {
           console.log(res);
-          if(res.code==1){
-            this.questionnaireDaAnList=res.data;
+          if (res.code == 1) {
+            this.questionnaireDaAnList = res.data;
           }
         })
         .catch((e) => {
@@ -689,9 +624,9 @@ export default {
         });
     },
     //删除编辑题目里的单条选项
-    delUpdateOptionTop(index,item){
+    delUpdateOptionTop(index, item) {
       console.log(item);
-      if(this.questionnaire.length<=1){
+      if (this.questionnaire.length <= 1) {
         this.$message.error('至少保留一个题目');
         return;
       }
@@ -702,27 +637,27 @@ export default {
         })
         .then((res) => {
           console.log(res);
-          if(res.code==1){
+          if (res.code == 1) {
             //删除成功
             this.$message.success('删除成功');
-          }else{
+          } else {
             this.$message.error(res.msg);
           }
-          this.openQuestionnaireUpdate({id:item.activity_id});
+          this.openQuestionnaireUpdate({id: item.activity_id});
         })
         .catch((e) => {
           console.log(e);
         });
     },
-    delOptionTop(index){
-      if(this.questionnaireData.length<=1){
+    delOptionTop(index) {
+      if (this.questionnaireData.length <= 1) {
         this.$message.error('至少保留一个题目');
         return;
       }
       this.questionnaireData.splice(index, 1);
     },
-    delUpdateOptionItem(index,opIndex){
-      if( this.questionnaire[index].option.length<=2){
+    delUpdateOptionItem(index, opIndex) {
+      if (this.questionnaire[index].option.length <= 2) {
         this.$message.error('至少保留两个选项');
         return;
       }
@@ -731,8 +666,8 @@ export default {
         item.name = String.fromCharCode(65 + index);
       });
     },
-    delOptionItem(index,opIndex){
-      if( this.questionnaireData[index].option.length<=2){
+    delOptionItem(index, opIndex) {
+      if (this.questionnaireData[index].option.length <= 2) {
         this.$message.error('至少保留两个选项');
         return;
       }
@@ -741,7 +676,7 @@ export default {
         item.name = String.fromCharCode(65 + index);
       });
     },
-    updateOption(d){
+    updateOption(d) {
       var option = d.option;
       console.log(option);
       const transformedArray = [];
@@ -755,16 +690,16 @@ export default {
       this.$request
         .post("/questionnaire/topicEdit", {
           topic: JSON.stringify(jsonString),
-          id:d.id,
+          id: d.id,
         })
         .then((res) => {
           console.log(res);
-          if(res.code==1){
+          if (res.code == 1) {
             this.$message.success('保存成功');
-          }else{
+          } else {
             this.$message.error(res.msg);
           }
-          this.openQuestionnaireUpdate({id:d.activity_id});
+          this.openQuestionnaireUpdate({id: d.activity_id});
         })
         .catch((e) => {
           console.log(e);
@@ -772,7 +707,7 @@ export default {
     },
     addQuestionnaire() {
       var newItem = {
-        type: 1, title: '',wight:0, option: [{name: 'A', val: ""}, {name: 'B', val: ""}]
+        type: 1, title: '', wight: 0, option: [{name: 'A', val: ""}, {name: 'B', val: ""}]
       };
       this.questionnaireData.push(newItem);
     },
@@ -783,19 +718,19 @@ export default {
       };
       this.questionnaireData[index].option.push(newItem);
     },
-    onSubmitQuestionnaire(){
+    onSubmitQuestionnaire() {
       let jsonString = JSON.stringify(this.questionnaireData);
       console.log(jsonString);
       this.$request
         .post("/questionnaire/topicAdd", {
           activity_id: this.questionnaireId,
-          topic:jsonString
+          topic: jsonString
         })
         .then((res) => {
           console.log(res);
-          if(res.code==1){
+          if (res.code == 1) {
             this.$message.success('添加成功');
-          }else{
+          } else {
             this.$message.error(res.msg);
           }
           this.onCloseMy();
@@ -804,7 +739,7 @@ export default {
           console.log(e);
         });
     },
-    openQuestionnaireUpdate(d){
+    openQuestionnaireUpdate(d) {
       this.$request
         .post("/questionnaire/questionnairefind", {
           activity_id: d.id,
@@ -819,7 +754,7 @@ export default {
         });
     },
     openQuestionnairefind(d) {
-      this.questionnaireId=d.id;
+      this.questionnaireId = d.id;
       this.questionnaireAddMode = true;
     },
     onCurrentChangeInfo(d) {
@@ -830,13 +765,13 @@ export default {
       this.pagination.page = d;
       this.getList();
     },
-    openInfoDo(){
+    openInfoDo() {
       this.$request
         .post("/application/getList", {
           activity_id: this.infoId,
           page: this.info_pagination.page,
           size: this.info_pagination.size,
-          type:this.InfotabIndex
+          type: this.InfotabIndex
         })
         .then((res) => {
           console.log(res);
@@ -852,21 +787,21 @@ export default {
     },
     openInfo(d) {
       console.log(d);
-      this.info_list=[];
-      this.info_pagination.page=1;
-      this.info_pagination.total=0;
+      this.info_list = [];
+      this.info_pagination.page = 1;
+      this.info_pagination.total = 0;
       this.infoMode = true;
       this.infoId = d.id;
-      this.infoIfAuditing=d.if_auditing;
+      this.infoIfAuditing = d.if_auditing;
       // if(d.if_auditing==1){
       //   this.InfotabIndex='2';
       // }else{
       //   this.InfotabIndex='1';
       // }
-      if(d.if_auditing!=2){
+      if (d.if_auditing != 2) {
         this.info_columns = this.info_columns.filter(column => column.colKey !== 'sign');
-      }else{
-        this.info_columns= [
+      } else {
+        this.info_columns = [
           {colKey: 'photo_image', title: '形象照', align: 'center'},
           {colKey: 'nikename', title: '姓名', align: 'center'},
           {colKey: 'phone', title: '手机号', align: 'center'},
@@ -878,7 +813,7 @@ export default {
       }
       this.openInfoDo();
     },
-    formatResponseVideo(res){
+    formatResponseVideo(res) {
       console.log(res);
       this.activity_video = res.data.url;
       return {url: res.data.fullurl};
@@ -913,7 +848,7 @@ export default {
       this.isEdit = false;
       this.addForm = {
         // weigh:0,
-        money:0,
+        money: 0,
         activity_name: '',
         activity_desc: '',
         activity_image_show: [],
@@ -923,51 +858,25 @@ export default {
         activity_content: '',
         activity_location: '',
         activity_type: null,
-        if_display_registrants:null,
-        signup_start_time:'',
-        signup_end_time:'',
-        if_auditing:'1',
-        range:'3',
-        number:'',
-        if_sign:'1',
-        custom_points:''
+        if_display_registrants: null,
+        signup_start_time: '',
+        signup_end_time: '',
+        if_auditing: '1',
+        range: '3',
+        number: '',
+        if_sign: '1',
+        custom_points: ''
       };
     },
     edit(d) {
-      this.addForm.id = d.id;
-      this.activity_video = d.video;
-      if(d.video==''){
-        this.activity_video_show = [];
-      }else{
-        this.activity_video_show = [{url: store.state.user.apiUrl + d.video,name:d.video}];
-      }
-      // this.addForm.weigh = d.weigh;
-      this.addForm.activity_name = d.activity_name;
-      this.addForm.activity_desc = d.activity_desc;
-      this.addForm.activity_image_show = [{url: store.state.user.apiUrl + d.activity_image}];
-      this.addForm.activity_image = d.activity_image;
-      this.addForm.activity_start_time = d.activity_start_time;
-      this.addForm.activity_end_time = d.activity_end_time;
-      this.addForm.activity_location = d.activity_location;
-      this.addForm.activity_content = d.activity_content;
-      this.addForm.activity_type = d.activity_type;
-      this.addForm.if_display_registrants = d.if_display_registrants;
-      this.addForm.money = d.money;
-      this.addForm.signup_start_time= d.signup_start_time;
-      this.addForm.signup_end_time=d.signup_end_time;
-
-      this.addForm.if_auditing=String(d.if_auditing);
-        this.addForm.range=String(d.range);
-        this.addForm.number=String(d.number);
-        this.addForm.if_sign=String(d.if_sign);
-        this.addForm.custom_points=String(d.custom_points);
-      this.addMode = true;
-      this.isEdit = true;
+      this.$router.push({
+        path: '/activity/activity_edit?id=' + d.id + "&edit=1",
+      });
     },
-    InfotabIndexChange(d){
-      this.info_list=[];
-      this.info_pagination.page=1;
-      this.info_pagination.total=0;
+    InfotabIndexChange(d) {
+      this.info_list = [];
+      this.info_pagination.page = 1;
+      this.info_pagination.total = 0;
       this.openInfoDo();
     },
     tabIndexChange(d) {
@@ -983,9 +892,9 @@ export default {
           if (res.code == 1) {
             this.list = res.data.ret;
             this.pagination.total = res.data.count;
-          }else{
+          } else {
             this.list = [];
-            this.pagination.total =0;
+            this.pagination.total = 0;
           }
 
         })
@@ -1023,7 +932,7 @@ export default {
         this.$message.error('活动结束时间不能为空');
         return;
       }
-      if(this.addForm.activity_type==1||this.addForm.activity_type==4){
+      if (this.addForm.activity_type == 1 || this.addForm.activity_type == 4) {
         if (this.addForm.signup_start_time == '') {
           this.$message.error('报名开始时间不能为空');
           return;
@@ -1037,16 +946,16 @@ export default {
         this.$message.error('活动地址不能为空');
         return;
       }
-      if(this.addForm.activity_type==2||this.addForm.activity_type==3){
-        this.addForm.signup_start_time=this.addForm.activity_start_time;
-        this.addForm.signup_end_time=this.addForm.activity_end_time;
+      if (this.addForm.activity_type == 2 || this.addForm.activity_type == 3) {
+        this.addForm.signup_start_time = this.addForm.activity_start_time;
+        this.addForm.signup_end_time = this.addForm.activity_end_time;
       }
       console.log(this.addForm);
       var url = '/activity/add';
       if (this.isEdit) {
         url = '/activity/update';
       }
-      this.addForm.video=this.activity_video;
+      this.addForm.video = this.activity_video;
       this.$request
         .post(url, this.addForm)
         .then((res) => {
@@ -1068,17 +977,17 @@ export default {
       this.addMode = false;
       this.infoMode = false;
       this.questionnaireAddMode = false;
-      this.questionnaireUpdateMode=false;
-      this.QuestionnaireMode=false;
-      this.JuanMode=false;
+      this.questionnaireUpdateMode = false;
+      this.QuestionnaireMode = false;
+      this.JuanMode = false;
     },
-    exportList(d){
+    exportList(d) {
       const token = store.state.user.token;
-      if(d==0){
-        window.open(store.state.user.apiUrl + '/api/excel_controller/applicationexport?id='+this.infoId+"&token="+token);
+      if (d == 0) {
+        window.open(store.state.user.apiUrl + '/api/excel_controller/applicationexport?id=' + this.infoId + "&token=" + token);
       }
-      if(d==1){
-        window.open(store.state.user.apiUrl + '/api/excel_controller/activityexport?id='+this.QuestionnaireModeId+"&token="+token);
+      if (d == 1) {
+        window.open(store.state.user.apiUrl + '/api/excel_controller/activityexport?id=' + this.QuestionnaireModeId + "&token=" + token);
       }
 
     },
@@ -1089,7 +998,11 @@ export default {
 ::-webkit-scrollbar {
   display: none;
 }
-.layui-table-mend, .layui-table-tool, .layui-table-patch, .layui-table-click, .layui-table-hover, .layui-table-header, .table-total-wrapper, .layui-table-total td, .layui-table thead tr, .layui-table tbody tr:hover td, .layui-table.layui-table-even tr:nth-child(2n) td{background-color: #fafafa!important;}
+
+.layui-table-mend, .layui-table-tool, .layui-table-patch, .layui-table-click, .layui-table-hover, .layui-table-header, .table-total-wrapper, .layui-table-total td, .layui-table thead tr, .layui-table tbody tr:hover td, .layui-table.layui-table-even tr:nth-child(2n) td {
+  background-color: #fafafa !important;
+}
+
 .layui-table td, .layui-table th {
   position: relative;
   padding: 10px;
@@ -1100,6 +1013,7 @@ export default {
   border-style: solid;
   border-color: #eee;
 }
+
 .layui-table {
   width: 100%;
   background-color: #fff;
@@ -1107,7 +1021,8 @@ export default {
   table-layout: fixed;
   border-collapse: collapse;
 }
-.w-e-full-screen-container{
+
+.w-e-full-screen-container {
   z-index: 1024;
 }
 </style>
diff --git a/src/pages/dashboard/base/index.vue b/src/pages/dashboard/base/index.vue
index 6c20ef4..725b2ee 100644
--- a/src/pages/dashboard/base/index.vue
+++ b/src/pages/dashboard/base/index.vue
@@ -1,36 +1,82 @@
 <template>
   <div>
-<!--    <t-back-top-->
-<!--      container=".tdesign-starter-layout"-->
-<!--      :visible-height="0"-->
-<!--      style="position: absolute"-->
-<!--      :offset="['24px', '80px']"-->
-<!--    >-->
-<!--      <t-icon name="backtop" size="20px" />-->
-<!--    </t-back-top>-->
+    <!--    <t-back-top-->
+    <!--      container=".tdesign-starter-layout"-->
+    <!--      :visible-height="0"-->
+    <!--      style="position: absolute"-->
+    <!--      :offset="['24px', '80px']"-->
+    <!--    >-->
+    <!--      <t-icon name="backtop" size="20px" />-->
+    <!--    </t-back-top>-->
     <!-- 顶部 card  -->
-    <top-panel class="row-container" />
-    <!-- 中部图表  -->
-    <middle-chart class="row-container" />
-    <!-- 列表排名 -->
-    <rank-list class="row-container" />
-    <!-- 出入库概览 -->
-    <output-overview class="row-container" />
+    <!--    <top-panel class="row-container" />-->
+    <!--    &lt;!&ndash; 中部图表  &ndash;&gt;-->
+    <!--    <middle-chart class="row-container" />-->
+    <!--    &lt;!&ndash; 列表排名 &ndash;&gt;-->
+    <!--    <rank-list class="row-container" />-->
+    <!--    &lt;!&ndash; 出入库概览 &ndash;&gt;-->
+    <!--    <output-overview class="row-container" />-->
+    <div class="dashboard-detail">
+      <t-card title="待办事项" class="dashboard-detail-card" :bordered="false">
+        <t-row :gutter="[16, 16]">
+          <t-col v-for="(item, index) in list" :key="index" :xs="6" :xl="3">
+            <t-card :title="item.name" style="cursor: pointer;">
+              <div style="display: flex;justify-content: space-between;align-items: center">
+                <div style="font-size: 30px;color:#0052D9">{{ item.value }}</div>
+                <div>
+                  <icon name="chevron-right-s" style=""/>
+                </div>
+              </div>
+            </t-card>
+          </t-col>
+        </t-row>
+      </t-card>
+    </div>
+    <div class="dashboard-detail" style="margin-top: 10px;">
+      <t-card title="账户信息" class="dashboard-detail-card" :bordered="false">
+        <t-row :gutter="[16, 16]">
+          <t-col v-for="(item, index) in user_list" :key="index" :xs="6" :xl="3">
+            <t-card :title="item.name" style="cursor: pointer;">
+              <div style="display: flex;justify-content: space-between;align-items: center">
+                <div style="font-size: 30px;color:#0052D9">{{ item.value }}</div>
+                <div>
+                  <icon name="chevron-right-s" style=""/>
+                </div>
+              </div>
+            </t-card>
+          </t-col>
+        </t-row>
+      </t-card>
+    </div>
   </div>
 </template>
 <script>
-import TopPanel from './components/TopPanel.vue';
-import MiddleChart from './components/MiddleChart.vue';
-import RankList from './components/RankList.vue';
-import OutputOverview from './components/OutputOverview.vue';
+import {Icon} from 'tdesign-icons-vue';
 
 export default {
-  name: 'DashboardBase',
   components: {
-    TopPanel,
-    MiddleChart,
-    RankList,
-    OutputOverview,
+    Icon,
+  },
+  data() {
+    return {
+      list: [
+        {name: '入会审核', value: '11'},
+        {name: '青企圈审核', value: '5'},
+        {name: '青企圈评论审核', value: '7'},
+        {name: '会员发票', value: '1'},
+        {name: '编辑信息审核', value: '5'},
+        {name: '报名审核', value: '19'},
+        {name: '生日提醒', value: '3'},
+        {name: '会费逾期', value: '275'},
+      ],
+      user_list: [
+        {name: '访问日志', value: '126'},
+        {name: '操作日志', value: '595'},
+        {name: '短信余量', value: '402'},
+        {name: '存储空间', value: '500G'},
+        {name: '剩余空间', value: '450G'},
+      ]
+    }
   },
   mounted() {
     // var reload=localStorage.getItem('reload');
@@ -47,6 +93,7 @@ export default {
 .row-container {
   margin-bottom: 16px;
 }
+
 /deep/ .t-card__body {
   padding-top: 0;
 }
diff --git a/src/pages/news/news_add.vue b/src/pages/news/news_add.vue
new file mode 100644
index 0000000..dcc1cd7
--- /dev/null
+++ b/src/pages/news/news_add.vue
@@ -0,0 +1,274 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+<!--      <t-dialog :header="isEdit?'编辑新闻':'新增新闻'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"-->
+<!--                width="45%" top="20px">-->
+        <t-form >
+          <t-form-item label="文章标题" name="news_title">
+            <t-input size="large"  placeholder="请输入文章标题" v-model="addForm.news_title"/>
+          </t-form-item>
+          <t-form-item label="简短标题" name="news_titleshort">
+            <t-input size="large"  placeholder="请输入简短标题" v-model="addForm.news_titleshort"/>
+          </t-form-item>
+          <t-form-item label="所属类目" name="activity_location">
+            <t-select size="large"  v-model="addForm.gory_id">
+              <t-option v-for="(item,index) in gory_list" :key="index" :label="item.name" :value="item.id" />
+            </t-select>
+          </t-form-item>
+          <t-form-item label="作者" name="news_auto">
+            <t-input size="large"  placeholder="请输入作者" v-model="addForm.news_auto"/>
+          </t-form-item>
+          <t-form-item label="来源" name="news_source">
+            <t-input size="large"  placeholder="请输入来源" v-model="addForm.news_source"/>
+          </t-form-item>
+          <t-form-item label="点击量" name="news_source">
+            <t-input size="large"  placeholder="请输入自定义点击量" v-model="addForm.news_hits"/>
+          </t-form-item>
+          <t-form-item label="微信文章链接" name="wx_url">
+            <t-input size="large"  placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
+          </t-form-item>
+          <t-form-item label="新闻内容" name="news_content">
+            <div style="border: 1px solid #ccc;z-index: 99">
+              <!-- 工具栏 -->
+              <Toolbar
+                style="border-bottom: 1px solid #ccc"
+                mode="default"
+                :editor="editor"
+                :defaultConfig="toolbarConfig"
+              />
+
+              <Editor
+                style="height: 400px;"
+                v-model="addForm.news_content"
+                :defaultConfig="editorConfig"
+                mode="default"
+                @onCreated="(e) => onCreated(e)"
+              />
+            </div>
+          </t-form-item>
+          <t-form-item label="新闻主图">
+            <t-upload
+              :action="$store.state.user.apiUrl+'/api/common/upload'"
+              v-model="addForm.news_image_show"
+              theme="image"
+              tips="请选择单张图片文件上传"
+              accept="image/*"
+              :format-response="formatResponse"
+            ></t-upload>
+          </t-form-item>
+          <t-form-item
+            label="展示时间"
+            name="days">
+            <t-date-picker size="large"  :style="{ width: '200px' }" :clearable="true" placeholder="展示时间"
+                           :enableTimePicker="true" :allow-input="false"
+                           v-model="addForm.showtime"></t-date-picker>
+          </t-form-item>
+
+        </t-form>
+      <div style="padding: 50px 0px;text-align: center">
+        <t-button size="large" @click="onSubmit">提交</t-button>
+      </div>
+    </div>
+  </t-card>
+</template>
+
+<script lang="ts">
+import store from "@/store";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
+
+export default {
+  components: {Editor, Toolbar},
+  data() {
+    return {
+      visible: false,
+      infoMode: false,
+      ser:{
+        news_title:'',
+        gory_id:'',
+      },
+      addForm: {
+        news_title: '',
+        news_titleshort: '',
+        gory_id: null,
+        news_auto: '',
+        news_source: '',
+        news_content: '',
+        news_image: '',
+        news_image_show:[],
+        showtime:'',
+        news_hits:0,
+        wx_url:'',
+      },
+      addMode: false,
+      isEdit: false,
+      editID: 0,
+      gory_list:[],
+      editor: null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'insertImage',// 删除网络图片上传
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+        MENU_CONF: {
+          uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
+            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 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+          },
+          uploadVideo: {
+            server: store.state.user.apiUrl + '/api/common/upload',
+            fieldName: 'file',
+            customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
+              // customInsert(res, insertFn) {                  // JS 语法
+              // res 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+          }
+        }
+      },
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    editor.destroy() // 组件销毁时，及时销毁编辑器
+  },
+  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.getGory();
+  },
+  methods: {
+    formatResponse(res) {
+      console.log(res);
+      this.addForm.news_image = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    onCreated(editor) {
+      this.editor = Object.seal(editor);
+    },
+
+    edit(d) {
+      console.log(d);
+      this.addForm.news_id = d.news_id;
+      this.addForm.news_title = d.news_title;
+      this.addForm.news_titleshort = d.news_titleshort;
+      this.addForm.news_image_show = [{url: store.state.user.apiUrl + d.news_image}];
+      this.addForm.news_image = d.news_image;
+      this.addForm.gory_id = d.gory_id;
+      this.addForm.news_auto = d.news_auto;
+      this.addForm.news_source = d.news_source;
+      this.addForm.news_content = d.news_content;
+      this.addForm.showtime = d.showtime
+      this.addForm.news_hits = d.news_hits;
+      this.addForm.wx_url=d.wx_url;
+      this.addMode = true;
+      this.isEdit = true;
+    },
+
+    getGory(){
+      this.$request
+        .post("/gory/index")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.gory_list=res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onSubmit() {
+      console.log(this.addForm);
+      if (this.addForm.news_title == '') {
+        this.$message.error('新闻标题不能为空');
+        return;
+      }
+      if (this.addForm.news_titleshort == '') {
+        this.$message.error('简短标题不能为空');
+        return;
+      }
+      if (this.addForm.gory_id == null) {
+        this.$message.error('请选择新闻分类');
+        return;
+      }
+      if (this.addForm.news_auto == '') {
+        this.$message.error('作者不能为空');
+        return;
+      }
+      if (this.addForm.news_source == '') {
+        this.$message.error('来源不能为空');
+        return;
+      }
+      // if (this.addForm.news_content == '') {
+      //   this.$message.error('详情不能为空');
+      //   return;
+      // }
+      if (this.addForm.news_image=='') {
+        this.$message.error('新闻主图不能为空');
+        return;
+      }
+      if (this.addForm.showtime=='') {
+        this.$message.error('展示时间不能为空');
+        return;
+      }
+      var url = '/news/add';
+      this.$request
+        .post(url, this.addForm)
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+            setTimeout(()=>{
+              this.$router.push({
+                path: '/news/news_index',
+              },500);
+            })
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCloseMy() {
+      this.addMode = false;
+      this.infoMode = false;
+    }
+  }
+}
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/news/news_index.vue b/src/pages/news/news_index.vue
index cc755e8..a0aa949 100644
--- a/src/pages/news/news_index.vue
+++ b/src/pages/news/news_index.vue
@@ -1,7 +1,36 @@
 <template>
   <t-card :bordered="false">
     <div class="form-step-container">
-      <t-button @click="add">新增</t-button>
+      <t-form
+        ref="form"
+        :data="ser"
+        :label-width="80"
+        @submit="onSubmit"
+      >
+        <t-row>
+<!--          <t-form-item name="nikename">-->
+<!--            <t-button @click="add">添加新闻</t-button>-->
+<!--          </t-form-item>-->
+          <t-form-item label="标题">
+            <t-input
+              v-model="ser.news_title"
+              class="form-item-content"
+              type="search"
+              placeholder="请输入标题"
+              style="width: 150px"
+            />
+          </t-form-item>
+          <t-form-item label="所属类目" style="margin-left: 20px;">
+            <t-select  v-model="ser.gory_id">
+              <t-option :key="0" label="全部" value=""></t-option>
+              <t-option v-for="(item,index) in gory_list" :key="index" :label="item.name" :value="item.id" />
+            </t-select>
+          </t-form-item>
+          <t-form-item name="nikename">
+            <t-button theme="warning" @click="serDo" style="margin-left: 20px">搜索</t-button>
+          </t-form-item>
+        </t-row>
+      </t-form>
       <t-table
         rowKey="index"
         :data="list"
@@ -36,71 +65,7 @@
         ></t-pagination>
       </div>
     </div>
-    <t-dialog :header="isEdit?'编辑新闻':'新增新闻'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"
-              width="45%" top="20px">
-      <t-form>
-        <t-form-item label="文章标题" name="news_title">
-          <t-input placeholder="请输入文章标题" v-model="addForm.news_title"/>
-        </t-form-item>
-        <t-form-item label="简短标题" name="news_titleshort">
-          <t-input placeholder="请输入简短标题" v-model="addForm.news_titleshort"/>
-        </t-form-item>
-        <t-form-item label="所属类目" name="activity_location">
-          <t-select v-model="addForm.gory_id">
-            <t-option v-for="(item,index) in gory_list" :key="index" :label="item.name" :value="item.id" />
-          </t-select>
-        </t-form-item>
-        <t-form-item label="作者" name="news_auto">
-          <t-input placeholder="请输入作者" v-model="addForm.news_auto"/>
-        </t-form-item>
-        <t-form-item label="来源" name="news_source">
-          <t-input placeholder="请输入来源" v-model="addForm.news_source"/>
-        </t-form-item>
-        <t-form-item label="点击量" name="news_source">
-          <t-input placeholder="请输入自定义点击量" v-model="addForm.news_hits"/>
-        </t-form-item>
-        <t-form-item label="微信文章链接" name="wx_url">
-          <t-input placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
-        </t-form-item>
-        <t-form-item label="新闻内容" name="news_content">
-          <div style="border: 1px solid #ccc;z-index: 99">
-            <!-- 工具栏 -->
-            <Toolbar
-              style="border-bottom: 1px solid #ccc"
-              mode="default"
-              :editor="editor"
-              :defaultConfig="toolbarConfig"
-            />
 
-            <Editor
-              style="height: 200px"
-              v-model="addForm.news_content"
-              :defaultConfig="editorConfig"
-              mode="default"
-              @onCreated="(e) => onCreated(e)"
-            />
-          </div>
-        </t-form-item>
-        <t-form-item label="新闻主图">
-          <t-upload
-            :action="$store.state.user.apiUrl+'/api/common/upload'"
-            v-model="addForm.news_image_show"
-            theme="image"
-            tips="请选择单张图片文件上传"
-            accept="image/*"
-            :format-response="formatResponse"
-          ></t-upload>
-        </t-form-item>
-        <t-form-item
-                     label="展示时间"
-                     name="days">
-          <t-date-picker :style="{ width: '200px' }" :clearable="true" placeholder="展示时间"
-                         :enableTimePicker="true" :allow-input="false"
-                         v-model="addForm.showtime"></t-date-picker>
-        </t-form-item>
-
-      </t-form>
-    </t-dialog>
   </t-card>
 
 </template>
@@ -114,6 +79,10 @@ export default {
     return {
       visible: false,
       infoMode: false,
+      ser:{
+        news_title:'',
+        gory_id:'',
+      },
       addForm: {
         news_title: '',
         news_titleshort: '',
@@ -211,6 +180,10 @@ export default {
     this.getGory();
   },
   methods: {
+    serDo(){
+      this.pagination.page = 1;
+      this.getList();
+    },
     onCurrentChange(d) {
       this.pagination.page = d;
       this.getList();
@@ -310,7 +283,7 @@ export default {
     },
     getList() {
       this.$request
-        .post("/news", {page: this.pagination.page, size: this.pagination.size})
+        .post("/news", {page: this.pagination.page, size: this.pagination.size,gory_id:this.ser.gory_id,news_title:this.ser.news_title})
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
diff --git a/src/pages/pc/pc_news.vue b/src/pages/pc/pc_news.vue
index 68000bd..d90dbfc 100644
--- a/src/pages/pc/pc_news.vue
+++ b/src/pages/pc/pc_news.vue
@@ -285,19 +285,9 @@ export default {
       };
     },
     edit(d) {
-      console.log(d);
-      this.addForm.id = d.id;
-      this.addForm.title = d.title;
-      this.addForm.image_show = [{url: store.state.user.apiUrl + d.image}];
-      this.addForm.image = d.image;
-      this.addForm.category_id = d.category_id;
-      this.addForm.article_source = d.article_source;
-      this.addForm.content = d.content;
-      this.addForm.number_of_views = d.number_of_views;
-      this.addForm.display_time=d.display_time;
-      this.addForm.wx_url=d.wx_url;
-      this.addMode = true;
-      this.isEdit = true;
+      this.$router.push({
+        path: '/pc/pc_news_edit?id=' + d.id,
+      });
     },
     serDo(){
       this.pagination.page=1;
diff --git a/src/pages/pc/pc_news_add.vue b/src/pages/pc/pc_news_add.vue
new file mode 100644
index 0000000..10a7144
--- /dev/null
+++ b/src/pages/pc/pc_news_add.vue
@@ -0,0 +1,242 @@
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+        <t-form>
+          <t-form-item label="文章标题" name="news_title">
+            <t-input size="large" placeholder="请输入文章标题" v-model="addForm.title"/>
+          </t-form-item>
+          <t-form-item label="所属类目" name="activity_location">
+            <t-select size="large" v-model="addForm.category_id">
+              <t-option v-for="(item,index) in gory_list" :key="index" :label="item.category_name" :value="item.id" />
+            </t-select>
+          </t-form-item>
+          <t-form-item label="来源" name="news_source">
+            <t-input size="large" placeholder="请输入来源" v-model="addForm.article_source"/>
+          </t-form-item>
+          <t-form-item label="点击量" name="news_source">
+            <t-input size="large" placeholder="请输入自定义点击量" v-model="addForm.number_of_views"/>
+          </t-form-item>
+          <t-form-item label="微信文章链接" name="wx_url">
+            <t-input size="large" placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
+          </t-form-item>
+          <t-form-item label="新闻内容" name="news_content">
+            <div style="border: 1px solid #ccc;z-index: 99">
+              <!-- 工具栏 -->
+              <Toolbar
+                style="border-bottom: 1px solid #ccc"
+                mode="default"
+                :editor="editor"
+                :defaultConfig="toolbarConfig"
+              />
+
+              <Editor
+                style="height: 400px"
+                v-model="addForm.content"
+                :defaultConfig="editorConfig"
+                mode="default"
+                @onCreated="(e) => onCreated(e)"
+              />
+            </div>
+          </t-form-item>
+          <t-form-item label="新闻主图">
+            <t-upload
+              :action="$store.state.user.apiUrl+'/api/common/upload'"
+              v-model="addForm.image_show"
+              theme="image"
+              tips="请选择单张图片文件上传"
+              accept="image/*"
+              :format-response="formatResponse"
+            ></t-upload>
+          </t-form-item>
+          <t-form-item
+            label="展示时间"
+            name="days">
+            <t-date-picker size="large" :style="{ width: '200px' }" :clearable="true" placeholder="展示时间"
+                           :enableTimePicker="true" :allow-input="false"
+                           v-model="addForm.display_time"></t-date-picker>
+          </t-form-item>
+        </t-form>
+      <div style="padding: 50px 0px;text-align: center">
+        <t-button size="large" @click="onSubmit">提交</t-button>
+      </div>
+    </div>
+
+  </t-card>
+
+</template>
+<script lang="ts">
+import store from "@/store";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
+
+export default {
+  components: {Editor, Toolbar},
+  data() {
+    return {
+      addForm: {
+        title: '',
+        category_id: null,
+        article_source: '',
+        content: '',
+        image: '',
+        image_show:[],
+        number_of_views:0,
+        display_time:'',
+        wx_url:'',
+      },
+      addMode: false,
+      isEdit: false,
+      editID: 0,
+      gory_list:[],
+      editor: null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'insertImage',// 删除网络图片上传
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+        MENU_CONF: {
+          uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
+            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 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+            onError:(file, err, res)=>{
+              if(err.message.indexOf('exceeds maximum allowed size') !== -1){
+                this.$message.error('限制为50M，请调整好再上传！',2000);
+              }
+            },
+          },
+          uploadVideo: {
+            server: store.state.user.apiUrl + '/api/common/upload',
+            fieldName: 'file',
+            customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
+              // customInsert(res, insertFn) {                  // JS 语法
+              // res 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+          }
+        }
+      },
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    editor.destroy() // 组件销毁时，及时销毁编辑器
+  },
+  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.getGory();
+  },
+  methods: {
+
+    formatResponse(res) {
+      console.log(res);
+      this.addForm.image = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    onCreated(editor) {
+      this.editor = Object.seal(editor);
+    },
+
+    edit(d) {
+      console.log(d);
+      this.addForm.id = d.id;
+      this.addForm.title = d.title;
+      this.addForm.image_show = [{url: store.state.user.apiUrl + d.image}];
+      this.addForm.image = d.image;
+      this.addForm.category_id = d.category_id;
+      this.addForm.article_source = d.article_source;
+      this.addForm.content = d.content;
+      this.addForm.number_of_views = d.number_of_views;
+      this.addForm.display_time=d.display_time;
+      this.addForm.wx_url=d.wx_url;
+      this.addMode = true;
+      this.isEdit = true;
+    },
+
+    getGory(){
+      this.$request
+        .post("/pc/pc_news/gory")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.gory_list=res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onSubmit() {
+      console.log(this.addForm);
+      if (this.addForm.title == '') {
+        this.$message.error('新闻标题不能为空');
+        return;
+      }
+      if (this.addForm.category_id == null) {
+        this.$message.error('请选择新闻分类');
+        return;
+      }
+      if (this.addForm.article_source == '') {
+        this.$message.error('来源不能为空');
+        return;
+      }
+      // if (this.addForm.content == '') {
+      //   this.$message.error('详情不能为空');
+      //   return;
+      // }
+      if (this.addForm.image=='') {
+        this.$message.error('新闻主图不能为空');
+        return;
+      }
+      var url = '/pc_news/articleadd';
+      if (this.isEdit) {
+        url = '/pc_news/articleupdate';
+      }
+      this.$request
+        .post(url, this.addForm)
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+            this.addMode = false;
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+  }
+}
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/pc/pc_news_edit.vue b/src/pages/pc/pc_news_edit.vue
new file mode 100644
index 0000000..1a99471
--- /dev/null
+++ b/src/pages/pc/pc_news_edit.vue
@@ -0,0 +1,290 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  <t-card :bordered="false">
+    <div class="form-step-container">
+      <!--      <t-dialog :header="isEdit?'编辑新闻':'新增新闻'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"-->
+      <!--                width="45%" top="20px">-->
+      <t-form >
+        <t-form-item label="文章标题" name="news_title">
+          <t-input size="large"  placeholder="请输入文章标题" v-model="addForm.news_title"/>
+        </t-form-item>
+        <t-form-item label="简短标题" name="news_titleshort">
+          <t-input size="large"  placeholder="请输入简短标题" v-model="addForm.news_titleshort"/>
+        </t-form-item>
+        <t-form-item label="所属类目" name="activity_location">
+          <t-select size="large"  v-model="addForm.gory_id">
+            <t-option v-for="(item,index) in gory_list" :key="index" :label="item.name" :value="item.id" />
+          </t-select>
+        </t-form-item>
+        <t-form-item label="作者" name="news_auto">
+          <t-input size="large"  placeholder="请输入作者" v-model="addForm.news_auto"/>
+        </t-form-item>
+        <t-form-item label="来源" name="news_source">
+          <t-input size="large"  placeholder="请输入来源" v-model="addForm.news_source"/>
+        </t-form-item>
+        <t-form-item label="点击量" name="news_source">
+          <t-input size="large"  placeholder="请输入自定义点击量" v-model="addForm.news_hits"/>
+        </t-form-item>
+        <t-form-item label="微信文章链接" name="wx_url">
+          <t-input size="large"  placeholder="请输入微信文章链接" v-model="addForm.wx_url"/>
+        </t-form-item>
+        <t-form-item label="新闻内容" name="news_content">
+          <div style="border: 1px solid #ccc;z-index: 99">
+            <!-- 工具栏 -->
+            <Toolbar
+              style="border-bottom: 1px solid #ccc"
+              mode="default"
+              :editor="editor"
+              :defaultConfig="toolbarConfig"
+            />
+
+            <Editor
+              style="height: 400px;"
+              v-model="addForm.news_content"
+              :defaultConfig="editorConfig"
+              mode="default"
+              @onCreated="(e) => onCreated(e)"
+            />
+          </div>
+        </t-form-item>
+        <t-form-item label="新闻主图">
+          <t-upload
+            :action="$store.state.user.apiUrl+'/api/common/upload'"
+            v-model="addForm.news_image_show"
+            theme="image"
+            tips="请选择单张图片文件上传"
+            accept="image/*"
+            :format-response="formatResponse"
+          ></t-upload>
+        </t-form-item>
+        <t-form-item
+          label="展示时间"
+          name="days">
+          <t-date-picker size="large"  :style="{ width: '200px' }" :clearable="true" placeholder="展示时间"
+                         :enableTimePicker="true" :allow-input="false"
+                         v-model="addForm.showtime"></t-date-picker>
+        </t-form-item>
+
+      </t-form>
+      <div style="padding: 50px 0px;text-align: center">
+        <t-button size="large" @click="onSubmit">提交</t-button>
+      </div>
+    </div>
+  </t-card>
+</template>
+
+<script lang="ts">
+import store from "@/store";
+import {Editor, Toolbar} from '@wangeditor/editor-for-vue';
+
+export default {
+  components: {Editor, Toolbar},
+  data() {
+    return {
+      visible: false,
+      infoMode: false,
+      ser:{
+        news_title:'',
+        gory_id:'',
+      },
+      addForm: {
+        news_title: '',
+        news_titleshort: '',
+        gory_id: null,
+        news_auto: '',
+        news_source: '',
+        news_content: '',
+        news_image: '',
+        news_image_show:[],
+        showtime:'',
+        news_hits:0,
+        wx_url:'',
+      },
+      addMode: false,
+      isEdit: false,
+      editID: 0,
+      gory_list:[],
+      editor: null,
+      toolbarConfig: {
+        showLinkImg: false,
+        uploadImgShowBase64: true,
+        excludeKeys: [
+          'insertVideo', // 删除视频
+          'insertImage',// 删除网络图片上传
+          'insertLink',// 删除链接
+          'insertTable',// 删除表格
+          'codeBlock',// 删除代码块
+        ]
+      },
+      editorConfig: {
+        placeholder: '',
+        readOnly: false, // 是否只允许阅读，不可编辑
+        autoFocus: true,
+        MENU_CONF: {
+          uploadImage: {
+            maxFileSize: 50 * 1024 * 1024,
+            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 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+          },
+          uploadVideo: {
+            server: store.state.user.apiUrl + '/api/common/upload',
+            fieldName: 'file',
+            customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
+              // customInsert(res, insertFn) {                  // JS 语法
+              // res 即服务端的返回结果
+              console.log(res);
+              // 从 res 中找到 url alt href ，然后插入图片
+              insertFn(res.data.fullurl, '', '')
+            },
+          }
+        }
+      },
+    }
+  },
+  beforeDestroy() {
+    const editor = this.editor
+    if (editor == null) return
+    editor.destroy() // 组件销毁时，及时销毁编辑器
+  },
+  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;
+    if (typeof (this.$route.query.id) !== 'undefined') {
+      console.log(this.$route.query);
+      this.editID = this.$route.query.id;
+      this.getActInfo();
+    }
+    this.getGory();
+  },
+  methods: {
+    getActInfo(){
+      this.$request
+        .post('/news/find', {id: this.editID})
+        .then((res) => {
+          //this.edit(res.data);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    formatResponse(res) {
+      console.log(res);
+      this.addForm.news_image = res.data.url;
+      return {url: res.data.fullurl};
+    },
+    onCreated(editor) {
+      this.editor = Object.seal(editor);
+    },
+
+    edit(d) {
+      console.log(d);
+      this.addForm.news_id = d.news_id;
+      this.addForm.news_title = d.news_title;
+      this.addForm.news_titleshort = d.news_titleshort;
+      this.addForm.news_image_show = [{url: store.state.user.apiUrl + d.news_image}];
+      this.addForm.news_image = d.news_image;
+      this.addForm.gory_id = d.gory_id;
+      this.addForm.news_auto = d.news_auto;
+      this.addForm.news_source = d.news_source;
+      this.addForm.news_content = d.news_content;
+      this.addForm.showtime = d.showtime
+      this.addForm.news_hits = d.news_hits;
+      this.addForm.wx_url=d.wx_url;
+      this.addMode = true;
+      this.isEdit = true;
+    },
+
+    getGory(){
+      this.$request
+        .post("/gory/index")
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.gory_list=res.data;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onSubmit() {
+      console.log(this.addForm);
+      if (this.addForm.news_title == '') {
+        this.$message.error('新闻标题不能为空');
+        return;
+      }
+      if (this.addForm.news_titleshort == '') {
+        this.$message.error('简短标题不能为空');
+        return;
+      }
+      if (this.addForm.gory_id == null) {
+        this.$message.error('请选择新闻分类');
+        return;
+      }
+      if (this.addForm.news_auto == '') {
+        this.$message.error('作者不能为空');
+        return;
+      }
+      if (this.addForm.news_source == '') {
+        this.$message.error('来源不能为空');
+        return;
+      }
+      // if (this.addForm.news_content == '') {
+      //   this.$message.error('详情不能为空');
+      //   return;
+      // }
+      if (this.addForm.news_image=='') {
+        this.$message.error('新闻主图不能为空');
+        return;
+      }
+      if (this.addForm.showtime=='') {
+        this.$message.error('展示时间不能为空');
+        return;
+      }
+      var url = '/news/update';
+      this.addForm.id=this.editID
+      this.$request
+        .post(url, this.addForm)
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+            setTimeout(()=>{
+              this.$router.push({
+                path: '/news/news_index',
+              },500);
+            })
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCloseMy() {
+      this.addMode = false;
+      this.infoMode = false;
+    }
+  }
+}
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/pages/tweets/index.vue b/src/pages/tweets/index.vue
index 7b65989..a75d7c0 100644
--- a/src/pages/tweets/index.vue
+++ b/src/pages/tweets/index.vue
@@ -1,11 +1,11 @@
 <template>
   <t-card :bordered="false">
     <div class="form-step-container">
-      <t-tabs v-model="state" @change="tabIndexChange">
-        <t-tab-panel :value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
-      </t-tabs>
+<!--      <t-tabs v-model="state" @change="tabIndexChange">-->
+<!--        <t-tab-panel :value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>-->
+<!--      </t-tabs>-->
       <t-table
         rowKey="index"
         :data="list"
@@ -64,6 +64,7 @@
 </template>
 <script lang="ts">
 import store from "@/store";
+import {toInteger} from "lodash";
 
 export default {
   data() {
@@ -94,8 +95,9 @@ export default {
     }else{
       this.association=JSON.parse(store.state.user.association);
     }
+    var tab=this.$route.name.slice(-1);
+    this.state = toInteger(tab);
     this.getList();
-    //this.getGory();
   },
   methods: {
     tabIndexChange(index){
diff --git a/src/pages/tweets/pl_index.vue b/src/pages/tweets/pl_index.vue
index a0d9ddf..8eec42e 100644
--- a/src/pages/tweets/pl_index.vue
+++ b/src/pages/tweets/pl_index.vue
@@ -1,11 +1,11 @@
 <template>
   <t-card :bordered="false">
     <div class="form-step-container">
-      <t-tabs v-model="state" @change="tabIndexChange">
-        <t-tab-panel :value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
-      </t-tabs>
+<!--      <t-tabs v-model="state" @change="tabIndexChange">-->
+<!--        <t-tab-panel :value="1" label="待审核" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="2" label="已通过" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="3" label="已拒绝" :destroyOnHide="false"></t-tab-panel>-->
+<!--      </t-tabs>-->
       <t-table
         rowKey="index"
         :data="list"
@@ -63,6 +63,7 @@
 </template>
 <script lang="ts">
 import store from "@/store";
+import {toInteger} from "lodash";
 
 export default {
   data() {
@@ -92,6 +93,8 @@ export default {
     }else{
       this.association=JSON.parse(store.state.user.association);
     }
+    var tab=this.$route.name.slice(-1);
+    this.state=tab;
     this.getList();
     //this.getGory();
   },
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue
index b478960..be52e39 100644
--- a/src/pages/user/user_index.vue
+++ b/src/pages/user/user_index.vue
@@ -50,12 +50,12 @@
           </div>
         </t-row>
       </t-form>
-      <t-tabs v-model="tabIndex" @change="tabIndexChange">
-        <t-tab-panel :value="1" label="正式会员" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="0" label="待审核" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="3" label="待缴纳会费" :destroyOnHide="false"></t-tab-panel>
-        <t-tab-panel :value="2" label="已拒绝" :destroyOnHide="false"></t-tab-panel>
-      </t-tabs>
+<!--      <t-tabs v-model="tabIndex" @change="tabIndexChange">-->
+<!--        <t-tab-panel :value="1" label="正式会员" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="0" label="待审核" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="3" label="待缴纳会费" :destroyOnHide="false"></t-tab-panel>-->
+<!--        <t-tab-panel :value="2" label="已拒绝" :destroyOnHide="false"></t-tab-panel>-->
+<!--      </t-tabs>-->
       <t-table
         row-key="member_id"
         :data="list"
@@ -113,6 +113,7 @@
 import store from "@/store";
 import {toInteger} from "lodash";
 import {CloudDownloadIcon} from 'tdesign-icons-vue';
+import router from "@/router";
 
 export default {
   components: {
@@ -155,6 +156,7 @@ export default {
     }
   },
   mounted() {
+
     if (typeof (this.$store.state.user.association) == 'object') {
       this.association = this.$store.state.user.association;
     } else {
@@ -164,10 +166,13 @@ export default {
     if (page) {
       this.page = toInteger(page);
     }
-    const Tab = sessionStorage.getItem('sUserTab');
-    if (Tab) {
-      this.tabIndex = toInteger(Tab);
-    }
+    var tab=this.$route.name.slice(-1);
+    this.tabIndex = toInteger(tab);
+    console.log(tab);
+    // const Tab = sessionStorage.getItem('sUserTab');
+    // if (Tab) {
+    //   this.tabIndex = toInteger(Tab);
+    // }
     this.getList();
     this.getPositionList();
     this.getRegion();
diff --git a/src/pages/user/user_invoice.vue b/src/pages/user/user_invoice.vue
index 51bb170..8d8743d 100644
--- a/src/pages/user/user_invoice.vue
+++ b/src/pages/user/user_invoice.vue
@@ -1,10 +1,10 @@
 <template>
   <t-card :bordered="false">
-    <t-tabs v-model="tabIndex" @change="tabIndexChange">
-      <t-tab-panel :value="3" 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-tabs v-model="tabIndex" @change="tabIndexChange">-->
+<!--      <t-tab-panel :value="3" 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>-->
     <div class="form-step-container">
       <t-table
         rowKey="index"
@@ -104,6 +104,7 @@
 </template>
 <script lang="ts">
 import store from "@/store";
+import {toInteger} from "lodash";
 
 export default {
   data() {
@@ -137,7 +138,8 @@ export default {
     } else {
       this.association = JSON.parse(store.state.user.association);
     }
-    console.log(this.association);
+    var tab=this.$route.name.slice(-1);
+    this.tabIndex = toInteger(tab);
     this.getList();
   },
   methods: {
diff --git a/src/router/modules/base.ts b/src/router/modules/base.ts
index 2ea9684..c5fec0a 100644
--- a/src/router/modules/base.ts
+++ b/src/router/modules/base.ts
@@ -1,4 +1,3 @@
-import { DashboardIcon } from 'tdesign-icons-vue';
 import Layout from '@/layouts/index.vue';
 
 export default [
@@ -8,15 +7,16 @@ export default [
     redirect: '/dashboard/base',
     name: 'dashboard',
     meta: {
-      title: '首页',
-      icon: DashboardIcon,
+      title: '待办事项',
+      icon: 'chat-bubble-history',
+      single:true,
     },
     children: [
       {
         path: 'base',
         name: 'DashboardBase',
         component: () => import('@/pages/dashboard/base/index.vue'),
-        meta: { title: '数据大屏' },
+        meta: { title: '待办事项' },
       }
     ],
   },
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index d6bb566..75bc7e4 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -1,5 +1,3 @@
-import {ViewModuleIcon, UsergroupIcon, ViewListIcon, ChartBubbleIcon, HomeIcon, HelpIcon,UserAvatarIcon} from 'tdesign-icons-vue';
-
 import Layout from '@/layouts/index.vue';
 
 export default [
@@ -8,32 +6,46 @@ export default [
     name: 'user',
     component: Layout,
     redirect: '/user/user_index',
-    meta: {title: '会员管理', icon: UsergroupIcon},
+    meta: {title: '会员管理', icon: 'user'},
     children: [
       {
-        path: 'user_index',
-        name: 'userIndex',
+        path: 'user_add',
+        name: 'userAdd',
+        component: () => import('@/pages/user/user_add.vue'),
+        meta: {title: '新增会员'},
+      },
+      {
+        path: 'user_index_1',
+        name: 'userIndex1',
         component: () => import('@/pages/user/user_index.vue'),
-        meta: {title: '会员列表'},
+        meta: {title: '正式会员'},
       },
       {
-        path: 'plan',
-        name: 'userPlan',
-        component: () => import('@/pages/user/user_plan.vue'),
-        meta: {title: '职位管理'},
+        path: 'user_index_0',
+        name: 'userIndex0',
+        component: () => import('@/pages/user/user_index.vue'),
+        meta: {title: '待审核'},
       },
       {
-        path: 'line',
-        name: 'userLine',
-        component: () => import('@/pages/user/user_line.vue'),
-        meta: {title: '行业管理'},
+        path: 'user_index_3',
+        name: 'userIndex3',
+        component: () => import('@/pages/user/user_index.vue'),
+        meta: {title: '待缴纳会费'},
       },
       {
-        path: 'region',
-        name: 'userRegion',
-        component: () => import('@/pages/user/user_region.vue'),
-        meta: {title: '区域管理'},
+        path: 'user_index_2',
+        name: 'userIndex2',
+        component: () => import('@/pages/user/user_index.vue'),
+        meta: {title: '已拒绝'},
       },
+
+
+      // {
+      //   path: 'region',
+      //   name: 'userRegion',
+      //   component: () => import('@/pages/user/user_region.vue'),
+      //   meta: {title: '区域管理'},
+      // },
       {
         path: 'user_info',
         name: 'userInfo',
@@ -46,18 +58,7 @@ export default [
         component: () => import('@/pages/user/user_edit.vue'),
         meta: {title: '会员编辑', hidden: true},
       },
-      {
-        path: 'user_add',
-        name: 'userAdd',
-        component: () => import('@/pages/user/user_add.vue'),
-        meta: {title: '新增会员', hidden: true},
-      },
-      {
-        path: 'user_invoice',
-        name: 'userInvoice',
-        component: () => import('@/pages/user/user_invoice.vue'),
-        meta: {title: '会员发票管理'},
-      },
+
       // {
       //   path: 'user_edit_shen',
       //   name: 'userEditShen',
@@ -66,44 +67,229 @@ export default [
       // },
     ],
   },
+  {
+    path: '/user_invoice',
+    name: 'userInvoice',
+    component: Layout,
+    redirect: '/user/user_invoice',
+    meta: {title: '发票管理', icon: 'pantone'},
+    children: [
+      {
+        path: 'user_invoice3',
+        name: 'userInvoice3',
+        component: () => import('@/pages/user/user_invoice.vue'),
+        meta: {title: '待开具'},
+      },
+      {
+        path: 'user_invoice1',
+        name: 'userInvoice1',
+        component: () => import('@/pages/user/user_invoice.vue'),
+        meta: {title: '已开具'},
+      },
+      {
+        path: 'user_invoice2',
+        name: 'userInvoice2',
+        component: () => import('@/pages/user/user_invoice.vue'),
+        meta: {title: '已拒绝'},
+      },
+    ],
+  },
+  {
+    path: '/plan',
+    name: 'userPlan',
+    component: Layout,
+    redirect: '/user/user_plan',
+    meta: {title: '职位管理', icon: 'tree-round-dot'},
+    children: [
+      {
+        path: 'plan',
+        name: 'userPlan',
+        component: () => import('@/pages/user/user_plan.vue'),
+        meta: {title: '职位管理'},
+      },
+    ],
+  },
+  {
+    path: '/line',
+    name: 'userLine',
+    component: Layout,
+    redirect: '/user/user_line',
+    meta: {title: '行业管理', icon: 'education'},
+    children: [
+      {
+        path: 'line',
+        name: 'userLine',
+        component: () => import('@/pages/user/user_line.vue'),
+        meta: {title: '行业管理'},
+      },
+    ],
+  },
   {
     path: '/activity',
     name: 'activity',
     component: Layout,
     redirect: '/activity/index',
-    meta: {title: '活动管理', icon: ChartBubbleIcon},
+    meta: {title: '协会活动', icon: 'flag-4'},
     children: [
       {
-        path: 'activity_index',
-        name: 'activityIndex',
+        path: 'activity_add1',
+        name: 'activityAdd1',
+        component: () => import('@/pages/activity/activity_add.vue'),
+        meta: {title: '新增活动'},
+      },
+      {
+        path: 'activity_edit',
+        name: 'activityEdit',
+        component: () => import('@/pages/activity/activity_edit.vue'),
+        meta: {title: '活动编辑',hidden:true},
+      },
+      {
+        path: 'activity_index1',
+        name: 'activityIndex1',
         component: () => import('@/pages/activity/activity_index.vue'),
         meta: {title: '活动列表'},
       },
+      // {
+      //   path: 'activity_top',
+      //   name: 'activityTop',
+      //   component: () => import('@/pages/activity/activity_top.vue'),
+      //   meta: {title: '活动首页置顶'},
+      // }
+    ],
+  },
+  {
+    path: '/activity2',
+    name: 'activity2',
+    component: Layout,
+    redirect: '/activity/activity_index',
+    meta: {title: '调查问卷', icon: 'markup'},
+    children: [
       {
-        path: 'activity_top',
-        name: 'activityTop',
-        component: () => import('@/pages/activity/activity_top.vue'),
-        meta: {title: '活动首页置顶'},
-      }
+        path: 'activity_add2',
+        name: 'activityAdd2',
+        component: () => import('@/pages/activity/activity_add.vue'),
+        meta: {title: '新增问卷'},
+      },
+      {
+        path: 'activity_index2',
+        name: 'activityIndex2',
+        component: () => import('@/pages/activity/activity_index.vue'),
+        meta: {title: '问卷列表'},
+      },
+      // {
+      //   path: 'activity_top',
+      //   name: 'activityTop',
+      //   component: () => import('@/pages/activity/activity_top.vue'),
+      //   meta: {title: '活动首页置顶'},
+      // }
+    ],
+  },
+  {
+    path: '/activity3',
+    name: 'activity3',
+    component: Layout,
+    redirect: '/activity/activity_index',
+    meta: {title: '公益捐赠', icon: 'undertake-hold-up'},
+    children: [
+      {
+        path: 'activity_add3',
+        name: 'activityAdd3',
+        component: () => import('@/pages/activity/activity_add.vue'),
+        meta: {title: '新增公益捐赠'},
+      },
+      {
+        path: 'activity_index3',
+        name: 'activityIndex3',
+        component: () => import('@/pages/activity/activity_index.vue'),
+        meta: {title: '公益捐赠列表'},
+      },
+    ],
+  },
+  {
+    path: '/activity4',
+    name: 'activity4',
+    component: Layout,
+    redirect: '/activity/activity_index',
+    meta: {title: '学习培训', icon: 'git-repository'},
+    children: [
+      {
+        path: 'activity_add4',
+        name: 'activityAdd4',
+        component: () => import('@/pages/activity/activity_add.vue'),
+        meta: {title: '新增学习培训'},
+      },
+      {
+        path: 'activity_index4',
+        name: 'activityIndex4',
+        component: () => import('@/pages/activity/activity_index.vue'),
+        meta: {title: '学习培训列表'},
+      },
     ],
   },
   {
     path: '/tweets',
     name: 'tweets',
     component: Layout,
-    redirect: '/tweets/index',
-    meta: {title: '青企圈', icon: UserAvatarIcon},
+    meta: {title: '青企圈', icon: 'chat-heart'},
     children: [
       {
-        path: 'index',
+        path: 'tweets_index',
         name: 'tweetsIndex',
-        component: () => import('@/pages/tweets/index.vue'),
         meta: {title: '内容列表'},
+        component: () => import('@/layouts/blank.vue'),
+        children: [
+          {
+            path: 'tweets_index2',
+            name: 'tweetsIndex2',
+            component: () => import('@/pages/tweets/index.vue'),
+            meta: {title: '通过列表'},
+          }, {
+            path: 'tweets_index1',
+            name: 'tweetsIndex1',
+            component: () => import('@/pages/tweets/index.vue'),
+            meta: {title: '待审核列表'},
+          }, {
+            path: 'tweets_index3',
+            name: 'tweetsIndex3',
+            component: () => import('@/pages/tweets/index.vue'),
+            meta: {title: '已拒绝列表'},
+          }
+          // , {
+          //   path: 'pl_index',
+          //   name: 'tweetsPlIndex',
+          //   component: () => import('@/pages/tweets/pl_index.vue'),
+          //   meta: {title: '评论列表'},
+          // },
+        ],
       }, {
         path: 'pl_index',
         name: 'tweetsPlIndex',
-        component: () => import('@/pages/tweets/pl_index.vue'),
+        component: () => import('@/layouts/blank.vue'),
         meta: {title: '评论列表'},
+        children: [
+          {
+            path: 'pl_index2',
+            name: 'tweetsPlIndex2',
+            component: () => import('@/pages/tweets/pl_index.vue'),
+            meta: {title: '通过列表'},
+          }, {
+            path: 'pl_index1',
+            name: 'tweetsPlIndex1',
+            component: () => import('@/pages/tweets/pl_index.vue'),
+            meta: {title: '待审核列表'},
+          }, {
+            path: 'pl_index3',
+            name: 'tweetsPlIndex3',
+            component: () => import('@/pages/tweets/pl_index.vue'),
+            meta: {title: '已拒绝列表'},
+          }
+          // , {
+          //   path: 'pl_index',
+          //   name: 'tweetsPlIndex',
+          //   component: () => import('@/pages/tweets/pl_index.vue'),
+          //   meta: {title: '评论列表'},
+          // },
+        ],
       },
     ],
   },
@@ -112,7 +298,7 @@ export default [
     name: 'news',
     component: Layout,
     redirect: '/news/news_index',
-    meta: {title: '新闻文章', icon: ViewListIcon},
+    meta: {title: '新闻管理', icon: 'system-log'},
     children: [
       // {
       //   path: 'wechat_index',
@@ -120,11 +306,17 @@ export default [
       //   component: () => import('@/pages/news/wechat_index.vue'),
       //   meta: {title: '公众号内容管理'},
       // },
+      {
+        path: 'news_index_add',
+        name: 'newsIndexAdd',
+        component: () => import('@/pages/news/news_add.vue'),
+        meta: {title: '添加新闻'},
+      },
       {
         path: 'news_index',
         name: 'newsIndex',
         component: () => import('@/pages/news/news_index.vue'),
-        meta: {title: '新闻内容管理'},
+        meta: {title: '新闻内容列表'},
       },
       {
         path: 'news_type',
@@ -138,7 +330,7 @@ export default [
     name: 'association',
     component: Layout,
     redirect: '/association/index',
-    meta: {title: '协会管理', icon: HomeIcon},
+    meta: {title: '协会管理', icon: 'city-3'},
     children: [
       {
         path: 'person ',
@@ -176,25 +368,37 @@ export default [
     path: '/pc',
     name: 'pc',
     component: Layout,
-    meta: {title: '官网内容管理', icon: ViewModuleIcon},
+    meta: {title: '官网内容管理', icon: 'tv-2'},
     children: [
       {
-        path: 'pc_news_type',
-        name: 'pcNewsType',
-        component: () => import('@/pages/pc/pc_news_type.vue'),
-        meta: {title: '新闻分类'},
+        path: 'pc_news_add',
+        name: 'pcNewsAdd',
+        component: () => import('@/pages/pc/pc_news_add.vue'),
+        meta: {title: '添加新闻'},
+      },
+      {
+        path: 'pc_news_edit',
+        name: 'pcNewsEdit',
+        component: () => import('@/pages/pc/pc_news_edit.vue'),
+        meta: {title: '编辑新闻'},
       },
       {
         path: 'pc_news',
         name: 'pcNews',
         component: () => import('@/pages/pc/pc_news.vue'),
-        meta: {title: '新闻列表'},
+        meta: {title: '新闻内容列表'},
+      },
+      {
+        path: 'pc_news_type',
+        name: 'pcNewsType',
+        component: () => import('@/pages/pc/pc_news_type.vue'),
+        meta: {title: '新闻类目管理'},
       },
       {
         path: 'pc_message',
         name: 'pcSwiper',
         component: () => import('@/pages/pc/pc_message.vue'),
-        meta: {title: '留言管理'},
+        meta: {title: '官网留言管理'},
       },
     ],
   }