From dd810ca199e6b0b4830ce17af3a1884d756149d3 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Fri, 20 Sep 2024 17:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-admin-vue3/src/locales/zh-CN.ts                         | 2 +-
 yudao-admin-vue3/src/router/modules/remaining.ts              | 2 +-
 .../combination/activity/combinationActivity.data.ts          | 4 ++--
 .../mall/promotion/seckill/activity/seckillActivity.data.ts   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yudao-admin-vue3/src/locales/zh-CN.ts b/yudao-admin-vue3/src/locales/zh-CN.ts
index 0721651..fc47a7c 100644
--- a/yudao-admin-vue3/src/locales/zh-CN.ts
+++ b/yudao-admin-vue3/src/locales/zh-CN.ts
@@ -152,7 +152,7 @@ export default {
   router: {
     login: '登录',
     socialLogin: '社交登录',
-    home: '首页',
+    home: '主页',
     analysis: '分析页',
     workplace: '工作台'
   },
diff --git a/yudao-admin-vue3/src/router/modules/remaining.ts b/yudao-admin-vue3/src/router/modules/remaining.ts
index db23bb1..05c227a 100644
--- a/yudao-admin-vue3/src/router/modules/remaining.ts
+++ b/yudao-admin-vue3/src/router/modules/remaining.ts
@@ -59,7 +59,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     children: [
       {
         path: 'index',
-        component: () => import('@/views/Home/Index.vue'),
+        component: () => import('@/views/mall/home/index.vue'),
         name: 'Index',
         meta: {
           title: t('router.home'),
diff --git a/yudao-admin-vue3/src/views/mall/promotion/combination/activity/combinationActivity.data.ts b/yudao-admin-vue3/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
index dd3e48f..4680360 100644
--- a/yudao-admin-vue3/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
+++ b/yudao-admin-vue3/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
@@ -27,7 +27,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '活动开始时间',
+    label: '拼团开始时间',
     field: 'startTime',
     formatter: dateFormatter2,
     isSearch: true,
@@ -50,7 +50,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '活动结束时间',
+    label: '拼团结束时间',
     field: 'endTime',
     formatter: dateFormatter2,
     isSearch: true,
diff --git a/yudao-admin-vue3/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts b/yudao-admin-vue3/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
index b6e6422..faeb851 100644
--- a/yudao-admin-vue3/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
+++ b/yudao-admin-vue3/src/views/mall/promotion/seckill/activity/seckillActivity.data.ts
@@ -31,7 +31,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '活动开始时间',
+    label: '秒杀开始时间',
     field: 'startTime',
     formatter: dateFormatter2,
     isSearch: true,
@@ -54,7 +54,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '活动结束时间',
+    label: '秒杀结束时间',
     field: 'endTime',
     formatter: dateFormatter2,
     isSearch: true,