From be95eebf5b2d9ac31e98726f1fccca2341883753 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 13 Sep 2023 17:13:05 +0800
Subject: [PATCH] 冲突修改
---
src/App.vue | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 5753591..2f4059e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,24 +1,16 @@
<template>
<div class="demo-app">
- <!-- <a-config-provider :locale="zhCN"> -->
+<!-- <a-local-provider :locale="zhCN">-->
<router-view />
- <!-- </a-config-provider> -->
+<!-- </a-local-provider>-->
</div>
</template>
-<script lang="ts">
+<script setup lang="ts">
import zhCN from 'ant-design-vue/es/locale/zh_CN'
import moment from 'moment'
import 'moment/dist/locale/zh-cn'
-// import { defineComponent } from 'vue'
moment.locale('zh-cn')
-export default defineComponent({
- setup () {
- return {
- zhCN,
- }
- }
-})
</script>
<style lang="scss" scoped>
.demo-app {
--
Gitblit v1.9.3