diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue index c4d8bbb3..7b244bec 100644 --- a/src/components/common/upload/index.vue +++ b/src/components/common/upload/index.vue @@ -292,7 +292,12 @@ watch( (val) => { if (val) { if (val === true) { - upload_type.value = props.type; + if (icon_value.value) { + upload_type.value = 'icon'; + } else { + upload_type.value = props.type; + } + // upload_type.value = props.type; // 获取分类 get_tree(); // 获取附件列表 diff --git a/src/components/model-user-info/model-user-info-content.vue b/src/components/model-user-info/model-user-info-content.vue index ba0b181f..34958da4 100644 --- a/src/components/model-user-info/model-user-info-content.vue +++ b/src/components/model-user-info/model-user-info-content.vue @@ -16,7 +16,7 @@ @@ -114,7 +114,7 @@ const confirm_event = async (formEl: FormInstance | undefined) => { display: flex; justify-content: space-between; align-items: center; - background-color: #000; + background-color: $cr-primary; .nav-left { display: flex; align-items: center;