diff --git a/src/components/Analysis/Index.vue b/src/components/Analysis/Index.vue index 177b093..c2099d5 100644 --- a/src/components/Analysis/Index.vue +++ b/src/components/Analysis/Index.vue @@ -54,9 +54,11 @@ watch( if (!series.value.data?.length) return; console.log(`series.value.data`, series.value.data); - nextTick(() => { - useSetPieChart(pieChart, series, { title: false, legend: false }); - }); + // nextTick(() => { + // setTimeout(() => { + useSetPieChart(pieChart, series, { title: false, legend: false }); + // }, 1000); + // }); }, { immediate: true } ); diff --git a/src/router/index.ts b/src/router/index.ts index a4dd995..d3c5b3d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -68,7 +68,11 @@ const router = createRouter({ path: '/templatePreview', name: 'templatePreview', meta: { - title: '模板预览' + title: '模板预览', + header: { + bgc: 'green', + pureBGC: false + } }, component: () => import('@/views/Design/Preview.vue') }, @@ -104,7 +108,9 @@ const router = createRouter({ { path: '/search', name: 'search', - meta: {}, + meta: { + + }, component: () => import('@/views/HomeSearch/Index.vue') }, { diff --git a/src/views/AD/Index.vue b/src/views/AD/Index.vue index 26c229d..eeaa83d 100644 --- a/src/views/AD/Index.vue +++ b/src/views/AD/Index.vue @@ -60,10 +60,12 @@ function handleButtonClick() { " > - - {{ - bannerInfo.button_name - }} + + {{ bannerInfo.button_name }} diff --git a/src/views/HomeSearch/components/TemplateMarket/Index.vue b/src/views/HomeSearch/components/TemplateMarket/Index.vue index b8f1542..04d52ae 100644 --- a/src/views/HomeSearch/components/TemplateMarket/Index.vue +++ b/src/views/HomeSearch/components/TemplateMarket/Index.vue @@ -4,12 +4,13 @@ import MarketItem from '@/components/TemplateMarketItem/Index.vue'; import { templates } from '../../Hooks/useSurveySearch'; import { consoleSurveys, useTemplate } from '@/api/home'; import { saveQuestions, snQuestions } from '@/api/design'; -import { useRouter } from 'vue-router'; +import { useRoute, useRouter } from 'vue-router'; import { useCounterStore } from '@/stores/counter'; import { storeToRefs } from 'pinia'; import { computed } from 'vue'; const router = useRouter(); +const route = useRoute(); // 获取 Store 实例 const counterStore = useCounterStore(); @@ -19,6 +20,9 @@ const limit = defineModel('limit'); const currentTemplate = computed(() => templates.value.slice(0, limit.value)); function handleTemplateClick(template: any) { // ?sn=4O5xanLV&is_template=1&source=4O5xanLV&title=报名签到&parentCode=1&scene_code_info=11&user=苗闻博"e_nums=3 + + const isSearch = route.path.includes('/search'); + router.push({ path: '/templatePreview', query: { @@ -26,7 +30,8 @@ function handleTemplateClick(template: any) { user: template.creater_user, is_template: 1, source: template.sn, - title: template.title, + // H5TITLE 是为搜索页面传入的参数做兼容 + title: isSearch ? template.h5_title : template.title, parentCode: template.parentCode, scene_code_info: template.scene_code_info, quote_nums: template.quote_nums