diff --git a/yudao-admin-vue3/src/api/mall/product/spu.ts b/yudao-admin-vue3/src/api/mall/product/spu.ts index e3a2162..32fe688 100644 --- a/yudao-admin-vue3/src/api/mall/product/spu.ts +++ b/yudao-admin-vue3/src/api/mall/product/spu.ts @@ -109,3 +109,13 @@ export const exportSpu = async (params) => { export const getSpuSimpleList = async () => { return request.get({ url: '/product/spu/list-all-simple' }) } + +// 获得拼团商品 SPU 列表 +export const getSpuAdminSpuList = async () => { + return request.get({ url: '/promotion/combination-activity/adminSpuList' }) +} + +// 获得秒杀商品 SPU 列表 +export const getSpuMiaoShaAdminSpuList = async () => { + return request.get({ url: '/promotion/seckill-activity/adminSpuList' }) +} diff --git a/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue b/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue index 63f1966..5133f16 100644 --- a/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue +++ b/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue @@ -21,24 +21,27 @@ - - {{ group.name }} - - - - {{ appLink.name }} - - + + + {{ group.name }} + + + + {{ appLink.name }} + + + + @@ -155,11 +158,11 @@ const linkScrollbar = ref() // 处理分组选中 const handleGroupSelected = (group: string) => { activeGroup.value = group - const titleRef = groupTitleRefs.value.find((item: HTMLInputElement) => item.textContent === group) - if (titleRef) { - // 滚动分组标题 - linkScrollbar.value?.setScrollTop(titleRef.offsetTop) - } + // const titleRef = groupTitleRefs.value.find((item: HTMLInputElement) => item.textContent === group) + // if (titleRef) { + // // 滚动分组标题 + // linkScrollbar.value?.setScrollTop(titleRef.offsetTop) + // } } // 分组滚动条 diff --git a/yudao-admin-vue3/src/components/AppLinkInput/data.ts b/yudao-admin-vue3/src/components/AppLinkInput/data.ts index 6f1747b..77fb4e1 100644 --- a/yudao-admin-vue3/src/components/AppLinkInput/data.ts +++ b/yudao-admin-vue3/src/components/AppLinkInput/data.ts @@ -250,5 +250,30 @@ export const APP_LINK_GROUP_LIST = [ path: '/pages/user/user_vip/index' } ] + }, + { + name: '自定义页面', + links: [ + { + name: '促销页面', + path: 'ss' + }, + { + name: '关于我们', + path: '/pages/pay/recharge-lo' + }, + { + name: '产品与服务', + path: '/pages/pay/recharge-l' + }, + { + name: '自定义页面', + path: '/pages/pay/recharge-' + }, + { + name: '个人中心', + path: '/pages/pay/recharge' + } + ] } ] as AppLinkGroup[] diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/index.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/index.vue index 3e2302a..dd557fd 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/index.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/index.vue @@ -1,7 +1,7 @@ - + - - @@ -40,11 +37,11 @@ 立即领取 - + --> + @@ -64,8 +61,7 @@ - - + @@ -139,4 +135,11 @@ onMounted(() => { phoneWidth.value = containerRef.value?.wrapRef?.offsetWidth || 375 }) - + diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductCard/index.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductCard/index.vue index f05d4fa..a7f0de4 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductCard/index.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductCard/index.vue @@ -26,6 +26,7 @@ 'w-140px': property.layoutType === 'oneColSmallImg' } ]" + style="padding:10px;" > diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue index fe6f3a8..328c049 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue @@ -1,6 +1,26 @@ - + + + + + + + + + + 92人拼团成功 + + + 查看更多 + + + + + + + + diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue index ec09dc4..b479582 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue @@ -14,7 +14,7 @@ - + diff --git a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue index 1b4113b..b851de6 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue +++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue @@ -1,125 +1,165 @@ - - - + + + + + + + + + 已有99人购买 + + + 查看更多 + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - {{ spu.name }} - - - - - ¥{{ spu.price }} - - - - - - + ]"> + + + {{ spu.name }} + + + + + ¥{{ spu.price }} + + + + + + - + \ No newline at end of file diff --git a/yudao-admin-vue3/src/components/DiyEditor/util.ts b/yudao-admin-vue3/src/components/DiyEditor/util.ts index c75945f..5154c9b 100644 --- a/yudao-admin-vue3/src/components/DiyEditor/util.ts +++ b/yudao-admin-vue3/src/components/DiyEditor/util.ts @@ -146,7 +146,7 @@ export const PAGE_LIBS = [ components: [ 'PromotionCombination', 'PromotionSeckill', - 'PromotionPoint', + // 'PromotionPoint', 'CouponCard', 'PromotionArticle' ]