From cf3ee574ece7d17185872c0349b28e47069f4f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Mon, 25 Apr 2022 18:34:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: bc12d32bce0eafad7159e252f496805254fff1ac
---
 src/views/oms/order/index.vue                 |   2 +-
 src/views/pms/brand/index.vue                 |   2 +-
 src/views/pms/goods/index.vue                 |   2 +-
 src/views/sms/advert/index.vue                |   2 +-
 src/views/system/client/index.vue             |   2 +-
 src/views/system/dict/components/Dict.vue     |   2 +-
 src/views/system/dict/components/DictItem.vue |   2 +-
 src/views/system/menu/components/Perm.vue     | 170 +++++++++---------
 src/views/system/role/components/Role.vue     |   2 +-
 src/views/system/role/index.vue               |   4 +-
 src/views/system/user/index.vue               |   6 +-
 src/views/ums/member/index.vue                |   2 +-
 12 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index dfdab1e3..e00e49ba 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -226,7 +226,7 @@ onMounted(() => {
 
     <!-- 分页工具条 -->
     <pagination
-      v-show="total > 0"
+      v-if="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 0dadcb1b..4c540caf 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -199,7 +199,7 @@ onMounted(() => {
     </el-table>
 
     <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue
index 197f02f6..acf4ea45 100644
--- a/src/views/pms/goods/index.vue
+++ b/src/views/pms/goods/index.vue
@@ -250,7 +250,7 @@ onMounted(() => {
 
     <!-- 分页工具条 -->
     <pagination
-      v-show="total > 0"
+      v-if="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue
index d5bea75d..b745b245 100644
--- a/src/views/sms/advert/index.vue
+++ b/src/views/sms/advert/index.vue
@@ -193,7 +193,7 @@ onMounted(() => {
     </el-table>
 
     <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 39ee3172..79131a07 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -209,7 +209,7 @@ onMounted(() => {
     </el-table>
 
     <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
diff --git a/src/views/system/dict/components/Dict.vue b/src/views/system/dict/components/Dict.vue
index 23be833c..d9514e9a 100644
--- a/src/views/system/dict/components/Dict.vue
+++ b/src/views/system/dict/components/Dict.vue
@@ -45,7 +45,7 @@ export default {
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
 
     <!-- 弹窗表单 -->
diff --git a/src/views/system/dict/components/DictItem.vue b/src/views/system/dict/components/DictItem.vue
index 06f466c8..0b24a39a 100644
--- a/src/views/system/dict/components/DictItem.vue
+++ b/src/views/system/dict/components/DictItem.vue
@@ -34,7 +34,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index bb8b10b3..0d6009c2 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -1,85 +1,3 @@
-<template>
-  <div claas="component-container">
-    <!-- 搜索表单 -->
-    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-      <el-form-item>
-        <el-button type="success" :icon="Plus" :disabled="!menuId" @click="handleAdd">新增</el-button>
-        <el-button type="danger" :icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
-      </el-form-item>
-      <el-form-item prop="name">
-        <el-input v-model="queryParams.name" placeholder="权限名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 数据表格 -->
-    <el-table :data="permList" v-loading="loading" @selection-change="handleSelectionChange" border>
-      <el-table-column type="selection" width="40" align="center" />
-      <el-table-column label="权限名称" prop="name" width="150" />
-      <el-table-column label="URL权限" align="center">
-        <el-table-column prop="serviceName" label="所属服务" />
-        <el-table-column prop="requestMethod" label="请求方式" />
-        <el-table-column prop="requestPath" label="请求路径" />
-      </el-table-column>
-      <el-table-column label="按钮权限" prop="btnPerm" width="200" />
-      <el-table-column label="操作" align="center" width="150">
-        <template #default="scope">
-          <el-button type="primary" :icon="Edit" circle plain @click="handleUpdate(scope.row)" />
-          <el-button type="danger" :icon="Delete" circle plain @click="handleDelete(scope.row)" />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" :v-model:page="queryParams.pageNum" :v-model:limit="queryParams.pageSize"
-      @pagination="handleQuery" />
-
-    <!-- 表单弹窗 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px">
-      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="120px">
-        <el-form-item label="权限名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入权限名称" />
-        </el-form-item>
-
-        <el-form-item label="URL权限标识" prop="urlPerm">
-          <el-input placeholder="/api/v1/users" v-model="urlPerm.requestPath">
-            <template #prepend>
-              <el-select v-model="urlPerm.serviceName" style="width: 130px" placeholder="所属服务" clearable>
-                <el-option v-for="item in microServiceOptions" :key="item.value" :value="item.value"
-                  :label="item.label" />
-              </el-select>
-
-              <el-select v-model="urlPerm.requestMethod" style="width: 120px; margin-left: 20px" placeholder="请求方式"
-                clearable>
-                <el-option v-for="item in requestMethodOptions" :key="item.value" :value="item.value"
-                  :label="item.label" />
-              </el-select>
-            </template>
-          </el-input>
-          <el-link v-show="urlPerm.requestMethod">
-            {{ urlPerm.requestMethod }}:/{{
-              urlPerm.serviceName
-            }}{{ urlPerm.requestPath }}
-          </el-link>
-        </el-form-item>
-
-        <el-form-item label="按钮权限标识" prop="btnPerm">
-          <el-input v-model="formData.btnPerm" placeholder="sys:user:add" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
 <script setup lang="ts">
 
 import {
@@ -117,9 +35,7 @@ const dataFormRef = ref(ElForm);
 const props = defineProps({
   menuId: {
     type: String,
-    default: () => {
-      return ''
-    }
+    default: () => { }
   },
 });
 
@@ -333,7 +249,89 @@ onMounted(() => {
 });
 </script>
 
-<style scoped>
+<template>
+  <div claas="component-container">
+    <!-- 搜索表单 -->
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      <el-form-item>
+        <el-button type="success" :icon="Plus" :disabled="!menuId" @click="handleAdd">新增</el-button>
+        <el-button type="danger" :icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-form-item>
+      <el-form-item prop="name">
+        <el-input v-model="queryParams.name" placeholder="权限名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 数据表格 -->
+    <el-table :data="permList" v-loading="loading" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="40" align="center" />
+      <el-table-column label="权限名称" prop="name" width="150" />
+      <el-table-column label="URL权限" align="center">
+        <el-table-column prop="serviceName" label="所属服务" />
+        <el-table-column prop="requestMethod" label="请求方式" />
+        <el-table-column prop="requestPath" label="请求路径" />
+      </el-table-column>
+      <el-table-column label="按钮权限" prop="btnPerm" width="200" />
+      <el-table-column label="操作" align="center" width="150">
+        <template #default="scope">
+          <el-button type="primary" :icon="Edit" circle plain @click="handleUpdate(scope.row)" />
+          <el-button type="danger" :icon="Delete" circle plain @click="handleDelete(scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页工具条 -->
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="handleQuery" />
+
+    <!-- 表单弹窗 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px">
+      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="120px">
+        <el-form-item label="权限名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入权限名称" />
+        </el-form-item>
+
+        <el-form-item label="URL权限标识" prop="urlPerm">
+          <el-input placeholder="/api/v1/users" v-model="urlPerm.requestPath">
+            <template #prepend>
+              <el-select v-model="urlPerm.serviceName" style="width: 130px" placeholder="所属服务" clearable>
+                <el-option v-for="item in microServiceOptions" :key="item.value" :value="item.value"
+                  :label="item.label" />
+              </el-select>
+
+              <el-select v-model="urlPerm.requestMethod" style="width: 120px; margin-left: 20px" placeholder="请求方式"
+                clearable>
+                <el-option v-for="item in requestMethodOptions" :key="item.value" :value="item.value"
+                  :label="item.label" />
+              </el-select>
+            </template>
+          </el-input>
+          <el-link v-show="urlPerm.requestMethod">
+            {{ urlPerm.requestMethod }}:/{{
+              urlPerm.serviceName
+            }}{{ urlPerm.requestPath }}
+          </el-link>
+        </el-form-item>
+
+        <el-form-item label="按钮权限标识" prop="btnPerm">
+          <el-input v-model="formData.btnPerm" placeholder="sys:user:add" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
 .component-container {
   margin-bottom: 20px;
 }
diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue
index c480bda2..cc335664 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/system/role/components/Role.vue
@@ -187,7 +187,7 @@ onMounted(() => {
     </el-table>
 
     <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index cdd08311..5e187a80 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -29,7 +29,7 @@
       <el-col :span="8" :xs="24">
         <el-card class="box-card" shadow="always">
           <template #header>
-            <svg-icon color="#333" icon-class="perm" />
+            <svg-icon  icon-class="perm" />
             <span style="margin: 0 5px">权限分配</span>
 
             <el-tag type="success" style="margin: 0 5px 0 0" v-if="role.id">
@@ -46,7 +46,7 @@
             >
 
             <el-tag type="success" v-if="menu.id" size="small">
-              <svg-icon color="red" icon-class="menu" />
+              <svg-icon icon-class="menu" />
               {{ menu.name }}
             </el-tag>
             <el-tag type="warning" v-else size="small"> 请选择菜单</el-tag>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9415c755..46ea225a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -465,6 +465,8 @@ onMounted(() => {
   loadData();
 });
 </script>
+
+
 <template>
   <div class="app-container">
     <el-row :gutter="20">
@@ -498,7 +500,7 @@ onMounted(() => {
                 <el-form-item prop="status">
                   <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 200px">
                     <el-option label="正常" value="1" />
-                    <el-option label="停用" value="0" />
+                    <el-option label="禁用" value="0" />
                   </el-select>
                 </el-form-item>
 
@@ -554,7 +556,7 @@ onMounted(() => {
             </el-table-column>
           </el-table>
 
-          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize" @pagination="handleQuery" />
         </el-card>
       </el-col>
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index d07b913c..8a27fd82 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -140,7 +140,7 @@ onMounted(() => {
     </el-table>
 
     <!-- 分页工具条 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"  v-model:limit="queryParams.pageSize"
+    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum"  v-model:limit="queryParams.pageSize"
       @pagination="handleQuery" />
   </div>
 </template>