diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index dc0ba615..997adc59 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -120,7 +120,7 @@ import { Chrome,Slider,Sketch,Material,Compact,Swatches,Photoshop } from '@ans1998/vue3-color' import { Https } from "@/tool/https"; import GO from "@/tool/GO"; -import { defineComponent, h,ref } from 'vue' +import { defineComponent, h,ref,inject } from 'vue' import { LoadingOutlined } from '@ant-design/icons-vue'; import {getCookie} from '@/tool/cookie' import {getUploadUrl,rgbToHsv} from '@/tool/util' @@ -143,13 +143,14 @@ export default defineComponent({ }) //顔色选择器默认颜色 let selectColorList = ref({ }) - + let driver__ = inject('driver__') let {t} = useI18n() return { fileList, colorList, selectColor, selectColorList, + driver__, t, } }, @@ -370,7 +371,9 @@ export default defineComponent({ this.selectColorList = selectColorList this.getHsvColor(selectColorList) this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} - driverObj__.moveNext() + if(this.driver__.driver){ + driverObj__.moveNext() + } }; },100) @@ -392,7 +395,9 @@ export default defineComponent({ }, setUplpadColor(color){ this.selectColor = color - driverObj__.moveTo(12) + if(this.driver__.driver){ + driverObj__.moveTo(12) + } }, beforeUpload(file){ const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp'; diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 15149650..621f4afd 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -482,7 +482,9 @@ export default defineComponent({ ).catch(rv=>{ this.loadingShow = false }) - driverObj__.moveNext() + if(this.driver__.driver){ + driverObj__.moveNext() + } }) diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 92f4e326..537d6a96 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -132,7 +132,7 @@