diff --git a/src/assets/style/style.css b/src/assets/style/style.css index f724332a..27d168a4 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -162,7 +162,10 @@ li { .hideEvents * { pointer-events: none !important; } -.hideEvents .Guide_ { +.Guide_ { + pointer-events: auto !important; +} +.Guide_.showEvents * { pointer-events: auto !important; } .delete_like_file_block { @@ -389,6 +392,13 @@ li { .operate_file_block .select_img_type .category_list .category_item:hover { background: linear-gradient(-137deg, #eeefdb, #e7dbed); } +.driver-overlay, +.driver-active * { + pointer-events: none; +} +.showEvents * { + pointer-events: auto; +} .habit :deep(.ant-btn:hover), :deep(.ant-btn:focus), :deep(.ant-btn:active), @@ -502,12 +512,6 @@ li { .libraryPageCascader .ant-cascader-menu { margin-top: 4rem; } -.collection_modal .ant-modal-content, -.design_detail_modal_component .ant-modal-content, -.designOpenrtion_modal .ant-modal-content { - transform: scale(1.2); - transform-origin: center !important; -} .collection_modal .ant-modal-body, .design_detail_modal_component .ant-modal-body, .designOpenrtion_modal .ant-modal-body, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 1a0547a0..b3adae24 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -177,8 +177,14 @@ ul,li{ *{ pointer-events:none !important; } - .Guide_{ - pointer-events:auto !important; + +} +.Guide_{ + pointer-events:auto !important; + &.showEvents{ + *{ + pointer-events:auto !important; + } } } @@ -453,6 +459,14 @@ ul,li{ } } } +.driver-overlay, .driver-active * { + pointer-events: none; +} +.showEvents{ + *{ + pointer-events: auto; + } +} // .ant-modal-wrap{ // z-index: 10001 ; // } @@ -597,8 +611,8 @@ ul,li{ } .collection_modal,.design_detail_modal_component,.designOpenrtion_modal{ .ant-modal-content{ - transform: scale(1.2); - transform-origin: center !important; + // transform: scale(1.2); + // transform-origin: center !important; } } //collection 弹窗 diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index e6c49bb1..62409799 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -2,11 +2,13 @@
@@ -58,11 +60,11 @@
-
+
{{ $t('DesignDetail.Submit') }}
-
+
@@ -72,7 +74,7 @@
-
+
{{ $t('DesignDetail.CurrentPrint') }}
@@ -294,6 +296,11 @@ export default defineComponent({ let DesignDetailAlter:any = this.$refs.DesignDetailAlter DesignDetailAlter.init(num) if(num ==2 ){ + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } } }, @@ -569,7 +576,11 @@ export default defineComponent({ this.closeModal() this.store.commit('setDesignCollectionList',designCollectionList) this.store.commit('setLikeDesignCollectionList',likeDesignCollectionList) - + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } } ).catch(res=>{ this.loadingShow = false @@ -651,6 +662,7 @@ export default defineComponent({ }, clothesOpen(index:any){ this.clothesDetail('',index) + }, clothesOpenActive(index:any){ this.designItemDetail.clothes.forEach((item:any)=>{ @@ -688,6 +700,11 @@ export default defineComponent({ this.store.commit('setDesignPreviewData',data) let DesignDetailAlter:any = this.$refs.DesignDetailAlter DesignDetailAlter.changePlace() + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } }, //重新设计 redesignItem(){ @@ -852,6 +869,7 @@ export default defineComponent({ position: relative; height: 80%; display: inline-block; + width: 100%; .detail_modal_model{ z-index: 1; position: relative; diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 61b1d587..346bc98d 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -12,8 +12,8 @@
{{ $t('DesignDetailAlter.Library') }}
@@ -96,7 +96,7 @@
-
+
@@ -267,6 +267,7 @@ import { Sketch, Chrome} from '@ans1998/vue3-color' import {getUploadUrl,rgbToHsv} from '@/tool/util' import DesignDetailEnd from './DesignDetailEnd.vue'; import { getCookie } from "@/tool/cookie"; +import { openGuide,driverObj__ } from "@/tool/guide"; import { useI18n } from 'vue-i18n'; export default defineComponent({ props: ["msg"], @@ -278,6 +279,7 @@ export default defineComponent({ let type_ = ref(1); let select = ref(false); let current = inject('current')//父组件传过来的数据 + let driver__ = inject('driver__')//父组件传过来的数据 let openClick = ref(1); let searchPictureName = ref('') //模型印花 @@ -324,6 +326,7 @@ export default defineComponent({ selectColor, selectColorList, workspace, + driver__, t, } }, @@ -638,6 +641,11 @@ export default defineComponent({ minIOPath:imgData.minIOPath, path:imgData?.url }] + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } // console.log(this.current.printObject,imgData); } @@ -672,6 +680,11 @@ export default defineComponent({ this.openClick = num; if(num ==2 ){ this.getLibraryList() + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } } }, @@ -1417,7 +1430,11 @@ export default defineComponent({ flex-direction: row-reverse; .vc-chrome-color-wrap{ // width: 3.6rem; + margin-left: 2rem; width: auto; + .vc-chrome-active-color{ + border-radius: 50%; + } .vc-chrome-active-color,.vc-checkerboard{ width: 3rem; height: 3rem; diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 945a651a..9e64c11a 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -85,7 +85,7 @@
{{ $t('DesignDetailEnd.preview') }}
-
{{ $t('DesignDetailEnd.Layout') }}
+
{{ $t('DesignDetailEnd.Layout') }}
{{ $t('DesignDetailEnd.preview') }}
@@ -96,7 +96,7 @@