Selaa lähdekoodia

审核状态样式调整

yuwenjun1997 2 vuotta sitten
vanhempi
commit
66fa700b7c
52 muutettua tiedostoa jossa 128 lisäystä ja 1229 poistoa
  1. 30 0
      src/components/AuditStatus/index.vue
  2. 1 1
      src/components/Pagination/index.vue
  3. 9 0
      src/components/index.js
  4. 6 3
      src/main.js
  5. 0 5
      src/permission.js
  6. 0 104
      src/router/router-map.js
  7. 0 692
      src/styles/index.css
  8. 0 0
      src/styles/index.min.css
  9. 5 6
      src/styles/index.scss
  10. 0 0
      src/utils/format-routes-to-modules.js
  11. 0 75
      src/utils/formatRoutesToModule.js
  12. 0 3
      src/utils/open-window.js
  13. 1 13
      src/views/admin/audit/club/device/index.vue
  14. 3 5
      src/views/admin/audit/club/index.vue
  15. 3 16
      src/views/admin/audit/club/list.vue
  16. 2 4
      src/views/admin/audit/device/index.vue
  17. 7 33
      src/views/admin/audit/device/list.vue
  18. 8 17
      src/views/admin/audit/material/article/index.vue
  19. 2 14
      src/views/admin/audit/material/file/index.vue
  20. 1 14
      src/views/admin/audit/material/image/index.vue
  21. 12 34
      src/views/admin/audit/material/index.vue
  22. 2 14
      src/views/admin/audit/material/package/index.vue
  23. 1 14
      src/views/admin/audit/material/video/index.vue
  24. 9 18
      src/views/admin/audit/personnel/index.vue
  25. 1 12
      src/views/admin/audit/personnel/operate/index.vue
  26. 1 12
      src/views/admin/audit/personnel/training/index.vue
  27. 5 16
      src/views/admin/logistics-licensed/club/device/index.vue
  28. 0 1
      src/views/admin/logistics-licensed/components/club-list.vue
  29. 0 1
      src/views/admin/logistics-licensed/components/supplier-list.vue
  30. 0 1
      src/views/admin/member/index.vue
  31. 0 1
      src/views/admin/settings/menus/components/table-list.vue
  32. 1 14
      src/views/admin/supplier/club/device/index.vue
  33. 1 14
      src/views/admin/supplier/club/index.vue
  34. 0 1
      src/views/admin/supplier/index.vue
  35. 0 4
      src/views/common/helper/document/index.vue
  36. 0 4
      src/views/common/helper/video/index.vue
  37. 2 20
      src/views/normal/audit/club/components/club-list.vue
  38. 1 15
      src/views/normal/audit/club/components/device-list.vue
  39. 0 1
      src/views/normal/club/device-cate.vue
  40. 0 1
      src/views/normal/club/device/index.vue
  41. 0 1
      src/views/normal/club/index.vue
  42. 3 3
      src/views/normal/club/user/index-temp.vue
  43. 0 1
      src/views/normal/club/user/index.vue
  44. 1 3
      src/views/normal/feedback/index.vue
  45. 2 3
      src/views/normal/material/article/index.vue
  46. 3 4
      src/views/normal/material/file/index.vue
  47. 0 1
      src/views/normal/material/image/index.vue
  48. 2 3
      src/views/normal/material/package/index.vue
  49. 3 4
      src/views/normal/material/video/index.vue
  50. 0 1
      src/views/normal/personnel/operate/index.vue
  51. 0 1
      src/views/normal/personnel/training/index.vue
  52. 0 1
      src/views/normal/user/index.vue

+ 30 - 0
src/components/AuditStatus/index.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <span v-if="status === 2" class="status warning">待审核</span>
+    <span v-if="status === 1" class="status success">审核通过</span>
+    <!-- 未通过原因展示 -->
+    <template v-if="status === 0">
+      <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="reason">
+        <div slot="reference">
+          <span class="status danger">审核未通过</span>
+          <span class="el-icon-question status danger" />
+        </div>
+      </el-popover>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  name: 'AuditStatus',
+  props: {
+    status: {
+      type: Number,
+      default: 0
+    },
+    reason: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>

+ 1 - 1
src/components/Pagination/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
+  <div v-show="total > limit" :class="{'hidden':hidden}" class="pagination-container">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"

+ 9 - 0
src/components/index.js

@@ -0,0 +1,9 @@
+import AuditStatus from './AuditStatus'
+
+const install = (Vue) => {
+  Vue.component(AuditStatus.name, AuditStatus)
+}
+
+export default {
+  install
+}

+ 6 - 3
src/main.js

@@ -8,6 +8,8 @@ import Element from 'element-ui'
 import './styles/element-variables.scss'
 import '@/styles/index.scss' // global css
 
+import MyComponents from './components'
+
 import App from './App'
 import store from './store'
 import router from './router'
@@ -20,15 +22,16 @@ import './mixin/base' // 公共方法
 
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
-  // locale: enLang // 如果使用中文,无需设置,请删除
 })
 
+Vue.use(MyComponents)
+
 window.addEventListener('popstate', function() {
   history.pushState(null, null, document.URL)
 })
 
 // register global utility filters
-Object.keys(filters).forEach(key => {
+Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key])
 })
 
@@ -38,5 +41,5 @@ new Vue({
   el: '#app',
   router,
   store,
-  render: h => h(App)
+  render: (h) => h(App)
 })

+ 0 - 5
src/permission.js

@@ -15,7 +15,6 @@ const shareList = ['Share', 'SharePayVip', 'SharePaySuccess', 'SharePayFaild']
 
 // 路由拦截器
 router.beforeEach(async(to, from, next) => {
-  // 获取token
   const hasToken = getToken()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title)
@@ -25,16 +24,12 @@ router.beforeEach(async(to, from, next) => {
   }
 
   if (hasToken) {
-    // 如果是访问登录页面,强制跳转到首页
     if (to.path === '/login') {
       next({ path: initGoPage() })
     } else {
-      // 加载国家列表并保存到store
       store.dispatch('app/setCountry')
-      // 判断当前用户是否拥有角色
       const hasRoles = store.getters.roles && store.getters.roles.length > 0
       if (hasRoles) {
-        // 放行
         next()
       } else {
         try {

+ 0 - 104
src/router/router-map.js

@@ -1,104 +0,0 @@
-// 审核管理
-const audit = [
-  {
-    id: 1,
-    name: '审核管理',
-    children: [
-      { id: 1, name: '机构认证审核' },
-      { id: 2, name: '机构认证审核详情' },
-      { id: 3, name: '设备审核列表' },
-      { id: 4, name: '设备审核详情' },
-      { id: 5, name: '医师审核列表' },
-      { id: 6, name: '医师审核详情' },
-      { id: 7, name: '文章审核列表' },
-      { id: 8, name: '审核文章' },
-      { id: 9, name: '图片审核列表' },
-      { id: 10, name: '审核图片' },
-      { id: 11, name: '视频审核列表' },
-      { id: 12, name: '文件审核列表' }
-    ]
-  }
-]
-// 机构认证
-const club = [
-  {
-    id: 2,
-    name: '机构认证',
-    children: [
-      { id: 1, name: '机构列表' },
-      { id: 2, name: '添加机构' },
-      { id: 3, name: '修改机构' },
-      { id: 4, name: '登录用户' },
-      { id: 5, name: '设备列表' },
-      { id: 6, name: '添加设备' },
-      { id: 7, name: '修改设备' }
-    ]
-  }
-]
-// 医师认证
-const doctor = [
-  {
-    id: 3,
-    name: '医师认证',
-    children: [
-      { id: 1, name: '医师列表' },
-      { id: 2, name: '添加医师' },
-      { id: 3, name: '修改医师资料' }
-    ]
-  }
-]
-// 用户反馈
-const feedback = [
-  {
-    id: 4,
-    name: '用户反馈',
-    children: [
-      { id: 1, name: '反馈列表' },
-      { id: 2, name: '反馈处理' }
-    ]
-  }
-]
-// 新手帮助
-const helper = [
-  {
-    id: 5,
-    name: '新手帮助',
-    children: [
-      { id: 1, name: '视频教程' },
-      { id: 2, name: '文档教程' }
-    ]
-  }
-]
-// 资料库
-const material = [
-  {
-    id: 6,
-    name: '资料库',
-    children: [
-      { id: 1, name: '文章列表' },
-      { id: 2, name: '编辑文章' },
-      { id: 3, name: '图片列表' },
-      { id: 4, name: '编辑图片' },
-      { id: 5, name: '视频列表' },
-      { id: 6, name: '文件列表' }
-    ]
-  }
-]
-// 账号管理
-const supplier = [
-  {
-    id: 7,
-    name: '账号管理',
-    children: [
-      { id: 1, name: '供应商账号' },
-      { id: 2, name: '添加供应商' },
-      { id: 3, name: '修改供应商' },
-      { id: 4, name: '查看认证机构' },
-      { id: 5, name: '认证机构详情' },
-      { id: 6, name: '查看设备认证' },
-      { id: 7, name: '设备认证详情' }
-    ]
-  }
-]
-
-export default [...audit, ...club, ...doctor, ...feedback, ...helper, ...material, ...supplier]

+ 0 - 692
src/styles/index.css

@@ -1,692 +0,0 @@
-:export {
-  menuText: #bfcbd9;
-  menuActiveText: #409EFF;
-  subMenuActiveText: #f4f4f5;
-  menuBg: #304156;
-  menuHover: #263445;
-  subMenuBg: #1f2d3d;
-  subMenuHover: #001528;
-  sideBarWidth: 210px;
-}
-
-/* fade */
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.28s;
-}
-
-.fade-enter,
-.fade-leave-active {
-  opacity: 0;
-}
-
-/* fade-transform */
-.fade-transform-leave-active,
-.fade-transform-enter-active {
-  transition: all .5s;
-}
-
-.fade-transform-enter {
-  opacity: 0;
-  transform: translateX(-30px);
-}
-
-.fade-transform-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
-
-/* breadcrumb transition */
-.breadcrumb-enter-active,
-.breadcrumb-leave-active {
-  transition: all .5s;
-}
-
-.breadcrumb-enter,
-.breadcrumb-leave-active {
-  opacity: 0;
-  transform: translateX(20px);
-}
-
-.breadcrumb-move {
-  transition: all .5s;
-}
-
-.breadcrumb-leave-active {
-  position: absolute;
-}
-
-.el-breadcrumb__inner,
-.el-breadcrumb__inner a {
-  font-weight: 400 !important;
-}
-
-.el-upload input[type="file"] {
-  display: none !important;
-}
-
-.el-upload__input {
-  display: none;
-}
-
-.cell .el-tag {
-  margin-right: 0px;
-}
-
-.small-padding .cell {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-.fixed-width .el-button--mini {
-  padding: 7px 10px;
-  min-width: 60px;
-}
-
-.status-col .cell {
-  padding: 0 10px;
-  text-align: center;
-}
-
-.status-col .cell .el-tag {
-  margin-right: 0px;
-}
-
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-.upload-container .el-upload {
-  width: 100%;
-}
-
-.upload-container .el-upload .el-upload-dragger {
-  width: 100%;
-  height: 200px;
-}
-
-.el-dropdown-menu a {
-  display: block;
-}
-
-.el-range-editor.el-input__inner {
-  display: inline-flex !important;
-}
-
-.el-range-separator {
-  box-sizing: content-box;
-}
-
-#app .main-container {
-  min-height: 100%;
-  transition: margin-left .28s;
-  margin-left: 210px;
-  position: relative;
-}
-
-#app .sidebar-container {
-  transition: width 0.28s;
-  width: 210px !important;
-  background-color: #304156;
-  height: 100%;
-  position: fixed;
-  font-size: 0px;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1001;
-  overflow: hidden;
-}
-
-#app .sidebar-container .horizontal-collapse-transition {
-  transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
-}
-
-#app .sidebar-container .scrollbar-wrapper {
-  overflow-x: hidden !important;
-}
-
-#app .sidebar-container .el-scrollbar__bar.is-vertical {
-  right: 0px;
-}
-
-#app .sidebar-container .el-scrollbar {
-  height: 100%;
-}
-
-#app .sidebar-container.has-logo .el-scrollbar {
-  height: calc(100% - 50px);
-}
-
-#app .sidebar-container .is-horizontal {
-  display: none;
-}
-
-#app .sidebar-container a {
-  display: inline-block;
-  width: 100%;
-  overflow: hidden;
-}
-
-#app .sidebar-container .svg-icon {
-  margin-right: 16px;
-}
-
-#app .sidebar-container .sub-el-icon {
-  margin-right: 12px;
-  margin-left: -2px;
-}
-
-#app .sidebar-container .el-menu {
-  border: none;
-  height: 100%;
-  width: 100% !important;
-}
-
-#app .sidebar-container .submenu-title-noDropdown:hover,
-#app .sidebar-container .el-submenu__title:hover {
-  background-color: #263445 !important;
-}
-
-#app .sidebar-container .is-active > .el-submenu__title {
-  color: #f4f4f5 !important;
-}
-
-#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
-#app .sidebar-container .el-submenu .el-menu-item {
-  min-width: 210px !important;
-  background-color: #1f2d3d !important;
-}
-
-#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title:hover,
-#app .sidebar-container .el-submenu .el-menu-item:hover {
-  background-color: #001528 !important;
-}
-
-#app .hideSidebar .sidebar-container {
-  width: 54px !important;
-}
-
-#app .hideSidebar .main-container {
-  margin-left: 54px;
-}
-
-#app .hideSidebar .submenu-title-noDropdown {
-  padding: 0 !important;
-  position: relative;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip {
-  padding: 0 !important;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip .svg-icon {
-  margin-left: 20px;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip .sub-el-icon {
-  margin-left: 19px;
-}
-
-#app .hideSidebar .el-submenu {
-  overflow: hidden;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title {
-  padding: 0 !important;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .svg-icon {
-  margin-left: 20px;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .sub-el-icon {
-  margin-left: 19px;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
-  display: none;
-}
-
-#app .hideSidebar .el-menu--collapse .el-submenu > .el-submenu__title > span {
-  height: 0;
-  width: 0;
-  overflow: hidden;
-  visibility: hidden;
-  display: inline-block;
-}
-
-#app .el-menu--collapse .el-menu .el-submenu {
-  min-width: 210px !important;
-}
-
-#app .mobile .main-container {
-  margin-left: 0px;
-}
-
-#app .mobile .sidebar-container {
-  transition: transform .28s;
-  width: 210px !important;
-}
-
-#app .mobile.hideSidebar .sidebar-container {
-  pointer-events: none;
-  transition-duration: 0.3s;
-  transform: translate3d(-210px, 0, 0);
-}
-
-#app .withoutAnimation .main-container,
-#app .withoutAnimation .sidebar-container {
-  transition: none;
-}
-
-.el-menu--vertical > .el-menu .svg-icon {
-  margin-right: 16px;
-}
-
-.el-menu--vertical > .el-menu .sub-el-icon {
-  margin-right: 12px;
-  margin-left: -2px;
-}
-
-.el-menu--vertical .nest-menu .el-submenu > .el-submenu__title:hover,
-.el-menu--vertical .el-menu-item:hover {
-  background-color: #263445 !important;
-}
-
-.el-menu--vertical > .el-menu--popup {
-  max-height: 100vh;
-  overflow-y: auto;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar-track-piece {
-  background: #d3dce6;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar {
-  width: 6px;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar-thumb {
-  background: #99a9bf;
-  border-radius: 20px;
-}
-
-:export {
-  menuText: #bfcbd9;
-  menuActiveText: #409EFF;
-  subMenuActiveText: #f4f4f5;
-  menuBg: #304156;
-  menuHover: #263445;
-  subMenuBg: #1f2d3d;
-  subMenuHover: #001528;
-  sideBarWidth: 210px;
-}
-
-.blue-btn {
-  background: #324157;
-}
-
-.blue-btn:hover {
-  color: #324157;
-}
-
-.blue-btn:hover:before, .blue-btn:hover:after {
-  background: #324157;
-}
-
-.light-blue-btn {
-  background: #3A71A8;
-}
-
-.light-blue-btn:hover {
-  color: #3A71A8;
-}
-
-.light-blue-btn:hover:before, .light-blue-btn:hover:after {
-  background: #3A71A8;
-}
-
-.red-btn {
-  background: #C03639;
-}
-
-.red-btn:hover {
-  color: #C03639;
-}
-
-.red-btn:hover:before, .red-btn:hover:after {
-  background: #C03639;
-}
-
-.pink-btn {
-  background: #E65D6E;
-}
-
-.pink-btn:hover {
-  color: #E65D6E;
-}
-
-.pink-btn:hover:before, .pink-btn:hover:after {
-  background: #E65D6E;
-}
-
-.green-btn {
-  background: #30B08F;
-}
-
-.green-btn:hover {
-  color: #30B08F;
-}
-
-.green-btn:hover:before, .green-btn:hover:after {
-  background: #30B08F;
-}
-
-.tiffany-btn {
-  background: #4AB7BD;
-}
-
-.tiffany-btn:hover {
-  color: #4AB7BD;
-}
-
-.tiffany-btn:hover:before, .tiffany-btn:hover:after {
-  background: #4AB7BD;
-}
-
-.yellow-btn {
-  background: #FEC171;
-}
-
-.yellow-btn:hover {
-  color: #FEC171;
-}
-
-.yellow-btn:hover:before, .yellow-btn:hover:after {
-  background: #FEC171;
-}
-
-.pan-btn {
-  font-size: 14px;
-  color: #fff;
-  padding: 14px 36px;
-  border-radius: 8px;
-  border: none;
-  outline: none;
-  transition: 600ms ease all;
-  position: relative;
-  display: inline-block;
-}
-
-.pan-btn:hover {
-  background: #fff;
-}
-
-.pan-btn:hover:before, .pan-btn:hover:after {
-  width: 100%;
-  transition: 600ms ease all;
-}
-
-.pan-btn:before, .pan-btn:after {
-  content: '';
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 2px;
-  width: 0;
-  transition: 400ms ease all;
-}
-
-.pan-btn::after {
-  right: inherit;
-  top: inherit;
-  left: 0;
-  bottom: 0;
-}
-
-.custom-button {
-  display: inline-block;
-  line-height: 1;
-  white-space: nowrap;
-  cursor: pointer;
-  background: #fff;
-  color: #fff;
-  -webkit-appearance: none;
-  text-align: center;
-  box-sizing: border-box;
-  outline: 0;
-  margin: 0;
-  padding: 10px 15px;
-  font-size: 14px;
-  border-radius: 4px;
-}
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-label {
-  font-weight: 700;
-}
-
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-#app {
-  height: 100%;
-}
-
-*,
-*:before,
-*:after {
-  box-sizing: inherit;
-}
-
-.no-padding {
-  padding: 0px !important;
-}
-
-.padding-content {
-  padding: 4px 0;
-}
-
-a:focus,
-a:active {
-  outline: none;
-}
-
-a,
-a:focus,
-a:hover {
-  cursor: pointer;
-  color: inherit;
-  text-decoration: none;
-}
-
-div:focus {
-  outline: none;
-}
-
-.fr {
-  float: right;
-}
-
-.fl {
-  float: left;
-}
-
-.pr-5 {
-  padding-right: 5px;
-}
-
-.pl-5 {
-  padding-left: 5px;
-}
-
-.block {
-  display: block;
-}
-
-.pointer {
-  cursor: pointer;
-}
-
-.inlineBlock {
-  display: block;
-}
-
-.clearfix:after {
-  visibility: hidden;
-  display: block;
-  font-size: 0;
-  content: " ";
-  clear: both;
-  height: 0;
-}
-
-aside {
-  background: #eef1f6;
-  padding: 8px 24px;
-  margin-bottom: 20px;
-  border-radius: 2px;
-  display: block;
-  line-height: 32px;
-  font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  color: #2c3e50;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-aside a {
-  color: #337ab7;
-  cursor: pointer;
-}
-
-aside a:hover {
-  color: #20a0ff;
-}
-
-.app-container {
-  padding: 20px;
-}
-
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-
-.pagination-container {
-  margin-top: 30px;
-}
-
-.text-center {
-  text-align: center;
-}
-
-.sub-navbar {
-  height: 50px;
-  line-height: 50px;
-  position: relative;
-  width: 100%;
-  text-align: right;
-  padding-right: 20px;
-  transition: 600ms ease position;
-  background: linear-gradient(90deg, #20b6f9 0%, #20b6f9 0%, #2178f1 100%, #2178f1 100%);
-}
-
-.sub-navbar .subtitle {
-  font-size: 20px;
-  color: #fff;
-}
-
-.sub-navbar.draft {
-  background: #d0d0d0;
-}
-
-.sub-navbar.deleted {
-  background: #d0d0d0;
-}
-
-.link-type,
-.link-type:focus {
-  color: #337ab7;
-  cursor: pointer;
-}
-
-.link-type:hover,
-.link-type:focus:hover {
-  color: #20a0ff;
-}
-
-.filter-container {
-  padding-bottom: 10px;
-}
-
-.filter-container .filter-item {
-  display: inline-block;
-  vertical-align: middle;
-  margin-bottom: 10px;
-}
-
-.multiselect {
-  line-height: 16px;
-}
-
-.multiselect--active {
-  z-index: 1000 !important;
-}
-
-.status.success {
-  color: #67C23A;
-}
-
-.status.danger {
-  color: #F56C6C;
-}
-
-.status.warning {
-  color: #E6A23C;
-}
-
-.hidden .el-upload {
-  display: none !important;
-}
-
-.tableHeader th {
-  background-color: #f7f7f7 !important;
-}
-
-.el-drawer__header {
-  margin-bottom: 0 !important;
-}
-
-.table-cell .cell {
-  overflow: visible !important;
-}
-
-.table-cell .cell .el-badge {
-  vertical-align: 0;
-}
-
-.el-drawer header span {
-  outline: none;
-}
-
-.el-drawer button {
-  outline: none !important;
-}
-
-.reason {
-  cursor: pointer;
-}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/styles/index.min.css


+ 5 - 6
src/styles/index.scss

@@ -186,13 +186,14 @@ aside {
 // 状态颜色
 .status {
   &.success {
-    color: #67c23a;
+    color: #409EFF;
   }
   &.danger {
-    color: #f56c6c;
+    color: #F56C6C;
+    cursor: help;
   }
   &.warning {
-    color: #e6a23c;
+    color: #606266;
   }
 }
 
@@ -208,9 +209,6 @@ aside {
   }
 }
 
-// .el-badge__content.is-fixed{
-//   top: 14px !important;
-// }
 .el-drawer__header {
   margin-bottom: 0 !important;
 }
@@ -309,6 +307,7 @@ aside {
     > span {
       margin-right: 10px;
       font-size: 14px;
+      color: #606266;
     }
     > .el-input,
     > .el-select {

+ 0 - 0
src/utils/format-routes-to-modules.js


+ 0 - 75
src/utils/formatRoutesToModule.js

@@ -1,75 +0,0 @@
-import { constantRoutes, asyncRoutes } from '@/router/index'
-import store from '@/store'
-import routerMap from '@/router/router-map'
-
-let routesTree = []
-let routes = []
-let routeMap = []
-
-// 获取全部路由信息
-function getRoutes() {
-  routes = [...constantRoutes, ...asyncRoutes].filter(item => item.meta)
-  if (!store.getters.roles.includes('admin')) {
-    routes = routes.filter(route => !route.meta.roles || route.meta.roles.includes('normal'))
-  }
-  return routes
-}
-
-// 从路由map中获取id
-function getRouteKeyFromMap(name, flag = false) {
-  if (flag) {
-    return routerMap.reduce((prev, item) => {
-      prev.push(...item.children)
-      return prev
-    }, []).find(item => item.name === name)?.id
-  } else {
-    return routerMap.find(item => item.name === name)?.id
-  }
-}
-
-function formatRoutesToModule() {
-  routes = getRoutes()
-  routesTree = []
-  routeMap = []
-  routes.forEach(first => {
-    const obj = {
-      label: first.meta.title,
-      value: getRouteKeyFromMap(first.meta.title, false)
-    }
-    // 提取当前登录用户可以看到的路由
-    const find = routerMap.find(item => item.name === first.meta.title)
-    if (find) {
-      routeMap.push(find)
-    }
-    if (first.children) {
-      obj.children = []
-      first.children.forEach(second => {
-        obj.children.push({
-          label: second.meta.title,
-          value: getRouteKeyFromMap(second.meta.title, true)
-        })
-      })
-    }
-    routesTree.push(obj)
-  })
-  return routesTree
-}
-
-export function getToutesTree() {
-  return formatRoutesToModule()
-}
-
-// 根据id获取栏目
-export function getModuleType(ids) {
-  ids = ids.split('-')
-  console.log(routeMap)
-  const parent = routeMap.find(item => {
-    console.log(item)
-    return item.id === parseInt(ids[0])
-  })
-  const children = parent && parent.children.find(item => item.id === parseInt(ids[1]))
-  if (!parent || !children) {
-    return store.getters.roles.includes('admin') ? '未知模块' : ''
-  }
-  return `${parent.name}/${children.name}`
-}

+ 0 - 3
src/utils/open-window.js

@@ -14,9 +14,6 @@ export default function openWindow(url, strWindowName, title, w, h) {
 
   const width = w || screen.availWidth - 40
   const height = h || screen.availHeight - 50
-  // const newWindow = window.open(url, title, 'height=' + (screen.availHeight - 50) + ',width=' + (screen.availWidth - 10) + ',top=0,left=0,toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no')
-  // const left = ((width / 2) - (w / 2)) + dualScreenLeft
-  // const top = ((height / 2) - (h / 2)) + dualScreenTop
   const left = (screen.availWidth - width) / 2
   const top = (screen.availHeight - height) / 2
 

+ 1 - 13
src/views/admin/audit/club/device/index.vue

@@ -40,17 +40,7 @@
       <el-table-column prop="snCode" label="设备SN码" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -70,7 +60,6 @@
           <el-button
             v-if="row.auditStatus !== 1"
             type="primary"
-            icon="el-icon-s-check"
             size="mini"
             @click="$_navigationTo(`/audit/club/device-detail?id=${row.productId}&authId=${listQuery.authId}`)"
           >审核</el-button>
@@ -81,7 +70,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 3 - 5
src/views/admin/audit/club/index.vue

@@ -58,16 +58,15 @@
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>
+          <span v-if="row.lowerAuditStatus === 0" class="status warning">未完成审核</span>
           <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="240px" align="center">
+      <el-table-column label="操作" width="160px" align="center">
         <template slot-scope="{ row }">
           <el-badge :hidden="row.lowerAuditStatus === 1" :value="row.waitAuditNum" :max="99">
             <el-button
               type="primary"
-              icon="el-icon-s-check"
               size="mini"
               @click="$_navigationTo(`/audit/club/club-list?authUserId=${row.authUserId}`)"
             >机构认证审核</el-button>
@@ -78,7 +77,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -120,7 +118,7 @@ export default {
     getList() {
       this.listLoading = true
       fetchSupplierList(this.listQuery)
-        .then(res => {
+        .then((res) => {
           if (res.code !== 0) return
           this.list = res.data.list
           this.total = res.data.total

+ 3 - 16
src/views/admin/audit/club/list.vue

@@ -43,22 +43,12 @@
       <el-table-column prop="authParty" label="机构名称" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="商品信息审核状态" width="160px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>
+          <span v-if="row.lowerAuditStatus === 0" class="status warning">未完成审核</span>
           <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>
         </template>
       </el-table-column>
@@ -83,13 +73,11 @@
             v-if="row.auditStatus !== 1"
             type="warning"
             size="mini"
-            style="margin-right: 5px"
-            icon="el-icon-s-check"
+            style="margin-right: 12px"
             @click="$_navigationTo(`/audit/club/club-detail?authId=${row.authId}`)"
           >审核</el-button>
           <el-badge :hidden="row.lowerAuditStatus === 1" :value="row.waitAuditNum" :max="99">
             <el-button
-              icon="el-icon-s-shop"
               type="primary"
               size="mini"
               @click="$_navigationTo(`/audit/club/device/list?authId=${row.authId}`)"
@@ -101,7 +89,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 2 - 4
src/views/admin/audit/device/index.vue

@@ -58,16 +58,15 @@
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />
       <el-table-column label="审核状态" width="220px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>
+          <span v-if="row.lowerAuditStatus === 0" class="status warning">未完成审核</span>
           <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="240px" align="center">
+      <el-table-column label="操作" width="160px" align="center">
         <template slot-scope="{ row }">
           <el-badge :hidden="row.lowerAuditStatus === 1" :value="row.productTypeWaitNum" :max="99">
             <el-button
               type="primary"
-              icon="el-icon-s-check"
               size="mini"
               @click="$_navigationTo(`/audit/device/device-list?authUserId=${row.authUserId}`)"
             >设备分类审核</el-button>
@@ -78,7 +77,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 7 - 33
src/views/admin/audit/device/list.vue

@@ -32,17 +32,7 @@
       <el-table-column prop="name" label="设备名称" align="center" />
       <el-table-column label="审核状态" width="220px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="250px" align="center">
@@ -59,36 +49,20 @@
       </el-table-column>
       <el-table-column label="操作" width="240px" align="center">
         <template slot-scope="{ row }">
-          <el-button
-            v-if="row.auditStatus !== 1"
-            type="warning"
-            size="mini"
-            style="margin-right:5px"
-            icon="el-icon-s-check"
-            @click="handleAudit(row)"
-          >审核</el-button>
+          <el-button v-if="row.auditStatus !== 1" type="warning" size="mini" @click="handleAudit(row)">审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 审核对话框 -->
-    <el-dialog
-      title="审核"
-      :visible.sync="dialogVisible"
-      width="30%"
-      @closed="onDialogClose"
-    >
+    <el-dialog title="审核" :visible.sync="dialogVisible" width="30%" @closed="onDialogClose">
       <el-form label-width="80px">
         <el-form-item label="设备名称:">
           <span v-text="currentData.name" />
         </el-form-item>
         <el-form-item label="设备图片:">
-          <el-image
-            style="width: 200px; height: 200px"
-            :src="currentData.image"
-            :preview-src-list="srcList"
-          />
+          <el-image style="width: 200px; height: 200px" :src="currentData.image" :preview-src-list="srcList" />
         </el-form-item>
         <el-form-item label="审核状态:">
           <el-radio-group v-model="dialogData.auditStatus">
@@ -188,9 +162,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.app-container{
-  ::v-deep{
-    .el-dialog__body{
+.app-container {
+  ::v-deep {
+    .el-dialog__body {
       padding-bottom: 0;
     }
   }

+ 8 - 17
src/views/admin/audit/material/article/index.vue

@@ -34,21 +34,15 @@
       <el-table-column label="序号" :index="indexMethod" type="index" width="80" align="center" />
       <el-table-column label="文章标题" prop="articleTitle" align="center" />
       <el-table-column label="文章头图" width="80px" align="center">
-        <template slot-scope="{ row }"> <el-image style="width: 50px; height: 50px" :src="row.articleImage" /></template>
+        <template slot-scope="{ row }">
+          <el-image
+            style="width: 50px; height: 50px"
+            :src="row.articleImage"
+          /></template>
       </el-table-column>
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -70,8 +64,6 @@
             v-if="row.auditStatus !== 1"
             type="primary"
             size="mini"
-            style="margin-right:5px"
-            icon="el-icon-s-check"
             @click="$_navigationTo(`/audit/material/article-detail?articleId=${row.articleId}`)"
           >审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
@@ -81,7 +73,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -120,7 +111,7 @@ export default {
     getList() {
       this.listLoading = true
       getArticleList(this.listQuery)
-        .then(res => {
+        .then((res) => {
           if (res.code !== 0) return
           this.list = res.data.list
           this.total = res.data.total
@@ -132,7 +123,7 @@ export default {
     },
     // 初始化预览图片列表
     initPreviewList(list) {
-      list.forEach(item => this.srcList.push(item.articleCover))
+      list.forEach((item) => this.srcList.push(item.articleCover))
     },
     indexMethod(index) {
       return index + this.listQuery.pageSize * (this.listQuery.pageNum - 1) + 1

+ 2 - 14
src/views/admin/audit/material/file/index.vue

@@ -44,17 +44,7 @@
       <el-table-column label="文件名称" prop="fileTitle" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -76,8 +66,6 @@
             v-if="row.auditStatus===2"
             type="primary"
             size="mini"
-            style="margin-right:5px"
-            icon="el-icon-s-check"
             @click="handleShowDialog(row)"
           >审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
@@ -86,7 +74,7 @@
     </el-table>
     <!-- 表格区域END -->
     <!-- 页码 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
+    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
     <!-- 视频预览对话框 -->
     <el-dialog
       title="视频审核"

+ 1 - 14
src/views/admin/audit/material/image/index.vue

@@ -35,17 +35,7 @@
       <el-table-column label="图片标题" prop="imageTitle" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -67,8 +57,6 @@
             v-if="row.auditStatus !== 1"
             type="primary"
             size="mini"
-            style="margin-right:5px"
-            icon="el-icon-s-check"
             @click="$_navigationTo(`/audit/material/image-detail?imageId=${row.imageId}`)"
           >审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
@@ -78,7 +66,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 12 - 34
src/views/admin/audit/material/index.vue

@@ -58,51 +58,26 @@
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />
       <el-table-column label="审核状态" width="150px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>
+          <span v-if="row.lowerAuditStatus === 0" class="status warning">未完成审核</span>
           <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>
         </template>
       </el-table-column>
-      <el-table-column label="待审核" width="460px" align="center">
+      <el-table-column label="待审核" width="390px" align="center">
         <template slot-scope="{ row }">
           <el-badge :hidden="row.articleWaitNum === 0" :value="row.articleWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-tickets"
-              size="mini"
-              @click="$_navigationTo(`material/article-list?authUserId=${row.authUserId}`)"
-            >文章</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'article')">文章</el-button>
           </el-badge>
           <el-badge :hidden="row.imageWaitNum === 0" :value="row.imageWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-picture-outline"
-              size="mini"
-              @click="$_navigationTo(`material/image-list?authUserId=${row.authUserId}`)"
-            >图片</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'image')">图片</el-button>
           </el-badge>
           <el-badge :hidden="row.videoWaitNum === 0" :value="row.videoWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-video-camera"
-              size="mini"
-              @click="$_navigationTo(`material/video-list?authUserId=${row.authUserId}`)"
-            >视频</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'video')">视频</el-button>
           </el-badge>
           <el-badge :hidden="row.fileWaitNum === 0" :value="row.fileWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-document-copy"
-              size="mini"
-              @click="$_navigationTo(`material/file-list?authUserId=${row.authUserId}`)"
-            >文件</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'file')">文件</el-button>
           </el-badge>
           <el-badge :hidden="row.zipWaitNum === 0" :value="row.zipWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-document-copy"
-              size="mini"
-              @click="$_navigationTo(`material/package-list?authUserId=${row.authUserId}`)"
-            >资料包</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'package')">资料包</el-button>
           </el-badge>
         </template>
       </el-table-column>
@@ -110,7 +85,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -146,11 +120,15 @@ export default {
     this.getList()
   },
   methods: {
+    goAuditList(row, type) {
+      const url = `material/${type}-list?authUserId=${row.authUserId}`
+      this.$router.push(url)
+    },
     // 获取供应商待审核列表数据
     getList() {
       this.listLoading = true
       fetchSupplierList(this.listQuery)
-        .then(res => {
+        .then((res) => {
           if (res.code !== 0) return
           this.list = res.data.list
           this.total = res.data.total

+ 2 - 14
src/views/admin/audit/material/package/index.vue

@@ -44,17 +44,7 @@
       <el-table-column label="文件名称" prop="fileTitle" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -76,8 +66,6 @@
             v-if="row.auditStatus===2"
             type="primary"
             size="mini"
-            style="margin-right:5px"
-            icon="el-icon-s-check"
             @click="handleShowDialog(row)"
           >审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
@@ -86,7 +74,7 @@
     </el-table>
     <!-- 表格区域END -->
     <!-- 页码 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
+    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
     <!-- 视频预览对话框 -->
     <el-dialog
       title="视频审核"

+ 1 - 14
src/views/admin/audit/material/video/index.vue

@@ -35,17 +35,7 @@
       <el-table-column label="视频名称" prop="videoTitle" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核时间" width="160px" align="center">
@@ -67,8 +57,6 @@
             v-if="row.auditStatus !== 1"
             type="primary"
             size="mini"
-            style="margin-right: 5px"
-            icon="el-icon-s-check"
             @click="handleShowDialog(row)"
           >审核</el-button>
           <span v-else class="status success el-icon-check">&nbsp;已审核</span>
@@ -78,7 +66,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 9 - 18
src/views/admin/audit/personnel/index.vue

@@ -58,27 +58,17 @@
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />
       <el-table-column label="审核状态" width="220px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>
+          <span v-if="row.lowerAuditStatus === 0" class="status warning">未完成审核</span>
           <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="320px" align="center">
+      <el-table-column label="操作" width="260px" align="center">
         <template slot-scope="{ row }">
           <el-badge :hidden="row.lowerAuditStatus === 1" :value="row.doctorWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-s-check"
-              size="mini"
-              @click="$_navigationTo(`personnel/operate/doctor-list?authUserId=${row.authUserId}`)"
-            >操作师审核</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'operate')">操作师审核</el-button>
           </el-badge>
           <el-badge :hidden="row.lowerAuditStatus === 1" :value="row.doctorWaitNum" :max="99">
-            <el-button
-              type="primary"
-              icon="el-icon-s-check"
-              size="mini"
-              @click="$_navigationTo(`personnel/training/doctor-list?authUserId=${row.authUserId}`)"
-            >培训师审核</el-button>
+            <el-button type="primary" size="mini" @click="goAuditList(row, 'training')">培训师审核</el-button>
           </el-badge>
         </template>
       </el-table-column>
@@ -86,7 +76,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -122,13 +111,15 @@ export default {
     this.getList()
   },
   methods: {
-    // 过滤列表
-    handleFilter() {},
+    goAuditList(row, type) {
+      const url = `personnel/${type}/doctor-list?authUserId=${row.authUserId}`
+      this.$router.push(url)
+    },
     // 获取供应商列表
     getList() {
       this.listLoading = true
       fetchSupplierList(this.listQuery)
-        .then(res => {
+        .then((res) => {
           if (res.code !== 0) return
           this.list = res.data.list
           this.total = res.data.total

+ 1 - 12
src/views/admin/audit/personnel/operate/index.vue

@@ -39,17 +39,7 @@
 
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
 
@@ -84,7 +74,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 1 - 12
src/views/admin/audit/personnel/training/index.vue

@@ -39,17 +39,7 @@
 
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>
-          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <template slot="reference">
-                <span class="status danger">审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </template>
-            </el-popover>
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
 
@@ -84,7 +74,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 5 - 16
src/views/admin/logistics-licensed/club/device/index.vue

@@ -35,29 +35,18 @@
       <!-- <el-table-column v-if="false" label="创建人" width="180px" align="center" prop="createBy" /> -->
       <el-table-column label="操作" align="center" width="240px" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
-          <permission-button
-            type="default"
-            size="mini"
-            @click="$_navigationTo(`device-detail?id=${row.productId}`)"
-          >
+          <el-button type="default" size="mini" @click="$_navigationTo(`device-detail?id=${row.productId}`)">
             查看
-          </permission-button>
-          <permission-button v-if="row.auditStatus === 1" type="primary" size="mini" @click="handleShowQRcode(row)">
+          </el-button>
+          <el-button :disabled="row.auditStatus !== 1" type="primary" size="mini" @click="handleShowQRcode(row)">
             二维码
-          </permission-button>
-          <permission-button v-else type="info" size="mini" disabled> 二维码 </permission-button>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 页码 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.pageNum"
-      :limit.sync="listQuery.pageSize"
-      @pagination="getList"
-    />
+    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList" />
 
     <!-- 二维码 -->
     <transition name="fade">

+ 0 - 1
src/views/admin/logistics-licensed/components/club-list.vue

@@ -70,7 +70,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/admin/logistics-licensed/components/supplier-list.vue

@@ -82,7 +82,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/admin/member/index.vue

@@ -77,7 +77,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/admin/settings/menus/components/table-list.vue

@@ -75,7 +75,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 1 - 14
src/views/admin/supplier/club/device/index.vue

@@ -74,19 +74,7 @@
 
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>
-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <el-tag slot="reference" size="small" type="danger" class="reason">
-                <span>审核未通过</span>
-                <span class="el-icon-question status danger " />
-              </el-tag>
-            </el-popover>
-            <!-- 未通过原因展示END -->
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
 
@@ -141,7 +129,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 1 - 14
src/views/admin/supplier/club/index.vue

@@ -67,19 +67,7 @@
 
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>
-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.auditStatus === 0">
-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <el-tag slot="reference" size="small" type="danger" class="reason">
-                <span>审核未通过</span>
-                <span class="el-icon-question status danger " />
-              </el-tag>
-            </el-popover>
-            <!-- 未通过原因展示END -->
-          </template>
+          <audit-status :status="row.auditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
 
@@ -130,7 +118,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/admin/supplier/index.vue

@@ -124,7 +124,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 4
src/views/common/helper/document/index.vue

@@ -21,7 +21,6 @@
         <el-button type="primary" @click="getList">查询</el-button>
         <el-button
           v-if="userIdentity === 1"
-          icon="el-icon-edit"
           type="primary"
           @click="dialogVisible = true"
         >添加</el-button>
@@ -57,7 +56,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -110,7 +108,6 @@ import Pagination from '@/components/Pagination' // secondary package based on e
 import openWindow from '@/utils/open-window'
 import { mapGetters } from 'vuex'
 import { fetchCourseList, saveCourse, removeCourse } from '@/api/helper'
-// import { getToutesTree, getModuleType } from '@/utils/formatRoutesToModule'
 import { debounce } from '@/utils/tools'
 import { sysMenuTree } from '@/api/system'
 export default {
@@ -171,7 +168,6 @@ export default {
   },
   created() {
     this.dialogFormData = this.resetDialogFormData()
-    // this.modules = getToutesTree(this.routes)
     this.getMenuTree()
   },
   methods: {

+ 0 - 4
src/views/common/helper/video/index.vue

@@ -21,7 +21,6 @@
         <el-button type="primary" @click="getList">查询</el-button>
         <el-button
           v-if="userIdentity === 1"
-          icon="el-icon-edit"
           type="primary"
           @click="dialogVisible = true"
         >添加</el-button>
@@ -57,7 +56,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -105,7 +103,6 @@ import Pagination from '@/components/Pagination' // secondary package based on e
 import openWindow from '@/utils/open-window'
 import { mapGetters } from 'vuex'
 import { fetchCourseList, saveCourse, removeCourse } from '@/api/helper'
-// import { getToutesTree, getModuleType } from '@/utils/formatRoutesToModule'
 import { debounce } from '@/utils/tools'
 import { sysMenuTree } from '@/api/system'
 export default {
@@ -156,7 +153,6 @@ export default {
   },
   created() {
     this.dialogFormData = this.resetDialogFormData()
-    // this.modules = getToutesTree(this.routes)
     this.getMenuTree()
     console.log(this.authUserId)
   },

+ 2 - 20
src/views/normal/audit/club/components/club-list.vue

@@ -35,19 +35,7 @@
       <el-table-column label="手机号" width="120px" align="center" prop="mobile" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.shopAuditStatus === 2" size="small" type="warning">待审核</el-tag>
-          <el-tag v-if="row.shopAuditStatus === 1" size="small" type="success">审核通过</el-tag>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.shopAuditStatus === 0">
-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <el-tag slot="reference" size="small" type="danger" class="reason">
-                <span>审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </el-tag>
-            </el-popover>
-            <!-- 未通过原因展示END -->
-          </template>
+          <audit-status :status="row.shopAuditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center" width="200px">
@@ -90,13 +78,7 @@
     </el-table>
     <!-- 表格区域END -->
     <!-- 页码 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.pageNum"
-      :limit.sync="listQuery.pageSize"
-      @pagination="getList"
-    />
+    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList" />
     <!-- 审核弹窗 -->
     <el-dialog title="授权机构审核" :visible.sync="dialogVisible" width="450px" @close="dialogClosed">
       <div class="auth-info">

+ 1 - 15
src/views/normal/audit/club/components/device-list.vue

@@ -31,19 +31,7 @@
       <el-table-column prop="snCode" label="设备SN码" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.shopAuditStatus === 2" size="small" type="warning">待审核</el-tag>
-          <el-tag v-if="row.shopAuditStatus === 1" size="small" type="success">审核通过</el-tag>
-          <!-- 未通过原因展示 -->
-          <template v-if="row.shopAuditStatus === 0">
-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->
-            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">
-              <el-tag slot="reference" size="small" type="danger" class="reason">
-                <span>审核未通过</span>
-                <span class="el-icon-question status danger" />
-              </el-tag>
-            </el-popover>
-            <!-- 未通过原因展示END -->
-          </template>
+          <audit-status :status="row.shopAuditStatus" :reason="row.invalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center">
@@ -69,7 +57,6 @@
           <el-button
             v-if="row.shopAuditStatus !== 1"
             type="primary"
-            icon="el-icon-s-check"
             size="mini"
             @click="$_navigationTo(`/supplier-audit/club/device-detail?id=${row.productId}&authId=${listQuery.authId}`)"
           >审核</el-button>
@@ -80,7 +67,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/club/device-cate.vue

@@ -96,7 +96,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/club/device/index.vue

@@ -117,7 +117,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/club/index.vue

@@ -125,7 +125,6 @@
 
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 3 - 3
src/views/normal/club/user/index-temp.vue

@@ -81,13 +81,13 @@
       </el-table-column>
       <el-table-column label="操作" width="200px" align="center">
         <template slot-scope="{row}">
-          <permission-button v-if="row.status === 1" type="danger" size="mini" style="margin-right:5px" @click="handleUnbindGenerate(row)">解绑邀请码</permission-button>
-          <permission-button v-else type="primary" size="mini" style="margin-right:5px" @click="handleUpdateGenerate(row)">更新邀请码</permission-button>
+          <permission-button v-if="row.status === 1" type="danger" size="mini" style="margin-right:12px" @click="handleUnbindGenerate(row)">解绑邀请码</permission-button>
+          <permission-button v-else type="primary" size="mini" style="margin-right:12px" @click="handleUpdateGenerate(row)">更新邀请码</permission-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 表格区域END -->
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
+    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList(listQuery)" />
   </div>
 </template>
 

+ 0 - 1
src/views/normal/club/user/index.vue

@@ -71,7 +71,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 1 - 3
src/views/normal/feedback/index.vue

@@ -99,8 +99,7 @@
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
-            icon="el-icon-edit"
+            style="margin-right:12px"
             @click="$_navigationTo(`/feedback/detail?feedbackId=${row.feedbackId}`)"
           >处理</permission-button>
         </template>
@@ -109,7 +108,6 @@
     <!-- 表格区域END -->
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 2 - 3
src/views/normal/material/article/index.vue

@@ -92,13 +92,13 @@
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="$_navigationTo(`article-edit?articleId=${row.articleId}`)"
           >编辑</permission-button>
           <permission-button
             type="danger"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleRemoveArticle(row)"
           >删除</permission-button>
         </template>
@@ -106,7 +106,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 3 - 4
src/views/normal/material/file/index.vue

@@ -89,19 +89,19 @@
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handlePreviewFile(row)"
           >预览</permission-button>
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleShowDialog('edit', row)"
           >编辑</permission-button>
           <permission-button
             type="danger"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleRemoveFile(row)"
           >删除</permission-button>
         </template>
@@ -109,7 +109,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/material/image/index.vue

@@ -102,7 +102,6 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 2 - 3
src/views/normal/material/package/index.vue

@@ -89,13 +89,13 @@
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleShowDialog('edit', row)"
           >编辑</permission-button>
           <permission-button
             type="danger"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleRemoveFile(row)"
           >删除</permission-button>
         </template>
@@ -103,7 +103,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 3 - 4
src/views/normal/material/video/index.vue

@@ -89,19 +89,19 @@
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handlePlayer(row)"
           >播放</permission-button>
           <permission-button
             type="primary"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleShowDialog('edit', row)"
           >编辑</permission-button>
           <permission-button
             type="danger"
             size="mini"
-            style="margin-right:5px"
+            style="margin-right:12px"
             @click="handleRemoveVideo(row)"
           >删除</permission-button>
         </template>
@@ -109,7 +109,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/personnel/operate/index.vue

@@ -104,7 +104,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/personnel/training/index.vue

@@ -104,7 +104,6 @@
     </el-table>
     <!-- 页码 -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

+ 0 - 1
src/views/normal/user/index.vue

@@ -91,7 +91,6 @@
     </el-table>
     <!-- 表格区域END -->
     <pagination
-      v-show="total > 0"
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä