From efac7b27344b346b241cb8af39dd6b699269aaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Wed, 1 Feb 2023 14:02:26 +0800
Subject: [PATCH] =?UTF-8?q?[fix](=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?bug#8436&&#8445=EF=BC=8C=E5=AD=90=E9=A1=B5=E9=9D=A2=E7=88=B6?=
 =?UTF-8?q?=E7=BA=A7=E5=AF=BC=E8=88=AA=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bg-ui/bg-nav-list.vue                            |  2 +-
 .../main/home-config/banner/edit/banner-form.vue     | 12 ++++++++++--
 src/page/main/home-config/foot-info/index.vue        |  2 +-
 src/page/main/home-config/recommend/edit/index.vue   |  3 ++-
 .../main/home-config/recommend/edit/type-form.vue    | 11 +++++++++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/bg-ui/bg-nav-list.vue b/src/bg-ui/bg-nav-list.vue
index e487a06..12ddc10 100644
--- a/src/bg-ui/bg-nav-list.vue
+++ b/src/bg-ui/bg-nav-list.vue
@@ -82,7 +82,7 @@ const showMoreAction = (index) => {
 
 const getChildrenPath = (arr, temp = []) => {
   arr.forEach((e) => {
-    temp.push(e);
+    temp.push(e.path);
     if (e.children && e.children.length) {
       getChildrenPath(e.children, temp);
     }
diff --git a/src/page/main/home-config/banner/edit/banner-form.vue b/src/page/main/home-config/banner/edit/banner-form.vue
index a2ca1aa..6c01cca 100644
--- a/src/page/main/home-config/banner/edit/banner-form.vue
+++ b/src/page/main/home-config/banner/edit/banner-form.vue
@@ -11,9 +11,10 @@
         v-model="formData.banner_image"
         :fileSize="1"
         :showTips="true"
-        customTips="请选择图片上传：大小1920 * 464像素支持jpg、png等格式，图片需小于1MB"
+        customTips="请选择图片上传：大小1920 * 464像素支持jpg、jpeg、png格式，图片需小于1MB"
         :limit="1"
         listType="picture-card"
+        @change="changeLogo"
         :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
     </el-form-item>
     <el-form-item label="是否启用" prop="state" class="state_form_item">
@@ -39,16 +40,23 @@ const state = reactive({
   },
   formRules: {
     banner_name: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
-    link_address: [{max: 8182, message: "最长可输入8182个字符", trigger: "blur" }],
+    link_address: [{ max: 8182, message: "最长可输入8182个字符", trigger: "blur" }],
     banner_image: [{ required: true, message: "请上传banner图", trigger: "change" }],
     state: [{ required: true, message: "请选择启用状态", trigger: "change" }],
   },
 });
 
+const changeLogo = (value) => {
+  if (value && value.length > 0) {
+    form.value.clearValidate("banner_image");
+  }
+};
+
 const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
   if (!form) return;
+  console.log(form.value);
   await form.value.validate((valid, fields) => {
     if (valid) {
       emit("action", state.formData);
diff --git a/src/page/main/home-config/foot-info/index.vue b/src/page/main/home-config/foot-info/index.vue
index 6ea82f9..e898153 100644
--- a/src/page/main/home-config/foot-info/index.vue
+++ b/src/page/main/home-config/foot-info/index.vue
@@ -17,7 +17,7 @@
               :fileSize="500"
               :fileSizeUnit="'KB'"
               :showTips="true"
-              customTips="请选择图片上传：大小80 * 80像素支持jpg、png等格式，图片需小于500KB"
+              customTips="请选择图片上传：大小80 * 80像素支持jpg、jpeg、png格式，图片需小于500KB"
               :limit="1"
               listType="picture-card"
               :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
diff --git a/src/page/main/home-config/recommend/edit/index.vue b/src/page/main/home-config/recommend/edit/index.vue
index 6819490..b9164eb 100644
--- a/src/page/main/home-config/recommend/edit/index.vue
+++ b/src/page/main/home-config/recommend/edit/index.vue
@@ -76,7 +76,7 @@
             </el-cascader>
             <el-input
               v-model.trim="dialogFilter.keyword"
-              placeholder="请输入内容"
+              placeholder="请输入能力/开发商名称"
               style="width: 240px"
               :prefix-icon="Search" />
             <el-button type="primary" @click="searchAction">查询</el-button>
@@ -299,6 +299,7 @@ const move = (temp) => {
       }
     }
   });
+  state.selectArrNew = state.selectArr.filter((e) => e )
 };
 const changePage = (val) => {
   state.dialogFilter.page = 1;
diff --git a/src/page/main/home-config/recommend/edit/type-form.vue b/src/page/main/home-config/recommend/edit/type-form.vue
index a6834bb..6111a0c 100644
--- a/src/page/main/home-config/recommend/edit/type-form.vue
+++ b/src/page/main/home-config/recommend/edit/type-form.vue
@@ -6,7 +6,7 @@
         placeholder="请选择能力类型"
         style="width: 100%"
         @change="changeType"
-        :disabled="route.query.id">
+        :disabled="!!route.query.id">
         <el-option v-for="item in props.businessList" :key="item.dict_id" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
@@ -16,9 +16,10 @@
         :fileSize="500"
         :fileSizeUnit="'KB'"
         :showTips="true"
-        customTips="请选择图片上传：大小36 * 36像素支持jpg、png等格式，图片需小于500KB"
+        customTips="请选择图片上传：大小36 * 36像素支持jpg、jpeg、png格式，图片需小于500KB"
         :limit="1"
         listType="picture-card"
+        @change="changeLogo"
         :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
     </el-form-item>
   </el-form>
@@ -51,6 +52,12 @@ const state = reactive({
 
 const emit = defineEmits(["action", "changeType"]);
 
+const changeLogo = (value) => {
+  if (value && value.length > 0) {
+    form.value.clearValidate("logo")
+  }
+}
+
 const submitForm = async () => {
   if (!form) return;
   await form.value.validate((valid, fields) => {
-- 
2.26.0