From 23adf759f5e6592cb213bed20653442e80632dcb Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Feb 2025 10:06:12 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 2 ++ src/assets/style/style.less | 2 ++ src/component/HomePage/generalMenu.vue | 4 ++++ src/views/HomeView/library.vue | 4 ++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 3616fe9e..796fe136 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -774,6 +774,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte transition: all 0.3s; box-sizing: content-box; border: 1px solid; + height: 100%; + box-sizing: border-box; } .generalModel_state .generalModel_state_item .el-cascader .el-cascader__tags, .generalModel_state .generalModel_state_item .el-cascader .el-input { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 815f82ec..b8a20a2b 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -844,6 +844,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte transition: all .3s; box-sizing: content-box; border: 1px solid; + height: 100%; + box-sizing: border-box; .el-cascader__tags,.el-input{ height: 100%; } diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue index ae311bd1..e894e020 100644 --- a/src/component/HomePage/generalMenu.vue +++ b/src/component/HomePage/generalMenu.vue @@ -201,6 +201,7 @@ import { message, Upload, Modal } from "ant-design-vue"; //衣服类型下拉菜单 .generalMenu_printModel{ margin-right: 2rem; + height: 6rem; .icon-xiala{ margin-left: auto; transition: all .3s; @@ -221,6 +222,9 @@ import { message, Upload, Modal } from "ant-design-vue"; display: flex; font-size: 1.8rem; justify-content: space-around; + height: 100%; + box-sizing: border-box; + align-items: center; > span{ white-space: nowrap; overflow: hidden; diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index f90d552b..626fca7f 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -242,7 +242,7 @@
  • {{ $t('LibraryPage.Model3') }}
    • --> - +
    @@ -365,7 +365,7 @@ v-model="captionGeneration" >
    -
    +
    Date: Thu, 6 Feb 2025 11:10:04 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/scaleImage.vue | 7 ++-- src/views/HomeView/library.vue | 47 +++++++++++++++++---------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index dd8f9373..eefe3350 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -110,7 +110,7 @@
    - +
    @@ -169,8 +169,7 @@ export default defineComponent({ }, workspace:{ type:Object, - default:{ - } + default:false }, }, setup(props:any,{emit}) { @@ -360,7 +359,7 @@ export default defineComponent({ }) let data = { "base64": rv, - "category": scaleImageList.value[scaleImageIndex.value]?.categoryValue, + "category": scaleImageList.value[scaleImageIndex.value]?.categoryValue || scaleImageList.value[scaleImageIndex.value]?.level2Type, "gender": props.workspace.sexEnum.value, "originalId":scaleImageList.value[scaleImageIndex.value]?.id, "isOverride":isOverlay, diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 626fca7f..af986824 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -192,20 +192,22 @@
    -
    -
    - -
    -
    - -
    -
    - -
    +
    +
    + +
    -
    +
    +
    + +
    +
    +
    + +
    +
    {{img.name}}
    @@ -409,13 +411,15 @@
    -
    +
    +
    +
    @@ -2096,12 +2100,21 @@ export default defineComponent({ .img_operate_content{ position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%,-50%); - max-width: 90%; + // top: 50%; + // left: 50%; + // transform: translate(-50%,-50%); + // max-width: 90%; display: flex; - flex-wrap: wrap; + flex-direction: column; + top: 1rem; + &.left{ + left: 1rem; + right: auto; + } + &.right{ + right: 1rem; + left: auto; + } >div{ margin-bottom: .5rem; margin-right: .5rem; From cfa572f5800f4c721cbd42620060d02b1db4249e Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Feb 2025 11:14:16 +0800 Subject: [PATCH 04/23] fix --- src/component/HomePage/scaleImage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index eefe3350..b7c12682 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -169,7 +169,7 @@ export default defineComponent({ }, workspace:{ type:Object, - default:false + default:{} }, }, setup(props:any,{emit}) { From 55924c8408bd39c05e34e9e33798a724a9a2b402 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Feb 2025 11:17:15 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E7=A7=AF=E5=88=86stripe=E4=BB=98=E6=AC=BE=E9=80=9A=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Pay/payMethod.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/component/Pay/payMethod.vue b/src/component/Pay/payMethod.vue index 2b956daf..f36f4b08 100644 --- a/src/component/Pay/payMethod.vue +++ b/src/component/Pay/payMethod.vue @@ -36,12 +36,11 @@ PayPal - + --> - +