diff --git a/.env b/.env index 7716aac9..d5d47de3 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ # NODE_ENV = 'production' NODE_ENV = 'development' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' -VUE_APP_BASE_URL = 'https://api.aida.com.hk' +VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' diff --git a/.env.dev b/.env.dev index c8f7d099..dd58044b 100644 --- a/.env.dev +++ b/.env.dev @@ -4,8 +4,8 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' -# VUE_APP_BASE_URL = 'https://api.aida.com.hk' +VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' # 佩佩 -VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/.env.production b/.env.production index 4741690b..bcd34d5c 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV = 'production' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' # VUE_APP_BASE_URL = 'https://polyu.api.aida.com.hk' -VUE_APP_BASE_URL = 'https://api.aida.com.hk' +VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 29fb838c..c750b6c3 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -270,13 +270,16 @@ li { pointer-events: auto !important; overflow-y: initial !important; } -.Guide_.showEvents * { +.Guide_.showEvents *, +.Guide_ .showEvents * { pointer-events: auto !important; } -.Guide_.showEvents .hideEvents { +.Guide_.showEvents .hideEvents, +.Guide_ .showEvents .hideEvents { pointer-events: none !important; } -.Guide_.showEvents .hideEvents * { +.Guide_.showEvents .hideEvents *, +.Guide_ .showEvents .hideEvents * { pointer-events: none !important; } .Guide_ .Guide_active { @@ -299,6 +302,8 @@ li { filter: drop-shadow(0px 0px 2px #ff5f5f) drop-shadow(0px 0px 1px #ff5f5f); animation: identifier_img 1s infinite linear; display: block !important; + cursor: pointer; + pointer-events: auto !important; } @keyframes identifier_img { 0% { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index d159d053..7534dc75 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -287,7 +287,7 @@ input:focus{ .Guide_{ pointer-events:auto !important; overflow-y: initial !important; - &.showEvents{ + &.showEvents,.showEvents{ *{ pointer-events:auto !important; } @@ -322,6 +322,8 @@ input:focus{ filter: drop-shadow(0px 0px 2px rgb(255, 95, 95))drop-shadow(0px 0px 1px rgb(255, 95, 95)); animation: identifier_img 1s infinite linear; display: block !important; + cursor: pointer; + pointer-events:auto !important; @keyframes identifier_img { 0% { filter: none; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index cbe6630a..c9cdde20 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -28,8 +28,8 @@
-
-
+
+
@@ -543,7 +543,7 @@ export default defineComponent({ if(this.driver__.driver){ nextTick().then(()=>{ // driverObj__.moveNext(); - driverObj__.moveTo(41); + driverObj__.moveTo(36); }) } } diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 8670660f..0451b469 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -752,14 +752,14 @@ export default defineComponent({ // path:imgData?.url, // designType: imgData?.designType // }] - // if(this.driver__.driver){ - // nextTick().then(()=>{ - // driverObj__.moveNext(); - // }) - // } + imgData.path = imgData.url DesignDetailEnd.printsList.push(imgData) - + if(this.driver__.driver){ + nextTick().then(()=>{ + driverObj__.moveNext(); + }) + } // console.log(this.current.printObject,imgData); }else if(this.selectCode == 'DesignElements'){ imgData.path = imgData.url diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 126317aa..9342501f 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -829,7 +829,9 @@ export default defineComponent({ } this.designOpenrtion = false if(this.driver__.driver){ - driverObj__.moveNext(); + nextTick(()=>{ + driverObj__.moveNext(); + }) } }, clearModal(){ diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index 049b6889..cf262a3c 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -833,7 +833,9 @@ export default defineComponent({ this.designItemDetailTS = {} } if(this.driver__.driver){ - driverObj__.moveNext(); + nextTick(()=>{ + driverObj__.moveNext(); + }) } }, clearModal(){ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index c92962f5..e790b447 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -61,7 +61,7 @@ {{ workspaceItem.styleName }}
-
{{ $t('Habit.Select') }}
+
{{ $t('Habit.Select') }}
{ // driverObj__.moveTo(2); - driverObj__.moveNext(); + setTimeout(() => { + driverObj__.moveNext(); + }, 300); this.openType.model = false // driverObj__.moveNext(); diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 48539e3c..b725610b 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -90,7 +90,7 @@ {{ $t('ColorboardUpload.UploadImage') }}
-
+
@@ -102,7 +102,7 @@
Delete
-
+
@@ -123,8 +124,8 @@
-
-
+
+
@@ -454,6 +455,11 @@ export default defineComponent({ file.status = 'done' this.fileList[0] = file this.getImgColor() + // nextTick().then(()=>{ + // if(this.driver__.driver){ + // driverObj__.moveNext() + // } + // }) }; // 转化为base64S reader.readAsDataURL(fileData) diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index f6487884..7d8fa630 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -205,11 +205,11 @@
{{ $t('exportModel.insufficient') }}
-
+
{{ $t('exportModel.Save') }}
{{ $t('exportModel.Share') }}
-
{{ $t('exportModel.Export') }}
+
{{ $t('exportModel.Export') }}
@@ -321,10 +321,10 @@ export default defineComponent({ props: ["msg", "sketchCatecoryList"], setup(props,{emit}) { const {t} = useI18n() + const store = useStore(); let driver__ = computed(()=>{ return store.state.Guide.guide }) - const store = useStore(); let showUpgradePlan = ref(false); let canvas = reactive({}); @@ -605,7 +605,6 @@ export default defineComponent({ } } }) - isShowMark.value = false } updateCanvasState('')//加载完成后记录一下 @@ -870,9 +869,6 @@ export default defineComponent({ FileSaver.saveAs(content, "DesignFiles"); // 利用file-saver保存文件 自定义文件名 isShowMark.value = false; }); - if(driver__.value.driver){ - driverObj__.moveNext() - } setSubmit()//导出的时候保存 initAligningGuidelines(canvas,true) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 412c5315..015f1c19 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -1,7 +1,7 @@