合并 master 代码的冲突

src/views/mall/product/spu/components/DescriptionForm.vue

@@ -27,13 +27,15 @@
   </Descriptions>
   </Descriptions>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-defineOptions({ name: 'DescriptionForm' })
 import type { Spu } from '@/api/mall/product/spu'
 import type { Spu } from '@/api/mall/product/spu'
 import { Editor } from '@/components/Editor'
 import { Editor } from '@/components/Editor'
 import { PropType } from 'vue'
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
 import { copyValueToTarget } from '@/utils'
 import { copyValueToTarget } from '@/utils'
 import { descriptionSchema } from './spu.data'
 import { descriptionSchema } from './spu.data'
+
+defineOptions({ name: 'DescriptionForm' })
+
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 
 
 const { allSchemas } = useCrudSchemas(descriptionSchema)
 const { allSchemas } = useCrudSchemas(descriptionSchema)

src/views/mall/product/spu/components/OtherSettingsForm.vue

@@ -84,17 +84,18 @@
   </Descriptions>
   </Descriptions>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-defineOptions({ name: 'OtherSettingsForm' })
 import type { Spu } from '@/api/mall/product/spu'
 import type { Spu } from '@/api/mall/product/spu'
 import { PropType } from 'vue'
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
 import { copyValueToTarget } from '@/utils'
 import { copyValueToTarget } from '@/utils'
 import { otherSettingsSchema } from './spu.data'
 import { otherSettingsSchema } from './spu.data'
 
 
-const { allSchemas } = useCrudSchemas(otherSettingsSchema)
+defineOptions({ name: 'OtherSettingsForm' })
 
 
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 
 
+const { allSchemas } = useCrudSchemas(otherSettingsSchema)
+
 const props = defineProps({
 const props = defineProps({
   propFormData: {
   propFormData: {
     type: Object as PropType<Spu>,
     type: Object as PropType<Spu>,

src/views/mall/product/spu/components/ProductPropertyAddForm.vue

@@ -18,8 +18,10 @@
   </Dialog>
   </Dialog>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-defineOptions({ name: 'ProductPropertyForm' })
 import * as PropertyApi from '@/api/mall/product/property'
 import * as PropertyApi from '@/api/mall/product/property'
+
+defineOptions({ name: 'ProductPropertyForm' })
+
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 
 

src/views/mall/product/spu/components/SkuList.vue

@@ -190,7 +190,6 @@
   </el-table>
   </el-table>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-defineOptions({ name: 'SkuList' })
 import { PropType, Ref } from 'vue'
 import { PropType, Ref } from 'vue'
 import { copyValueToTarget } from '@/utils'
 import { copyValueToTarget } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
@@ -198,6 +197,8 @@ import { UploadImg } from '@/components/UploadFile'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'
 import { createImageViewer } from '@/components/ImageViewer'
 import { createImageViewer } from '@/components/ImageViewer'
 
 
+defineOptions({ name: 'SkuList' })
+
 const props = defineProps({
 const props = defineProps({
   propFormData: {
   propFormData: {
     type: Object as PropType<Spu>,
     type: Object as PropType<Spu>,