From af7177654f8214157c03722a9fa21b7e46400d41 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 28 Nov 2023 17:07:38 +0800 Subject: [PATCH] 2023-11-28 --- src/component/Detail/DesignDetail.vue | 2 +- src/component/Detail/habit.vue | 2 +- src/component/HomePage/ColorboardUpload.vue | 7 +++++-- src/component/HomePage/MoodboardUpload.vue | 2 -- src/component/HomePage/collectionModal.vue | 5 ----- src/tool/guide.js | 12 ++++++++---- src/views/HomeView.vue | 10 +++++++--- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 62409799..8caed8e9 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -356,7 +356,7 @@ export default defineComponent({ this.loadingShow = false if(this.driver__.driver){ nextTick().then(()=>{ - driverObj__.moveTo(18); + driverObj__.moveTo(20); }) } } diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index a03d745f..c0c41d51 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -596,7 +596,7 @@ export default defineComponent({ if(this.driver__.driver){ nextTick().then(()=>{ // driverObj__.moveNext(); - driverObj__.moveTo(28); + driverObj__.moveTo(30); }) } diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 688d90d1..02f1ac7a 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -4,7 +4,7 @@
{{ $t('ColorboardUpload.Thumbnail') }}
-
+
@@ -269,6 +269,9 @@ export default defineComponent({ this.pantongNameList = [] this.reviewColor= {} this.getColorBg = false + if(this.driver__.driver){ + driverObj__.moveNext() + } // this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {} }, @@ -399,7 +402,7 @@ export default defineComponent({ setUplpadColor(color){ this.selectColor = color if(this.driver__.driver){ - driverObj__.moveTo(12) + driverObj__.moveNext() } }, beforeUpload(file){ diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index bafa55f9..5df36aed 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -268,8 +268,6 @@ export default defineComponent({ }, driver__:{ handler(newVal,oldVal){ - console.log(newVal,'======'); - if(newVal.index >= 1 && newVal.index <= 2){ this.open(newVal.index) }else{ diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index 560b2027..e8232133 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -86,8 +86,6 @@ export default defineComponent({ const store = useStore() let {t} = useI18n() let driver__:any = computed(()=>{ - console.log(123); - return store.state.Guide.guide }) provide('driver__',driver__) @@ -194,9 +192,6 @@ export default defineComponent({ this.showCollectionModal =false this.collectionStep = 1 this.$emit('finishCollection') - if(this.driver__.driver){ - driverObj__.moveNext() - } let elList = document.querySelectorAll('.img_block_item_sketch img') Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data) .then((rv: any) => { diff --git a/src/tool/guide.js b/src/tool/guide.js index 1adc6a17..c0019134 100644 --- a/src/tool/guide.js +++ b/src/tool/guide.js @@ -23,6 +23,10 @@ const driverObj__ = driver({ { element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } }, { element: '.Guide_1_10', popover: { title: 'Title', description: 'Description' } }, { element: '.Guide_1_11', popover: { title: 'Title', description: 'Description' } }, + + { element: '.Guide_1_11_1', popover: { title: 'Title', description: 'Description' } }, + { element: '.Guide_1_11', popover: { title: 'Title', description: 'Description' } }, + { element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } }, { element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } }, { element: '.Guide_1_14', popover: { title: 'Title', description: 'Description' } }, @@ -59,11 +63,11 @@ const driverObj__ = driver({ element.classList.remove('Guide_') } popover.previousButton.style.display = 'none' - let driver = document.getElementsByClassName('driver-active')[0] + let driver = document.querySelector('body') if( options.state.activeIndex >= 1 && options.state.activeIndex <= 2 || - options.state.activeIndex >= 18 && options.state.activeIndex < 19 || - options.state.activeIndex >= 24 && options.state.activeIndex < 25 + options.state.activeIndex >= 20 && options.state.activeIndex < 21 || + options.state.activeIndex >= 26 && options.state.activeIndex < 27 ){ popover.footer.style.display = 'block' driver.classList.add('showEvents') @@ -86,7 +90,7 @@ const driverObj__ = driver({ }, //销毁前 onDestroyStarted:()=>{ - data.driver = false + // data.driver = false store?.commit("setGuide", data); driverObj__.destroy();//销毁方法 }, diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 91738572..da9130b0 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,5 +1,5 @@