From 2e5c4cdfa14c65f7b87db264a1c69025b1aa6f00 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 29 Aug 2024 15:29:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20sws=202024-08-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/upload/index.vue                     | 7 ++++++-
 src/components/model-user-info/model-user-info-content.vue | 2 +-
 src/layout/components/navbar/index.vue                     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

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 @@
                 <div class="nav-list">
                     <drag :data="form.icon_setting" :space-col="20" @remove="icon_setting_remove" @on-sort="icon_setting_sort">
                         <template #default="{ row }">
-                            <upload v-model="row.src" v-model:icon-value="row.icon" is-icon type="icon" :limit="1" :styles="2" :size="30"></upload>
+                            <upload v-model="row.src" v-model:icon-value="row.icon" is-icon type="img" :limit="1" :styles="2" :size="30"></upload>
                             <url-value v-model="row.href"></url-value>
                         </template>
                     </drag>
diff --git a/src/layout/components/navbar/index.vue b/src/layout/components/navbar/index.vue
index 9d9a2a18..3d15df24 100644
--- a/src/layout/components/navbar/index.vue
+++ b/src/layout/components/navbar/index.vue
@@ -8,7 +8,7 @@
                     <div class="flex-row align-c gap-10 c-pointer" @click="dialog_visible = true">
                         <image-empty :src="modelValue.logo" class="round img" error-img-style="width: 2.2rem;height: 2.2rem;" />
                         <div>{{ modelValue.name }}</div>
-                        <icon name="edit" color="primary"></icon>
+                        <icon name="edit" color="#7DBEFF"></icon>
                     </div>
                 </div>
             </div>
@@ -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;