冲突合并

package.json

@@ -15,6 +15,7 @@
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "qs": "^6.12.1",
+    "pnpm": "^9.1.0",
     "roboto-fontface": "*",
     "vue": "^3.4.0",
     "vue-i18n": "9",

pnpm-lock.yaml

@@ -20,6 +20,9 @@ importers:
       pinia-plugin-persistedstate:
         specifier: ^3.2.1
         version: 3.2.1(pinia@2.1.7(vue@3.4.25))
+      pnpm:
+        specifier: ^9.1.0
+        version: 9.1.0
       roboto-fontface:
         specifier: '*'
         version: 0.10.0
@@ -948,6 +951,11 @@ packages:
       typescript:
         optional: true
 
+  pnpm@9.1.0:
+    resolution: {integrity: sha512-Z/WHmRapKT5c8FnCOFPVcb6vT3U8cH9AyyK+1fsVeMaq07bEEHzLO6CzW+AD62IaFkcayDbIe+tT+dVLtGEnJA==}
+    engines: {node: '>=18.12'}
+    hasBin: true
+
   postcss-selector-parser@6.0.16:
     resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==}
     engines: {node: '>=4'}
@@ -2135,6 +2143,8 @@ snapshots:
       vue: 3.4.25
       vue-demi: 0.14.7(vue@3.4.25)
 
+  pnpm@9.1.0: {}
+
   postcss-selector-parser@6.0.16:
     dependencies:
       cssesc: 3.0.0

src/components/Dialog/index.vue → src/components/CtDialog/index.vue

@@ -57,7 +57,7 @@
 
 <script setup>
 import { ref, defineEmits, computed, watch  } from 'vue'
-defineOptions({ name: 'dialog-page' })
+defineOptions({ name: 'components-ct-dialog' })
 const emits = defineEmits('update:visible', 'close', 'submit')
 
 const props = defineProps({
@@ -114,7 +114,7 @@ const handleSave = () => {
   color: #fff;
   background-color: #1976d2;
 }
-::v-deep .v-dialog:not(.v-dialog--fullscreen) {
-  overflow: visible !important;
-}
+// ::v-deep .v-dialog:not(.v-dialog--fullscreen) {
+//   overflow: visible !important;
+// }
 </style>

src/components/Form/index.vue → src/components/CtForm/index.vue

@@ -247,7 +247,7 @@
 <script setup>
 // import DatePicker from '@/components/Form/datePicker.vue'
 import { ref, defineEmits  } from 'vue'
-defineOptions({ name: 'form-index' })
+defineOptions({ name: 'components-ct-form' })
 const props = defineProps({items: Object})
 const inputUpdateValue = ref('')
 const form = ref()

src/components/Pagination/index.vue → src/components/CtPagination/index.vue

@@ -29,7 +29,7 @@
 
 <script setup>
 import { computed, watch, ref, defineEmits } from 'vue'
-defineOptions({ name: 'pagnation-page' })
+defineOptions({ name: 'components-ct-pagnation' })
 const props = defineProps({
   total: {
     type: [String, Number],

src/views/Home/components/personal.vue

@@ -9,7 +9,7 @@
   </div>
 </template>
 <script setup>
-import Dialog from '@/components/Dialog'
+import Dialog from '@/components/CtDialog'
 import enterpriseRegister from '@/views/enterprise/components/register.vue'
 import { ref } from 'vue';
 defineOptions({ name:'personal-index'})

src/views/login/components/phone.vue

@@ -141,7 +141,7 @@ defineExpose({
   color: grey;
   font-size: 12px;
 }
-::v-deep .phone-number {
+.phone-number {
   width: 34px;
   font-size: 12px;
 }

vite.config.mjs

@@ -2,7 +2,7 @@
 import Components from 'unplugin-vue-components/vite'
 import Vue from '@vitejs/plugin-vue'
 import Vuetify, { transformAssetUrls } from 'vite-plugin-vuetify'
-import ViteFonts from 'unplugin-fonts/vite'
+// import ViteFonts from 'unplugin-fonts/vite'
 
 // Utilities
 import { defineConfig } from 'vite'
@@ -16,15 +16,17 @@ export default defineConfig({
     }),
     // https://github.com/vuetifyjs/vuetify-loader/tree/master/packages/vite-plugin#readme
     Vuetify(),
-    Components(),
-    ViteFonts({
-      google: {
-        // families: [{
-        //   name: 'Roboto',
-        //   styles: 'wght@100;300;400;500;700;900',
-        // }],
-      },
+    Components({
+      dts: false
     }),
+    // ViteFonts({
+    //   google: {
+    //     // families: [{
+    //     //   name: 'Roboto',
+    //     //   styles: 'wght@100;300;400;500;700;900',
+    //     // }],
+    //   },
+    // }),
   ],
   define: { 'process.env': {} },
   resolve: {