diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index dc34b783..218b06cb 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -362,7 +362,7 @@ export default defineComponent({ if(this.driver__.driver){ nextTick().then(()=>{ // driverObj__.moveNext(); - driverObj__.moveTo(41); + driverObj__.moveTo(42); }) } } diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 8df10b87..8bbf83fb 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -35,7 +35,7 @@ -
+
@@ -95,7 +95,7 @@
{{ $t('Habit.Designer') }}
-
+
=4){ + if(newVal.index>=5){ this.openType.habit = false } } @@ -285,6 +285,13 @@ export default defineComponent({ } } }, + 'openType.sex':{ + handler(newVal:any,oldVal:any){ + if(this.driver__.driver && oldVal){ + driverObj__.moveTo(3); + } + } + }, // 'openType.model':{ // handler(newVal:any,oldVal:any){ // if(this.driver__.driver){ @@ -587,7 +594,8 @@ export default defineComponent({ if(this.driver__.driver){ // this.openType.habit = false nextTick().then(()=>{ - driverObj__.moveTo(2); + // driverObj__.moveTo(2); + driverObj__.moveNext(); this.openType.model = false // driverObj__.moveNext(); @@ -635,7 +643,7 @@ export default defineComponent({ this.getMannequins() if(this.driver__.driver && this.openType.model){ nextTick().then(()=>{ - driverObj__.moveTo(3); + driverObj__.moveTo(4); // driverObj__.moveNext(); }) } diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index a5208ba9..fefe56ab 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -319,8 +319,8 @@ export default defineComponent({ driver__:{ handler(newVal,oldVal){ if(this.type_.type2 == 'Printboard'){ - if(newVal.index >= 13 && newVal.index < 15){ - this.setKeyword(newVal.index-13) + if(newVal.index >= 14 && newVal.index < 16){ + this.setKeyword(newVal.index-14) }else{ } }else if(this.type_.type2 == 'Sketchboard'){ @@ -483,7 +483,7 @@ export default defineComponent({ }) nextTick().then(()=>{ if(this.driver__.driver){ - driverObj__.moveTo(9) + driverObj__.moveTo(10) } }) // if(){ diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 425a5297..d9e8f9a7 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -254,8 +254,8 @@ export default defineComponent({ watch:{ driver__:{ handler(newVal,oldVal){ - if(newVal.index >= 5 && newVal.index <= 7){ - this.open(newVal.index-4) + if(newVal.index >= 6 && newVal.index <= 8){ + this.open(newVal.index-5) }else{ } } diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 65d6c6d8..9e4f66ea 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -356,7 +356,7 @@ export default defineComponent({ }, driver__:{ handler(newVal,oldVal){ - if(newVal.index >= 14 && newVal.index <= 15){ + if(newVal.index >= 15 && newVal.index <= 16){ if(this.driver__.driver){ // driverObj__.moveTo(15) } diff --git a/src/tool/guide.js b/src/tool/guide.js index 23a92167..28e6f3c5 100644 --- a/src/tool/guide.js +++ b/src/tool/guide.js @@ -15,7 +15,8 @@ const driverObj__ = driver({ steps: [ { element: '.Guide_1_1_1', popover: { title: 'Title', description: 'Description' } }, { element: '.Guide_1_27', popover: { title: '', description: 'You can change the mannequin and other settings in Workspace.' } }, - { element: '.Guide_1_28', popover: { title: '', description: 'Change the mannequin here.' } }, + { element: '.Guide_1_28', popover: { title: '', description: 'Change the mannequin here.', side: "right",align: 'center' } }, + { element: '.Guide_1_28', popover: { title: '', description: 'Change the mannequin here.', side: "right",align: 'end' } }, { element: '.Guide_1_29', popover: { title: '', description: 'Select a mannequin of your choice from our system library.' } }, @@ -110,9 +111,9 @@ const driverObj__ = driver({ // options.config.stagePadding = 10 // } if( - options.state.activeIndex >= 2 && options.state.activeIndex < 3 || - options.state.activeIndex >= 5 && options.state.activeIndex < 8 || - options.state.activeIndex >= 13 && options.state.activeIndex < 15 || + // options.state.activeIndex >= 2 && options.state.activeIndex < 3 || + options.state.activeIndex >= 6 && options.state.activeIndex < 9 || + options.state.activeIndex >= 14 && options.state.activeIndex < 16 || // options.state.activeIndex >= 24 && options.state.activeIndex < 25 || driverObj__.isLastStep() ){ @@ -134,7 +135,6 @@ const driverObj__ = driver({ } element = options.state.activeElement element.classList.add('Guide_') - console.log(element); }) @@ -156,12 +156,11 @@ const driverObj__ = driver({ onNextClick:(element, step, options) =>{ - console.log(element,step,options); - if(options.state.activeIndex == 2){ - driverObj__.moveTo(4) - }else{ - driverObj__.moveNext() - } + // if(options.state.activeIndex == 2){ + // driverObj__.moveTo(4) + // }else{ + // driverObj__.moveNext() + // } } }); function addDiv(element){ @@ -191,7 +190,6 @@ function removeDiv(element){ const openGuide = () =>{ let isBeginner = JSON.parse(getCookie('isBeginner')) - console.log(isBeginner); let data // console.log(isBeginner); if(isBeginner){