From 030aa55d3890ccca0f0f9d784f729f8ff695c9b1 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 22 Feb 2024 10:03:51 +0800
Subject: [PATCH] fix
---
src/assets/style/style.css | 48 +-
src/assets/style/style.less | 2 +-
src/component/Detail/DesignDetail.vue | 2 +-
src/component/Detail/DesignDetailAlter.vue | 41 +-
.../Detail/DesignPrintOperationMobile.vue | 14 +-
src/component/Detail/habit.vue | 2 +-
src/component/Detail/magnifyingGlass.vue | 2 +-
src/component/Detail/setDesignItem2.vue | 664 ++++++++++++++++++
src/component/Detail/setDesignItemMobile.vue | 16 +-
src/views/HomeView.vue | 2 +-
10 files changed, 730 insertions(+), 63 deletions(-)
create mode 100644 src/component/Detail/setDesignItem2.vue
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 1941986e..ef58b821 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -618,17 +618,17 @@ li {
color: #000000;
}
.collection_modal .ant-modal-body,
-.payOrder_modal.design_detail_modal_component .ant-modal-body,
+.payOrder_modal .ant-modal-body,
+.design_detail_modal_component .ant-modal-body,
.designOpenrtion_modal .ant-modal-body,
-.library_page .ant-modal-body,
-.detail_modal_body_select .ant-modal-body {
+.library_page .ant-modal-body {
overflow-y: hidden;
}
.collection_modal .design_title_text,
-.payOrder_modal.design_detail_modal_component .design_title_text,
+.payOrder_modal .design_title_text,
+.design_detail_modal_component .design_title_text,
.designOpenrtion_modal .design_title_text,
-.library_page .design_title_text,
-.detail_modal_body_select .design_title_text {
+.library_page .design_title_text {
font-size: var(--aida-fsize2);
font-weight: 900;
color: rgba(0, 0, 0, 0.65);
@@ -636,19 +636,19 @@ li {
margin-bottom: calc(2rem*1.2);
}
.collection_modal .design_title_text .design_title_text_intro,
-.payOrder_modal.design_detail_modal_component .design_title_text .design_title_text_intro,
+.payOrder_modal .design_title_text .design_title_text_intro,
+.design_detail_modal_component .design_title_text .design_title_text_intro,
.designOpenrtion_modal .design_title_text .design_title_text_intro,
-.library_page .design_title_text .design_title_text_intro,
-.detail_modal_body_select .design_title_text .design_title_text_intro {
+.library_page .design_title_text .design_title_text_intro {
font-size: var(--aida-fsize1-4);
font-weight: 400;
color: rgba(0, 0, 0, 0.45);
}
.collection_modal .ant-upload.ant-upload-select-picture-card,
-.payOrder_modal.design_detail_modal_component .ant-upload.ant-upload-select-picture-card,
+.payOrder_modal .ant-upload.ant-upload-select-picture-card,
+.design_detail_modal_component .ant-upload.ant-upload-select-picture-card,
.designOpenrtion_modal .ant-upload.ant-upload-select-picture-card,
-.library_page .ant-upload.ant-upload-select-picture-card,
-.detail_modal_body_select .ant-upload.ant-upload-select-picture-card {
+.library_page .ant-upload.ant-upload-select-picture-card {
background: #FFFFFF;
width: calc(6rem*1.2);
height: calc(6rem*1.2);
@@ -657,33 +657,33 @@ li {
margin: 0;
}
.collection_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
-.payOrder_modal.design_detail_modal_component .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
+.payOrder_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
+.design_detail_modal_component .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
.designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
-.library_page .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
-.detail_modal_body_select .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao {
+.library_page .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao {
font-size: calc(3.2rem*1.2);
color: #B7B7B7;
}
.collection_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
-.payOrder_modal.design_detail_modal_component .ant-upload.ant-upload-select-picture-card .ant-upload-text,
+.payOrder_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
+.design_detail_modal_component .ant-upload.ant-upload-select-picture-card .ant-upload-text,
.designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
-.library_page .ant-upload.ant-upload-select-picture-card .ant-upload-text,
-.detail_modal_body_select .ant-upload.ant-upload-select-picture-card .ant-upload-text {
+.library_page .ant-upload.ant-upload-select-picture-card .ant-upload-text {
font-size: calc(1.6rem*1.2);
color: #B7B7B7;
}
.collection_modal .ant-upload-list-picture-card-container,
-.payOrder_modal.design_detail_modal_component .ant-upload-list-picture-card-container,
+.payOrder_modal .ant-upload-list-picture-card-container,
+.design_detail_modal_component .ant-upload-list-picture-card-container,
.designOpenrtion_modal .ant-upload-list-picture-card-container,
-.library_page .ant-upload-list-picture-card-container,
-.detail_modal_body_select .ant-upload-list-picture-card-container {
+.library_page .ant-upload-list-picture-card-container {
display: none !important;
}
.collection_modal .ant-upload-picture-card-wrapper,
-.payOrder_modal.design_detail_modal_component .ant-upload-picture-card-wrapper,
+.payOrder_modal .ant-upload-picture-card-wrapper,
+.design_detail_modal_component .ant-upload-picture-card-wrapper,
.designOpenrtion_modal .ant-upload-picture-card-wrapper,
-.library_page .ant-upload-picture-card-wrapper,
-.detail_modal_body_select .ant-upload-picture-card-wrapper {
+.library_page .ant-upload-picture-card-wrapper {
width: auto;
vertical-align: top;
}
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 29a715f1..222d866c 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -722,7 +722,7 @@ ul,li{
}
}
//collection 弹窗
-.collection_modal,.payOrder_modal.design_detail_modal_component,.designOpenrtion_modal,.library_page,.detail_modal_body_select{
+.collection_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page{
.ant-modal-body{
overflow-y: hidden;
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index f96273e2..e59834a6 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -148,7 +148,7 @@
import { defineComponent,computed,ref,provide,nextTick,createVNode} from 'vue'
import DesignDetailAlter from '@/component/Detail/DesignDetailAlter.vue'
import magnifyingGlass from '@/component/Detail/magnifyingGlass.vue'
-import setDesignItem from '@/component/Detail/setDesignItem.vue'
+import setDesignItem from '@/component/Detail/setDesignItem2.vue'
import setDesignItemMobile from '@/component/Detail/setDesignItemMobile.vue'
import Draggable from 'vuedraggable'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue
index f86aaf70..f39e4592 100644
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -490,26 +490,29 @@ export default defineComponent({
mounted () {
this.token = getCookie("token") || "";
this.uploadUrl = getUploadUrl();
- const backIcon = document.createElement('div');
- backIcon.classList.add('vc-sketch-color-wrap')
- let dropperDom = document.getElementsByClassName("detail_modal_body_select")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
- dropperDom.appendChild(backIcon);
- backIcon.addEventListener('click',async ()=>{
- try {
- const dropper = new EyeDropper();
- const result = await dropper.open();
- let hex = result.sRGBHex.replace("#", "");
- // 将十六进制颜色码拆分成红、绿、蓝三个部分
- const r = parseInt(hex.substring(0, 2), 16);
- const g = parseInt(hex.substring(2, 4), 16);
- const b = parseInt(hex.substring(4, 6), 16);
- this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
- // return `rgb(${r}, ${g}, ${b})`;
- // box.style.backgroundColor = label.textContent = result.sRGBHex;
- } catch (e) {
- message.info(this.t('DesignDetailAlter.jsContent1'))
- }
+ nextTick().then(()=>{
+ const backIcon = document.createElement('div');
+ backIcon.classList.add('vc-sketch-color-wrap')
+ let dropperDom = document.getElementsByClassName("detail_modal_body_select")?.[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
+ dropperDom.appendChild(backIcon);
+ backIcon.addEventListener('click',async ()=>{
+ try {
+ const dropper = new EyeDropper();
+ const result = await dropper.open();
+ let hex = result.sRGBHex.replace("#", "");
+ // 将十六进制颜色码拆分成红、绿、蓝三个部分
+ const r = parseInt(hex.substring(0, 2), 16);
+ const g = parseInt(hex.substring(2, 4), 16);
+ const b = parseInt(hex.substring(4, 6), 16);
+ this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
+ // return `rgb(${r}, ${g}, ${b})`;
+ // box.style.backgroundColor = label.textContent = result.sRGBHex;
+ } catch (e) {
+ message.info(this.t('DesignDetailAlter.jsContent1'))
+ }
+ })
})
+
},
methods:{
//点击判断
diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue
index 6afe2bec..03de1dc3 100644
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -73,7 +73,7 @@
v-for="item,index in designOpenrtionList"
:key="item"
:style="[printStyleList?.[index]?.style]"
- @touchstart.stop="itemMoveMousedown(index,$event)"
+ @touchstart.passive="itemMoveMousedown(index,$event)"
class="modal_imgItem"
@click="setpitch(item,index)" ref="content" >
@@ -83,11 +83,11 @@