diff --git a/src/bg-ui/bg-nav-list.vue b/src/bg-ui/bg-nav-list.vue index e487a06564cc2e7e63bf98043a13f29e853b0d72..12ddc10b967be329d60b1d5ee66581f4e8763a7d 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 a2ca1aa2a1b586dcdc946fe7b05d63256c35b5b2..6c01ccae96b34f895da3efeefdab1b4e9e733ec6 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']"> @@ -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 6ea82f9a2cb9ffc5a5aa138252ac7ccec1803fec..e898153defad6bee5a1fc38a75c8489a760c4357 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']"> diff --git a/src/page/main/home-config/recommend/edit/index.vue b/src/page/main/home-config/recommend/edit/index.vue index 681949094f5388c0f29a53bb47ab081d8705d898..b9164eb68140f230bf692e8707551b463f095ee7 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 @@ 查询 @@ -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 a6834bbc0b6da9369eb2b46e06c30f810c7748b1..6111a0c2ba9cf5f3920029e97c90a25bab5a9aa7 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"> @@ -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']"> @@ -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) => {