修复部分bug和页面调整

src/component/Detail/DesignDetail.vue

@@ -426,6 +426,8 @@ export default defineComponent({
 					this.currentIndex = 0
                     this.store.commit('setDesignItemDetail',rv)
 					this.removeRevocation()
+					this.deleteShow = false
+
 					this.setRevocation(rv,'')
 					// if(rv.others[0].layersObject.length != 0){
 					// 	this.body = false

src/component/Detail/DesignDetailAlter.vue

@@ -1363,7 +1363,7 @@ export default defineComponent({
 				box-shadow: 2px 2px 8px rgba(0,0,0,.3);
 				.vc-chrome{
 					background: rgba(0,0,0,0);
-
+					box-shadow:none;
 				}
 				.chrome_color{
 					width: calc(17.5rem*1.2);

src/component/Detail/habit.vue

@@ -1071,6 +1071,7 @@ export default defineComponent({
 }
 .habit :deep(.ant-btn) {
     box-shadow: none !important;
+	height: 4.2rem;
     color: rgba(0, 0, 0, 0.5);
     box-shadow: none;
     border: none;

src/component/HomePage/ColorboardUpload.vue

@@ -49,6 +49,7 @@
 								</div>
 							</div>
 						</div> -->
+						<!-- <div>1231239817239871923918723</div> -->
                     </div>
                     <!-- <div class="color_review_block">
                         <div class="clear_button" @click="clearCurrentColor()">Clear</div>
@@ -702,7 +703,7 @@ export default defineComponent({
 					box-shadow: 2px 2px 8px rgba(0,0,0,.3);
 					.vc-chrome{
 						background: rgba(0,0,0,0);
-
+						box-shadow:none;
 					}
 					.chrome_color{
 						width: calc(17.5rem*1.2);

src/component/HomePage/ExportModel.vue

@@ -1405,7 +1405,7 @@ export default defineComponent({
 			if (selectedObjects.length >= 1) {
 				allSelect.value = selectedObjects
 				// allSelectWidth.value = 0
-				allSelectWidth.value = selectedObjects[0].width * selectedObjects[0].scaleX
+				allSelectWidth.value = (selectedObjects[0].width * selectedObjects[0].scaleX).toFixed(0)
 			}else{
 				allSelectWidth.value = -1
 			}
@@ -1561,7 +1561,7 @@ export default defineComponent({
 						data.push(obj)
 						let img = new Image
 						img.onload = ()=>{
-							if(img.width*scaleSR.value>4069 || img.height*scaleSR.value>4069){
+							if(img.width*scaleSR.value>2048 || img.height*scaleSR.value>2048){
 								arr.push(index)
 							}
 							resolve(img)

src/component/HomePage/Material.vue

@@ -260,6 +260,9 @@ export default defineComponent({
         init(code:any){
             this.selectCode = code
             // this.myMaterialModalShow = true
+			this.currentPage = 1
+			this.pageSize = 12
+			this.imgList = []
 			this.getLibraryList('')
 			
         },

src/component/HomePage/PrintboardUpload.vue

@@ -102,17 +102,17 @@
 					</div>
 				</div>
 			</div>
-			<div v-show="openClick == 3 || openClick == 2" class="modal_accomplish">
+			<div v-show="openClick == 3" class="modal_accomplish">
 				<div class="input_border">
 					<div class="Guide_1_2_8 input_box" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
 						<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
 						<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
 						<span>{{ $t('PrintboardUpload.maximumLength') }}</span>
 					</div>
-					<div>
+					<!-- <div>
 						<div v-show="!isUseGenerate" @click="setUseGenerate">Printboard</div>
 						<div v-show="isUseGenerate" @click="setUseGenerate">Generate</div>
-					</div>
+					</div> -->
 				</div>
 				<div class="modal_img">
 					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_2_9" :class="[item?.checked?'active':'',driver__.driver?'showEvents':'']" >

src/component/HomePage/SketchboardUpload.vue

@@ -180,17 +180,17 @@
 					
 				</div>
 			</div>
-			<div v-show="openClick == 3 || openClick == 2" class="modal_accomplish">
+			<div v-show="openClick == 3" class="modal_accomplish">
 				<div class="input_border">
 					<div class="Guide_1_9_2 input_box" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
 						<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
 						<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
 						<span>{{ $t('PrintboardUpload.maximumLength') }}</span>
 					</div>
-					<div>
+					<!-- <div>
 						<div v-show="!isUseGenerate" @click="setUseGenerate">Printboard</div>
 						<div v-show="isUseGenerate" @click="setUseGenerate">Generate</div>
-					</div>
+					</div> -->
 				</div>
 				<div class="modal_img">
 					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_13_2" :class="[driver__.driver?'showEvents':'',item?.checked?'active':'']">

src/component/HomePage/UpgradePlan.vue

@@ -67,7 +67,7 @@
 						<input type="number" v-model="price.num">
 						<div class="UpgradePlan_payList2_input_add" @click="addPriceNum">+</div>
 					</div>
-					<div class="UpgradePlan_payList2_describe">{{ $t('upgradePlan.organization') }}</div>
+					<!-- <div class="UpgradePlan_payList2_describe">{{ $t('upgradePlan.organization') }}</div> -->
 					<div class="UpgradePlan_payList-item-upgrade subitOkPreviewBtn" @click="upgrade(1)">{{ $t('upgradePlan.Continue') }}</div>
 				</div>
 			</div>
@@ -92,7 +92,7 @@
 
 				</div>
 			</div>
-			<div class="UpgradePlan_payAffirm_clause">
+			<div class="UpgradePlan_payAffirm_clause" ref="labelDisclaimer">
 				<label>
 					<input type="checkbox" v-model="clause">
 					<span>I acknowledge that I have read, understand, and agree with the <a href="https://code-create.com.hk/aida-terms-and-conditions/" target="_blank">Terms and Conditions</a> (including the Scope of service) and the <a href="https://code-create.com.hk/aida-subscription-agreement/" target="_blank">Subscription Agreement</a>. *</span>
@@ -217,6 +217,14 @@ export default defineComponent({
 			parsedUrl.pathname = '/';
 			url = parsedUrl.href + 'paySucceed';
 			if(!this.clause){
+				let labelDisclaimer:any = this.$refs.labelDisclaimer
+				if(!labelDisclaimer.classList.contains('animation')){
+					labelDisclaimer.classList.add('animation')
+					setTimeout(() => {
+						labelDisclaimer.classList.remove('animation')
+					}, 1000);
+				}
+			
 				return
 			}
 			let httpsUrl = Https.httpUrls.payAlipay
@@ -274,7 +282,7 @@ export default defineComponent({
 <style lang="less" scoped>
 .UpgradePlan_modal {
 	flex: 1;
-    // height: 30rem;
+    height: 30rem;
     // overflow-x: hidden;
 	display: flex;
     flex-direction: column;
@@ -447,7 +455,8 @@ export default defineComponent({
 			border-radius: 2rem;
 			img{
 				margin: 0rem 2rem;
-				max-width: 4rem;
+				// max-width: 4rem;
+				width: 4rem;
 			}
 		}
 	}
@@ -458,6 +467,7 @@ export default defineComponent({
 			input{
 				margin-right: 1rem;
 				cursor: pointer;
+				vertical-align: middle;
 			}
 			span{
 				vertical-align: top;
@@ -467,6 +477,26 @@ export default defineComponent({
 				}
 			}
 		}
+		&.animation{
+			animation: shake .3s linear;
+			@keyframes shake {
+				0%{
+					transform: translateX(0px);
+				}
+				25%{
+					transform: translateX(-10px);
+				}
+				50%{
+					transform: translateX(10px);
+				}
+				75%{
+					transform: translateX(-10px);
+				}
+				100%{
+					transform: translateX(0px);
+				}
+			}
+		}
 	}
 	.UpgradePlan_payList_item_upgrade_btn{
 		display: flex;
@@ -538,4 +568,14 @@ export default defineComponent({
 		}
 	}
 }
+.UpgradePlan_modal{
+	.ant-modal-content{
+		
+		.ant-modal-body{
+			padding: calc(5rem*1.2) calc(5rem*1.2) !important;
+			height: calc(50rem*1.2);
+			// height: calc(65rem*1.2);
+		}
+	}
+}
 </style>

src/component/HomePage/collectionModal.vue

@@ -1,4 +1,5 @@
 <template>
+	<keep-alive>
     <div v-if="showCollectionModal">
          <a-modal class="modal_component collection_modal Guide_1_2" 
             v-model:visible="showCollectionModal" 
@@ -55,10 +56,10 @@
 			</div>
         </a-modal>
     </div>
-   
+</keep-alive>
 </template>
 <script lang="ts">
-import { defineComponent ,createVNode, ref, computed,provide } from 'vue'
+import { defineComponent ,createVNode, ref,onUnmounted , computed,provide } from 'vue'
 
 import Generate from '@/component/HomePage/Generate.vue'
 import MoodboardUpload from '@/component/HomePage/MoodboardUpload.vue'
@@ -95,21 +96,39 @@ export default defineComponent({
 		let position:any = computed(()=>{
 			return store.state.Workspace.workspacePosition
 		})
+		let showCollectionModal=ref(false)
+		let collectionStep=ref(1)
 		provide('driver__',driver__)
 		let isShowMark = ref(false)
+		onUnmounted(()=>{
+			let data = {
+				showCollectionModal:showCollectionModal.value,
+				collectionStep:collectionStep.value
+			}
+			sessionStorage.setItem('collectionData', JSON.stringify(data));
+		})
 		return {
 			driver__,
 			workspace,
 			t,
 			isShowMark,
 			position,
+			showCollectionModal,
+			collectionStep,
 		}
+		
+	},
+	activated () {
+		// let data:any = JSON.parse((sessionStorage.getItem('collectionData') as any));
+		// if(!data){
+		// 	return
+		// }
+		// this.showCollectionModal = data.showCollectionModal
+		// this.collectionStep = data.collectionStep
 	},
-
     data(){
         return{
-            showCollectionModal:false,
-            collectionStep:1,
+            
             store:useStore()
         }
     },
@@ -408,7 +427,7 @@ export default defineComponent({
 }
 </style>
 <style lang="less">
-.collection_modal,.layout_modal,{
+.collection_modal,.layout_modal{
 	// max-width: 1200px ;
 	// max-width: 1150px ;
 	.ant-modal-content{