From bbf009e15d0479707f1fdf9c275c9042dbe36384 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 May 2024 11:14:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Index.vue | 75 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index cef6e8e2..c59b9d22 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -62,7 +62,14 @@
         <template #header>
           <div class="h-3 flex justify-between">
             <span>{{ t('workplace.project') }}</span>
-            <el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>
+            <el-link
+              type="primary"
+              :underline="false"
+              href="https://github.com/yudaocode"
+              target="_blank"
+            >
+              {{ t('action.more') }}
+            </el-link>
           </div>
         </template>
         <el-skeleton :loading="loading" animated>
@@ -76,13 +83,13 @@
               :sm="24"
               :xs="24"
             >
-              <el-card shadow="hover">
+              <el-card shadow="hover" class="mr-5px mt-5px">
                 <div class="flex items-center">
                   <Icon :icon="item.icon" :size="25" class="mr-8px" />
                   <span class="text-16px">{{ item.name }}</span>
                 </div>
-                <div class="mt-16px text-14px text-gray-400">{{ t(item.message) }}</div>
-                <div class="mt-16px flex justify-between text-12px text-gray-400">
+                <div class="mt-12px text-9px text-gray-400">{{ t(item.message) }}</div>
+                <div class="mt-12px flex justify-between text-12px text-gray-400">
                   <span>{{ item.personal }}</span>
                   <span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
                 </div>
@@ -204,45 +211,45 @@ let projects = reactive<Project[]>([])
 const getProject = async () => {
   const data = [
     {
-      name: 'Github',
+      name: 'ruoyi-vue-pro',
       icon: 'akar-icons:github-fill',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      message: 'https://github.com/YunaiV/ruoyi-vue-pro',
+      personal: 'Spring Boot 单体架构',
       time: new Date()
     },
     {
-      name: 'Vue',
+      name: 'yudao-ui-admin-vue3',
       icon: 'logos:vue',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      message: 'https://github.com/yudaocode/yudao-ui-admin-vue3',
+      personal: 'Vue3 + element-plus',
       time: new Date()
     },
     {
-      name: 'Angular',
-      icon: 'logos:angular-icon',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      name: 'yudao-ui-admin-vben',
+      icon: 'logos:vue',
+      message: 'https://github.com/yudaocode/yudao-ui-admin-vben',
+      personal: 'Vue3 + vben(antd)',
       time: new Date()
     },
     {
-      name: 'React',
-      icon: 'logos:react',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      name: 'yudao-cloud',
+      icon: 'akar-icons:github',
+      message: 'https://github.com/YunaiV/yudao-cloud',
+      personal: 'Spring Cloud 微服务架构',
       time: new Date()
     },
     {
-      name: 'Webpack',
-      icon: 'logos:webpack',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      name: 'yudao-ui-mall-uniapp',
+      icon: 'logos:vue',
+      message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp',
+      personal: 'Vue3 + uniapp',
       time: new Date()
     },
     {
-      name: 'Vite',
-      icon: 'vscode-icons:file-type-vite',
-      message: 'workplace.introduction',
-      personal: 'Archer',
+      name: 'yudao-ui-admin-vue2',
+      icon: 'logos:vue',
+      message: 'https://github.com/yudaocode/yudao-ui-admin-vue2',
+      personal: 'Vue2 + element-ui',
       time: new Date()
     }
   ]
@@ -254,27 +261,27 @@ let notice = reactive<Notice[]>([])
 const getNotice = async () => {
   const data = [
     {
-      title: '系统升级版本',
+      title: '系统支持 JDK 8/17/21，Vue 2/3',
       type: '通知',
-      keys: ['通知', '升级'],
+      keys: ['通知', '8', '17', '21', '2', '3'],
       date: new Date()
     },
     {
-      title: '系统凌晨维护',
+      title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
       type: '公告',
-      keys: ['公告', '维护'],
+      keys: ['公告', 'Boot', 'Cloud'],
       date: new Date()
     },
     {
-      title: '系统升级版本',
+      title: '全部开源，个人与企业可 100% 直接使用，无需授权',
       type: '通知',
-      keys: ['通知', '升级'],
+      keys: ['通知', '无需授权'],
       date: new Date()
     },
     {
-      title: '系统凌晨维护',
+      title: '国内使用最广泛的快速开发平台，超 300+ 人贡献',
       type: '公告',
-      keys: ['公告', '维护'],
+      keys: ['公告', '最广泛'],
       date: new Date()
     }
   ]

From 143eb655b12bb5a399aefcf79d0381ad62bb9590 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 May 2024 11:14:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E5=8F=91=E7=89=88=E3=80=91?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=EF=BC=9A2.1.0=20=E5=8F=91=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff06a04d..b450bf69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "2.0.1-snapshot",
+  "version": "2.1.0-snapshot",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,

From f4705ad4e1410f5e0b4b4c24a7d620b6805f9763 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 May 2024 21:51:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=8F=91=E7=89=88=E3=80=91?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=EF=BC=9A2.1.0=20=E5=8F=91=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/goview/index.vue   | 2 ++
 src/views/report/jmreport/index.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
index 1bac2869..dd10cca0 100644
--- a/src/views/report/goview/index.vue
+++ b/src/views/report/goview/index.vue
@@ -1,5 +1,7 @@
 <template>
   <ContentWrap>
+    <doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" />
+
     <IFrame :src="src" />
   </ContentWrap>
 </template>
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
index 0bac3519..382d7893 100644
--- a/src/views/report/jmreport/index.vue
+++ b/src/views/report/jmreport/index.vue
@@ -1,5 +1,7 @@
 <template>
   <ContentWrap>
+    <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
+
     <IFrame :src="src" />
   </ContentWrap>
 </template>

From 66c6463f4441a51871c97c186a754db8633ca4f8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 5 May 2024 11:20:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=EF=BC=9Aseckill=20=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/promotion/seckill/seckillConfig.ts             | 5 +++++
 src/views/mall/promotion/seckill/activity/index.vue         | 2 +-
 .../mall/promotion/seckill/activity/seckillActivity.data.ts | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/api/mall/promotion/seckill/seckillConfig.ts b/src/api/mall/promotion/seckill/seckillConfig.ts
index e3d618f7..66857df8 100644
--- a/src/api/mall/promotion/seckill/seckillConfig.ts
+++ b/src/api/mall/promotion/seckill/seckillConfig.ts
@@ -17,6 +17,11 @@ export const SeckillConfigApi = {
     return await request.get({ url: `/promotion/seckill-config/page`, params })
   },
 
+  // 查询秒杀时段列表
+  getSimpleSeckillConfigList: async () => {
+    return await request.get({ url: `/promotion/seckill-config/simple-list` })
+  },
+
   // 查询秒杀时段详情
   getSeckillConfig: async (id: number) => {
     return await request.get({ url: `/promotion/seckill-config/get?id=` + id })
diff --git a/src/views/mall/promotion/seckill/activity/index.vue b/src/views/mall/promotion/seckill/activity/index.vue
index d7686688..bffe265a 100644
--- a/src/views/mall/promotion/seckill/activity/index.vue
+++ b/src/views/mall/promotion/seckill/activity/index.vue
@@ -157,7 +157,7 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as SeckillActivityApi from '@/api/mall/promotion/seckill/seckillActivity'
-import * as SeckillConfigApi from '@/api/mall/promotion/seckill/seckillConfig'
+import { SeckillConfigApi } from '@/api/mall/promotion/seckill/seckillConfig'
 import SeckillActivityForm from './SeckillActivityForm.vue'
 import { formatDate } from '@/utils/formatTime'
 import { fenToYuanFormat } from '@/utils/formatter'
diff --git a/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts b/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
index 3cb8ccfb..b6e64225 100644
--- a/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
+++ b/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
-import { getSimpleSeckillConfigList } from '@/api/mall/promotion/seckill/seckillConfig'
+import { dateFormatter2 } from '@/utils/formatTime'
+import { SeckillConfigApi } from '@/api/mall/promotion/seckill/seckillConfig'
 
 // 表单校验
 export const rules = reactive({
@@ -88,7 +88,7 @@ const crudSchemas = reactive<CrudSchema[]>([
           valueField: 'id'
         }
       },
-      api: getSimpleSeckillConfigList
+      api: SeckillConfigApi.getSimpleSeckillConfigList
     },
     table: {
       width: 300

From 2101731f0b3220e73f2c855de205dfce73f2f6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=B1=E9=87=8E=E7=BE=A1=E6=B0=91?=
 <liyujiang_tk@yeah.net>
Date: Mon, 6 May 2024 01:55:15 +0000
Subject: [PATCH 5/6] =?UTF-8?q?update=20src/views/mall/statistics/product/?=
 =?UTF-8?q?components/ProductSummary.vue.=20=E5=95=86=E5=93=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AE=A1=E6=95=B0=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E6=88=90?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
---
 .../product/components/ProductSummary.vue     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/mall/statistics/product/components/ProductSummary.vue b/src/views/mall/statistics/product/components/ProductSummary.vue
index d28660e2..06692234 100644
--- a/src/views/mall/statistics/product/components/ProductSummary.vue
+++ b/src/views/mall/statistics/product/components/ProductSummary.vue
@@ -26,9 +26,9 @@
           icon="ep:view"
           icon-color="bg-blue-100"
           icon-bg-color="text-blue-500"
-          prefix="￥"
-          :decimals="2"
-          :value="fenToYuan(trendSummary?.value?.browseCount || 0)"
+          prefix=""
+          :decimals="0"
+          :value="trendSummary?.value?.browseCount || 0"
           :percent="
             calculateRelativeRate(
               trendSummary?.value?.browseCount,
@@ -44,9 +44,9 @@
           icon="ep:user-filled"
           icon-color="bg-purple-100"
           icon-bg-color="text-purple-500"
-          prefix="￥"
-          :decimals="2"
-          :value="fenToYuan(trendSummary?.value?.browseUserCount || 0)"
+          prefix=""
+          :decimals="0"
+          :value="trendSummary?.value?.browseUserCount || 0"
           :percent="
             calculateRelativeRate(
               trendSummary?.value?.browseUserCount,
@@ -62,9 +62,9 @@
           icon="fa-solid:money-check-alt"
           icon-color="bg-yellow-100"
           icon-bg-color="text-yellow-500"
-          prefix="￥"
-          :decimals="2"
-          :value="fenToYuan(trendSummary?.value?.orderPayCount || 0)"
+          prefix=""
+          :decimals="0"
+          :value="trendSummary?.value?.orderPayCount || 0"
           :percent="
             calculateRelativeRate(
               trendSummary?.value?.orderPayCount,
@@ -98,9 +98,9 @@
           icon="fa-solid:wallet"
           icon-color="bg-cyan-100"
           icon-bg-color="text-cyan-500"
-          prefix="￥"
-          :decimals="2"
-          :value="fenToYuan(trendSummary?.value?.afterSaleCount || 0)"
+          prefix=""
+          :decimals="0"
+          :value="trendSummary?.value?.afterSaleCount || 0"
           :percent="
             calculateRelativeRate(
               trendSummary?.value?.afterSaleCount,

From c350fc466e60834aa9c97ffe2916a7d7a7d48608 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Mon, 6 May 2024 14:43:52 +0000
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20id=3D0=E5=AF=BC=E8=87=B4sqlserver?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dhb52 <dhb52@126.com>
---
 src/views/system/menu/MenuForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/menu/MenuForm.vue b/src/views/system/menu/MenuForm.vue
index 7eaf6ab6..2b4a90d1 100644
--- a/src/views/system/menu/MenuForm.vue
+++ b/src/views/system/menu/MenuForm.vue
@@ -130,7 +130,7 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  id: 0,
+  id: undefined,
   name: '',
   permission: '',
   type: SystemMenuTypeEnum.DIR,
@@ -231,7 +231,7 @@ const getTree = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    id: 0,
+    id: undefined,
     name: '',
     permission: '',
     type: SystemMenuTypeEnum.DIR,