Merge pull request '优化1' (#13) from Branch_csl into master

Reviewed-on: #13

yudao-admin-vue3/src/locales/zh-CN.ts

@@ -152,7 +152,7 @@ export default {
   router: {
     login: '登录',
     socialLogin: '社交登录',
-    home: '首页',
+    home: '主页',
     analysis: '分析页',
     workplace: '工作台'
   },

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'),

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,

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,