From 55d0ef569d73f5ea1bf2d258e0f357c2fd419e84 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 23 Feb 2024 18:17:32 +0800
Subject: [PATCH] fix

---
 src/components/modules/link.vue   |  17 +-
 src/components/modules/module.vue |   4 +-
 src/libs/util.js                  |   8 +-
 src/mixins/page/index.js          |   2 +-
 src/pages/article/add/index.vue   |   7 +
 src/pages/column/add/index.vue    |   4 +-
 src/pages/column/page/about.vue   | 524 +++++++++++++++++-------------
 src/pages/role/list/index.vue     |   5 +-
 src/pages/setting/list/info.vue   |   6 +-
 src/pages/user/list/index.vue     |   2 +-
 src/setting.js                    |   1 -
 11 files changed, 321 insertions(+), 259 deletions(-)

diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue
index cc6426f..d6bb257 100644
--- a/src/components/modules/link.vue
+++ b/src/components/modules/link.vue
@@ -91,6 +91,7 @@
 </template>
 
 <script>
+import Util from '@/libs/util'
 export default {
   props: {
     data: {
@@ -131,15 +132,13 @@ export default {
   methods: {
     // 栏目列表
     getList () {
-      this.$post(this.api.listWithTree, {
-
-
+      this.$post(this.api.listWithTree, Util.rsa({
         siteId: this.site.id,
         columnName: '',
         templateId: '',
         typeId: '',
         isSort: 1
-      }).then(({ data }) => {
+      })).then(({ data }) => {
         this.columns = data
         this.data.connectionType !== 2 && this.getArticle()
       }).catch(err => { })
@@ -160,14 +159,14 @@ export default {
     getArticle () {
       // 站内链接/其他站点链接
       const id = this.data.connectionType === 1 ? this.data.columnId[this.data.columnId.length - 1] : this.data.otherColumnId[this.data.otherColumnId.length - 1]
-      id && this.$post(this.api.queryArticle, {
+      id && this.$post(this.api.queryArticle, Util.rsa({
         siteId: this.data.connectionType === 1 ? this.site.id : this.data.site,
         columnIds: [id],
         pageNum: 1,
         pageSize: 1000,
         title: '',
         isDisable: 0
-      }).then(({ data }) => {
+      })).then(({ data }) => {
         this.articles = data.records.filter(e => e.isRelease) // 只显示已发布的文章
       }).catch(err => { })
     },
@@ -183,15 +182,13 @@ export default {
     },
     // 获取指定站点的栏目列表
     getOtherColumn () {
-      this.data.site && this.$post(this.api.listWithTree, {
-
-
+      this.data.site && this.$post(this.api.listWithTree, Util.rsa({
         siteId: this.data.site,
         columnName: '',
         templateId: '',
         typeId: '',
         isSort: 1
-      }).then(({ data }) => {
+      })).then(({ data }) => {
         this.otherColumns = data
       }).catch(err => { })
     },
diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue
index 98ed084..5a11daa 100644
--- a/src/components/modules/module.vue
+++ b/src/components/modules/module.vue
@@ -434,13 +434,13 @@ export default {
     },
     // 站点切换回调
     siteChange (siteId) {
-      this.$post(this.api.listWithTree, {
+      this.$post(this.api.listWithTree, Util.rsa({
         siteId,
         columnName: '',
         templateId: '',
         typeId: '',
         isSort: 1
-      }).then(({ data }) => {
+      })).then(({ data }) => {
         this.data.type === 'columns' || this.handleColumn(data)
         this.columns = data
       }).catch(err => { })
diff --git a/src/libs/util.js b/src/libs/util.js
index ef1e5b7..184c426 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -6,10 +6,10 @@ import JSEncrypt from "jsencrypt"
 
 // 文件后缀集合
 const exts = {
-  video: 'mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv',
-  audio: 'mp3,aac,ape,flac,wav,wma,amr,mid',
-  img: 'jpg,jpeg,png,gif,svg,psd',
-  doc: 'doc,docx,txt,xls,xlsx,csv,xml,ppt,pptx'
+  video: 'mp4,mov',
+  audio: 'mp3',
+  img: 'jpg,png,gif',
+  doc: 'doc,docx,xls,xlsx'
 }
 const util = {
     local: _local,
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index 14a29f9..ec5f2ed 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -65,7 +65,7 @@ export default {
       })
       const { modules } = this
       // 查询页面详情
-      this.$post(`${this.api.findPage}?columnId=${this.columnId}`).then(({ data }) => {
+      this.$post(this.api.findPage, Util.rsa(this.columnId)).then(({ data }) => {
         if (data.length) {
           const json = data[data.length - 1]
           this.id = json.id
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index ee80850..487748b 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -1496,6 +1496,13 @@ export default {
           this.$message.error('请上传100M以内的图片！')
           return false
         }
+      } else {
+        const { name } = file
+        const ext = name.substring(name.lastIndexOf('.') + 1)
+        if (!Util.isImg(ext) && !Util.isVideo(ext) && !Util.isDoc(ext) && !Util.isAudio(ext) && ext !== 'pdf') {
+          this.$message.error('请上传合规文件！')
+          return false
+        }
       }
       this.uploading++
     },
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 04098e4..b04b127 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -409,13 +409,13 @@ export default {
   methods: {
     // 获取当前站点的栏目列表
     getList () {
-      this.$post(this.api.listWithTree, {
+      this.$post(this.api.listWithTree, Util.rsa({
         siteId: this.site.id,
         columnName: '',
         templateId: '',
         typeId: '',
         isSort: 1
-      }).then(({ data }) => {
+      })).then(({ data }) => {
         this.columns = data
         if (this.isEdit) {
           this.getData()
diff --git a/src/pages/column/page/about.vue b/src/pages/column/page/about.vue
index 8511a0e..bc19dc4 100644
--- a/src/pages/column/page/about.vue
+++ b/src/pages/column/page/about.vue
@@ -3,25 +3,33 @@
     <div class="actions">
       <p class="page-name">页面设置/ABOUT</p>
       <div>
-        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button type="primary"
+                   @click="preview">预览</el-button>
         <el-button @click="save(0)">保存为草稿</el-button>
-        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button type="primary"
+                   @click="save(1)">发布</el-button>
         <el-button @click="back">放弃编辑</el-button>
       </div>
     </div>
 
     <div class="modules">
       <div class="relative">
-        <el-carousel height="480px" :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+        <el-carousel height="480px"
+                     :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
           <template v-for="(item, i) in modules[0].list">
-            <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-              <img width="100%" height="100%" :src="item.pic" alt="">
+            <el-carousel-item v-if="item.pic && item.isEnable"
+                              :key="i">
+              <img width="100%"
+                   height="100%"
+                   :src="item.pic"
+                   alt="">
             </el-carousel-item>
           </template>
         </el-carousel>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
-      
+
       <div class="block history gray">
         <div class="inner c-wrap">
           <h2 style="margin-left: 57px">{{ modules[1].form.title }}</h2>
@@ -31,9 +39,14 @@
               <div class="line"></div>
               <div class="des">{{ modules[1].form.des }}</div>
             </div>
-            <img class="bg" width="562" height="506" :src="modules[1].form.pic" alt="">
+            <img class="bg"
+                 width="562"
+                 height="506"
+                 :src="modules[1].form.pic"
+                 alt="">
           </div>
-          <div class="cover" @click="toSet(1)">点击更改图片、标题概述与链接</div>
+          <div class="cover"
+               @click="toSet(1)">点击更改图片、标题概述与链接</div>
         </div>
       </div>
 
@@ -42,28 +55,37 @@
           <div class="c-wrap">
             <h2 class="b-title">{{ modules[2].form.title }}</h2>
             <p class="intro">{{ modules[2].form.des }}</p>
-            <div class="cover" @click="toSet(2)">点击更换标题与描述</div>
+            <div class="cover"
+                 @click="toSet(2)">点击更换标题与描述</div>
           </div>
           <ul class="card">
             <li class="item1">
               <h6>{{ modules[3].form.title }}</h6>
-              <div class="des" v-html="modules[3].form.des"></div>
-              <div class="cover" @click="toSet(3)">点击更换标题、概述与跳转</div>
+              <div class="des"
+                   v-html="modules[3].form.des"></div>
+              <div class="cover"
+                   @click="toSet(3)">点击更换标题、概述与跳转</div>
             </li>
             <li class="item2">
               <h6>{{ modules[4].form.title }}</h6>
-              <div class="des" v-html="modules[4].form.des"></div>
-              <div class="cover" @click="toSet(4)">点击更换标题、概述与跳转</div>
+              <div class="des"
+                   v-html="modules[4].form.des"></div>
+              <div class="cover"
+                   @click="toSet(4)">点击更换标题、概述与跳转</div>
             </li>
             <li class="item3">
               <h6>{{ modules[5].form.title }}</h6>
-              <div class="des" v-html="modules[5].form.des"></div>
-              <div class="cover" @click="toSet(5)">点击更换标题、概述与跳转</div>
+              <div class="des"
+                   v-html="modules[5].form.des"></div>
+              <div class="cover"
+                   @click="toSet(5)">点击更换标题、概述与跳转</div>
             </li>
             <li class="item4">
               <h6>{{ modules[6].form.title }}</h6>
-              <div class="des" v-html="modules[6].form.des"></div>
-              <div class="cover" @click="toSet(6)">点击更换标题、概述与跳转</div>
+              <div class="des"
+                   v-html="modules[6].form.des"></div>
+              <div class="cover"
+                   @click="toSet(6)">点击更换标题、概述与跳转</div>
             </li>
           </ul>
         </div>
@@ -74,38 +96,45 @@
           <div class="c-wrap">
             <h2 class="b-title">{{ modules[7].form.title }}</h2>
             <p class="intro">{{ modules[7].form.des }}</p>
-            <div class="cover" @click="toSet(7)">点击更换标题与描述</div>
+            <div class="cover"
+                 @click="toSet(7)">点击更换标题与描述</div>
           </div>
           <ul class="stat">
             <li>
               <p class="num">{{ modules[8].form.title }}</p>
               <p class="text">{{ modules[8].form.des }}</p>
-              <div class="cover" @click="toSet(8)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(8)">点击更换标题与描述</div>
             </li>
             <li>
               <p class="num">{{ modules[9].form.title }}</p>
               <p class="text">{{ modules[9].form.des }}</p>
-              <div class="cover" @click="toSet(9)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(9)">点击更换标题与描述</div>
             </li>
             <li>
               <p class="num">{{ modules[10].form.title }}</p>
               <p class="text">{{ modules[10].form.des }}</p>
-              <div class="cover" @click="toSet(10)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(10)">点击更换标题与描述</div>
             </li>
             <li>
               <p class="num">{{ modules[11].form.title }}</p>
               <p class="text">{{ modules[11].form.des }}</p>
-              <div class="cover" @click="toSet(11)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(11)">点击更换标题与描述</div>
             </li>
             <li>
               <p class="num">{{ modules[12].form.title }}</p>
               <p class="text">{{ modules[12].form.des }}</p>
-              <div class="cover" @click="toSet(12)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(12)">点击更换标题与描述</div>
             </li>
             <li>
               <p class="num">{{ modules[13].form.title }}</p>
               <p class="text">{{ modules[13].form.des }}</p>
-              <div class="cover" @click="toSet(13)">点击更换标题与描述</div>
+              <div class="cover"
+                   @click="toSet(13)">点击更换标题与描述</div>
             </li>
           </ul>
         </div>
@@ -113,14 +142,19 @@
 
       <div class="plan c-wrap">
         <div class="inner">
-          <img class="pic" :src="modules[14].form.pic" alt="">
+          <img class="pic"
+               :src="modules[14].form.pic"
+               alt="">
           <div class="texts">
             <h6>{{ modules[14].form.title }}</h6>
             <div class="des">{{ modules[14].form.des }}</div>
-            <img src="@/assets/images/arrow-white.png" alt="">
+            <img src="@/assets/images/arrow-white.png"
+                 alt="">
           </div>
         </div>
-        <div class="cover" style="height: calc(100% + 60px);" @click="toSet(14)">点击更换标题、概述与跳转</div>
+        <div class="cover"
+             style="height: calc(100% + 60px);"
+             @click="toSet(14)">点击更换标题、概述与跳转</div>
       </div>
 
       <div class="block">
@@ -128,21 +162,28 @@
           <div class="c-wrap">
             <h2 class="b-title">{{ modules[15].form.title }}</h2>
             <p class="intro">{{ modules[15].form.des }}</p>
-            <div class="cover" @click="toSet(15)">点击更换标题与描述</div>
+            <div class="cover"
+                 @click="toSet(15)">点击更换标题与描述</div>
           </div>
           <ul class="people">
             <template v-for="(item, i) in modules[16].list">
-              <li v-if="item.isEnable" :key="i">
-                <img class="pic" :src="item.pic" alt="">
+              <li v-if="item.isEnable"
+                  :key="i">
+                <img class="pic"
+                     :src="item.pic"
+                     alt="">
                 <div class="texts">
                   <p class="sub">{{ item.subTitle }}</p>
                   <h6>{{ item.title }}</h6>
                   <p class="des">{{ item.des }}</p>
-                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                  <img class="arrow"
+                       src="@/assets/images/arrow.png"
+                       alt="">
                 </div>
               </li>
             </template>
-            <div class="cover" @click="toSet(16)">点击更改图片、标题概述与链接</div>
+            <div class="cover"
+                 @click="toSet(16)">点击更改图片、标题概述与链接</div>
           </ul>
         </div>
       </div>
@@ -152,26 +193,36 @@
           <div class="c-wrap">
             <h2 class="b-title">{{ modules[17].form.title }}</h2>
             <p class="intro">{{ modules[17].form.des }}</p>
-            <div class="cover" @click="toSet(17)">点击更换标题与描述</div>
+            <div class="cover"
+                 @click="toSet(17)">点击更换标题与描述</div>
           </div>
           <ul class="list">
             <li>
-              <img class="pic" :src="modules[18].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[18].form.pic"
+                   alt="">
               <h6>{{ modules[18].form.title }}</h6>
               <p class="des">{{ modules[18].form.des }}</p>
-              <div class="cover" @click="toSet(18)">点击更改图片、标题概述与链接</div>
+              <div class="cover"
+                   @click="toSet(18)">点击更改图片、标题概述与链接</div>
             </li>
             <li>
-              <img class="pic" :src="modules[19].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[19].form.pic"
+                   alt="">
               <h6>{{ modules[19].form.title }}</h6>
               <p class="des">{{ modules[19].form.des }}</p>
-              <div class="cover" @click="toSet(19)">点击更改图片、标题概述与链接</div>
+              <div class="cover"
+                   @click="toSet(19)">点击更改图片、标题概述与链接</div>
             </li>
             <li>
-              <img class="pic" :src="modules[20].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[20].form.pic"
+                   alt="">
               <h6>{{ modules[20].form.title }}</h6>
               <p class="des">{{ modules[20].form.des }}</p>
-              <div class="cover" @click="toSet(20)">点击更改图片、标题概述与链接</div>
+              <div class="cover"
+                   @click="toSet(20)">点击更改图片、标题概述与链接</div>
             </li>
           </ul>
         </div>
@@ -182,21 +233,28 @@
           <div class="c-wrap">
             <h2 class="b-title">{{ modules[21].form.title }}</h2>
             <p class="intro">{{ modules[21].form.des }}</p>
-            <div class="cover" @click="toSet(21)">点击更换标题与描述</div>
+            <div class="cover"
+                 @click="toSet(21)">点击更换标题与描述</div>
           </div>
           <div class="staff">
             <div class="left">
               <h6>{{ modules[22].form.title }}</h6>
               <div class="des">{{ modules[22].form.des }}</div>
             </div>
-            <img class="pic" :src="modules[22].form.pic" alt="">
-            <div class="cover" @click="toSet(22)">点击更改图片、标题概述与链接</div>
+            <img class="pic"
+                 :src="modules[22].form.pic"
+                 alt="">
+            <div class="cover"
+                 @click="toSet(22)">点击更改图片、标题概述与链接</div>
           </div>
         </div>
       </div>
     </div>
 
-    <Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
+    <Module ref="module"
+            :data.sync="curData"
+            :visible.sync="diaVisible"
+            @moduleSubmit="moduleSubmit" />
   </div>
 </template>
 
@@ -205,12 +263,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.about
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -236,210 +294,210 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .history {
-  h2 {
-    font-size: 30px;
-    color: #333;
-  }
-  .texts {
-    display: flex;
-    justify-content: space-between;
-    padding: 82px 57px 30px;
-    margin-top: 20px;
-    background-color: #fff;
-    border-radius: 100px 0px 0px 0px;
-  }
-  .left {
-    width: 695px;
-  }
-  .line {
-    width: 136px;
-    height: 2px;
-    margin: 20px 0;
-    background: #D7D7D7;
-  }
-  .des {
-    font-size: 22px;
-    color: #181818;
-    line-height: 31px;
-  }
-  .bg {
-    margin: -122px 0 0 0;
-    border-top-right-radius: 40px;
-  }
+    h2 {
+        font-size: 30px;
+        color: #333;
+    }
+    .texts {
+        display: flex;
+        justify-content: space-between;
+        padding: 82px 57px 30px;
+        margin-top: 20px;
+        background-color: #fff;
+        border-radius: 100px 0px 0px 0px;
+    }
+    .left {
+        width: 695px;
+    }
+    .line {
+        width: 136px;
+        height: 2px;
+        margin: 20px 0;
+        background: #d7d7d7;
+    }
+    .des {
+        font-size: 22px;
+        color: #181818;
+        line-height: 31px;
+    }
+    .bg {
+        margin: -122px 0 0 0;
+        border-top-right-radius: 40px;
+    }
 }
 .card {
-  display: flex;
-  flex-wrap: wrap;
-  li {
-    position: relative;
-    width: 686px;
-    height: 277px;
-    padding: 70px 67px 20px;
-    margin-bottom: 28px;
-    color: #fff;
-    &:nth-child(odd) {
-      margin-right: 28px;
+    display: flex;
+    flex-wrap: wrap;
+    li {
+        position: relative;
+        width: 686px;
+        height: 277px;
+        padding: 70px 67px 20px;
+        margin-bottom: 28px;
+        color: #fff;
+        &:nth-child(odd) {
+            margin-right: 28px;
+        }
+    }
+    .item1 {
+        background: url(../../../assets/images/about/3.png) 0 0/100% 100% no-repeat;
+    }
+    .item2 {
+        background-color: #4984b6;
+    }
+    .item3 {
+        background-color: #567180;
+    }
+    .item4 {
+        background: url(../../../assets/images/about/4.png) 0 0/100% 100% no-repeat;
+    }
+    h6 {
+        margin-bottom: 10px;
+        font-size: 40px;
+        font-family: toppan;
+    }
+    .des {
+        font-size: 18px;
     }
-  }
-  .item1 {
-    background: url(../../../assets/images/about/3.png) 0 0/100% 100% no-repeat;
-  }
-  .item2 {
-    background-color: #4984B6;
-  }
-  .item3 {
-    background-color: #567180;
-  }
-  .item4 {
-    background: url(../../../assets/images/about/4.png) 0 0/100% 100% no-repeat;
-  }
-  h6 {
-    margin-bottom: 10px;
-    font-size: 40px;
-    font-family: toppan;
-  }
-  .des {
-    font-size: 18px;
-  }
 }
 .plan {
-  padding: 73px 0;
-  background: #072947;
-  .inner {
-    display: flex;
-    justify-content: space-between;
-    width: 1575px;
-  }
-  .pic {
-    width: 664px;
-    height: 488px;
-    margin-bottom: -120px;
-  }
-  .texts {
-    width: 802px;
-    margin-top: 36px;
-    color: #fff;
-  }
-  h6 {
-    font-size: 36px;
-  }
-  .des {
-    margin: 20px 0;
-    font-size: 20px;
-  }
+    padding: 73px 0;
+    background: #072947;
+    .inner {
+        display: flex;
+        justify-content: space-between;
+        width: 1575px;
+    }
+    .pic {
+        width: 664px;
+        height: 488px;
+        margin-bottom: -120px;
+    }
+    .texts {
+        width: 802px;
+        margin-top: 36px;
+        color: #fff;
+    }
+    h6 {
+        font-size: 36px;
+    }
+    .des {
+        margin: 20px 0;
+        font-size: 20px;
+    }
 }
 .people {
-  position: relative;
-  li {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 126px;
-    &:nth-child(even) {
-      flex-direction: row-reverse;
+    position: relative;
+    li {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 126px;
+        &:nth-child(even) {
+            flex-direction: row-reverse;
+        }
+    }
+    .pic {
+        width: 660px;
+        height: 465px;
+    }
+    .texts {
+        width: 680px;
+        padding-top: 90px;
+    }
+    h6 {
+        margin: 20px 0;
+        font-size: 40px;
+    }
+    .sub {
+        font-size: 20px;
+        color: #020202;
+    }
+    .des {
+        font-size: 18px;
+        color: #020202;
+        line-height: 30px;
     }
-  }
-  .pic {
-    width: 660px;
-    height: 465px;
-  }
-  .texts {
-    width: 680px;
-    padding-top: 90px;
-  }
-  h6 {
-    margin: 20px 0;
-    font-size: 40px;
-  }
-  .sub {
-    font-size: 20px;
-    color: #020202;
-  }
-  .des {
-    font-size: 18px;
-    color: #020202;
-    line-height: 30px;
-  }
 }
 .list-block {
-  .inner {
-    width: 80%;
-    padding: 90px 0;
-    background-color: #fff;
-  }
+    .inner {
+        width: 80%;
+        padding: 90px 0;
+        background-color: #fff;
+    }
 }
 .list {
-  display: flex;
-  justify-content: center;
-  li {
-    position: relative;
-    width: calc((100% - 100px) / 3);
-    padding-bottom: 30px;
-    margin-right: 28px;
-    text-align: center;
-    background-color: #F5F5F5;
-    &:last-child {
-      margin-right: 0;
+    display: flex;
+    justify-content: center;
+    li {
+        position: relative;
+        width: calc((100% - 100px) / 3);
+        padding-bottom: 30px;
+        margin-right: 28px;
+        text-align: center;
+        background-color: #f5f5f5;
+        &:last-child {
+            margin-right: 0;
+        }
+    }
+    .pic {
+        width: 100%;
+        height: 353px;
+    }
+    h6 {
+        margin: 35px 0 5px;
+        font-size: 24px;
+        color: #272727;
+    }
+    .des {
+        font-size: 16px;
+        color: #757575;
     }
-  }
-  .pic {
-    width: 100%;
-    height: 353px;
-  }
-  h6 {
-    margin: 35px 0 5px;
-    font-size: 24px;
-    color: #272727;
-  }
-  .des {
-    font-size: 16px;
-    color: #757575;
-  }
 }
 .staff {
-  position: relative;
-  display: flex;
-  justify-content: space-between;
-  background: #F8F8F8;
-  .left {
-    width: 658px;
-    margin: 50px 0 0 46px;
-  }
-  h6 {
-    margin-bottom: 30px;
-    font-size: 30px;
-    color: #333;
-  }
-  .des {
-    font-size: 20px;
-    color: #333;
-    line-height: 34px;
-  }
-  .pic {
-    width: 650px;
-  }
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    background: #f8f8f8;
+    .left {
+        width: 658px;
+        margin: 50px 0 0 46px;
+    }
+    h6 {
+        margin-bottom: 30px;
+        font-size: 30px;
+        color: #333;
+    }
+    .des {
+        font-size: 20px;
+        color: #333;
+        line-height: 34px;
+    }
+    .pic {
+        width: 650px;
+    }
 }
 .stat {
-  display: flex;
-  justify-content: space-around;
-  flex-wrap: wrap;
-  margin-top: 60px;
-  li {
-    position: relative;
-    width: 30%;
-    margin-bottom: 50px;
-  }
-  .num {
-    margin-bottom: 10px;
-    font-size: 60px;
-    font-weight: 800;
-    font-family: toppan;
-    color: #035CE1;
-    line-height: 49px;
-  }
-  .text {
-    font-size: 24px;
-  }
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+    margin-top: 60px;
+    li {
+        position: relative;
+        width: 30%;
+        margin-bottom: 50px;
+    }
+    .num {
+        margin-bottom: 10px;
+        font-size: 60px;
+        font-weight: 800;
+        font-family: toppan;
+        color: #035ce1;
+        line-height: 49px;
+    }
+    .text {
+        font-size: 24px;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index 0e95892..dde593c 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -48,6 +48,7 @@
                      type="text"
                      @click="showRole(scope.row)">查看</el-button>
           <el-button v-auth
+                     v-if="scope.row.name !== '超级管理员'"
                      type="text"
                      @click="editRole(scope.row)">编辑</el-button>
           <el-button v-auth
@@ -165,8 +166,8 @@ export default {
         limit: this.pageSize,
         name: this.keyword,
       })).then(({ data }) => {
-        // const list = data.records.filter(e => e.id !== 1) // 不显示超管
-        const list = data.records
+        const list = data.records.filter(e => e.id !== 1) // 不显示超管
+        // const list = data.records
         this.list = list
         this.total = data.total == 0 ? 0 : +data.total - 1
       }).catch(res => { })
diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue
index 2809293..98b92f4 100644
--- a/src/pages/setting/list/info.vue
+++ b/src/pages/setting/list/info.vue
@@ -324,14 +324,14 @@ export default {
       if (!data.password) return Util.warningMsg("请输入原密码")
       if (!data.newPassword) return Util.warningMsg("请输入新密码")
       if (!data.reNewPassword) return Util.warningMsg("请确认新密码")
-      if (data.newPassword.length < 6 || data.reNewPassword.length < 6) return Util.warningMsg("请输入6位数以上的密码")
+      if (data.newPassword.length < 8 || data.reNewPassword.length < 8) return Util.warningMsg("密码不得小于8位，并且至少包含数字、字母和特殊字符中两种")
       if (data.newPassword !== data.reNewPassword) return Util.warningMsg("输入的新密码不一致，请重新确认")
       if (data.password === data.newPassword) return Util.warningMsg("原密码跟新密码不能一致")
-      this.$put(this.api.pwd, {
+      this.$post(this.api.pwd, Util.rsa({
         id: this.form.id,
         oldPwd: data.password,
         newPwd: data.newPassword
-      }).then(res => {
+      })).then(res => {
         Util.successMsg("更换成功")
         this.pwdVisible = false
       }).catch(err => { })
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index 1d41f43..2e7d23f 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -741,7 +741,7 @@ export default {
     },
     // 重置密码
     resetPassword (row) {
-      this.$confirm(`确定重置密码？重置后密码为111aaa。`, "提示", { type: "warning" }).then(() => {
+      this.$confirm(`确定重置密码？重置后密码为Iasf#2024。`, "提示", { type: "warning" }).then(() => {
         this.$post(this.api.resetPwd, Util.rsa(+row.id)).then(res => {
           Util.successMsg("重置成功")
         }).catch(res => { })
diff --git a/src/setting.js b/src/setting.js
index 12ccf79..7017260 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -6,7 +6,6 @@ let host = `${location.origin}/`
 if (isDev) {
   host = 'http://192.168.31.51:10000/'
 }
-
 const Setting = {
     /**
      * 基础配置