Merge branch 'dev_vite' into StableVersion

This reverts commit f86c18cf3a.

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;

src/component/home/design/collection/MoodboardUpload.vue

@@ -711,9 +711,10 @@ export default defineComponent({
 						top: 50%;
 						left: 50%;
 						transform: translate(-50%,-50%);
-						// float: left;
-						// user-select:none;
-						// -webkit-user-drag: none;
+						float: left;
+						object-fit: contain;
+						user-select:none;
+						-webkit-user-drag: none;
 					}
 				}
 				.wh1{

src/component/home/design/collection/PrintboardUpload.vue

@@ -145,7 +145,7 @@
 		</div>
 		<!-- 取消请求 -->
 		<scaleImage ref="scaleImage"></scaleImage>
-        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isRound="false" :isUpload="isUpload"></Cropper>
+        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
     </div>
 </template>
 <script lang="ts">

src/component/mainPage/signUp/index.vue

@@ -388,9 +388,10 @@
 		display: flex;
 		flex-direction: column;
 		@media (max-width: 768px) {
+			justify-content: flex-start;
 			display: flex;
 			flex-direction: column;
-			justify-content: center;
+			justify-content: flex-start;
 		}
 	}
 	.gallery_list_box{

src/views/HomeMain.vue

@@ -561,7 +561,7 @@ export default defineComponent({
     const getIdExistToHistory = async () => {
       return await new Promise((resolve, reject) => {
         let value = {
-          id: Number(route.params?.id || route.query?.history)
+          id: Number(route.query?.id || route.query?.history)
         }
         Https.axiosPost(Https.httpUrls.historyProject, value)
           .then(rv => {
@@ -582,9 +582,9 @@ export default defineComponent({
             }
           const key = Object.keys(query)?.[0]
           if (key) {
-            if (route.params?.id && !query.tools) {
+            if (query.id && !query.tools) {
               homeMainData.openType = 'history'
-              homeMainData.openTypeChild = route.params?.id
+              homeMainData.openTypeChild = query.id
             } else {
               homeMainData.openType = Object.keys(query)[0]
               homeMainData.openTypeChild = query[Object.keys(query)[0]]
@@ -593,6 +593,10 @@ export default defineComponent({
               homeMainData.openTypeChild = ''
               homeMainData.openType = ''
             }
+            if ((query?.id || query?.history) && !(await getIdExistToHistory())) {
+              router.push('/home')
+              return
+            }
           } else {
             homeMainData.openType = ''
             homeMainData.openTypeChild = ''
@@ -912,12 +916,12 @@ export default defineComponent({
               rv.content.forEach((item, index) => {
                 let str = categorizeDate(item.updateTime) + 'list'
                 homeMainData.navTypeList.history[str].push(item)
-                if (item.id == (route.params?.id || route.query?.history)) {
+                if (item.id == (route.query?.id || route.query?.history)) {
                   existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
                 }
               })
               homeMainData.historyData.isNull = false
-              if ((route.params?.id || route.query?.history) && isFound < 1) setScrollTop()
+              if ((route.query?.id || route.query?.history) && isFound < 1) setScrollTop()
             } else {
               homeMainData.historyData.isNoData = true
             }

src/views/HomeView/history.vue

@@ -788,7 +788,7 @@ export default defineComponent({
             padding: 0 1rem;
 
             .operate_item {
-              // font-size: 1.4rem;
+              font-size: 1.6rem;
               font-family: Roboto;
               font-weight: 400;
               color: #007ee5;