修复部分bug和页面调整

src/assets/style/style.css

@@ -1157,6 +1157,17 @@ i {
   z-index: 2;
   flex: 1;
 }
+.collection_modal_body .input_border .input_box.active input,
+.design_detail_modal_component .input_border .input_box.active input,
+.library_page .input_border .input_box.active input {
+  border: 1px solid #ff0001;
+  box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2);
+}
+.collection_modal_body .input_border .input_box.active span,
+.design_detail_modal_component .input_border .input_box.active span,
+.library_page .input_border .input_box.active span {
+  opacity: 1;
+}
 .collection_modal_body .input_border input,
 .design_detail_modal_component .input_border input,
 .library_page .input_border input {
@@ -1195,17 +1206,6 @@ i {
   transform: scale(0.7);
   transform-origin: left bottom;
 }
-.collection_modal_body .input_border.active input,
-.design_detail_modal_component .input_border.active input,
-.library_page .input_border.active input {
-  border: 1px solid #ff0001;
-  box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2);
-}
-.collection_modal_body .input_border.active span,
-.design_detail_modal_component .input_border.active span,
-.library_page .input_border.active span {
-  opacity: 1;
-}
 .collection_modal_body .input_border .generage_btn,
 .design_detail_modal_component .input_border .generage_btn,
 .library_page .input_border .generage_btn {

src/assets/style/style.less

@@ -1259,6 +1259,16 @@ i{
 			position: relative;
 			z-index: 2;
 			flex: 1;
+			&.active{
+				input{
+					// color: rgb(255, 0, .7);
+					border: 1px solid rgb(255, 0, .7);
+					box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2);
+				}
+				span{
+					opacity: 1;
+				}
+			}
 		}
 		input{
 			border-radius: calc(.5rem*1.2);
@@ -1291,16 +1301,7 @@ i{
 			transform: scale(.7);
 			transform-origin: left bottom;
 		}
-		&.active{
+		
-			input{
-				// color: rgb(255, 0, .7);
-				border: 1px solid rgb(255, 0, .7);
-				box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2);
-			}
-			span{
-				opacity: 1;
-			}
-		}
 		.generage_btn{
 			// margin: 0 auto;
 			margin-left: 2rem;

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{

src/lang/cn.ts

@@ -60,7 +60,7 @@ export default {
 		jsContent2:'我们只支持对印花进行超分',
 		jsContent3:'您的积分小于一次超分',
 		jsContent4:'您的积分余额不足',
-		jsContent5:'你选择的第 {str}张图片宽度或者高度超过4090,',
+		jsContent5:'你选择的第 {str}张图片宽度或者高度超过2048,',
 		jsContent6:'请选择需要SR的图片',
 	},
 	upgradePlan:{

src/lang/en.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent2:'We only provide super-resolution capabilities for printboard images.',
 		jsContent3:'Your points are less than one SR',
 		jsContent4:'Your points balance is insufficient',
-		jsContent5:'You selected the {str} image and zoom ratio more than 4090,',
+		jsContent5:'You selected the {str} image and zoom ratio more than 2048,',
 		jsContent6:'Please select the picture that requires SR',
 	},
 	upgradePlan:{

src/router/index.ts

@@ -32,6 +32,7 @@ const routes: Array<RouteRecordRaw> = [
 		path: '/home',
 		name: 'home',
 		component: _import('HomeMain'),
+		meta:{keepAlive:true},
 		children:[
 			{
 				path: "",
@@ -41,7 +42,8 @@ const routes: Array<RouteRecordRaw> = [
 				path:'homePage',
 				name:'homePage',
 				component: _import_custom('HomeView/HomeView.vue'),
-			},{
+					meta:{keepAlive:true},
+				},{
 				path:'library',
 				name:'library',
 				component: _import_custom('HomeView/library.vue'),
@@ -155,7 +157,7 @@ router.beforeEach((to, from, next) => {
 		if (isMurmur && murmurStr && token) {
 			const toName = to.name === 'login';
 			if (toName) {
-				next({ name: 'home' });
+				next({ name: 'homePage' });
 			} else {
 				next();
 			}
@@ -173,6 +175,7 @@ router.beforeEach((to, from, next) => {
 				// 如果页面存在，正常跳转
 		}
 	} else {
+		return
 		// 如果页面不存在，可以跳转到404页面或者其他页面
 		next('/404');
 	}

src/views/HomeMain.vue

@@ -88,7 +88,13 @@
         </header>
 	
 		<div class="homeMain_content_body">
-			<router-view @setTask = "setTask"/>
+			<!-- <router-view v-slot="{ Component }" @setTask = "setTask">
+				<keep-alive>
+					<component :key="$route.name" :is="Component"  v-if="$route.meta.keepAlive"/>
+				</keep-alive>
+				<component :key="$route.name" :is="Component"  v-if="!$route.meta.keepAlive"/>
+			</router-view>  -->
+			<router-view @setTask = "setTask"></router-view>
 		</div>
 		<RobotAssist></RobotAssist>
     </div>

src/views/HomeView/HomeView.vue

@@ -188,7 +188,9 @@
 				</div>
 			</div>
 		</div>
-		<CollectionModal ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
+		<KeepAlive>
+			<CollectionModal ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
+		</KeepAlive>
 		<DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail>
 		<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
 		<ExportModel ref="ExportModel" @setTask="setTask"></ExportModel>
@@ -459,7 +461,7 @@ export default defineComponent({
 			this.getHistoryChoose(this.$route.params.id, "normal");
 			this.store.commit("setDesignCollectionList",[]);
 		} else {
-			this.store.commit("clearAllData");
+			// this.store.commit("clearAllData");
 		}
 	},
 	directives:{

src/views/HomeView/library.vue

@@ -203,18 +203,19 @@
 											</div>
 										</div>
 									</div>
-									
+									<div class="input_border">
-									<div class="input_box" :class="{active:inputShow}">
+										<div class="input_box" :class="{active:inputShow}">
-										<input 
+											<input 
-											class="search_input" 
+												class="search_input " 
-											@input="ifMaximumLength" 
+												@input="ifMaximumLength" 
-											:maxlength='inputShow?0:9999' 
+												:maxlength='inputShow?0:9999' 
-											:class="{active:checkbox[0].type && selectCode != 'Moodboard'}" 
+												:class="{active:checkbox[0].type && selectCode != 'Moodboard'}" 
-											@keydown.enter="getgenerate" :readonly="checkbox[0].type  && selectCode != 'Moodboard'" 
+												@keydown.enter="getgenerate" :readonly="checkbox[0].type  && selectCode != 'Moodboard'" 
-											:placeholder="$t('LibraryPage.inputContent2')" 
+												:placeholder="$t('LibraryPage.inputContent2')" 
-											v-model="captionGeneration">
+												v-model="captionGeneration">
-										<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('LibraryPage.Generate') }}</div>
+											<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('LibraryPage.Generate') }}</div>
-										<span>{{ $t('LibraryPage.maximumLength') }}</span>
+											<span>{{ $t('LibraryPage.maximumLength') }}</span>
+										</div>
 									</div>
 									<div v-show="selectCode == 'Printboard'" class="printModel">
 										<div @click.stop="PrintModel">{{ printModel.name }}</div>
@@ -1594,24 +1595,31 @@ export default defineComponent({
 											span {
 												font-size: 1.4rem;
 												font-weight: 500;
+												bottom: -.5rem;
 											}
 										}
 									}
-									.input_box{
+									.input_border{
-										background:initial;
+										background: rgba(0, 0, 0, 0);
-										padding: 1.5rem 0;
+										padding: 0;
-										input{
+										.input_box{
-											width: 30rem;
+											background:initial;
-											height: 3rem;
+											padding: 1.5rem 0;
-											&.active{
+											padding: 0;
-												cursor: no-drop;
+											input{
+												width: 30rem;
+												height: 3rem;
+												&.active{
+													cursor: no-drop;
+												}
+											}
+											
+											.generage_btn{
+												margin: 0 3rem;
 											}
 										}
-										
-										.generage_btn{
-											margin: 0 3rem;
-										}
 									}
+									
 									.printModel{
 											font-size: 1.4rem;
 											font-weight: 500;
@@ -1658,6 +1666,16 @@ export default defineComponent({
 											height: 8rem;
 											margin: 0;
 											margin-right: 2rem;
+											.delete_file_block{
+												width: 3rem;
+												height: 3rem;
+												display: flex;
+												align-items: center;
+												justify-content: center;
+												span{
+													font-size: 1.4rem;
+												}
+											}
 										}
 										.upload_component{
 											margin: 0;