From 47eac89d1e2fb88b76a63f15bc66fdb364eecfbc Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 13 Jun 2023 11:24:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=BB=9F=E4=B8=80=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=202.=20=E5=A2=9E=E5=8A=A0=20DocAlert=20=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/notice/index.ts         | 15 ++++++++----
 src/components/DictTag/src/DictTag.vue |  1 +
 src/components/DocAlert/index.vue      | 32 ++++++++++++++++++++++++++
 src/views/mp/account/index.vue         | 13 +++++------
 src/views/mp/freePublish/index.vue     |  8 +++----
 src/views/mp/statistics/index.vue      |  8 +++----
 src/views/system/user/user.data.ts     |  4 ++--
 7 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 src/components/DocAlert/index.vue

diff --git a/src/api/system/notice/index.ts b/src/api/system/notice/index.ts
index 62bf5259..cd420a29 100644
--- a/src/api/system/notice/index.ts
+++ b/src/api/system/notice/index.ts
@@ -11,27 +11,32 @@ export interface NoticeVO {
   createTime: Date
 }
 
+export interface NoticePageReqVO extends PageParam {
+  title?: string
+  status?: number
+}
+
 // 查询公告列表
-export const getNoticePage = (params: PageParam) => {
+export const getNoticePageApi = (params: NoticePageReqVO) => {
   return request.get({ url: '/system/notice/page', params })
 }
 
 // 查询公告详情
-export const getNotice = (id: number) => {
+export const getNoticeApi = (id: number) => {
   return request.get({ url: '/system/notice/get?id=' + id })
 }
 
 // 新增公告
-export const createNotice = (data: NoticeVO) => {
+export const createNoticeApi = (data: NoticeVO) => {
   return request.post({ url: '/system/notice/create', data })
 }
 
 // 修改公告
-export const updateNotice = (data: NoticeVO) => {
+export const updateNoticeApi = (data: NoticeVO) => {
   return request.put({ url: '/system/notice/update', data })
 }
 
 // 删除公告
-export const deleteNotice = (id: number) => {
+export const deleteNoticeApi = (id: number) => {
   return request.delete({ url: '/system/notice/delete?id=' + id })
 }
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index e3ba78d2..db37f714 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -48,6 +48,7 @@ export default defineComponent({
               ? dictData.value?.cssClass
               : ''
           }
+          disableTransitions={true}
         >
           {dictData.value?.label}
         </ElTag>
diff --git a/src/components/DocAlert/index.vue b/src/components/DocAlert/index.vue
new file mode 100644
index 00000000..7ca29f75
--- /dev/null
+++ b/src/components/DocAlert/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <el-alert v-if="getEnable()" type="success" show-icon>
+    <template #title>
+      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
+    </template>
+  </el-alert>
+</template>
+<script setup lang="tsx" name="DocAlert">
+import { propTypes } from '@/utils/propTypes'
+
+const props = defineProps({
+  title: propTypes.string,
+  url: propTypes.string
+})
+
+/** 跳转 URL 链接 */
+const goToUrl = () => {
+  window.open(props.url)
+}
+
+/** 是否开启 */
+const getEnable = () => {
+  return import.meta.env.VITE_APP_TENANT_ENABLE === 'true'
+}
+</script>
+<style scoped>
+.el-alert--success.is-light {
+  border: 1px solid green;
+  margin-bottom: 10px;
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/mp/account/index.vue b/src/views/mp/account/index.vue
index 2629c658..3111e20a 100644
--- a/src/views/mp/account/index.vue
+++ b/src/views/mp/account/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 搜索工作栏 -->
-  <content-wrap>
+  <ContentWrap>
     <el-form
       class="-mb-15px"
       :model="queryParams"
@@ -25,10 +25,10 @@
         </el-button>
       </el-form-item>
     </el-form>
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 列表 -->
-  <content-wrap>
+  <ContentWrap>
     <el-table v-loading="loading" :data="list">
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="微信号" align="center" prop="account" width="180" />
@@ -86,15 +86,14 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 分页组件 -->
-    <pagination
-      v-show="total > 0"
+    <!-- 分页 -->
+    <Pagination
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 对话框(添加 / 修改) -->
   <AccountForm ref="formRef" @success="getList" />
diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue
index 8a3d5285..fd230786 100644
--- a/src/views/mp/freePublish/index.vue
+++ b/src/views/mp/freePublish/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 搜索工作栏 -->
-  <content-wrap>
+  <ContentWrap>
     <el-form
       class="-mb-15px"
       :model="queryParams"
@@ -23,10 +23,10 @@
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
       </el-form-item>
     </el-form>
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 列表 -->
-  <content-wrap>
+  <ContentWrap>
     <div class="waterfall" v-loading="loading">
       <div
         class="waterfall-item"
@@ -54,7 +54,7 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-  </content-wrap>
+  </ContentWrap>
 </template>
 
 <script setup lang="ts" name="freePublish">
diff --git a/src/views/mp/statistics/index.vue b/src/views/mp/statistics/index.vue
index a692365c..cef8e079 100644
--- a/src/views/mp/statistics/index.vue
+++ b/src/views/mp/statistics/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 搜索工作栏 -->
-  <content-wrap>
+  <ContentWrap>
     <el-form class="-mb-15px" ref="queryForm" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" @change="getSummary" class="!w-240px">
@@ -24,10 +24,10 @@
         />
       </el-form-item>
     </el-form>
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 图表 -->
-  <content-wrap>
+  <ContentWrap>
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
@@ -70,7 +70,7 @@
         </el-card>
       </el-col>
     </el-row>
-  </content-wrap>
+  </ContentWrap>
 </template>
 
 <script setup lang="ts" name="MpStatistics">
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index fd8a3677..1b690bec 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -1,7 +1,7 @@
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
 const { t } = useI18n()
-const validateMobile = (rule: any, value: any, callback: any) => {
+const validateMobile = (_: any, value: any, callback: any) => {
   const reg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
   if (value === '') {
     callback(new Error('请输入联系手机'))
@@ -13,7 +13,7 @@ const validateMobile = (rule: any, value: any, callback: any) => {
     }
   }
 }
-const validatePassword = (rule: any, value: any, callback: any) => {
+const validatePassword = (_: any, value: any, callback: any) => {
   const reg = /^(?! +$).+/
   if (value === '') {
     callback(new Error('请输入用户密码'))