From 734de8ada010635d1218babfddbe4520dfb17203 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Sat, 28 Oct 2023 14:36:55 +0800
Subject: [PATCH] 1

---
 src/App.vue                                        |   2 +-
 src/api/job.js                                     |   6 +
 src/api/userinfo.js                                |   1 +
 src/components/FirstJob/recordBill.vue             |  18 +-
 src/components/main/index.vue                      |   8 +-
 .../merchantManagement/components/wangEditor.vue   |   6 +-
 src/components/merchantManagement/memberInfo.vue   |   2 +-
 .../merchantManagement/notificationCenter.vue      | 220 +++++++++++++++++++--
 .../merchantManagement/roleManagement.vue          |   2 +-
 .../userinfo/accountsetting/components/bocaiTV.vue |  17 +-
 src/components/userinfo/systemMsg.vue              | 208 +++++++++++++++++++
 src/components/userinfo/teamMsg.vue                | 219 ++++++++++++++++++++
 .../usercenter/components/dataStatistics.vue       |  18 +-
 src/router/index.js                                |  14 +-
 src/style/index.less                               |   8 +
 src/views/main.vue                                 |  45 ++++-
 src/views/merchantBack.vue                         |  51 +++--
 src/views/userinfo.vue                             | 218 +++++++++-----------
 18 files changed, 874 insertions(+), 189 deletions(-)
 create mode 100644 src/components/userinfo/systemMsg.vue
 create mode 100644 src/components/userinfo/teamMsg.vue

diff --git a/src/App.vue b/src/App.vue
index d9eb793..5ce94cd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_wh8pz6ovidi.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_muu1luphz6.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/api/job.js b/src/api/job.js
index 43fe2f6..c652d4a 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -83,6 +83,12 @@ export function getPolicyByJobIdApi(data) {
 		url: `/yishoudan/store/job/getPolicyByStoreJobId?storeJobId=${data}`,
 	});
 }
+// 根据岗位id获取政策列表
+export function getPolicyListByJobIdApi(data) {
+	return request({
+		url: `/yishoudan/store/job/getPolicyListByStoreJobId?storeJobId=${data}`,
+	});
+}
 // 获取热门职位城市
 export function getHotCityApi() {
 	return request({
diff --git a/src/api/userinfo.js b/src/api/userinfo.js
index 3d934c4..8c336b5 100644
--- a/src/api/userinfo.js
+++ b/src/api/userinfo.js
@@ -200,3 +200,4 @@ export function dataStatisticsListApiold (data) {
 
 
 
+
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index db6bdfe..85e96e4 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -213,7 +213,7 @@ import { nationlist } from '../../utils/datalist'
 import moment from 'moment'
 import { isEmptyCheck, getAgeFromBirthday } from '../../utils/commonUtil'
 import timepicker from './components/timepicker.vue'
-import { recordBillApi, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi } from '@/api/job'
+import { recordBillApi, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi, getPolicyListByJobIdApi } from '@/api/job'
 import request from '@/utils/request'
 import qs from 'qs'
 // import axios from "axios";
@@ -381,12 +381,10 @@ export default {
     if (this.proxyinfo.roleOfPmd) {
       this.isMaster = true
     }
-    console.log(this.firminfo)
     this.getProxyInfo(this.proxyinfo.id)
     this.getJob(this.firminfo)
     this.getPolicyByJobId(this.firminfo.id)
-    console.log(this.proxyinfo)
-    console.log(this.firminfo)
+    this.getPolicyListByJobId(this.firminfo.id)
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -423,6 +421,18 @@ export default {
         console.log(error)
       }
     },
+    async getPolicyListByJobId(value) {
+      console.log(value)
+      try {
+        const { data } = await getPolicyListByJobIdApi(value)
+        console.log(data)
+        if (data.status === 200) {
+          this.form.policy = data.data
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
     async getPolicyByJobId(value) {
       console.log(value)
       try {
diff --git a/src/components/main/index.vue b/src/components/main/index.vue
index 06df89b..e344642 100644
--- a/src/components/main/index.vue
+++ b/src/components/main/index.vue
@@ -115,8 +115,12 @@
 					</li>
         </ul>-->
         <div>
-          Copyright © 2015-2023 Bocai. All Rights Reserved.
-          <i></i>
+          <span>
+            powered by
+            <svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
+              <use xlink:href="#icon-bocai2" />
+            </svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
+          </span>
           <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
         </div>
       </div>
diff --git a/src/components/merchantManagement/components/wangEditor.vue b/src/components/merchantManagement/components/wangEditor.vue
index 97a7cb8..93bd593 100644
--- a/src/components/merchantManagement/components/wangEditor.vue
+++ b/src/components/merchantManagement/components/wangEditor.vue
@@ -178,7 +178,7 @@
 					// excludeKeys: ["blockquote"] ,
 				},
 				editorConfig: {
-					placeholder: '请输入内容...',
+					// placeholder: '请输入内容...',
 					readOnly: false, // 是否只允许阅读，不可编辑
 					autoFocus: true,
 					MENU_CONF: {
@@ -304,4 +304,8 @@
 		margin-bottom: 0;
 		line-height: 1.8;
 	}
+  .w-e-text-placeholder{
+    font-size: 16px;
+    top: -6px;
+  }
 </style>
\ No newline at end of file
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 8db8b49..6103d11 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -430,7 +430,7 @@ export default {
           // width: 100,
           // filters: this.groupList,
           customRender: (text, row, index) => {
-            let text1 = '系统'
+            let text1 = '未分配'
             this.groupList.forEach((item) => {
               // text1 = '系统'
 
diff --git a/src/components/merchantManagement/notificationCenter.vue b/src/components/merchantManagement/notificationCenter.vue
index 47e24bc..9f86fd3 100644
--- a/src/components/merchantManagement/notificationCenter.vue
+++ b/src/components/merchantManagement/notificationCenter.vue
@@ -32,18 +32,59 @@
           <a-table :columns="columns" :data-source="contentList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
             <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
             <div slot="status" slot-scope="text, record">
-              <a-switch :checked="text" @change="showChange(record,'showAgencyScreen')" />
+              <a-switch :checked="text" @change="showChange(record)" />
             </div>
             <div slot="setting" class="setting" slot-scope="text, record" style="color: #1890FF">
-              <a @click="showDetail(record)">详情</a>
-              <a :class="record.roleType == 1 ?'':'unclick'" class="delete" @click="record.roleType == 1 ?  addRole('edit',record):''">预览</a>
-              <a :class="record.roleType == 1 ?'':'unclick'" @click="record.roleType == 1 ?  delRole('del'):''">删除</a>
+              <a @click="editContent(record)">编辑</a>
+              <a class="delete" @click="showContent(record)">预览</a>
+              <a @click="delContent('del')">删除</a>
             </div>
           </a-table>
         </div>
       </div>
-      <div v-else>
-        <wangEditor></wangEditor>
+      <div v-else-if="secondBreadcrumb == '新增内容' || secondBreadcrumb == '编辑内容'">
+        <a-form :selfUpdate="true" class="mt16 " style="width:1300px;margin:16px auto 0" :colon="false" :form="entryForm" @submit="handleSubmit">
+          <div class="content" style="padding-bottom: 80px">
+            <div class="contentMain bgf">
+              <div class="mb24 pr">
+                <div class="biaoti">
+                  <a-form-item :label-col="{ span: 1}" :wrapper-col="{ span: 16 }" label="标题: ">
+                    <a-input v-decorator="['articleTitle', { rules: [{ required: true, message: '请输入标题' }] }]" autocomplete="off" placeholder="请输入标题" ref="title" style="color: #333;font-size: 14px;min-width: 1200px;"></a-input>
+                  </a-form-item>
+                </div>
+                <div class="clb"></div>
+                <div class="tinyDiv" id="mytoolbar">
+                  <a-form-item :label-col="{ span:1 }" :wrapper-col="{ span: 16 }" :required="true" label="内容: ">
+                    <wangEditor style="min-width: 1200px;" ref="editor" v-if="pluginsReady" :articleContent="articleContent" @transfer="getChild"></wangEditor>
+                  </a-form-item>
+                </div>
+                <!--<hr style="width: 800px;margin-left:60px;margin-bottom: 24px;border-color:#D9D9D9"> -->
+                <!--<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
+                  <img alt="example" style="width: 100%" :src="previewImage" />
+                </a-modal>-->
+                <div class="batn">
+                  <!-- <a-form-item > -->
+                  <a-form-item :label-col="{ span:1 }" :wrapper-col="{ span: 16 }" label=" ">
+                    <span>
+                      <a-button class @click="goBack" style="width: 72px">取消</a-button>
+                      <a-button v-if="artFrom != 'activityManage' && artFrom != 'contentManage'"
+                      type="primary" ghost class="ml8" @click="draft" style="width: 72px">存草稿</a-button>
+                      <a-button type="primary" html-type="submit" class="ml8" :loading="btnLoading" style="width: 72px">发布</a-button>
+                    </span>
+                  </a-form-item>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-form>
+      </div>
+      <div v-else class="preview por">
+        <div class style="position:absolute; top:0px;left:56px">
+          <a-icon type="rollback" class="f24 ml8" @click="goBack" />
+        </div>
+        <div class="tac f24 mt48">{{currentContent.mark}}</div>
+        <div class="tac f14 cccc">{{currentContent.fbsj}}</div>
+        <div class="previewContent" v-html="currentContent.desp"></div>
       </div>
     </div>
   </div>
@@ -66,6 +107,11 @@ export default {
     return {
       secondBreadcrumb: '',
       menuType: 'fabu',
+      entryForm: this.$form.createForm(this),
+      articleContent: '', // 富文本内容
+      currentContent: '',
+      btnLoading: false,
+      pluginsReady: true,
       pagination: {
         hideOnSinglePage: false,
         showQuickJumper: true,
@@ -84,32 +130,40 @@ export default {
       isspinning: false,
       contentList: [
         {
+          id: 1,
           mark: '测试标题',
-          desp: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
           cjr: '测试创建人',
           fbsj: '2023-10-26 21:00',
-          status: 0,
+          status: true,
         },
         {
+          id: 2,
           mark: '测试标题',
-          desp: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
           cjr: '测试创建人',
           fbsj: '2023-10-26 21:00',
-          status: 0,
+          status: true,
         },
         {
+          id: 3,
           mark: '测试标题',
-          desp: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
           cjr: '测试创建人',
           fbsj: '2023-10-26 21:00',
-          status: 0,
+          status: true,
         },
         {
+          id: 4,
           mark: '测试标题',
-          desp: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
           cjr: '测试创建人',
           fbsj: '2023-10-26 21:00',
-          status: 0,
+          status: true,
         },
       ],
     }
@@ -149,8 +203,9 @@ export default {
         // },
         {
           title: '内容',
-          dataIndex: 'desp',
-          key: 'desp',
+          dataIndex: 'despOut',
+          key: 'despOut',
+          scopedSlots: { customRender: 'despOut' },
           // width: 100,
           // filters: this.groupList,
           // customRender: (text, row, index) => {
@@ -238,15 +293,137 @@ export default {
   mounted() {},
   // 组件方法
   methods: {
+    editContent(val) {
+      console.log(val)
+      this.secondBreadcrumb = '编辑内容'
+      this.articleContent = val.desp
+      setTimeout(() => {
+        this.entryForm.setFieldsValue({
+          articleTitle: val.mark,
+        })
+      }, 10)
+    },
+    showContent(val) {
+      console.log(val)
+      this.secondBreadcrumb = '预览'
+      this.currentContent = val
+    },
+    cancelAdd() {
+      this.secondBreadcrumb = ''
+    },
     onSearch() {
       // if (this.billPagination.keys != null && this.billPagination.keys.length != 0) {
       // this.gitBillList()
       // }
     },
+    showChange(val) {
+      this.contentList.forEach((item) => {
+        if (item.id == val.id) {
+          item.status = !item.status
+        }
+      })
+    },
     resetsearch() {},
     onChange() {},
     addContent() {
       this.secondBreadcrumb = '新增内容'
+      this.articleContent = ''
+    },
+    getChild(e) {
+      console.log(e)
+    },
+    handleSubmit(e) {
+      this.secondBreadcrumb = ''
+      e.preventDefault()
+      return
+      var that = this
+      that.btnLoading = true
+      console.log(e)
+      setTimeout(function () {
+        that.entryForm.validateFields((err, values) => {
+          if (!err) {
+            console.log(that.currentProject)
+            that.entryShowLoading = true
+            values['articleContent'] = that.articleContent
+
+            values['articleOutline'] = isNotEmptyCheck(that.articleContent) ? that.articleContent.replace(/[^\u4e00-\u9fa5，,.、。~]/gi, '').substring(0, 50) : ''
+
+            values['channelIds'] = that.channelIds
+            console.log(that.channelIds)
+
+            values['status'] = 0
+            // channelIds: that.channelIds,
+
+            var newValue
+            var url
+            if (that.modalTitle == '新增内容') {
+              url = '/cms/article/addArticle'
+              if (that.artFrom == 'contentManage') {
+                url = '/admin/v4/bocai/cms/addRecord'
+                newValue = {
+                  title: values['articleTitle'],
+                  content: values['articleContent'],
+                }
+              } else if (that.artFrom == 'activityManage') {
+                url = '/admin/v4/daotian/activity/addRecord'
+                newValue = {
+                  name: values['articleTitle'],
+                  content: values['articleContent'],
+                  status: 0,
+                  type: 0,
+                }
+              }
+            } else {
+              url = '/cms/article/updateArticle'
+              values['recordId'] = that.selectedRecord.id
+              if (that.artFrom == 'contentManage') {
+                url = '/admin/v4/bocai/cms/updateRecord'
+                newValue = {
+                  title: values['articleTitle'],
+                  content: values['articleContent'],
+                  id: that.selectedRecord.id,
+                }
+              } else if (that.artFrom == 'activityManage') {
+                url = '/admin/v4/daotian/activity/updateRecord'
+                newValue = {
+                  status: 0,
+                  name: values['articleTitle'],
+                  content: values['articleContent'],
+                  id: that.selectedRecord.activity.id,
+                }
+              }
+            }
+            axios({
+              url: url,
+              method: 'post',
+              data: that.artFrom == 'contentManage' || that.artFrom == 'activityManage' ? newValue : values,
+            })
+              .then((response) => {
+                console.log(response)
+                if (response.status == 200) {
+                  localStorage.setItem('artFromTabStatus', 10) //发布，标识回到上一页的tab页签
+                  that.$message.success('保存成功')
+                  that.btnLoading = false
+                  that.$router.go(-1)
+                } else {
+                  that.$message.error(response.msg)
+                  that.btnLoading = false
+                }
+                console.log('2=================')
+                that.entryShowLoading = false
+              })
+              .catch((err) => {
+                console.log(err)
+              })
+          } else {
+            that.btnLoading = false
+          }
+        })
+      }, 500)
+    },
+    goBack() {
+      // history.back(-1)
+      this.secondBreadcrumb = ''
     },
   },
 }
@@ -288,4 +465,15 @@ export default {
     margin: 0 6px 0 6px;
   }
 }
+.preview {
+  // text-align: center;
+  .previewContent {
+    width: 100%;
+    color: #333;
+    max-width: 752px;
+    // background-color: #fff;
+    padding: 32px;
+    margin: 0 auto;
+  }
+}
 </style>
diff --git a/src/components/merchantManagement/roleManagement.vue b/src/components/merchantManagement/roleManagement.vue
index daa2e60..5ff85ab 100644
--- a/src/components/merchantManagement/roleManagement.vue
+++ b/src/components/merchantManagement/roleManagement.vue
@@ -30,7 +30,7 @@
           </div>
         </a-table>
         <div class="pagecontainer mt16 fss dn">
-          <a-pagination :current="pagination.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="pagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
+          <a-pagination :current="pagination.pageNum"  :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="pagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
         </div>
       </div>
       <div v-else-if="secondBreadcrumb == '添加角色' || secondBreadcrumb == '编辑角色'">
diff --git a/src/components/userinfo/accountsetting/components/bocaiTV.vue b/src/components/userinfo/accountsetting/components/bocaiTV.vue
index 933a076..c472a2f 100644
--- a/src/components/userinfo/accountsetting/components/bocaiTV.vue
+++ b/src/components/userinfo/accountsetting/components/bocaiTV.vue
@@ -103,7 +103,6 @@ export default {
    */
   created() {
     this.$emit('setTitle', '伯才TV')
-
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -131,9 +130,8 @@ export default {
 </script>
 
 <style scoped lang="less">
-.bocaiTV-container{
-    padding: 16px;
- 
+.bocaiTV-container {
+  padding: 16px;
 }
 .icon {
   width: 1em;
@@ -151,7 +149,7 @@ export default {
   padding-top: 58px;
   // text-align: center;
   .setCenter {
-    width: 430px;
+    width: 640px;
   }
 }
 .block {
@@ -256,12 +254,13 @@ export default {
   color: #ccc;
 }
 .dtBtn {
-  padding: 34px 0;
+  padding: 18px 0;
 
   button {
-    width: 92px;
-    height: 32px;
-    background: #ff4400;
+    width: 72px;
+    height: 28px;
+    background: #1890ff;
+    border-radius: 4px;
     outline: none;
     border: none;
     color: #fff;
diff --git a/src/components/userinfo/systemMsg.vue b/src/components/userinfo/systemMsg.vue
new file mode 100644
index 0000000..1d0f776
--- /dev/null
+++ b/src/components/userinfo/systemMsg.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="w">
+    <a-table :columns="columns" :data-source="contentList" :pagination="false" class="mt16" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
+      <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
+      <div slot="mark" slot-scope="record, text, index">{{ record.mark }}</div>
+      
+    </a-table>
+    <div class="pagecontainer f40">
+      <a-pagination :current="+formvalue.pageNum" :default-current="1" :defaultPageSize="8" :total="formvalue.total" @change="pageChange" />
+      <div class="ant-pagination-options-quick-jumper">
+        跳至
+        <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      isspinning: false,
+      formvalue: {},
+      pagination: {
+        hideOnSinglePage: false,
+        showQuickJumper: true,
+        pageSize: 100,
+        total: 0,
+        size: 'small',
+        showTotal: function (total, range) {
+          return `共${total}条`
+        },
+        pageSizeOptions: ['25', '50', '100'],
+        showSizeChanger: true,
+        // showSizeChange:function(current, pageSize){
+        //     this.pageSize = pageSize;
+        // }
+      },
+      contentList: [
+        {
+          id: 1,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 2,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 3,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 4,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+      ],
+    }
+  },
+  // 计算属性
+  computed: {
+    columns() {
+      const columns = [
+        {
+          title: '系统通知',
+          dataIndex: 'mark',
+          key: 'mark',
+          scopedSlots: { customRender: 'mark' },
+          ellipsis: true,
+          // width: 300,
+        },
+
+        // {
+        //   title: '内容',
+        //   dataIndex: 'despOut',
+        //   key: 'despOut',
+        //   scopedSlots: { customRender: 'despOut' },
+
+        //   ellipsis: true,
+        // },
+        // {
+        //   title: '创建人',
+        //   dataIndex: 'cjr',
+        //   key: 'cjr',
+        //   scopedSlots: { customRender: 'cjr' },
+        //   ellipsis: true,
+
+        //   width: 90,
+        // },
+        {
+          title: '发布时间',
+          dataIndex: 'fbsj',
+          key: 'fbsj',
+          scopedSlots: { customRender: 'fbsj' },
+          ellipsis: true,
+          width: 150,
+        },
+      ]
+      return columns
+    },
+  },
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {},
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {
+    inputpageChange(e) {
+      const pagenumcount = this.formvalue.total / this.formvalue.pageSize
+      // console.log(pagenumcount);
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.formvalue.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.formvalue.pageNum = e.target.value
+        }
+      } else {
+        this.formvalue.pageNum = 1
+      }
+      this.getJobList()
+      // console.log(e);
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+/deep/.ant-table {
+  .ant-table-content {
+    .ant-table-body {
+      .ant-table-thead {
+        th {
+          padding: 12px 0;
+          // padding-left: 14px;
+          div {
+            padding: 0px 12px;
+          }
+          &:not(:first-child) {
+            > span {
+              //  line-height: 22px;
+              > div {
+                //  line-height: 1;
+                border-left: 1px solid #ddd;
+                padding-left: 12px;
+              }
+            }
+          }
+        }
+        .ant-table-row-cell-break-word {
+          font-size: 14px !important;
+          font-weight: bold;
+        }
+        .ant-table-row-cell-ellipsis {
+          font-size: 14px !important;
+          font-weight: bold;
+        }
+      }
+      .ant-table-tbody {
+        .ant-table-row-cell-ellipsis {
+          font-size: 14px !important;
+          padding: 12px 14px;
+        }
+        .ant-table-row-expand-icon {
+          // color: #000;
+          padding: 0;
+        }
+        .ant-table-row-indent {
+          display: none !important;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/userinfo/teamMsg.vue b/src/components/userinfo/teamMsg.vue
new file mode 100644
index 0000000..f99f0a0
--- /dev/null
+++ b/src/components/userinfo/teamMsg.vue
@@ -0,0 +1,219 @@
+<template>
+  <div class="w">
+    <a-table :columns="columns" :data-source="contentList" :pagination="false" class="mt16" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
+      <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
+    </a-table>
+    <div class="pagecontainer f40">
+      <a-pagination :current="+formvalue.pageNum" :default-current="1" :defaultPageSize="8" :total="formvalue.total" @change="pageChange" />
+      <div class="ant-pagination-options-quick-jumper">
+        跳至
+        <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      isspinning: false,
+      formvalue:{},
+      pagination: {
+        hideOnSinglePage: false,
+        showQuickJumper: true,
+        pageSize: 100,
+        total: 0,
+        size: 'small',
+        showTotal: function (total, range) {
+          return `共${total}条`
+        },
+        pageSizeOptions: ['25', '50', '100'],
+        showSizeChanger: true,
+        // showSizeChange:function(current, pageSize){
+        //     this.pageSize = pageSize;
+        // }
+      },
+      contentList: [
+        {
+          id: 1,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 2,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 3,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+        {
+          id: 4,
+          mark: '测试标题',
+          desp: '<p><span style="font-family: Helvetica; font-size: 16px;">各位同事：</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;</span></p><p><span style="font-family: Helvetica; font-size: 16px;">&nbsp; &nbsp; &nbsp; &nbsp;中秋/国庆佳节将至，根据国家法定假期规定，并结合我司实际情况，现将中秋节/国庆节放假事宜安排如下：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">一、假期安排：9月29日（周五）至10月4日（周三）放假，共计6天；10月5日（周四）至10月7日（周六）上班；9月24日（周日）补班，10月8日（周日）正常休息。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">二、业务部门（客户经理、项目客服、项目经理）根据运营需求进行值班调休，部门负责人将放假期间的排班计划报至人力行政部。</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px;">三、注意事项：</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">1. 请各部门提前做好工作安排，放假前请自觉做好工位清洁工作，并做好防火、防盗检查，关好门窗，确保无任何安全隐患；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">2. 放假期间全员需保持电话畅通，如遇特殊情况，请及时联系部门负责人及人力行政部；</span></p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">3. 节假期间有返乡或出游计划的伙伴请注意天气变化，旅途中注意人身财产安全；提前关注购票信息，做好返程安排。</span></p><p>&nbsp;</p><p style="text-indent: 2em;"><span style="font-family: Helvetica; font-size: 16px; background-color: #ffffff;">家国安康，月满人间，提前祝大家中秋国庆双节快乐、阖家幸福！</span></p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8;">&nbsp;</p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">伯才科技人力行政部</span></p><p style="line-height: 1.8; text-align: right;"><span style="font-family: Helvetica; font-size: 16px;">2023年9月20日</span></p><p style="line-height: 1.8;">&nbsp;</p><p>&nbsp;</p>',
+          despOut: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
+          cjr: '测试创建人',
+          fbsj: '2023-10-26 21:00',
+          status: true,
+        },
+      ],
+    }
+  },
+  // 计算属性
+  computed: {
+    columns() {
+      const columns = [
+        {
+          title: '排序',
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, row, index) => {
+            if (row.children) {
+              return ''
+            } else {
+              return index + 1
+            }
+          },
+          // ellipsis: true,
+          width: 60,
+        },
+        {
+          title: '标题',
+          dataIndex: 'mark',
+          key: 'mark',
+          scopedSlots: { customRender: 'mark' },
+          ellipsis: true,
+          width: 300,
+        },
+
+        {
+          title: '内容',
+          dataIndex: 'despOut',
+          key: 'despOut',
+          scopedSlots: { customRender: 'despOut' },
+
+          ellipsis: true,
+        },
+        {
+          title: '创建人',
+          dataIndex: 'cjr',
+          key: 'cjr',
+          scopedSlots: { customRender: 'cjr' },
+          ellipsis: true,
+
+          width: 90,
+        },
+        {
+          title: '发布时间',
+          dataIndex: 'fbsj',
+          key: 'fbsj',
+          scopedSlots: { customRender: 'fbsj' },
+          ellipsis: true,
+          width: 150,
+        },
+      ]
+      return columns
+    },
+  },
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {},
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {
+    inputpageChange(e) {
+      const pagenumcount = this.formvalue.total / this.formvalue.pageSize
+      // console.log(pagenumcount);
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.formvalue.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.formvalue.pageNum = e.target.value
+        }
+      } else {
+        this.formvalue.pageNum = 1
+      }
+      this.getJobList()
+      // console.log(e);
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+/deep/.ant-table {
+  .ant-table-content {
+    .ant-table-body {
+      .ant-table-thead {
+        th {
+          padding: 12px 0;
+          div {
+            padding: 0px 8px;
+          }
+          &:not(:first-child) {
+            > span {
+              //  line-height: 22px;
+              > div {
+                //  line-height: 1;
+                border-left: 1px solid #ddd;
+                padding-left: 12px;
+              }
+            }
+          }
+        }
+        .ant-table-row-cell-break-word {
+          font-size: 14px !important;
+          font-weight: bold;
+        }
+        .ant-table-row-cell-ellipsis {
+          font-size: 14px !important;
+          font-weight: bold;
+        }
+      }
+      .ant-table-tbody {
+        .ant-table-row-cell-ellipsis {
+          font-size: 14px !important;
+          padding: 12px 14px;
+        }
+        .ant-table-row-expand-icon {
+          // color: #000;
+          padding: 0;
+        }
+        .ant-table-row-indent {
+          display: none !important;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 3dbec5d..f9632b5 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -144,6 +144,8 @@
             <a @click="getBillInfo(text1,50)" style="color:#576B95;text-decoration:underline" slot="obJob" slot-scope="text, text1">{{text}}</a>
             <a @click="getBillInfo(text1,60)" style="color:#576B95;text-decoration:underline" slot="entryGPA" slot-scope="text, text1">{{toFixed(text)}}</a>
             <a @click="getBillInfo(text1,70)" style="color:#576B95;text-decoration:underline" slot="finshedGPA" slot-scope="text, text1">{{toFixed(text)}}</a>
+            <a @click="getBillInfo(text1,60)" style="color:#576B95;text-decoration:underline" slot="packageIdx" slot-scope="text, text1">{{toFixed(text)}}</a>
+            <a @click="getBillInfo(text1,60)" style="color:#576B95;text-decoration:underline" slot="funnel" slot-scope="text, text1">{{toFixed(text)}}</a>
           </a-table>
         </div>
         <!-- <div class="pagecontainer mt16" v-if="dataList.length > 0">
@@ -175,7 +177,7 @@
       </a-table>
       <div class="pagecontainer mt16" v-if="billList.length > 0">
         <!-- <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="10" :total="billPagination.total" @change="onChange" /> -->
-        <a-pagination :current="billPagination.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="billPagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
+        <a-pagination :current="billPagination.pageNum"  :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="billPagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
         <!-- <div class="ant-pagination-options-quick-jumper ml12">
           <span>共{{ billPagination.total }}条，</span>跳至
           <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
@@ -379,13 +381,13 @@ export default {
         },
         {
           title: '背包指数',
-          dataIndex: 'finshedGPA',
-          key: 'finshedGPA',
-           customRender: (text, row, index) => {
-             return '*'
-           },
-          sorter: (a, b) => a.finshedGPA - b.finshedGPA,
-          scopedSlots: { customRender: 'finshedGPA' },
+          dataIndex: 'packageIdx',
+          key: 'packageIdx',
+          //  customRender: (text, row, index) => {
+          //    return '*'
+          //  },
+          sorter: (a, b) => a.packageIdx - b.packageIdx,
+          scopedSlots: { customRender: 'packageIdx' },
           ellipsis: true,
           width: 120,
         },
diff --git a/src/router/index.js b/src/router/index.js
index 3b5b45c..bb69879 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -216,6 +216,16 @@ const routes = [
           },
         ],
       },
+      {
+        path: "systemMsg",
+        name: "SystemMsg",
+        component: () => import("../components/userinfo/systemMsg.vue"),
+      },
+      {
+        path: "teamMsg",
+        name: "TeamMsg",
+        component: () => import("../components/userinfo/teamMsg.vue"),
+      },
     ],
   },
   {
@@ -287,7 +297,8 @@ const routes = [
         component: () =>
           import("../components/userinfo/usercenter/components/mybill.vue"),
       },
-    ], 
+
+    ],
   },
   {
     path: "/merchantBack",
@@ -411,6 +422,7 @@ const routes = [
       },
     ]
   },
+
   {
     path: "*",
     name: "404",
diff --git a/src/style/index.less b/src/style/index.less
index 2f2f730..26f8bac 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -455,6 +455,11 @@ i {
 	margin-left: 50%;
 	transform: translateX(-50%);
 }
+.middle {
+  position: relative;
+	left: 50%;
+	transform: translateX(-40%);
+}
 .setH{
   transform: translate(-50%, 50%);
 }
@@ -521,6 +526,9 @@ i {
 .mt20 {
 	margin-top: 20px;
 }
+.mt48{
+  margin-top: 48px;
+}
 .mt60{
   margin-top: 60px;
 }
diff --git a/src/views/main.vue b/src/views/main.vue
index 78f5093..d7137fb 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -4,9 +4,11 @@
     <div class="pagetitle" v-if="isLogin && routertitleindex != 0">
       <div class="w fsa">
         <div class="fss">
-          <svg class="svg_icon f64" aria-hidden="true">
-            <use xlink:href="#icon-daotian2" />
-          </svg>
+          <router-link to="/main">
+            <svg class="svg_icon f64" aria-hidden="true">
+              <use xlink:href="#icon-daotian2" />
+            </svg>
+          </router-link>
         </div>
         <span class="login fsa">
           <div class="f14 pr16 mr16" style="line-height:1;border-right:1px solid #979797;cursor:pointer">
@@ -49,7 +51,34 @@
               </li>-->
             </ul>
           </div>
-          <span v-if="isLogin" class="logined">
+          <span v-if="isLogin" class="logined fsa">
+            <div class="" v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
+              <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
+                <div class="mr20">
+                  <svg class="svg_icon f16" aria-hidden="true">
+                    <use xlink:href="#icon-tongzhi" />
+                  </svg>
+                </div>
+                <div class="loginbox" slot="overlay">
+                  <router-link to="/systemMsg">
+                    <div>
+                      <span>
+                        <i class="iconfont icon-xitongtongzhi"></i>系统通知
+                      </span>
+                      <i class="iconfont icon-youjiantou"></i>
+                    </div>
+                  </router-link>
+                  <router-link to="/teamMsg">
+                    <div>
+                      <span>
+                        <i class="iconfont icon-tuanduitongzhi"></i>团队通知
+                      </span>
+                      <i class="iconfont icon-youjiantou"></i>
+                    </div>
+                  </router-link>
+                </div>
+              </a-dropdown>
+            </div>
             <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
               <!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
               <span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span>-->
@@ -233,8 +262,12 @@
           </li>
         </ul>-->
         <div>
-          Copyright © 2015-2023 Bocai. All Rights Reserved.
-          <i></i>
+          <span>
+            powered by
+            <svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
+              <use xlink:href="#icon-bocai2" />
+            </svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
+          </span>
           <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
         </div>
       </div>
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index cbcaa73..c7b02cb 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -16,9 +16,9 @@
           </div>
         </div>
 
-        <a-menu :selectedKeys="[$route.name]" :openKeys.sync="openKeys" @click="handleClick" class mode="inline" style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
+        <a-menu mode="inline" :selectedKeys="[$route.name]" :openKeys.sync="openKeys" @click="handleClick" class style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
           <template v-for="(item, index) in roles">
-            <a-menu-item :key="item.name" v-if="item.path != '' && item.level < 3">
+            <a-menu-item :key="item.name" :title="null" v-if="item.path != '' && item.level < 3">
               <router-link :to="{ name: item.name }">
                 <i class="iconfont f12 mr8" :class="item.icon" />
 
@@ -93,8 +93,14 @@
           <router-view @setTitle="setTitle"></router-view>
           <!-- </div> -->
         </a-layout-content>
-        <a-layout-footer :style="{ marginLeft: pLeft }" class="tac" style="textalign: center">
-          <span class="c025">Copyright © 2015 - 2021 Matripe. All Rights Reserved.</span>
+        <a-layout-footer :style="{ marginLeft: pLeft }" class="tac f12" style="textalign: center">
+          <span>
+            powered by
+            <svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
+              <use xlink:href="#icon-bocai2" />
+            </svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
+          </span>
+          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
         </a-layout-footer>
       </a-layout>
     </a-layout>
@@ -122,7 +128,7 @@ export default {
     return {
       roles: [
         {
-          id: 294,
+          id: 1,
           parentId: '',
           name: 'HomePage',
           url: ' ',
@@ -135,7 +141,7 @@ export default {
           menuType: 1,
         },
         {
-          id: 294,
+          id: 2,
           parentId: '',
           name: 'JobManagement',
           url: ' ',
@@ -172,7 +178,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 3,
           parentId: '',
           name: 'TownsmanManagement',
           url: ' ',
@@ -198,7 +204,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 4,
           parentId: '',
           name: 'AgencyManagement',
           url: ' ',
@@ -224,7 +230,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 5,
           parentId: '',
           name: 'teammanagement',
           url: ' ',
@@ -320,7 +326,7 @@ export default {
         // },
 
         {
-          id: 294,
+          id: 6,
           parentId: '',
           name: 'OrderManagement',
           url: ' ',
@@ -346,7 +352,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 7,
           parentId: '',
           name: 'BillCenter',
           url: ' ',
@@ -372,7 +378,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 8,
           parentId: '',
           name: 'group',
           url: ' ',
@@ -415,14 +421,14 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 9,
           parentId: '',
           name: 'container',
           url: ' ',
           icon: 'icon-neirongguanli',
           component: '',
           path: '',
-          title: '内容管理-',
+          title: '内容管理',
           menuName: 'container',
           level: 1,
           menuType: 1,
@@ -435,7 +441,7 @@ export default {
               icon: '',
               component: 'home',
               path: '/home',
-              title: '通知中心-',
+              title: '通知中心',
               menuName: 'container',
               level: 2,
               menuType: 1,
@@ -444,7 +450,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 10,
           parentId: '',
           name: 'GlobalConfig',
           url: ' ',
@@ -492,7 +498,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 11,
           parentId: '',
           name: 'FirmConfig',
           url: ' ',
@@ -518,7 +524,7 @@ export default {
           ],
         },
         {
-          id: 294,
+          id: 12,
           parentId: '',
           name: 'ServiceMarket',
           url: ' ',
@@ -666,7 +672,7 @@ header.header,
   // height: calc(100vh - 64px);
   min-height: calc(100vh - 64px);
   overflow: auto;
-  background-color: #f5f5f5;
+  background-color: #f0f2f5;
   transition: all 0.2s;
   // padding: 18px;
   // padding-right: 36px;
@@ -910,4 +916,11 @@ header.header,
 /deep/.ant-menu-inline-collapsed > .ant-menu-submenu > .ant-menu-submenu-title {
   padding: 0 16px !important;
 }
+/deep/.ant-menu-submenu-title {
+  color: unset !important;
+}
+/deep/ .ant-tooltip-open {
+  // display: none !important;
+  // opacity: 0;
+}
 </style>
diff --git a/src/views/userinfo.vue b/src/views/userinfo.vue
index 51ca710..4d750cd 100644
--- a/src/views/userinfo.vue
+++ b/src/views/userinfo.vue
@@ -5,56 +5,47 @@
       <div class="w">
         <span class="titlelogo">
           <!-- <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i> -->
-          <router-link to="/main"
-            ><svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-yishoudanlogo"></use></svg
-          ></router-link>
+          <router-link to="/main">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-yishoudanlogo" />
+            </svg>
+          </router-link>
         </span>
         <span class="navigationleft">
           <ul>
             <li>
-              <router-link
-                to="/"
-                :class="routertitleindex === 0 ? 'titleactive' : ''"
-              >
-                首页</router-link
-              >
+              <router-link to="/" :class="routertitleindex === 0 ? 'titleactive' : ''">首页</router-link>
             </li>
             <li>
-              <router-link
-                to="/userinfo/usercenter"
-                :class="routertitleindex === 1 ? 'titleactive' : ''"
-                >个人中心</router-link
-              >
+              <router-link to="/userinfo/usercenter" :class="routertitleindex === 1 ? 'titleactive' : ''">个人中心</router-link>
             </li>
             <li>
-              <router-link
-                to="/userinfo/accountsetting/loginpsw"
-                :class="routertitleindex === 2 ? 'titleactive' : ''"
-                >账号设置
-              </router-link>
+              <router-link to="/userinfo/accountsetting/loginpsw" :class="routertitleindex === 2 ? 'titleactive' : ''">账号设置</router-link>
             </li>
           </ul>
         </span>
         <span class="login">
           <span v-if="isLogin">
             <a-dropdown overlayClassName="logindropdown">
-              <span><i class="iconfont icon-morentouxiang"></i></span>
+              <span>
+                <i class="iconfont icon-morentouxiang"></i>
+              </span>
               <div class="loginbox" slot="overlay">
                 <div>{{ loginValue.tel }}</div>
                 <router-link to="/userinfo/usercenter">
                   <div>
-                    <span
-                      ><i class="iconfont icon-gerenzhongxin"></i>个人中心</span
-                    ><i class="iconfont icon-youjiantou"></i>
+                    <span>
+                      <i class="iconfont icon-gerenzhongxin"></i>个人中心
+                    </span>
+                    <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link>
                 <router-link to="/userinfo/accountsetting/loginpsw">
                   <div>
-                    <span
-                      ><i class="iconfont icon-zhanghaoshezhi"></i
-                      >账号设置</span
-                    ><i class="iconfont icon-youjiantou"></i>
+                    <span>
+                      <i class="iconfont icon-zhanghaoshezhi"></i>账号设置
+                    </span>
+                    <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link>
                 <button @click="logout">退出登录</button>
@@ -63,26 +54,18 @@
           </span>
           <span v-else class="loginbtn">
             <!-- <router-link to="/register">注册</router-link>/ -->
-            <router-link to="/login"
-              ><button style="cursor: pointer">登录</button></router-link
-            ></span
-          >
+            <router-link to="/login">
+              <button style="cursor: pointer">登录</button>
+            </router-link>
+          </span>
         </span>
         <span class="navigationright">
           <ul>
             <li>
-              <router-link
-                to="/userinfo/mytownsman"
-                :class="routertitleindex === 3 ? 'titleactiveafter' : ''"
-                >我的老乡
-              </router-link>
+              <router-link to="/userinfo/mytownsman" :class="routertitleindex === 3 ? 'titleactiveafter' : ''">我的老乡</router-link>
             </li>
             <li>
-              <router-link
-                to="/userinfo/mybill"
-                :class="routertitleindex === 4 ? 'titleactiveafter' : ''"
-                >我的报名
-              </router-link>
+              <router-link to="/userinfo/mybill" :class="routertitleindex === 4 ? 'titleactiveafter' : ''">我的报名</router-link>
             </li>
           </ul>
         </span>
@@ -90,12 +73,7 @@
     </div>
     <!-- 搜索栏 -->
 
-    <router-view
-      :isspecialboxshow.sync="isspecialboxshow"
-      :formvalue="formvalue"
-      :jobMainList="jobMainList"
-      :isspinning="isspinning"
-    ></router-view>
+    <router-view :isspecialboxshow.sync="isspecialboxshow" :formvalue="formvalue" :jobMainList="jobMainList" :isspinning="isspinning"></router-view>
     <!-- 老乡广告 -->
     <!-- <div class="fellowtownsman" v-if="laoxiangshow">
       <div class="w">
@@ -144,7 +122,7 @@
           </div>
         </div>
       </div>
-    </div> -->
+    </div>-->
     <!-- banner广告栏 -->
     <div class="banner" v-if="isbannershow">
       <div class="w">
@@ -165,12 +143,15 @@
           <li @click="totop">
             <router-link to="/aboutus">关于我们</router-link>
           </li>
-        </ul> -->
+        </ul>-->
         <div>
-          Copyright © 2015-2023 Bocai. All Rights Reserved. <i></i>
-          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index"
-            >豫ICP备2023001993号</a
-          >
+          <span>
+            powered by
+            <svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
+              <use xlink:href="#icon-bocai2" />
+            </svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
+          </span>
+          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
         </div>
       </div>
     </footer>
@@ -179,14 +160,14 @@
 
 <script>
 // import joblist from "../components/firstjob/joblist.vue";
-import { logoutApi } from "../api/login";
-import Cookies from "js-cookie";
+import { logoutApi } from '../api/login'
+import Cookies from 'js-cookie'
 
 export default {
-  inject: ["reload"],
+  inject: ['reload'],
 
   // 组件名称
-  name: "",
+  name: '',
   // 局部注册的组件
   components: {
     // joblist,
@@ -211,29 +192,29 @@ export default {
         monthlyPayStr: [], // 每月工资
         ageStr: [], // 年龄数据
         jobSpecialLabelIds: [], // 特色标签索引
-        aliasName: "",
+        aliasName: '',
         pageNum: 1,
         pageSize: 8,
         total: null, //分页配置
       },
-    };
+    }
   },
   // 计算属性
   computed: {
     routertitleindex: {
       set() {},
       get() {
-        const path = this.$route.fullPath;
-        if (path.indexOf("usercenter") > -1) {
-          return 1;
-        } else if (path.indexOf("accountsetting") > -1) {
-          return 2;
-        } else if (path.indexOf("mytownsman") > -1) {
-          return 3;
-        } else if (path.indexOf("mybill") > -1) {
-          return 4;
+        const path = this.$route.fullPath
+        if (path.indexOf('usercenter') > -1) {
+          return 1
+        } else if (path.indexOf('accountsetting') > -1) {
+          return 2
+        } else if (path.indexOf('mytownsman') > -1) {
+          return 3
+        } else if (path.indexOf('mybill') > -1) {
+          return 4
         } else {
-          return 5;
+          return 5
         }
       },
     },
@@ -250,17 +231,17 @@ export default {
   // 侦听器
   watch: {
     routertitleindex() {
-      const path = this.$route.fullPath;
-      if (path.indexOf("serviceoutlets") > -1) {
-        this.laoxiangshow = true;
-      } else if (path.indexOf("list") > -1 || path.indexOf("detail") > -1) {
-        this.laoxiangshow = true;
-      } else if (path.indexOf("aboutus") > -1) {
-        this.laoxiangshow = false;
+      const path = this.$route.fullPath
+      if (path.indexOf('serviceoutlets') > -1) {
+        this.laoxiangshow = true
+      } else if (path.indexOf('list') > -1 || path.indexOf('detail') > -1) {
+        this.laoxiangshow = true
+      } else if (path.indexOf('aboutus') > -1) {
+        this.laoxiangshow = false
       } else {
-        this.laoxiangshow = true;
+        this.laoxiangshow = true
       }
-      this.showfooter();
+      this.showfooter()
     },
     // isLogin() {
     //   this.isLogin = JSON.parse(localStorage.getItem("LOGIN_DATA"));
@@ -272,87 +253,84 @@ export default {
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    this.isLaoxiangshow();
-    this.showfooter();
+    this.isLaoxiangshow()
+    this.showfooter()
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
-    this.isLogin = localStorage.getItem("LOGIN_DATA") !== null ? true : false;
+    this.isLogin = localStorage.getItem('LOGIN_DATA') !== null ? true : false
 
-    this.loginValue =
-      localStorage.getItem("LOGIN_DATA") !== null
-        ? JSON.parse(localStorage.getItem("LOGIN_DATA"))
-        : { tel: "" };
+    this.loginValue = localStorage.getItem('LOGIN_DATA') !== null ? JSON.parse(localStorage.getItem('LOGIN_DATA')) : { tel: '' }
     // console.log(document.querySelector(".ant-pagination-options-quick-jumper"));
   },
   // 组件方法
   methods: {
     totop() {
       // console.log(window);
-      document.body.scrollTop = 0;
-      document.documentElement.scrollTop = 0;
+      document.body.scrollTop = 0
+      document.documentElement.scrollTop = 0
       // window.body.scrollY = 0;
     },
     isLaoxiangshow() {
-      const path = this.$route.fullPath;
-      if (path.indexOf("serviceoutlets") > -1) {
-        this.laoxiangshow = true;
-      } else if (path.indexOf("list") > -1 || path.indexOf("detail") > -1) {
-        this.laoxiangshow = true;
-      } else if (path.indexOf("aboutus") > -1) {
-        this.laoxiangshow = false;
+      const path = this.$route.fullPath
+      if (path.indexOf('serviceoutlets') > -1) {
+        this.laoxiangshow = true
+      } else if (path.indexOf('list') > -1 || path.indexOf('detail') > -1) {
+        this.laoxiangshow = true
+      } else if (path.indexOf('aboutus') > -1) {
+        this.laoxiangshow = false
       } else {
-        this.laoxiangshow = true;
+        this.laoxiangshow = true
       }
     },
 
     async logout() {
       try {
-        const data = await logoutApi();
-        console.log(data);
+        const data = await logoutApi()
+        console.log(data)
         if (data.status === 200) {
-          localStorage.removeItem("LOGIN_DATA");
-          this.reload();
-          this.$router.push("/main");
+          localStorage.removeItem('LOGIN_DATA')
+          this.reload()
+          this.$router.push('/main')
         } else {
-          console.log(1);
+          console.log(1)
         }
       } catch (error) {
-        console.log(error);
-        this.$message.warning(error.message);
+        console.log(error)
+        this.$message.warning(error.message)
       }
     },
     resetpage() {
-      console.log(1);
+      console.log(1)
       setTimeout(() => {
-        this.reload();
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-      }, 1000);
+        this.reload()
+        document.body.scrollTop = 0
+        document.documentElement.scrollTop = 0
+      }, 1000)
     },
     showfooter() {
-      const path = this.$route.fullPath;
+      const path = this.$route.fullPath
 
-      if (path.indexOf("main") > -1) {
-        this.isbannershow = false;
-        this.isfootershow = false;
+      if (path.indexOf('main') > -1) {
+        this.isbannershow = false
+        this.isfootershow = false
       } else {
-        this.isbannershow = true;
-        this.isfootershow = true;
+        this.isbannershow = true
+        this.isfootershow = true
       }
 
-      if (path.indexOf("login") > -1) {
-        this.isbannershow = false;
+      if (path.indexOf('login') > -1) {
+        this.isbannershow = false
       }
-      if (path.indexOf("loginpsw") > -1) {
-        this.isbannershow = true;
+      if (path.indexOf('loginpsw') > -1) {
+        this.isbannershow = true
       }
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">