From 11fd2edc8643a9b5923d05ff21d18b7d845d4f76 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 十一月 2023 10:36:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/views/dashboard/components/CraftDetailModal.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/dashboard/components/CraftDetailModal.vue b/src/views/dashboard/components/CraftDetailModal.vue
index 81e00c0..a48d654 100644
--- a/src/views/dashboard/components/CraftDetailModal.vue
+++ b/src/views/dashboard/components/CraftDetailModal.vue
@@ -68,8 +68,8 @@
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>(), {
@@ -97,7 +97,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 +108,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