fix

src/component/Account/frontPage/bindPage.vue

@@ -10,7 +10,7 @@
 						<div class="text">{{ userDetail.accountExtendList?.WeChat?userDetail.accountExtendList?.WeChat.name:'Unbound' }}</div>
 					</div>
 					<div v-if="!userDetail.accountExtendList?.WeChat" class="gallery_btn" @click="openWeiXinModel">Bind Now</div>
-					<div v-else class="gallery_btn" @click="ungroupWeiXinModel">Ungroup</div>
+					<div v-else class="gallery_btn" @click="ungroupWeiXinModel">Unbind</div>
 				</div>
 			</div>
 			<div class="bind_item">
@@ -23,7 +23,7 @@
 					</div>
 					<div class="gmail_btn">
 						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn">Bind Now</div>
-						<div v-else class="gallery_btn" @click="ungroupGoogleModel">Ungroup</div>
+						<div v-else class="gallery_btn" @click="ungroupGoogleModel">Unbind</div>
 						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
 					</div>
 				</div>

src/component/Account/frontPage/cancelRenewal.vue

@@ -9,7 +9,7 @@
 				<a-select class="gallerySelect" v-model:value="currentState.value" size="large" optionFilterProp="label" :options="state" placeholder="Select a reason" allowClear show-search></a-select>
 				<textarea v-model="textareaValue" placeholder="Share your feedback here..."></textarea>
 				<div class="button_box">
-					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">Styt subscribed</div>
+					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">stay subscribed</div>
 					<div class="gallery_btn gallery_btn_radius" @click="cancelSubscription">Yes, cancel it</div>
 				</div>
 			</div>
@@ -31,7 +31,7 @@
 						safe.</div>
 				</div>
 				<div class="button_box">
-					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">Styt subscribed</div>
+					<div class="gallery_btn white gallery_btn_radius" @click="subscribe">stay subscribed</div>
 					<div class="gallery_btn gallery_btn_radius" @click="cancelSubscription">Yes, cancel it</div>
 				</div>
 			</div>

src/component/HomePage/ColorboardUpload.vue

@@ -103,7 +103,8 @@
 									</div>
 								</div>
 								<div class="upload_file_item_scale" :style="[(driver__.driver && (driver__.index == 19 || driver__.index == 18))?'display :flex;':'']">
-									<a-upload
+									<div style="position: relative;">
+										<a-upload
 										:title="$t('ColorboardUpload.uploadTitle')"
 										:capture="null"
 										:max-count="1"
@@ -118,6 +119,7 @@
 											<i class="fi fi-br-upload"></i>
 										</div>
 									</a-upload>
+									</div>
 									<div :title="$t('ColorboardUpload.selectTitle')" class="upload_file_item" @click="setPrintImg()">
 										<i class="fi fi-rr-picture"></i>
 									</div>

src/component/HomePage/bindEmail.vue

@@ -6,7 +6,7 @@
 		v-model:visible="registerModel"
 		:footer="null"
 		:width="pageWidth"
-		height="50rem"
+		height="60rem"
 		:maskClosable="false"
 		:centered="true"
 		:closable="false"
@@ -254,7 +254,7 @@ export default defineComponent({
         //邮箱登录提交
         submitEmailLogin(emailVerifyCode: any) {
             let data = {
-                email: this.email,
+                userEmail: this.email,
                 emailVerifyCode: emailVerifyCode,
             };
             Https.axiosPost(Https.httpUrls.accountBindEmail, data).then(
@@ -402,6 +402,7 @@ export default defineComponent({
                 margin-top: 4rem;
 				position: relative;
                 &[state="2"]{
+					height: 30rem;
 					>*{
 						opacity: 0;
 					}

src/component/Pay/allOrder.vue

@@ -229,7 +229,7 @@ export default defineComponent({
 				page:this.currentPage,
                 size:this.pageSize,
 				startTime: startDate,
-				orderId:this.orderId
+				id:this.orderId
 			}
 			// getCreditsDetail
 			// orderInfoList

src/component/mainPage/signUp/index.vue

@@ -4,7 +4,7 @@
 			<div class="back" @click="close">
 				&lt; BACK
 			</div>
-			<div class="title">Choose your subscription plan</div>
+			<div class="title">Our Advantages</div>
 			<div class="introduce"><span @click="()=>isSelectSignUp=true">LEARN MORE ALL OUR PRODUCT FEATURES</span></div>
 			<div class="gallery_list product_list">
 				<div class="gallery_item" v-for="item in productList" :key="item">
@@ -22,7 +22,7 @@
 			</div>
 		</div>
 		<div class="introductDetail" v-show="isSelectSignUp">
-			<div class="title">Choose your subscription plan</div>
+			<div class="title">Product Features</div>
 			<div class="gallery_list introductList">
 				<div class="gallery_item" v-for="item in introductList" :key="item">
 					<div class="itemIcon">
@@ -68,33 +68,34 @@
 							'Support monthly/annual payment options',
 							'Suitable for individual creators and freelance designers to use'
 						]
-					},{
-						title:"Education Edition",
-						info:"XXX / Year",
-						detail:"Multi user management system for universities",
-						highlight:"Free 5-day trial",
-						detailList:[
-							'Multi user management system for universities',
-							'Credit limits are shared across the entire school',
-							'AI assisted design teaching function',
-							'Support sketch creativity and design inspiration teaching',
-							'Basic 3D design functions',
-						]
-					},{
-						title:"Enterprise Edition",
-						info:"XXX / Year",
-						detail:"Enterprise level multi person collaboration system",
-						highlight:"Free 5-day trial",
-						detailList:[
-							'Enterprise level multi person collaboration system',
-							'Internal Credit Sharing within Enterprises',
-							'Brand DNA management system, customizable brand Exclusive design preferences',
-							'Cloud based design generation and management',
-							'Complete 3D design function, supporting high-definition printing output, professional plate making, and 3D rendering of renderings',
-							'Enterprise level data security assurance',
-							'Suitable for fashion design teams and brands to use',
-						]
 					},
+					// {
+					// 	title:"Education Edition",
+					// 	info:"XXX / Year",
+					// 	detail:"Multi user management system for universities",
+					// 	highlight:"Free 5-day trial",
+					// 	detailList:[
+					// 		'Multi user management system for universities',
+					// 		'Credit limits are shared across the entire school',
+					// 		'AI assisted design teaching function',
+					// 		'Support sketch creativity and design inspiration teaching',
+					// 		'Basic 3D design functions',
+					// 	]
+					// },{
+					// 	title:"Enterprise Edition",
+					// 	info:"XXX / Year",
+					// 	detail:"Enterprise level multi person collaboration system",
+					// 	highlight:"Free 5-day trial",
+					// 	detailList:[
+					// 		'Enterprise level multi person collaboration system',
+					// 		'Internal Credit Sharing within Enterprises',
+					// 		'Brand DNA management system, customizable brand Exclusive design preferences',
+					// 		'Cloud based design generation and management',
+					// 		'Complete 3D design function, supporting high-definition printing output, professional plate making, and 3D rendering of renderings',
+					// 		'Enterprise level data security assurance',
+					// 		'Suitable for fashion design teams and brands to use',
+					// 	]
+					// },
 				],
 				introductList:[
 					{
@@ -104,7 +105,7 @@
 					},{
 						img:'/image/homeIntroduct/introduct2.png',
 						title:'Generate plan',
-						info:'Upload inspiration boards, colors, fabric printing patterns, and sketches to generate unlimited design suggestions',
+						info:'Upload inspiration moodboards, colors, printboards, and sketches to generate unlimited design suggestions',
 					},{
 						img:'/image/homeIntroduct/introduct3.png',
 						title:'Simple operation',

src/tool/https.js

@@ -36,6 +36,7 @@ axios.defaults.baseURL = process.env.VUE_APP_BASE_URL;   //配置接口地址
 const CancelToken = axios.CancelToken;
 const source = CancelToken.source();
 // console.log(process.env.VUE_APP_BASE_URL);
+const filterHttpsUrl = ['/api/portfolio/page','/api/portfolio/detail']
 //POST传参序列化(添加请求拦截器)
 axios.interceptors.request.use((config) => {
     //在发送请求之前做某件事
@@ -45,7 +46,11 @@ axios.interceptors.request.use((config) => {
         // config.data = JSON.stringify(config.data);
     }
     // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; 
-    config.headers.Authorization = getCookie('token'); 
+	if(filterHttpsUrl.indexOf(config.url) == -1){
+		config.headers.Authorization = getCookie('token'); 
+	}else{
+		config.headers.Authorization = '';
+	}
     return config;
 },(error) =>{
     return Promise.reject(error);

src/views/HomeMain.vue

@@ -127,7 +127,8 @@
 				</keep-alive>
 				<component :key="$route.name" :is="Component"  v-if="!$route.meta.keepAlive"/>
 			</router-view>  -->
-			<router-view @setTask = "setTask" :getLangIsShowMark="getLangIsShowMark"></router-view>
+			<router-view @setTask = "setTask" :getLangIsShowMark="getLangIsShowMark">
+			</router-view>
 		</div>
 		<RobotAssist></RobotAssist>
 		<scaleVideo ref="scaleVideo"></scaleVideo>

src/views/HomeRecommend.vue

@@ -46,8 +46,10 @@
 						<h3>bloom your creativity</h3>
 					</div>
 					<div class="content_body_recommend_center_btn">
-						<a class="gallery_btn white" style="border: none;" href="https://code-create.com.hk/aida/" target="_blank">SUBSCRIBE NOW</a>
+						<div @click="setRegister" class="gallery_btn white" style="border: none; margin-right: 2rem;" >SUBSCRIBE NOW</div>
-						<a class="gallery_btn white" style="border: none;" href="https://code-create.com.hk/aida-trial/" target="_blank">START TRIAL</a>
+						<div @click="setRegister" class="gallery_btn white" style="border: none;" >START TRIAL</div>
+						<!-- <a class="gallery_btn white" style="border: none;" href="https://code-create.com.hk/aida/" target="_blank">SUBSCRIBE NOW</a>
+						<a class="gallery_btn white" style="border: none;" href="https://code-create.com.hk/aida-trial/" target="_blank">START TRIAL</a> -->
 					</div>
 				</div>
 			</div>

src/views/HomeView/HomeView.vue

@@ -12,7 +12,7 @@
 			<div class="page_content_body">
 				<div class="home_page_body">
 					<div class="home_page_left" ref="hidden">
-						<div class="home_page_left_content" :class="{'active':domHidden}">
+						<div class="home_page_left_content" :class="{'active':(domHidden && isHaveReviewCollection)}">
 							<!-- 空状态 start-->
 							<div class="home_left_null" v-show="!isHaveReviewCollection">
 								<div>
@@ -77,7 +77,7 @@
 										<a-slider id="system_silder"
 											class="system_silder"
 											v-model:value="collValue"
-											@afterChange="setSystemDesigner"
+											@afterChange="setSystemDesigner(500)"
 											:tooltipVisible="false"
 										>
 										</a-slider>
@@ -234,7 +234,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, h, ref, computed, reactive, toRefs, inject,provide,nextTick,createVNode} from "vue";
+import { defineComponent, h, ref, computed, reactive, toRefs, inject,provide,nextTick,createVNode,onBeforeUnmount} from "vue";
 // import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 // import HeaderComponent from "@/component/HomePage/Header.vue";
 import CollectionModal from "@/component/HomePage/collectionModal.vue";
@@ -259,6 +259,7 @@ import { useI18n } from "vue-i18n";
 const FileSaver = require("file-saver");
 
 export default defineComponent({
+	name: "homePage",
 	components: {
 		// HeaderComponent,
 		tesst,
@@ -276,6 +277,12 @@ export default defineComponent({
 			type:Boolean,
 		}
 	},
+	 activated() {
+    console.log('Home component activated');
+  },
+  deactivated() {
+    console.log('Home component deactivated');
+  },
 	setup(props,{emit}) {
 		const store = useStore();
 		let likeDesignCollectionList: any = computed(() => {
@@ -355,14 +362,14 @@ export default defineComponent({
 		provide('portfolio',portfolio)
 
 		const collItemSize = reactive({
-			collValue:40,
+			collValue:JSON.parse(sessionStorage.getItem('collValue') as any) || 40,
 			collStyle:{
 				width:'24rem',
 				height:'37rem'
 			},
 			collTime:null as any,
 		})
-		const setSystemDesigner = ()=>{
+		const setSystemDesigner = (time:any)=>{
 			clearTimeout(collItemSize.collTime)
 			collItemSize.collTime = setTimeout(()=>{
 				let wScale = 60,hScale = 92.5
@@ -370,8 +377,9 @@ export default defineComponent({
 				let {width,height} = collItemSize.collStyle
 				collItemSize.collStyle.width = wScale * ((num<20?20:num) / 100) + 'rem'
 				collItemSize.collStyle.height = hScale * ((num<20?20:num) / 100) + 'rem'
-			},500)
+			},time)
 		}
+		setSystemDesigner(0)
 		return {
 			store,
 			likeDesignCollectionList,
@@ -417,7 +425,7 @@ export default defineComponent({
 			likeLoading: false, //喜欢防抖
 			dragIdx:0,
 			designRandom:'',
-			domHidden:false,
+			domHidden:JSON.parse(sessionStorage.getItem('domHidden') as any) || false,
 
 			getDesignTime:null as any,
 		};
@@ -434,8 +442,11 @@ export default defineComponent({
 			},
 		},
 	},
+	
 	beforeUnmount(){
 		clearTimeout(this.getDesignTime);
+		sessionStorage.setItem('domHidden',JSON.stringify(this.domHidden))
+		sessionStorage.setItem('collValue',JSON.stringify(this.collValue))
 	},
 	async mounted() {
 		// if(JSON.parse( getCookie('isFirst') as any)){
@@ -688,6 +699,7 @@ export default defineComponent({
 				})
 			}
 			this.isShowMark = true
+			this.store.commit("setLikeDesignCollectionList", []);
 			Https.axiosPost(Https.httpUrls.designCollection, data)
 			
 				.then((rv: any) => {
@@ -696,7 +708,7 @@ export default defineComponent({
 							objectSignList:data.requestIdList.join(),
 							requestId:rv
 						}
-						this.store.commit("setLikeDesignCollectionList", []);
+						this.store.commit("setDesignCollectionList",[]);
 						this.getDesignResult(value,'newDesign')
 						this.startDesignType = "design";
 					}
@@ -710,12 +722,35 @@ export default defineComponent({
 		getDesignResult(data:any,str:any){
 			this.showDesignMark = true
 			Https.axiosGet(Https.httpUrls.getDesignResult,{params:data})
-			.then((rv)=>{
+			.then(async (rv)=>{
 				if(rv.designCollectionItems){
-					this.store.commit("setDesignCollectionList",rv.designCollectionItems);
+					let arr:any = []
+					if(this.designCollectionList.length == 0){
+						arr.push(...rv.designCollectionItems)
+					}else{
+						arr = rv.designCollectionItems.filter((itemA:any) => 
+							!this.designCollectionList.some((itemB:any) => itemA.objectSign === itemB.objectSign)
+						);
+					}
+					for (let index = 0; index < arr.length; index++) {
+						const item = arr[index];
+						await new Promise((resolve, reject) => {
+							setTimeout(() => {
+								this.designCollectionList.push(item)
+								resolve('')
+							}, 200);
+						})
+						
+					}
+					// this.designCollectionList.push(...result)
+					// // for (let index = 0; index < rv.designCollectionItems.length; index++) {
+					
+					// }
+					
 				}
 
 				if(rv.unfinishedList.length == 0){
+					
 					this.showDesignMark = false
 					if(str == 'newDesign'){
 						if(rv.designCollectionItems){
@@ -730,6 +765,9 @@ export default defineComponent({
 						// this.designProgress = 0,
 						this.store.commit("setDesignId", rv.designId);
 					}
+					nextTick().then(()=>{
+						driverObj__.moveNext();
+					})
 				}else{
 					this.getDesignTime = setTimeout(()=>{
 						data.objectSignList = rv.unfinishedList.join()
@@ -764,6 +802,7 @@ export default defineComponent({
 							requestId:rv
 						}
 						this.getDesignResult(value,'resDesign')
+						this.store.commit("setDesignCollectionList",[]);
 						this.startDesignType = "resDesign";
 						this.isShowMark = false
 					}
@@ -1282,7 +1321,7 @@ export default defineComponent({
 						height: 100%;
 						width: 55rem;
 						overflow: hidden;
-						transition: all .3s;
+						// transition: all .3s;
 						padding-right: 1.2rem;
 						&.active{
 							padding-right: 0;