From 9a4d47c1cd4deb90854bef3ebd6c27a8d756dfbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Fri, 24 Jan 2025 09:19:03 +0800
Subject: [PATCH] 1

---
 src/layouts/components/MenuContent.vue |   5 +
 src/pages/activity/activity_add.vue    |  37 +--
 src/pages/activity/activity_edit.vue   |  22 +-
 src/pages/activity/activity_index.vue  |  32 +--
 src/pages/activity/activity_top.vue    |   2 +-
 src/pages/association/carousel.vue     |  11 +-
 src/pages/association/index.vue        |  11 +-
 src/pages/association/opinion.vue      |   4 +-
 src/pages/association/person.vue       |   2 +-
 src/pages/business/index.vue           |   1 +
 src/pages/dashboard/base/index.vue     | 140 +++++++++---
 src/pages/log/operate.vue              |  77 +++++++
 src/pages/log/visit.vue                |  76 +++++++
 src/pages/log/wechat_login.vue         |  75 +++++++
 src/pages/news/news_add.vue            |  22 +-
 src/pages/news/news_edit.vue           | 300 +++++++++++++++++++++++++
 src/pages/news/news_index.vue          |  35 +--
 src/pages/news/news_type.vue           |   2 +-
 src/pages/pc/pc_news.vue               |  57 -----
 src/pages/pc/pc_news_add.vue           |  17 +-
 src/pages/pc/pc_news_edit.vue          | 160 ++++++-------
 src/pages/points/points_details.vue    | 248 ++++++++++++++++++++
 src/pages/points/points_rule.vue       | 118 ++++++++++
 src/pages/register/index.vue           |  47 +++-
 src/pages/tweets/index.vue             |  38 +++-
 src/pages/tweets/pl_index.vue          |  10 +-
 src/pages/user/user_add.vue            |  22 +-
 src/pages/user/user_edit.vue           |  28 ++-
 src/pages/user/user_index.vue          |   6 +-
 src/pages/user/user_info.vue           |  26 ++-
 src/pages/user/user_invoice.vue        |   2 +-
 src/pages/user/user_line.vue           |   2 +-
 src/pages/user/user_plan.vue           |   2 +-
 src/router/modules/components.ts       | 128 ++++++++---
 src/store/modules/user.ts              |   2 +-
 35 files changed, 1441 insertions(+), 326 deletions(-)
 create mode 100644 src/pages/log/operate.vue
 create mode 100644 src/pages/log/visit.vue
 create mode 100644 src/pages/log/wechat_login.vue
 create mode 100644 src/pages/news/news_edit.vue
 create mode 100644 src/pages/points/points_details.vue
 create mode 100644 src/pages/points/points_rule.vue

diff --git a/src/layouts/components/MenuContent.vue b/src/layouts/components/MenuContent.vue
index 0d2207a..c2b3ea9 100644
--- a/src/layouts/components/MenuContent.vue
+++ b/src/layouts/components/MenuContent.vue
@@ -18,6 +18,7 @@
 
         <t-menu-item
           v-else
+          @click="openUrl(item.path)"
           :key="`${item.path}`"
           :to="item.path"
           :name="item.path"
@@ -104,6 +105,10 @@ export default Vue.extend({
     },
   },
   methods: {
+    openUrl(url){
+      console.log(url);
+      sessionStorage.removeItem('sUserPage');
+    },
     getHref(item: MenuRoute) {
       return item.path.match(/(http|https):\/\/([\w.]+\/?)\S*/);
     },
diff --git a/src/pages/activity/activity_add.vue b/src/pages/activity/activity_add.vue
index e703aec..d8c4a12 100644
--- a/src/pages/activity/activity_add.vue
+++ b/src/pages/activity/activity_add.vue
@@ -1,6 +1,6 @@
 <template>
   <t-card :bordered="false">
-    <div style="color: #2E2E2E;font-size: 20px;height: 50px">
+    <div style="color: #2E2E2E;font-size: 16px;font-weight: 600;height: 50px">
       <span>新增</span>
       <span v-if="addForm.activity_type==1">协会活动</span>
       <span v-if="addForm.activity_type==2">调查问卷</span>
@@ -42,29 +42,29 @@
             <t-option key="3" label="不限制" value="3"/>
           </t-select>
         </t-form-item>
-        <t-form-item label="报名审核" name="if_auditing">
+        <t-form-item v-if="addForm.activity_type!=3&&addForm.activity_type!=2" 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"
+        <t-form-item label="报名人数" name="number" help="0为不限制">
+          <t-input size="large" type="number"  placeholder="请输入报名人数（0）为不限制" v-model="addForm.number"
                    :style="{ width: '480px' }"/>
         </t-form-item>
 
-        <t-form-item label="签到" name="if_sign">
+        <t-form-item v-if="addForm.activity_type!=3&&addForm.activity_type!=2" 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"
+          <t-input size="large" type="number" 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"
+        <t-form-item v-if="addForm.activity_type==4" label="付费金额" name="money" help="0为免费">
+          <t-input size="large" type="number" placeholder="请输入付费金额（0为免费）" v-model="addForm.money"
                    :style="{ width: '480px' }"/>
         </t-form-item>
         <t-form-item label="活动主图" :style="{ width: '100%' }">
@@ -78,6 +78,7 @@
             accept="image/*"
             :allowUploadDuplicateFile="true"
             :format-response="formatResponse"
+            :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
           ></t-upload>
         </t-form-item>
         <t-form-item label="视频" v-if="addForm.activity_type==4" :style="{ width: '100%' }">
@@ -87,8 +88,8 @@
             tips="请选择单个视频文件上传"
             accept="video/*"
             :showImageFileName="true"
-            :imageViewerProps="true"
             :format-response="formatResponseVideo"
+            :sizeLimit="{ size: 50, unit: 'MB', message: '视频大小不超过50MB' }"
           ></t-upload>
         </t-form-item>
         <t-form-item label="活动简介" name="activity_desc">
@@ -115,7 +116,7 @@
       <!--        <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 layout="inline" style="margin-top: 20px;" v-if="addForm.activity_type!=2&&addForm.activity_type!=3">
         <t-form-item label="报名开始时间" name="signup_start_time">
           <t-date-picker size="large" :clearable="true" placeholder="报名开始时间"
                          :enableTimePicker="true" :allow-input="false"
@@ -139,6 +140,14 @@
                          v-model="addForm.activity_end_time"></t-date-picker>
         </t-form-item>
       </t-form>
+      <t-form layout="inline" style="margin-top: 20px;" v-if="addForm.activity_type==1 || addForm.activity_type==4">
+        <t-form-item  label="短信通知" name="if_sign">
+          <t-select size="large" v-model="addForm.if_message" :style="{ width: '228px' }">
+            <t-option label="不发送" :value="2"/>
+            <t-option label="发送" :value="1"/>
+          </t-select>
+        </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">
           提交
@@ -178,7 +187,8 @@ export default {
         range: '3',
         number: '',
         if_sign: '1',
-        custom_points: ''
+        custom_points: '',
+        if_message:2,
       },
       activity_video: '',
       activity_video_show: [],
@@ -203,7 +213,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
-            maxFileSize: 50 * 1024 * 1024,
+            maxFileSize: 1 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             metaWithUrl: false,
@@ -218,8 +228,9 @@ export default {
               insertFn(res.data.fullurl, '', '')
             },
             onError: (file, err, res) => {
+              console.log(err);
               if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
-                this.$message.error('限制为50M，请调整好再上传！', 2000);
+                this.$message.error('图片限制为1M，请调整好再上传！', 2000);
               }
             },
           }
diff --git a/src/pages/activity/activity_edit.vue b/src/pages/activity/activity_edit.vue
index 90a318b..3e5530d 100644
--- a/src/pages/activity/activity_edit.vue
+++ b/src/pages/activity/activity_edit.vue
@@ -36,7 +36,7 @@
             <t-option key="3" label="不限制" value="3"/>
           </t-select>
         </t-form-item>
-        <t-form-item label="报名审核" name="if_auditing">
+        <t-form-item v-if="addForm.activity_type!=3&&addForm.activity_type!=2" 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"/>
@@ -47,13 +47,13 @@
                    :style="{ width: '480px' }"/>
         </t-form-item>
 
-        <t-form-item label="签到" name="if_sign">
+        <t-form-item v-if="addForm.activity_type!=3&&addForm.activity_type!=2" 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-form-item v-if="addForm.if_sign==2&&addForm.activity_type!=3&&addForm.activity_type!=2" label="签到积分" name="custom_points">
           <t-input size="large" placeholder="请输入签到积分" v-model="addForm.custom_points"
                    :style="{ width: '480px' }"/>
         </t-form-item>
@@ -72,6 +72,7 @@
             accept="image/*"
             :allowUploadDuplicateFile="true"
             :format-response="formatResponse"
+            :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
           ></t-upload>
         </t-form-item>
         <t-form-item label="视频" v-if="addForm.activity_type==4" :style="{ width: '100%' }">
@@ -83,6 +84,7 @@
             :showImageFileName="true"
             :imageViewerProps="true"
             :format-response="formatResponseVideo"
+            :sizeLimit="{ size: 50, unit: 'MB', message: '视频大小不超过50MB' }"
           ></t-upload>
         </t-form-item>
         <t-form-item label="活动简介" name="activity_desc">
@@ -109,7 +111,7 @@
       <!--        <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 layout="inline" style="margin-top: 20px;" v-if="addForm.activity_type!=2&&addForm.activity_type!=3">
         <t-form-item label="报名开始时间" name="signup_start_time">
           <t-date-picker size="large" :clearable="true" placeholder="报名开始时间"
                          :enableTimePicker="true" :allow-input="false"
@@ -133,6 +135,14 @@
                          v-model="addForm.activity_end_time"></t-date-picker>
         </t-form-item>
       </t-form>
+      <t-form layout="inline" style="margin-top: 20px;" v-if="addForm.activity_type==1 || addForm.activity_type==4">
+        <t-form-item  label="短信通知" name="if_sign">
+          <t-select size="large" v-model="addForm.if_message" :style="{ width: '228px' }">
+            <t-option label="不发送" :value="2"/>
+            <t-option label="发送" :value="1"/>
+          </t-select>
+        </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">
           提交
@@ -171,7 +181,8 @@ export default {
         range: '3',
         number: '',
         if_sign: '1',
-        custom_points: ''
+        custom_points: '',
+        if_message:2,
       },
       addMode: false,
       editID: 0,
@@ -289,6 +300,7 @@ export default {
       this.addForm.signup_start_time = d.signup_start_time;
       this.addForm.signup_end_time = d.signup_end_time;
 
+      this.addForm.if_message = Number(d.if_message);
       this.addForm.if_auditing = String(d.if_auditing);
       this.addForm.range = String(d.range);
       this.addForm.number = String(d.number);
diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue
index bcf1cf9..963248f 100644
--- a/src/pages/activity/activity_index.vue
+++ b/src/pages/activity/activity_index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="活动列表" :bordered="false">
     <div class="form-step-container">
       <!--      <t-button @click="add">新增</t-button>-->
 <!--      <t-tabs v-model="tabIndex" @change="tabIndexChange">-->
@@ -66,7 +66,7 @@
         <template #qr_code="{ row }">
           <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"
+                    :text="$store.state.user.apiUrl+'?type=1&id='+row.id+'&association_id=1'"
                     width="100"
                     height="100"
             ></vue-qr>
@@ -347,7 +347,7 @@ export default {
       questionnaireData: [{
         type: 1, title: '', wight: 0, option: [{name: 'A', val: ""}, {name: 'B', val: ""}]
       }],
-      InfotabIndex: '2',
+      InfotabIndex: '1',
       tabIndex: '1',
       visible: false,
       infoMode: false,
@@ -476,12 +476,13 @@ export default {
     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: 'activity_type', title: '活动类别', width: 140, align: 'center'},
+        {colKey: 'qr_code', title: '签到二维码', width: 150, align: 'center'},
         {colKey: 'start', title: '活动时间', align: 'center'},
         {colKey: 'sign', title: '报名时间', align: 'center'},
         // {colKey: 'money', title: '付费金额', align: 'center'},
         {colKey: 'activity_location', title: '活动地点', align: 'center'},
+        {colKey: 'application_count_type', title: '待审核', align: 'center'},
         {colKey: 'top', title: '置顶', align: 'center'},
         {colKey: 'select', title: '操作', width: 200, align: 'center'},
       ];
@@ -497,9 +498,9 @@ export default {
       ];
     }else if(tab==3){
       this.columns=[
-        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 150,},
+        {colKey: 'activity_name', title: '活动标题', align: 'center', width: 250,},
         {colKey: 'activity_type', title: '活动类别', width: 200, align: 'center'},
-        {colKey: 'qr_code', 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'},
@@ -523,7 +524,7 @@ export default {
   methods: {
     updateType(d, type) {
       this.$request
-        .post('/application/updateType', {id: d.id, type: type})
+        .post('/application/updateType', {id: d.id, type: type,activity_id: this.infoId,member_id:d.member_id})
         .then((res) => {
           if (res.code == 1) {
             this.$message.success('审核成功');
@@ -776,7 +777,7 @@ export default {
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
-            this.info_list = res.data.ret;
+            this.info_list = res.data.ret==null?[]:res.data.ret;
             this.info_pagination.total = res.data.count;
           }
 
@@ -793,11 +794,12 @@ export default {
       this.infoMode = true;
       this.infoId = d.id;
       this.infoIfAuditing = d.if_auditing;
-      // if(d.if_auditing==1){
-      //   this.InfotabIndex='2';
-      // }else{
-      //   this.InfotabIndex='1';
-      // }
+      //this.InfotabIndex='2';
+      if(d.if_auditing==1){
+        this.InfotabIndex='2';
+      }else{
+        this.InfotabIndex='1';
+      }
       if (d.if_auditing != 2) {
         this.info_columns = this.info_columns.filter(column => column.colKey !== 'sign');
       } else {
@@ -870,7 +872,7 @@ export default {
     },
     edit(d) {
       this.$router.push({
-        path: '/activity/activity_edit?id=' + d.id + "&edit=1",
+        path: '/activity1/activity_edit?id=' + d.id + "&edit=1",
       });
     },
     InfotabIndexChange(d) {
diff --git a/src/pages/activity/activity_top.vue b/src/pages/activity/activity_top.vue
index d38d2f0..654f7f0 100644
--- a/src/pages/activity/activity_top.vue
+++ b/src/pages/activity/activity_top.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="置顶活动列表" :bordered="false">
     <div class="form-step-container">
       <t-button @click="add">新增置顶</t-button>
       <t-table
diff --git a/src/pages/association/carousel.vue b/src/pages/association/carousel.vue
index 6daa024..b70e388 100644
--- a/src/pages/association/carousel.vue
+++ b/src/pages/association/carousel.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="轮播图管理" :bordered="false">
     <div class="form-step-container">
       <t-button @click="add">新增</t-button>
       <t-table
@@ -50,15 +50,16 @@
         <t-form-item label="排序" name="weight">
           <t-input placeholder="请输入排序" v-model="addForm.weight"/>
         </t-form-item>
-        <t-form-item label="轮播图片/视频">
+        <t-form-item label="轮播图片">
           <t-upload
             :action="$store.state.user.apiUrl+'/api/common/upload'"
             v-model="addForm.news_image_show"
-            tips="请选择单张图片/视频文件上传"
-            accept="image/*,video/*"
+            tips="请选择单张图片"
+            accept="image/*"
             :data="{association_id:this.association.association_id}"
             :showImageFileName="true"
             :format-response="formatResponse"
+            :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
           ></t-upload>
         </t-form-item>
       </t-form>
@@ -86,7 +87,7 @@ export default {
       list: [],
       columns: [
         {colKey: 'weight', title: '排序', align: 'center'},
-        {colKey: 'image', title: '图片视频', align: 'center'},
+        {colKey: 'image', title: '图片', align: 'center'},
         {colKey: 'type', title: '类别', align: 'center'},
         {colKey: 'url', title: '跳转链接', align: 'center'},
         {colKey: 'select', title: '操作', width: 200, align: 'center'},
diff --git a/src/pages/association/index.vue b/src/pages/association/index.vue
index 914e94e..69e5622 100644
--- a/src/pages/association/index.vue
+++ b/src/pages/association/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="关于我们" :bordered="false">
     <div class="form-step-container">
       <t-row>
         <t-col :span="6" :offset="3">
@@ -11,6 +11,7 @@
                 theme="image"
                 tips="请选择比例为（1：1）单张图片文件上传"
                 accept="image/*"
+                :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
                 :format-response="(response) => formatResponse(response, 0)"
               ></t-upload>
             </t-form-item>
@@ -25,16 +26,16 @@
               ></t-upload>
             </t-form-item>
             <t-form-item label="协会名称" name="association_name">
-              <t-input placeholder="请输入协会名称" v-model="addForm.association_name"/>
+              <t-input size="large" placeholder="请输入协会名称" v-model="addForm.association_name"/>
             </t-form-item>
             <t-form-item label="协会地址" name="association_dizhi">
-              <t-input placeholder="请输入协会地址" v-model="addForm.association_dizhi"/>
+              <t-input size="large" placeholder="请输入协会地址" v-model="addForm.association_dizhi"/>
             </t-form-item>
             <t-form-item label="协会邮箱" name="association_emal">
-              <t-input placeholder="请输入协会邮箱" v-model="addForm.association_emal"/>
+              <t-input size="large" placeholder="请输入协会邮箱" v-model="addForm.association_emal"/>
             </t-form-item>
             <t-form-item label="联系方式" name="association_phone">
-              <t-input placeholder="请输入联系方式" v-model="addForm.association_phone"/>
+              <t-input size="large" placeholder="请输入联系方式" v-model="addForm.association_phone"/>
             </t-form-item>
             <t-form-item label="协会简介" name="association_desc">
               <div style="border: 1px solid #ccc;">
diff --git a/src/pages/association/opinion.vue b/src/pages/association/opinion.vue
index 618a2c0..f0de1f0 100644
--- a/src/pages/association/opinion.vue
+++ b/src/pages/association/opinion.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="意见反馈列表" :bordered="false">
     <div class="form-step-container">
       <t-table
         rowKey="index"
@@ -35,7 +35,7 @@ export default {
       columns: [
         {colKey: 'name', title: '反馈人', align: 'center'},
         {colKey: 'phone', title: '联系方式', align: 'center'},
-        {colKey: 'content', title: '反馈内容', align: 'center'},
+        {colKey: 'text', title: '反馈内容', align: 'center'},
         {colKey: 'createtime', title: '创建时间', align: 'center'},
       ],
       pagination: {
diff --git a/src/pages/association/person.vue b/src/pages/association/person.vue
index 430a776..9c479ec 100644
--- a/src/pages/association/person.vue
+++ b/src/pages/association/person.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="管理员列表" :bordered="false">
     <div class="form-step-container">
       <t-button @click="add">新增</t-button>
       <t-table
diff --git a/src/pages/business/index.vue b/src/pages/business/index.vue
index 82933c1..7e1d6da 100644
--- a/src/pages/business/index.vue
+++ b/src/pages/business/index.vue
@@ -33,6 +33,7 @@
             tips="请选择单张图片文件上传"
             accept="image/*"
             :format-response="formatResponse"
+            :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
           ></t-upload>
         </t-form-item>
         <div style="width: 100%"></div>
diff --git a/src/pages/dashboard/base/index.vue b/src/pages/dashboard/base/index.vue
index 725b2ee..b2fcfbe 100644
--- a/src/pages/dashboard/base/index.vue
+++ b/src/pages/dashboard/base/index.vue
@@ -20,14 +20,16 @@
       <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 @click="openDbUrl(index)">
+              <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>
-              </div>
-            </t-card>
+              </t-card>
+            </div>
           </t-col>
         </t-row>
       </t-card>
@@ -36,21 +38,23 @@
       <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 @click="openDbUrlTwo(index)">
+              <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>
-              </div>
-            </t-card>
+              </t-card>
+            </div>
           </t-col>
         </t-row>
       </t-card>
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import {Icon} from 'tdesign-icons-vue';
 
 export default {
@@ -60,34 +64,98 @@ export default {
   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'},
+        {name: '入会审核', value: '0'},
+        {name: '青企圈审核', value: '0'},
+        {name: '青企圈评论审核', value: '0'},
+        {name: '会员发票', value: '0'},
+        {name: '报名审核', value: '0'},
+        {name: '生日提醒', value: '0'},
+        {name: '会费逾期', value: '0'},
       ],
       user_list: [
-        {name: '访问日志', value: '126'},
-        {name: '操作日志', value: '595'},
-        {name: '短信余量', value: '402'},
-        {name: '存储空间', value: '500G'},
-        {name: '剩余空间', value: '450G'},
+        {name: '登陆日志', value: '0'},
+        {name: '操作日志', value: '0'},
+        {name: '短信余量', value: '0'},
+        {name: '已用空间', value: '0'},
       ]
     }
   },
   mounted() {
-    // var reload=localStorage.getItem('reload');
-    // if(!reload){
-    //   localStorage.setItem('reload', 1);
-    //   setTimeout(() => {
-    //     window.location.reload();
-    //   }, 50);
-    // }
+    this.getInfo();
+    this.getInfoTwo();
+    this.getMsg();
   },
-};
+  methods: {
+    getMsg(){
+      this.$request
+        .post('/sending_message/duanxinCount')
+        .then((res) => {
+          var key=res.data.Response.SmsPackagesStatisticsSet[0];
+          this.user_list[2].value=key.CurrentUsage+'/'+key.PackageAmount;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getInfo(){
+      this.$request
+        .post('/index/todo')
+        .then((res) => {
+          console.log(res.data);
+          var d=res.data;
+          this.list[0].value=d.membershipReview;
+          this.list[1].value=d.YouthEnterpriseCircleAudit;
+          this.list[2].value=d.CommentModeration;
+          this.list[3].value=d.Membershipinvoice;
+          this.list[4].value=d.Registrationreview;
+          this.list[5].value=d.birthdays;
+          this.list[6].value=d.Overduemembershipfees;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    getInfoTwo(){
+      this.$request
+        .post('/index/AccountInformation')
+        .then((res) => {
+          console.log(res.data);
+          var d=res.data;
+          this.user_list[0].value=d.AccessLog;
+          this.user_list[1].value=d.BackendLog;
+          //this.user_list[2].value=d.SMSmargin;
+          this.user_list[3].value=d.fileSize+' / '+d.Storagespace;
+          //this.user_list[4].value=d.formattedRemainingspace;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    openDbUrlTwo(index){
+      if(index==0){
+        this.$router.push('/log/visit');
+      }else if(index==1){
+        this.$router.push('/log/operate');
+      }
+    },
+    openDbUrl(index) {
+      console.log(index);
+      if(index==0){
+        this.$router.push('/user/user_index_0');
+      }else if(index==1){
+        this.$router.push('/tweets/tweets_index/tweets_index1');
+      }else if(index==2){
+        this.$router.push('/tweets/pl_index/pl_index1');
+      }else if(index==3){
+        this.$router.push('/user_invoice/user_invoice3');
+      }else if(index==4){
+        this.$router.push('/activity1/activity_index1');
+      }else if(index==6){
+        this.$router.push('/user/user_index_3');
+      }
+    }
+  }
+}
 </script>
 <style scoped lang="less">
 .row-container {
diff --git a/src/pages/log/operate.vue b/src/pages/log/operate.vue
new file mode 100644
index 0000000..fd11a5f
--- /dev/null
+++ b/src/pages/log/operate.vue
@@ -0,0 +1,77 @@
+<template>
+  <t-card title="操作日志列表" :bordered="false">
+    <div class="form-step-container">
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+      </t-table>
+      <div style="margin-top: 30px">
+        <t-pagination
+          :total="pagination.total"
+          :page-size="pagination.size"
+          @current-change="onCurrentChange"
+          :showPageSize="false"
+        ></t-pagination>
+      </div>
+    </div>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      list: [],
+      pagination: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      columns: [
+        {colKey: 'id', title: 'ID'},
+        {colKey: 'username', title: '操作帐号'},
+        {colKey: 'ip', title: '操作IP'},
+        {colKey: 'createtime', title: '操作时间'},
+        {colKey: 'title', title: '操作内容'},
+        {colKey: 'url', title: '操作URL', width: 200},
+      ],
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$request
+        .post("/index/backendLog", {page: this.pagination.page, size: this.pagination.size})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.list = res.data.data;
+            this.pagination.total = res.data.count;
+          }
+
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCurrentChange(d) {
+      this.pagination.page = d;
+      this.getList();
+    },
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
diff --git a/src/pages/log/visit.vue b/src/pages/log/visit.vue
new file mode 100644
index 0000000..9d1e363
--- /dev/null
+++ b/src/pages/log/visit.vue
@@ -0,0 +1,76 @@
+<template>
+  <t-card title="登陆日志列表" :bordered="false">
+    <div class="form-step-container">
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+      </t-table>
+      <div style="margin-top: 30px">
+        <t-pagination
+          :total="pagination.total"
+          :page-size="pagination.size"
+          @current-change="onCurrentChange"
+          :showPageSize="false"
+        ></t-pagination>
+      </div>
+    </div>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      list: [],
+      pagination: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      columns: [
+        {colKey: 'id', title: 'ID'},
+        {colKey: 'username', title: '登陆帐号'},
+        {colKey: 'ip', title: '访问IP'},
+        {colKey: 'createtime', title: '访问时间'},
+        {colKey: 'if_login', title: '访问状态', width: 200},
+      ],
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$request
+        .post("/index/loginLog", {page: this.pagination.page, size: this.pagination.size})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.list = res.data.data;
+            this.pagination.total = res.data.count;
+          }
+
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCurrentChange(d) {
+      this.pagination.page = d;
+      this.getList();
+    },
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
diff --git a/src/pages/log/wechat_login.vue b/src/pages/log/wechat_login.vue
new file mode 100644
index 0000000..cb7396f
--- /dev/null
+++ b/src/pages/log/wechat_login.vue
@@ -0,0 +1,75 @@
+<template>
+  <t-card title="登陆日志列表" :bordered="false">
+    <div class="form-step-container">
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+      </t-table>
+      <div style="margin-top: 30px">
+        <t-pagination
+          :total="pagination.total"
+          :page-size="pagination.size"
+          @current-change="onCurrentChange"
+          :showPageSize="false"
+        ></t-pagination>
+      </div>
+    </div>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      list: [],
+      pagination: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      columns: [
+        {colKey: 'id', title: 'ID'},
+        {colKey: 'name', title: '登陆名称'},
+        {colKey: 'ip_code', title: '访问IP'},
+        {colKey: 'datetime', title: '访问时间'},
+      ],
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$request
+        .post("/index/wxloginLog", {page: this.pagination.page, size: this.pagination.size})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.list = res.data.data;
+            this.pagination.total = res.data.count;
+          }
+
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCurrentChange(d) {
+      this.pagination.page = d;
+      this.getList();
+    },
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
diff --git a/src/pages/news/news_add.vue b/src/pages/news/news_add.vue
index dcc1cd7..20b8f75 100644
--- a/src/pages/news/news_add.vue
+++ b/src/pages/news/news_add.vue
@@ -1,9 +1,5 @@
-<script setup lang="ts">
-
-</script>
-
 <template>
-  <t-card :bordered="false">
+  <t-card title="添加新闻" :bordered="false">
     <div class="form-step-container">
 <!--      <t-dialog :header="isEdit?'编辑新闻':'新增新闻'" :visible="addMode" :onClose="onCloseMy" @confirm="onSubmit"-->
 <!--                width="45%" top="20px">-->
@@ -58,6 +54,7 @@
               tips="请选择单张图片文件上传"
               accept="image/*"
               :format-response="formatResponse"
+              :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
             ></t-upload>
           </t-form-item>
           <t-form-item
@@ -125,7 +122,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
-            maxFileSize: 50 * 1024 * 1024,
+            maxFileSize: 1 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{
@@ -138,8 +135,15 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError: (file, err, res) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('图片限制为1M，请调整好再上传！', 2000);
+              }
+            },
           },
           uploadVideo: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
@@ -149,6 +153,12 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError: (file, err, res) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('视频限制为50M，请调整好再上传！', 2000);
+              }
+            },
           }
         }
       },
diff --git a/src/pages/news/news_edit.vue b/src/pages/news/news_edit.vue
new file mode 100644
index 0000000..f4ea000
--- /dev/null
+++ b/src/pages/news/news_edit.vue
@@ -0,0 +1,300 @@
+<template>
+  <t-card title="编辑新闻" :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"
+            :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
+          ></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: 1 * 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) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('图片限制为1M，请调整好再上传！', 2000);
+              }
+            },
+          },
+          uploadVideo: {
+            maxFileSize: 50 * 1024 * 1024,
+            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, '', '')
+            },
+            onError: (file, err, res) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('视频限制为50M，请调整好再上传！', 2000);
+              }
+            },
+          }
+        }
+      },
+    }
+  },
+  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();
+    if (typeof (this.$route.query.id) !== 'undefined') {
+      console.log(this.$route.query);
+      this.editID = this.$route.query.id;
+      this.getNewsInfo();
+    }
+
+  },
+  methods: {
+    getNewsInfo(){
+      this.$request
+        .post('/news/find', {news_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.$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 a0aa949..3dbf0d3 100644
--- a/src/pages/news/news_index.vue
+++ b/src/pages/news/news_index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="新闻列表" :bordered="false">
     <div class="form-step-container">
       <t-form
         ref="form"
@@ -265,21 +265,24 @@ export default {
       };
     },
     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;
+      // 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;
+      this.$router.push({
+        path: '/news/news_edit?id=' + d.news_id
+      });
     },
     getList() {
       this.$request
diff --git a/src/pages/news/news_type.vue b/src/pages/news/news_type.vue
index 6ef0b49..0fc945e 100644
--- a/src/pages/news/news_type.vue
+++ b/src/pages/news/news_type.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="新闻类目列表" :bordered="false">
     <div class="form-step-container">
       <t-button @click="add">新增</t-button>
       <t-table
diff --git a/src/pages/pc/pc_news.vue b/src/pages/pc/pc_news.vue
index d90dbfc..7b4412c 100644
--- a/src/pages/pc/pc_news.vue
+++ b/src/pages/pc/pc_news.vue
@@ -66,64 +66,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.title"/>
-        </t-form-item>
-        <t-form-item label="所属类目" name="activity_location">
-          <t-select 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 placeholder="请输入来源" v-model="addForm.article_source"/>
-        </t-form-item>
-        <t-form-item label="点击量" name="news_source">
-          <t-input placeholder="请输入自定义点击量" v-model="addForm.number_of_views"/>
-        </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.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 :style="{ width: '200px' }" :clearable="true" placeholder="展示时间"
-                         :enableTimePicker="true" :allow-input="false"
-                         v-model="addForm.display_time"></t-date-picker>
-        </t-form-item>
-      </t-form>
-    </t-dialog>
   </t-card>
 
 </template>
diff --git a/src/pages/pc/pc_news_add.vue b/src/pages/pc/pc_news_add.vue
index 10a7144..84135e9 100644
--- a/src/pages/pc/pc_news_add.vue
+++ b/src/pages/pc/pc_news_add.vue
@@ -105,7 +105,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
-            maxFileSize: 50 * 1024 * 1024,
+            maxFileSize: 1 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{
@@ -120,11 +120,12 @@ export default {
             },
             onError:(file, err, res)=>{
               if(err.message.indexOf('exceeds maximum allowed size') !== -1){
-                this.$message.error('限制为50M，请调整好再上传！',2000);
+                this.$message.error('图片限制为1M，请调整好再上传！',2000);
               }
             },
           },
           uploadVideo: {
+            maxFileSize: 1 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
@@ -134,6 +135,11 @@ 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);
+              }
+            },
           }
         }
       },
@@ -226,8 +232,11 @@ export default {
           console.log(res);
           if (res.code == 1) {
             this.$message.success(res.msg);
-            this.addMode = false;
-            this.getList();
+            setTimeout(()=>{
+              this.$router.push({
+                path: '/pc/pc_news',
+              },500);
+            })
           } else {
             this.$message.error(res.msg);
           }
diff --git a/src/pages/pc/pc_news_edit.vue b/src/pages/pc/pc_news_edit.vue
index 1a99471..975ee3e 100644
--- a/src/pages/pc/pc_news_edit.vue
+++ b/src/pages/pc/pc_news_edit.vue
@@ -5,70 +5,62 @@
 <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"
-            />
+        <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.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>
+              <Editor
+                style="height: 200px"
+                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"
+              :sizeLimit="{ size: 500, unit: 'KB', message: '图片大小不超过500KB' }"
+            ></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>
@@ -125,7 +117,7 @@ export default {
         autoFocus: true,
         MENU_CONF: {
           uploadImage: {
-            maxFileSize: 50 * 1024 * 1024,
+            maxFileSize: 1 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             meta:{
@@ -138,8 +130,15 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError: (file, err, res) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('图片限制为1M，请调整好再上传！', 2000);
+              }
+            },
           },
           uploadVideo: {
+            maxFileSize: 50 * 1024 * 1024,
             server: store.state.user.apiUrl + '/api/common/upload',
             fieldName: 'file',
             customInsert(res: any, insertFn: InsertFnType) {  // TS 语法
@@ -149,6 +148,12 @@ export default {
               // 从 res 中找到 url alt href ，然后插入图片
               insertFn(res.data.fullurl, '', '')
             },
+            onError: (file, err, res) => {
+              console.log(err);
+              if (err.message.indexOf('exceeds maximum allowed size') !== -1) {
+                this.$message.error('视频限制为50M，请调整好再上传！', 2000);
+              }
+            },
           }
         }
       },
@@ -177,9 +182,10 @@ export default {
   methods: {
     getActInfo(){
       this.$request
-        .post('/news/find', {id: this.editID})
+        .post('/pc_news/articlefind', {id: this.editID})
         .then((res) => {
-          //this.edit(res.data);
+          console.log(res);
+          this.edit(res.data);
         })
         .catch((e) => {
           console.log(e);
@@ -196,17 +202,15 @@ export default {
 
     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.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;
@@ -269,7 +273,7 @@ export default {
             this.$message.success(res.msg);
             setTimeout(()=>{
               this.$router.push({
-                path: '/news/news_index',
+                path: '/pc/pc_news',
               },500);
             })
           } else {
diff --git a/src/pages/points/points_details.vue b/src/pages/points/points_details.vue
new file mode 100644
index 0000000..94ac344
--- /dev/null
+++ b/src/pages/points/points_details.vue
@@ -0,0 +1,248 @@
+<template>
+  <t-card title="用户积分列表" :bordered="false">
+    <div class="form-step-container">
+      <t-form
+        ref="form"
+        :data="formData"
+        :label-width="80"
+        @submit="onSubmit"
+        :style="{ marginBottom: '30px' }"
+      >
+        <t-row>
+          <t-form-item label="会员姓名" name="nikename">
+            <t-input
+              v-model="formData.nikename"
+              class="form-item-content"
+              type="search"
+              placeholder="请输入会员姓名"
+              style="width: 150px"
+            />
+          </t-form-item>
+<!--          <t-form-item label="手机号" name="phone">-->
+<!--            <t-input-->
+<!--              v-model="formData.phone"-->
+<!--              class="form-item-content"-->
+<!--              placeholder="请输入手机号" style="width: 150px"-->
+<!--            />-->
+<!--          </t-form-item>-->
+          <div>
+            <t-space>
+              <t-button theme="primary" type="submit" :style="{ marginLeft: '8px' }"> 查询</t-button>
+            </t-space>
+          </div>
+        </t-row>
+      </t-form>
+      <t-table
+        rowKey="index"
+        :data="list"
+        :columns="columns"
+        :stripe="false"
+        :bordered="false"
+        :hover="true"
+        size="large"
+        table-layout="auto"
+        cellEmptyContent="-"
+      >
+        <template #photo_image="{ row }">
+          <img v-if="row.photo_image" :src="$store.state.user.apiUrl+row.photo_image" style="width: 50px;height: 50px">
+        </template>
+        <template #select="{ row }">
+          <t-space size="24px">
+            <t-button theme="default" @click="openInfoMode(row)">积分明细</t-button>
+            <t-button theme="primary" @click="openAddMode(row)">加减积分</t-button>
+          </t-space>
+        </template>
+      </t-table>
+      <div style="margin-top: 30px">
+        <t-pagination
+          :total="pagination.total"
+          :page-size="pagination.size"
+          @current-change="onCurrentChange"
+          :showPageSize="false"
+        ></t-pagination>
+      </div>
+    </div>
+    <t-dialog header="加减积分" :visible="addMode" :onClose="onCloseMy" @confirm="AddonSubmit">
+      <t-form>
+        <t-form-item label="用户" name="nikename">
+          <t-input placeholder="用户" disabled="" v-model="addInfo.nikename"/>
+        </t-form-item>
+        <t-form-item label="积分分值" name="points_number">
+          <t-input placeholder="请输入积分分值" type="number" v-model="addFrom.number"/>
+        </t-form-item>
+        <t-form-item label="操作类型" name="type">
+          <t-select v-model="addFrom.type">
+            <t-option label="增加积分" :value="1"></t-option>
+            <t-option label="扣除积分" :value="2"></t-option>
+          </t-select>
+        </t-form-item>
+        <t-form-item label="操作备注" name="desc">
+          <t-input placeholder="请输入操作备注"  v-model="addFrom.content"/>
+        </t-form-item>
+      </t-form>
+    </t-dialog>
+    <t-dialog header="积分明细" :confirmBtn="null" :visible="InfoMode" :onClose="onCloseMy"
+              width="65%" top="50px">
+      <div>
+        <t-table
+          rowKey="index"
+          :data="InfoList"
+          :columns="columnsInfo"
+          :stripe="false"
+          :bordered="false"
+          :hover="true"
+          size="large"
+          table-layout="auto"
+          cellEmptyContent="-"
+        >
+          <template #type="{ row }">
+            <t-space size="24px">
+              <t-tag v-if="row.type==1" theme="success">增加</t-tag>
+              <t-tag v-if="row.type==2" theme="danger">扣除</t-tag>
+            </t-space>
+          </template>
+        </t-table>
+        <div style="margin-top: 30px">
+          <t-pagination
+            :total="paginationInfo.total"
+            :page-size="paginationInfo.size"
+            @current-change="onCurrentChangeInfo"
+            :showPageSize="false"
+          ></t-pagination>
+        </div>
+      </div>
+    </t-dialog>
+  </t-card>
+
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      list: [],
+      pagination: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      addFrom:{
+        number:'',
+        type:1,
+        content:'',
+        member_id:0,
+      },
+      addMode:false,
+      formData:{
+        nikename:'',
+        phone:'',
+      },
+      addInfo:{},
+      columns: [
+        {colKey: 'id', title: 'ID'},
+        {colKey: 'photo_image', title: '证件照'},
+        {colKey: 'nikename', title: '姓名'},
+        {colKey: 'phone', title: '手机号'},
+        {colKey: 'points_number', title: '积分'},
+        {colKey: 'select', title: '操作', width: 200},
+      ],
+      columnsInfo: [
+        {colKey: 'id', title: 'ID'},
+        {colKey: 'number', title: '积分'},
+        {colKey: 'type', title: '类型'},
+        {colKey: 'content', title: '说明'},
+        {colKey: 'createtime', title: '时间'},
+      ],
+      paginationInfo: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      InfoMode:false,
+      InfoList:[],
+    }
+  },
+  mounted() {
+    //this.member_id=this.$route.query.id;
+    this.getList();
+  },
+  methods: {
+    AddonSubmit(){
+      this.addFrom.member_id=this.addInfo.id;
+      console.log(this.addFrom);
+      this.$request
+        .post("/points_rule/memberPointUpdate", this.addFrom)
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success('操作成功！');
+            this.getList();
+            this.addMode=false;
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    openInfoMode(row){
+      this.$request
+        .post("/points_rule/memberPointefind", {page: this.paginationInfo.page, size: this.paginationInfo.size,id:row.id})
+        .then((res) => {
+          this.InfoList = res.data.ret;
+          this.paginationInfo.total = res.data.count;
+          this.InfoMode=true;
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+      },
+    openAddMode(row){
+      this.addInfo=row;
+      this.addMode=true;
+      this.addFrom={
+        number:'',
+          type:1,
+          content:'',
+          member_id:0,
+      };
+    },
+    onSubmit(){
+      this.pagination.page=1;
+        this.getList();
+    },
+    onCloseMy(){
+      this.addMode=false;
+      this.InfoMode=false;
+    },
+    getList() {
+      this.$request
+        .post("/points_rule/memberPointeIndex", {page: this.pagination.page, size: this.pagination.size,...this.formData})
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.list = res.data.ret;
+            this.pagination.total = res.data.count;
+          }else{
+            this.list = [];
+            this.pagination.total = 0;
+          }
+
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onCurrentChangeInfo(d){
+      this.paginationInfo.page=d;
+      this.openInfoMode();
+    },
+    onCurrentChange(d) {
+      this.pagination.page = d;
+      this.getList();
+    },
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
diff --git a/src/pages/points/points_rule.vue b/src/pages/points/points_rule.vue
new file mode 100644
index 0000000..c5a319c
--- /dev/null
+++ b/src/pages/points/points_rule.vue
@@ -0,0 +1,118 @@
+<template>
+  <t-card :bordered="false">
+    <div style="padding-bottom:40px;font-size: 16px;font-weight: 600">积分细则设置</div>
+    <div class="form-step-container">
+
+      <t-form :labelWidth="150">
+        <t-form-item label="每日签到积分" name="association_name">
+          <t-input size="large" type="number" placeholder="请输入每日签到积分" v-model="sign_in_points"
+                   style="width: 500px"/>
+        </t-form-item>
+        <t-form-item label="青企圈消耗积分" name="association_dizhi">
+          <t-input size="large" type="number" placeholder="请输入青企圈消耗积分" v-model="consumption_poin"
+                   style="width: 500px"/>
+        </t-form-item>
+      </t-form>
+      <div style="margin:40px">
+        <t-button @click="updateInfo" theme="primary" size="large">保存</t-button>
+      </div>
+    </div>
+  </t-card>
+</template>
+<script lang="ts">
+export default {
+  data() {
+    return {
+      info: {},
+      consumption_poin: '',
+      sign_in_points: '',
+    }
+  },
+
+  mounted() {
+    this.getInfo();
+  },
+  methods: {
+    getInfo() {
+      this.$request
+        .post('/points_rule/find', {id: 1})
+        .then((res) => {
+          this.consumption_poin = res.data.consumption_poin;
+          this.sign_in_points = res.data.sign_in_points;
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    updateInfo() {
+      this.$request
+        .post('/points_rule/update', {
+          id: 1,
+          consumption_poin: this.consumption_poin,
+          sign_in_points: this.sign_in_points
+        })
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+          } else {
+            this.$message.error(res.msg);
+          }
+          this.getInfo();
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+    onSubmit() {
+      if (this.association_name == '') {
+        this.$message.error('协会名称不能为空');
+        return;
+      }
+      if (this.association_phone == '') {
+        this.$message.error('协会联系方式不能为空');
+        return;
+      }
+      if (this.association_emal == '') {
+        this.$message.error('协会邮箱不能为空');
+        return;
+      }
+      if (this.association_dizhi == '') {
+        this.$message.error('协会地址不能为空');
+        return;
+      }
+      if (this.association_desc == '') {
+        this.$message.error('协会简介不能为空');
+        return;
+      }
+      if (this.association_guizhang == '') {
+        this.$message.error('协会规章制度不能为空');
+        return;
+      }
+      if (this.association_image == '') {
+        this.$message.error('协会头像不能为空');
+        return;
+      }
+      if (this.ruhuixizhu == '') {
+        this.$message.error('入会须知不能为空');
+        return;
+      }
+      this.$request
+        .post('/association/update', this.addForm)
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success(res.msg);
+            //localStorage.setItem('associationInfo',  JSON.stringify(this.addForm) );
+            this.getList();
+          } else {
+            this.$message.error(res.msg);
+          }
+          console.log(res);
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+  }
+}
+</script>
diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue
index 5c35bdb..6fb8083 100644
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
@@ -407,13 +407,19 @@
                   <t-form-item label="企业注册地">
                     <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                   </t-form-item>
+                  <t-form-item label="企业位置经度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                    <t-input size="large" v-model="formData.longitude" placeholder="地图经度（如：116.xxx ）"/>
+                  </t-form-item>
+                  <t-form-item label="企业位置纬度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                    <t-input size="large" v-model="formData.dimension" placeholder="地图纬度（如：39.xxx ）"/>
+                  </t-form-item>
                   <t-form-item label="注册资金（万元）">
                     <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                   </t-form-item>
                   <t-form-item label="是否上市" name="name">
                     <t-select size="large" v-model="formData.if_list" :style="{ width: '200px' }">
-                      <t-option key="0" label="是" value="0"></t-option>
-                      <t-option key="1" label="否" value="1"></t-option>
+                      <t-option key="0" label="是" :value="0"></t-option>
+                      <t-option key="1" label="否" :value="1"></t-option>
                     </t-select>
                   </t-form-item>
                   <t-form-item label="员工人数">
@@ -652,8 +658,8 @@
               <t-form layout="inline" labelAlign="top" :labelWidth="100">
                 <t-form-item label="是否建立团组织" name="name">
                   <t-select size="large" v-model="formData.if_organization" :style="{ width: '200px' }">
-                    <t-option key="0" label="是" value="0"></t-option>
-                    <t-option key="1" label="否" value="1"></t-option>
+                    <t-option key="0" label="是" :value="0"></t-option>
+                    <t-option key="1" label="否" :value="1"></t-option>
                   </t-select>
                 </t-form-item>
               </t-form>
@@ -959,6 +965,8 @@ export default {
         reporting_method: '3',
         recommendation_content: '',
         recommended_cities: '',
+        longitude:'',
+        dimension:'',
       },
       current: 2,
       industry_list: [],
@@ -1199,7 +1207,7 @@ export default {
             this.formData.unified_code = res.data.unified_code;
             this.formData.enterprise_nature = res.data.enterprise_nature;
             this.formData.enterprise_website = res.data.enterprise_website;
-            this.formData.if_list = res.data.if_list;
+            this.formData.if_list = parseInt(res.data.if_list);
             this.formData.employee = res.data.employee;
             this.formData.previous_revenue = res.data.previous_revenue;
             this.formData.previous_tax = res.data.previous_tax;
@@ -1221,14 +1229,8 @@ export default {
             this.formData.introduction = res.data.introduction;
             this.formData.enterprise_name = res.data.enterprise_name;
             this.formData.main_social_positions = res.data.main_social_positions;
-            this.social_duties = res.data.main_social_positions.split(',');
-            this.contactsList = JSON.parse(res.data.other_contacts);
+
             this.formData.work_experience = res.data.work_experience;
-
-            this.workList = JSON.parse(res.data.work_experience);
-
-            this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
-
             this.formData.reporting_method = res.data.reporting_method;
             this.formData.recommendation_content = res.data.recommendation_content;
             this.formData.recommendation_id = res.data.recommendation_id == 0 ? '' : res.data.recommendation_id;
@@ -1245,6 +1247,19 @@ export default {
             this.formData.zip_code = res.data.zip_code;
             this.formData.registered_capital = res.data.registered_capital;
             this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
+
+            this.formData.longitude = res.data.longitude;
+            this.formData.dimension=res.data.dimension;
+            if(res.data.work_experience!=null){
+              this.workList = JSON.parse(res.data.work_experience);
+            }else{
+              this.workList = [];
+            }
+            this.social_duties = res.data.main_social_positions.split(',');
+            this.contactsList = JSON.parse(res.data.other_contacts);
+            this.tuan_list = JSON.parse(res.data.tuanweifuzerenxinxi);
+
+
           }
         })
         .catch((e) => {
@@ -1375,6 +1390,14 @@ export default {
         this.$message.error('请选择行业！');
         return;
       }
+      if (this.formData.longitude == '') {
+        this.$message.error('请输入企业位置经度');
+        return;
+      }
+      if (this.formData.dimension == '') {
+        this.$message.error('请输入企业位置纬度');
+        return;
+      }
       // if (this.formData.if_organization == 0) {
       //   if (this.formData.nature == '') {
       //     this.$message.error('请输主团组织性质！');
diff --git a/src/pages/tweets/index.vue b/src/pages/tweets/index.vue
index a75d7c0..20bcc08 100644
--- a/src/pages/tweets/index.vue
+++ b/src/pages/tweets/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="青企圈列表" :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>-->
@@ -21,10 +21,18 @@
         <template #member_info="{ row }">
           <div>{{row.member.nikename}}</div>
         </template>
-        <template #files="{ row }">
-          <a v-for="item in row.files" :href="$store.state.user.apiUrl+item" target="_blank">
-            <img :src="$store.state.user.apiUrl+item" style="width: 100px;margin-right: 10px"/>
-          </a>
+        <template #files="{ row ,rowIndex}">
+<!--          <a v-for="item in row.files" :href="$store.state.user.apiUrl+item" target="_blank">-->
+<!--            <img :src="$store.state.user.apiUrl+item" style="width: 100px;margin-right: 10px"/>-->
+<!--          </a>-->
+          <t-image-viewer v-model="visible[rowIndex]" :images="row.files" @close="delViewer(index)">
+            <template #trigger="{ open }">
+              <div @click="open"  style="cursor: pointer" v-if="row.files.length>0">
+                <img   alt="test" :src="row.files[0]" style="width: 200px"/>
+                <div>预览图片 {{row.files.length}}张</div>
+              </div>
+            </template>
+          </t-image-viewer>
         </template>
         <template #this_top="{ row }">
           <t-tag v-if="row.is_top==0" theme="success" @click="topNews(row)" style="cursor: pointer">点击置顶</t-tag>
@@ -69,6 +77,7 @@ import {toInteger} from "lodash";
 export default {
   data() {
     return {
+      visible: [],
       state: 2,
       list: [],
       reason:'',
@@ -83,7 +92,7 @@ export default {
       ],
       pagination: {
         page: 1,
-        size: 10,
+        size: 5,
         total: 0,
       },
     }
@@ -100,6 +109,9 @@ export default {
     this.getList();
   },
   methods: {
+    delViewer(d){
+      console.log(d);
+    },
     tabIndexChange(index){
       this.state=index;
       this.pagination.page=1;
@@ -158,7 +170,7 @@ export default {
         });
     },
     onCurrentChange(d){
-      this.page=d;
+      this.pagination.page=d;
       this.getList();
     },
     getList() {
@@ -167,8 +179,16 @@ export default {
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
-            this.list = res.data.data;
-            this.pagination.total = res.data.total;
+            var list = res.data.paginator.data;
+            const apiUrl = store.state.user.apiUrl; // 假设这是你的 API URL
+            const transformedSelectList = list.map(item => ({
+              ...item, // 保留其他所有属性
+              files: item.files.length > 0 ? item.files.map(file => apiUrl + file) : []
+            }));
+            console.log(transformedSelectList);
+            this.list = transformedSelectList;
+            this.visible=Array(this.list.length).fill(false);
+            this.pagination.total = res.data.count;
           }
 
         })
diff --git a/src/pages/tweets/pl_index.vue b/src/pages/tweets/pl_index.vue
index 8eec42e..6e87d93 100644
--- a/src/pages/tweets/pl_index.vue
+++ b/src/pages/tweets/pl_index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="青企圈评论列表" :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>-->
@@ -19,7 +19,7 @@
         :pagination="pagination"
       >
         <template #tweet="{ row }">
-          <div>{{row.tweet.title}}</div>
+          <div>{{row.tweet==null?'-':row.tweet.title}}</div>
         </template>
         <template #member_info="{ row }">
           <div>{{row.member.nikename}}</div>
@@ -141,7 +141,7 @@ export default {
         });
     },
     onCurrentChange(d){
-      this.page=d;
+      this.pagination.page=d;
       this.getList();
     },
     getList() {
@@ -150,8 +150,8 @@ export default {
         .then((res) => {
           console.log(res);
           if (res.code == 1) {
-            this.list = res.data.data;
-            this.pagination.total = res.data.total;
+            this.list = res.data.paginator.data;
+            this.pagination.total = res.data.count;
           }
 
         })
diff --git a/src/pages/user/user_add.vue b/src/pages/user/user_add.vue
index b2998ee..f344a47 100644
--- a/src/pages/user/user_add.vue
+++ b/src/pages/user/user_add.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-base">
-    <t-card title="" :bordered="false" class="info-block">
+    <t-card title="新增会员"  :bordered="false" class="info-block">
       <div style="padding: 20px;margin-top: 20px">
         <div >
           <div>
@@ -396,6 +396,12 @@
                     <t-form-item label="企业注册地">
                       <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                     </t-form-item>
+                    <t-form-item label="企业位置经度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html ">
+                      <t-input size="large" v-model="formData.longitude" placeholder="地图经度（如：116.xxx ）"/>
+                    </t-form-item>
+                    <t-form-item label="企业位置纬度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                      <t-input size="large" v-model="formData.dimension" placeholder="地图纬度（如：39.xxx ）"/>
+                    </t-form-item>
                     <t-form-item label="注册资金（万元）">
                       <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                     </t-form-item>
@@ -909,6 +915,7 @@ export default {
         enterprise_nature: '',
         enterprise_website: '',
         if_list: null,
+        if_xianshi: 1,
         employee: '',
         previous_revenue: '',
         previous_tax: '',
@@ -935,6 +942,8 @@ export default {
         company_image: '',
         company_image_show: [],
         region_id: null,
+        longitude:'',
+        dimension:'',
       },
       id: 0,
       info: '',
@@ -1212,6 +1221,14 @@ export default {
       if (this.formData.photo_image == '') {
         this.formData.photo_image = '/uploads/20240517/8b2da599cd1e90fcfbb56bdf0f4f4181.webp';
       }
+      if (this.formData.longitude == '') {
+        this.$message.error('请输入企业位置经度');
+        return;
+      }
+      if (this.formData.dimension == '') {
+        this.$message.error('请输入企业位置纬度');
+        return;
+      }
       // if (this.formData.enterprise_nature == '') {
       //   this.$message.error('请输入企业性质！');
       //   return;
@@ -1327,6 +1344,9 @@ export default {
           console.log(res);
           if (res.code == 1) {
             this.$message.success('新增成功！');
+            this.$router.push({
+              path: '/user/user_index_1',
+            },500);
           } else {
             this.$message.error(res.msg);
           }
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index ec8536b..83cca75 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-base">
-    <t-card title="" :bordered="false" class="info-block">
+    <t-card title="会员编辑" :bordered="false" class="info-block">
       <div style="padding: 20px;margin-top: 20px">
         <div >
           <div>
@@ -396,6 +396,12 @@
                     <t-form-item label="企业注册地">
                       <t-input size="large" v-model="formData.enterprise_location" placeholder="请输入企业注册地"/>
                     </t-form-item>
+                    <t-form-item label="企业位置经度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                      <t-input size="large" v-model="formData.longitude" placeholder="地图经度（如：116.xxx ）"/>
+                    </t-form-item>
+                    <t-form-item label="企业位置纬度" help="坐标拾取：https://lbs.qq.com/tool/getpoint/get-point.html">
+                      <t-input size="large" v-model="formData.dimension" placeholder="地图纬度（如：39.xxx ）"/>
+                    </t-form-item>
                     <t-form-item label="注册资金（万元）">
                       <t-input size="large" v-model="formData.registered_capital" placeholder="注册资金（万元）"/>
                     </t-form-item>
@@ -935,6 +941,8 @@ export default {
         company_image: '',
         company_image_show: [],
         region_id: null,
+        longitude:'',
+        dimension:'',
       },
       id: 0,
       info: '',
@@ -1262,7 +1270,11 @@ export default {
           this.formData.enterprise_lvxingzeren=res.data.enterprise_lvxingzeren;
           this.formData.introdiction = res.data.introdiction;
           this.formData.enterprise_honor = res.data.enterprise_honor;
-          this.formData.if_organization = res.data.if_organization+'';
+          if(res.data.if_organization!=null){
+            this.formData.if_organization = res.data.if_organization+'';
+          }else{
+            this.formData.if_organization="1";
+          }
           this.formData.nature = res.data.nature;
           this.formData.jiantuan_time = res.data.jiantuan_time;
           this.formData.jiantuan_number = res.data.jiantuan_number;
@@ -1285,7 +1297,8 @@ export default {
           }else{
             this.contactsList = JSON.parse(res.data.other_contacts);
           }
-
+          this.formData.longitude = res.data.longitude;
+          this.formData.dimension=res.data.dimension;
           this.formData.reporting_method = res.data.reporting_method;
           this.formData.recommendation_id=res.data.recommendation_id;
           this.formData.recommendation_content = res.data.recommendation_content;
@@ -1417,14 +1430,17 @@ export default {
       //   }
       // }
       this.formData.member_id = this.id;
-      if (this.workList.length > 0) {
+      if (this.workList && this.workList.length > 0) {
 
         this.formData.work_experience = JSON.stringify(this.workList);
       }
-      if (this.contactsList.length > 0) {
+      if ( this.contactsList && this.contactsList.length > 0) {
         this.formData.other_contacts = JSON.stringify(this.contactsList);
       }
-      if (this.tuan_list.length > 0) {
+
+      console.log(this.tuan_list);
+
+      if (this.tuan_list && this.tuan_list.length > 0) {
         this.formData.tuanweifuzerenxinxi = JSON.stringify(this.tuan_list);
       }
       if (this.social_duties.length > 0) {
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue
index be52e39..33d9067 100644
--- a/src/pages/user/user_index.vue
+++ b/src/pages/user/user_index.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="会员列表" :bordered="false">
     <div class="form-step-container">
       <t-form
         ref="form"
@@ -78,6 +78,7 @@
         <template #if_xianshi="{ row }">
           <t-tag theme="primary" v-if="row.if_xianshi==0">待审核</t-tag>
           <t-tag theme="success" v-if="row.if_xianshi==1">正式会员</t-tag>
+          <t-tag theme="warning" v-if="row.if_xianshi==3">未缴纳会费</t-tag>
           <t-tag theme="danger" v-if="row.if_xianshi==2">申请已被拒绝</t-tag>
         </template>
         <template #select="{ row }">
@@ -168,7 +169,8 @@ export default {
     }
     var tab=this.$route.name.slice(-1);
     this.tabIndex = toInteger(tab);
-    console.log(tab);
+    // console.log(this.tabIndex);
+    // console.log(tab);
     // const Tab = sessionStorage.getItem('sUserTab');
     // if (Tab) {
     //   this.tabIndex = toInteger(Tab);
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 5ed3944..0ec9685 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-base">
-    <t-card title="" :bordered="false" class="info-block" style="padding: 30px">
+    <t-card title="会员详情" :bordered="false" class="info-block" style="padding: 30px">
       <t-steps :current="0" readonly v-if="info.if_xianshi!=1">
         <t-step-item title="信息审核" content="提交的信息审核"></t-step-item>
         <t-step-item v-if="info.if_xianshi!=2" title="会费缴纳" content="等待会费缴纳"></t-step-item>
@@ -218,7 +218,11 @@
                 <td>统一社会信用代码</td>
                 <td colspan="2">{{ info.unified_code }}</td>
                 <td>企业注册地</td>
-                <td colspan="2">{{ info.enterprise_location }}</td>
+                <td colspan="1">{{ info.enterprise_location }}</td>
+                <td>企业地址</td>
+                <td colspan="1">
+                  <a href="https://lbs.qq.com/tool/getpoint/get-point.html" target="_blank">{{ info.longitude }},{{ info.dimension }}</a>
+                </td>
                 <td>注册资金（万元）</td>
                 <td>{{ info.registered_capital }}</td>
               </tr>
@@ -231,7 +235,7 @@
                 <td>{{ info.enterprise_nature }}</td>
                 <td>所属行业</td>
                 <td>{{ info.industry_name }}</td>
-                <td>企业网址</td>
+                <td colspan="2">企业网址</td>
                 <td>{{ info.enterprise_website }}</td>
               </tr>
               <tr>
@@ -242,13 +246,13 @@
                 <td>上年度净利润（万元）</td>
                 <td colspan="2">{{ info.previous_profit }}</td>
                 <td>上年公益性捐赠支出（万元）</td>
-                <td colspan="2">{{ info.previous_donation }}</td>
+                <td colspan="3">{{ info.previous_donation }}</td>
               </tr>
               <tr>
                 <td>
                   营业执照
                 </td>
-                <td colspan="4">
+                <td colspan="5">
                   <t-image-viewer :images="[$store.state.user.apiUrl+info.business_license_image]" mode="modeless"
                                   :closeOnEscKeydown="false">
                     <template #trigger="{ open }">
@@ -275,7 +279,7 @@
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">公司介绍</div>
                 </td>
                 <td colspan="5">
@@ -283,7 +287,7 @@
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="text-align: left" v-html="info.enterprise_Introduction"></div>
                 </td>
                 <td colspan="5">
@@ -291,7 +295,7 @@
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">企业所获荣誉以及专利</div>
                 </td>
                 <td colspan="5">
@@ -299,7 +303,7 @@
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="text-align: left" v-html="info.enterprise_honor"></div>
                 </td>
                 <td colspan="5">
@@ -307,12 +311,12 @@
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="font-size: 18px;font-weight: 600">企业履行社会责任情况</div>
                 </td>
               </tr>
               <tr align="center">
-                <td colspan="5">
+                <td colspan="6">
                   <div style="text-align: left" v-html="info.enterprise_lvxingzeren"></div>
                 </td>
               </tr>
diff --git a/src/pages/user/user_invoice.vue b/src/pages/user/user_invoice.vue
index 8d8743d..53b25e1 100644
--- a/src/pages/user/user_invoice.vue
+++ b/src/pages/user/user_invoice.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="发票申请列表" :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>-->
diff --git a/src/pages/user/user_line.vue b/src/pages/user/user_line.vue
index eacaf14..b6d8f58 100644
--- a/src/pages/user/user_line.vue
+++ b/src/pages/user/user_line.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="行业列表" :bordered="false">
     <div class="form-step-container">
       <t-button @click="add">新增</t-button>
       <t-table
diff --git a/src/pages/user/user_plan.vue b/src/pages/user/user_plan.vue
index ea97eca..0b3ea3b 100644
--- a/src/pages/user/user_plan.vue
+++ b/src/pages/user/user_plan.vue
@@ -1,5 +1,5 @@
 <template>
-  <t-card :bordered="false">
+  <t-card title="职位列表" :bordered="false">
     <div class="form-step-container">
             <t-button @click="add">新增</t-button>
       <t-table
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index 75bc7e4..37bf9d6 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -125,10 +125,10 @@ export default [
     ],
   },
   {
-    path: '/activity',
-    name: 'activity',
+    path: '/activity1',
+    name: 'activity1',
     component: Layout,
-    redirect: '/activity/index',
+    redirect: '/activity1/index',
     meta: {title: '协会活动', icon: 'flag-4'},
     children: [
       {
@@ -157,6 +157,21 @@ export default [
       // }
     ],
   },
+  {
+    path: '/activity_top',
+    name: 'activity_top',
+    component: Layout,
+    redirect: '/activity/activity_top',
+    meta: {title: '活动置顶', icon: 'align-top'},
+    children: [
+      {
+        path: 'activity_top',
+        name: 'activityTop',
+        component: () => import('@/pages/activity/activity_top.vue'),
+        meta: {title: '活动首页置顶'},
+      }
+    ],
+  },
   {
     path: '/activity2',
     name: 'activity2',
@@ -306,6 +321,12 @@ export default [
       //   component: () => import('@/pages/news/wechat_index.vue'),
       //   meta: {title: '公众号内容管理'},
       // },
+      {
+        path: 'news_edit',
+        name: 'newsEdit',
+        component: () => import('@/pages/news/news_edit.vue'),
+        meta: {title: '编辑新闻',hidden:true},
+      },
       {
         path: 'news_index_add',
         name: 'newsIndexAdd',
@@ -325,7 +346,26 @@ export default [
         meta: {title: '新闻类目管理'},
       }
     ],
-  }, {
+  },   {
+    path: '/points',
+    name: 'points',
+    component: Layout,
+    meta: {title: '积分管理', icon: 'calculation-1'},
+    children: [
+      {
+        path: 'points_rule',
+        name: 'pointsRule',
+        component: () => import('@/pages/points/points_rule.vue'),
+        meta: {title: '积分细则'},
+      },
+      {
+        path: 'points_details',
+        name: 'pointsDetails',
+        component: () => import('@/pages/points/points_details.vue'),
+        meta: {title: '用户积分'},
+      },
+    ],
+  },{
     path: '/association',
     name: 'association',
     component: Layout,
@@ -364,41 +404,67 @@ export default [
       // }
     ],
   },
+  // {
+  //   path: '/pc',
+  //   name: 'pc',
+  //   component: Layout,
+  //   meta: {title: '官网管理', icon: 'tv-2'},
+  //   children: [
+  //     {
+  //       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: '编辑新闻',hidden:true},
+  //     },
+  //     {
+  //       path: 'pc_news',
+  //       name: 'pcNews',
+  //       component: () => import('@/pages/pc/pc_news.vue'),
+  //       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: '留言管理'},
+  //     },
+  //   ],
+  // },
   {
-    path: '/pc',
-    name: 'pc',
+    path: '/log',
+    name: 'log',
     component: Layout,
-    meta: {title: '官网内容管理', icon: 'tv-2'},
+    meta: {title: '日志管理', icon: 'git-repository'},
     children: [
       {
-        path: 'pc_news_add',
-        name: 'pcNewsAdd',
-        component: () => import('@/pages/pc/pc_news_add.vue'),
-        meta: {title: '添加新闻'},
+        path: 'wechat_login',
+        name: 'wechatLogin',
+        component: () => import('@/pages/log/wechat_login.vue'),
+        meta: {title: '访问日志'},
       },
       {
-        path: 'pc_news_edit',
-        name: 'pcNewsEdit',
-        component: () => import('@/pages/pc/pc_news_edit.vue'),
-        meta: {title: '编辑新闻'},
+        path: 'visit',
+        name: 'visitList',
+        component: () => import('@/pages/log/visit.vue'),
+        meta: {title: '登陆日志'},
       },
       {
-        path: 'pc_news',
-        name: 'pcNews',
-        component: () => import('@/pages/pc/pc_news.vue'),
-        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: '官网留言管理'},
+        path: 'operate',
+        name: 'operateList',
+        component: () => import('@/pages/log/operate.vue'),
+        meta: {title: '操作日志'},
       },
     ],
   }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 93f6503..3240705 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -72,7 +72,7 @@ const actions = {
       } else {
         return {
           name: 'td_dev',
-          roles: ['DashboardBase','newsIndex', 'login', 'activityIndex', 'userEditShen', 'userIndex', 'userInfo', 'userEdit'],
+          roles: ['userAdd','userIndex0','userInfo','userEdit','userIndex1','DashboardBase','activityAdd1','activityEdit','activityIndex1','activityIndex4','activityAdd4','activityAdd3','activityIndex3','activityAdd2','activityIndex2','activityTop', 'login','newsEdit','newsIndexAdd','newsIndex','newsType'],
         };
       }
       // if (key.group == 1) {