From bf1ab1257da014a702119827dad69c3ea5f74591 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 07 十一月 2023 10:28:13 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/refactor-new-style

---
 src/views/dashboard/components/CraftDetailModal.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/dashboard/components/CraftDetailModal.vue b/src/views/dashboard/components/CraftDetailModal.vue
index 81e00c0..2df6e91 100644
--- a/src/views/dashboard/components/CraftDetailModal.vue
+++ b/src/views/dashboard/components/CraftDetailModal.vue
@@ -68,12 +68,11 @@
 import { ref, toRefs, watch } from 'vue'
 import type { CraftModel } from '@/api/craftModel'
 export interface CraftDetailModalProps {
-  craftModel?: CraftModel
-  activeArr: Array
+  craftModel: CraftModel
+  activeArr: string[]
   modelValue: boolean
 }
 const props = withDefaults(defineProps<CraftDetailModalProps>(), {
-  craftModel: undefined,
   modelValue: false
 })
 const { craftModel, activeArr, modelValue } = toRefs(props)
@@ -97,7 +96,7 @@
 })
 function getLoading() {
   for (let i in activeArr.value) {
-    if (activeArr.value[i] == craftModel.value.number) {
+    if (activeArr.value[i] == craftModel?.value?.number) {
       isUpdate.value = 2
       loading.value = true
       return true
@@ -108,11 +107,11 @@
 
 function updateProcess() {
   isUpdate.value = 2
-  if (active.value) {
+  if (loading.value) {
     return true
   }
   // 璇锋眰鏇存柊鎺ュ彛 鑾峰緱鏁版嵁涔嬪悗isLoading.value=false;
-  emit('renew', craftModel.value, true)
+  emit('renew', craftModel?.value, true)
 }
 //TODO: 宸ヨ壓璇︽儏寮圭獥
 </script>

--
Gitblit v1.8.0