diff --git a/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue b/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue index 762ee96..683a013 100644 --- a/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue +++ b/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue @@ -24,7 +24,7 @@ :content="appLink.path" placement="bottom" :show-after="300"> {{ appLink.name }} @@ -109,9 +109,14 @@ // 处理 APP 链接选中 const handleAppLinkSelected = (appLink : AppLink) => { - if (!isSameLink(appLink.path, activeAppLink.value.path)) { - activeAppLink.value = appLink - console.log(activeAppLink.value,activeAppLink.value.path,"activeAppLink.value") + if(!appLink.path.includes('/pages/index/page')){ + if (!isSameLink(appLink.path, activeAppLink.value.path)) { + activeAppLink.value = appLink + // console.log(activeAppLink.value,activeAppLink.value.path,"activeAppLink.value") + } + }else{ + activeAppLink.value.path = appLink.path + console.log(activeAppLink.value.path,"activeAppLink.value.path") } switch (appLink.type) { case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST: diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGridTow/index.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGridTow/index.vue index b7cf31d..68f7b1e 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGridTow/index.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGridTow/index.vue @@ -112,7 +112,7 @@ defineProps<{ property: MenuGridProperty }>() border-radius: 5px; margin: 0 auto; padding: 5px 0; - margin-top: 10px; + // margin-top: 10px; padding-bottom: 10px; padding-top: 10px; &>.t { diff --git a/yudao-admin-vue3/src/views/mall/promotion/diy/template/ProductCategory.vue b/yudao-admin-vue3/src/views/mall/promotion/diy/template/ProductCategory.vue new file mode 100644 index 0000000..c2e4808 --- /dev/null +++ b/yudao-admin-vue3/src/views/mall/promotion/diy/template/ProductCategory.vue @@ -0,0 +1,109 @@ + + + + \ No newline at end of file diff --git a/yudao-admin-vue3/src/views/mall/promotion/diy/template/ThemeStyle.vue b/yudao-admin-vue3/src/views/mall/promotion/diy/template/ThemeStyle.vue new file mode 100644 index 0000000..5682c39 --- /dev/null +++ b/yudao-admin-vue3/src/views/mall/promotion/diy/template/ThemeStyle.vue @@ -0,0 +1,162 @@ + + + + \ No newline at end of file