Merge remote-tracking branch 'origin/StableVersion' into dev_vite

2025-12-18 11:01:04 +08:00
parent c6f3a44b81 fd80e2d3c7
commit 7da3dcb0d7
9 changed files with 79 additions and 29 deletions
--- a/src/component/HomePage/Cropper.vue
+++ b/src/component/HomePage/Cropper.vue
@@ -30,7 +30,7 @@
                        :outputSize="option.size"
                        :outputType="option.outputType"
                        :auto-crop="option.autoCrop"
-						:fixedBox="isRound"
+						:fixedBox="!isRound"
 						:movable="true"
                        :fixed="isRound"
                        :auto-crop-width="option.autoCropWidth"
@@ -333,7 +333,6 @@ export default defineComponent({
            .cut_picture_review_block{
                width: 100%;
                height: calc(100% - 6.8rem*1.2);
-				min-height: calc(100% - 6.8rem*1.2);
 				margin: 0 auto;
 				.next_step_button{
 					margin-top: 2rem;