fix

src/assets/style/style.css

@@ -941,12 +941,12 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .generalModel.fullScreen > .ant-modal-content {
   border-radius: 0rem;
 }
+.generalModel.fullScreen > .ant-modal-content > .ant-modal-body > .generalModel_btn .generalModel_closeIcon {
+  transform: translate(-100%, 100%);
+}
 .generalModel.fullScreen > .ant-modal-body {
   padding: 2.5rem 3rem;
 }
-.generalModel.fullScreen .generalModel_btn .generalModel_closeIcon {
-  transform: translate(-100%, 100%);
-}
 .generalModel .ant-modal-content {
   border-radius: 3rem;
   height: 100%;

src/assets/style/style.less

@@ -1025,15 +1025,18 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 		max-width: 100%;
 		> .ant-modal-content{
 			border-radius: 0rem;
+			> .ant-modal-body{
+				> .generalModel_btn {
+					.generalModel_closeIcon{
+						transform: translate(-100%, 100%);
+					}
+				}
+			}
 		}
 		> .ant-modal-body{
 			padding: 2.5rem 3rem;
 		}
-		.generalModel_btn {
+		
-			.generalModel_closeIcon{
-				transform: translate(-100%, 100%);
-			}
-		}
 	}
 	.ant-modal-content{
 		border-radius: 3rem;

src/component/Account/otherUsers.vue

@@ -43,7 +43,7 @@
 			<div class="otherUser_works_title modal_title_text">
 				<div>{{$t('account.hisWorks')}}</div>
 			</div>
-			<Works :isScroll="false" :otherUsers="true" :userId=userId></Works>
+			<Works :isScroll="false" :otherUsers="true"></Works>
 		</div>
     </div>
 </template>
@@ -63,7 +63,9 @@ export default defineComponent({
 		const router:any = useRouter()
         const store = useStore();
 		let otherUsers = reactive({
-			userId:'0',
+			userId:computed(()=>{
+				return store.state.UserHabit.userDetail.userId
+			}),
 			userContent:{}
 		})
 		let getUserDetail = (id:any)=>{
@@ -90,7 +92,6 @@ export default defineComponent({
 			})
 		}
 		onMounted (()=>{
-			otherUsers.userId = router.currentRoute.value.query?.userId
 			// alert()
 			setTimeout(() => {
 				getUserDetail(otherUsers.userId)

src/component/Canvas/CanvasEditor/components/HeaderMenu.vue

@@ -286,7 +286,7 @@ onMounted(() => {
             :value="canvasWidth?.toFixed(2)"
             class="setting-input"
             :min="1"
-            :max="9999"
+            :max="4999"
             :step="1"
             @change="
               (value) => {
@@ -302,7 +302,7 @@ onMounted(() => {
             :value="canvasHeight?.toFixed(2)"
             class="setting-input"
             :min="1"
-            :max="9999"
+            :max="4999"
             :step="1"
             @change="
               (value) => {

src/component/Detail/DesignDetail.vue

@@ -317,7 +317,7 @@ export default defineComponent({
 					scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
 					type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type || newData.categoryValue:list[i].type,
 					sketchString:list[i].sketchString?list[i].sketchString:'',
-					trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?list[i].trims:{prints:[]},
+					trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
 				}
 				if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){
 					gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient

src/component/Detail/detailRight/editPrintElement.vue

@@ -339,7 +339,7 @@ export default defineComponent({
 					editPrintElementData.stateOverallSingle = 'single'
 					let arr:any = editPrintElementData.selectDetail.printObject.prints
 					if(props.type == 'element'){
-						arr = editPrintElementData.selectDetail.trims
+						arr = editPrintElementData.selectDetail.trims.prints
 					}
 					if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
 						arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]

src/component/HomePage/productImg.vue

@@ -161,12 +161,12 @@
 							<div v-show="!isProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
 								{{ $t('Generate.Generate') }}
 							</div>
-							<div v-show="isProductimg && !remProductimg" class="generage_btn started_btn" @click="getPrductimg">
+							<div v-show="isProductimg && remProductimg" class="generage_btn started_btn" @click="getPrductimg">
 								<i class="fi fi-br-loading"></i>
 							</div>
-							<div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
+							<!-- <div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
 								{{$t('Generate.Close')}}
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>

src/component/HomePage/renew.vue

@@ -408,7 +408,7 @@ export default defineComponent({
     };
     const cancelDsign = () => {
       renew.renewModel = false;
-	  store.dispatch('getLangType')
+	  store.dispatch('getUserDetail')
     };
     const setPaymentType = (str: any) => {
       renewData.current.PaymentType = str;

src/component/HomePage/scaleImage.vue

@@ -113,12 +113,12 @@
 								<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 							</div>
 						</div>
-						<div class="generage_btn started_btn" v-show="productimgIsProductimg && !productimgRemProductimg">
+						<div class="generage_btn started_btn" v-show="productimgIsProductimg && productimgRemProductimg">
 							<i class="fi fi-br-loading" ></i>
 						</div>
-						<div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
+						<!-- <div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
 							{{$t('Generate.Close')}}
-						</div>
+						</div> -->
 					</div>
 					<!-- <div class="productImg_content_item_generate_btn input_border">
 						<div class="input_box">

src/component/Pay/allOrder.vue

@@ -2,7 +2,7 @@
     <div class="allOrder_page generalModel_page">
 		<div class="generalModel_table_search">
 			<div class="generalModel_state">
-				<div class="generalModel_state_item">
+				<div class="generalModel_state_item" style="width: 50rem;">
 					<!-- <span>{{$t('allOrder.Time')}}:</span> -->
 					<a-range-picker
 						class="range_picker"
@@ -254,5 +254,7 @@ export default defineComponent({
 	flex: 1;
 }
 .generalModel_page {
+	.generalModel_state_item{
+	}
 }
 </style>

src/component/WorksPage/Falls.vue

@@ -18,7 +18,7 @@
 					}"
 					
 				/>	
-				<i class="fi fi-rr-trash icon_delete" @click="deleteSinglePic(item,index)"></i>
+				<i v-show="isDelete" class="fi fi-rr-trash icon_delete" @click="deleteSinglePic(item,index)"></i>
 				<div v-if="item.original == 1" class="falls_item_user_Original">{{$t('newScaleImage.Original')}}</div>
 			</div>
 			

src/component/WorksPage/newScaleImage.vue

@@ -406,15 +406,44 @@ export default defineComponent({
 				}
 			)
 		}
+		const getWorks = (id)=>{
+			return new Promise<void>((resolve, reject) => {
+				let data:any = {
+					"accountId": 0,
+					"collectionId": 0,
+					"coverId": 0,
+					"createDate": "",
+					"id": id,
+					"isDeleted": 0,
+					"portfolioDes": "",
+					"portfolioName": "",
+					"portfolioType": "",
+					"status": 0,
+					"updateDate": "",
+					"userLikeGroupId":'' 
+				}
+				imgData.isShowMark = true;
+				Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
+					(rv: any) => {
+						imgData.isShowMark = false;
+						resolve(rv.id)
+					}
+				).catch((res)=>{
+					imgData.isShowMark = false;
+					reject('')
+				});
+			})
 			
-		let setChoose = () =>{
+		}
+		let setChoose = async () =>{
 			if(userDetail.value.systemList.indexOf(1) == -1){
 				return message.info(t('newScaleImage.jsContent1'))
 			}
 			if(imgData.scaleImageData.openSource == 0){
 				return message.info(t('newScaleImage.jsContent2'))
 			}
-        	router.push(`/home?history=${imgData.scaleImageData.id}&type=Works`)
+			let id = await getWorks(imgData.scaleImageData.id)
+        	router.push(`/home?history=${id}`)
         	// router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}})
 			store.commit('setChooseIsDesign',false)
         	// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})

src/component/home/design/editDesignType/index.vue

@@ -124,26 +124,13 @@
 							<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 						</div>
 					</div>
-					<div class="generage_btn started_btn" v-show="productimgIsProductimg && !productimgRemProductimg">
+					<div class="generage_btn started_btn" v-show="productimgIsProductimg && productimgRemProductimg">
 						<i class="fi fi-br-loading" ></i>
 					</div>
-					<div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
+					<!-- <div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
 						{{$t('Generate.Close')}}
-					</div>
+					</div> -->
 				</div>
-				<!-- <div class="productImg_content_item_generate_btn input_border">
-					<div class="input_box">
-						<div v-show="!productimgIsProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
-							{{ $t('Generate.Generate') }}
-						</div>
-						<div v-show="productimgIsProductimg && !productimgRemProductimg" class="generage_btn started_btn" @click="getPrductimg">
-							<i class="fi fi-br-loading"></i>
-						</div>
-						<div v-show="productimgRemProductimg" @click="removeProductimg" class="generage_btn started_btn">
-							{{$t('Generate.Close')}}
-						</div>
-					</div>
-				</div> -->
 			</div>
 		</div>
 		<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
@@ -408,7 +395,13 @@ setup(props:any,{emit}) {
 		}
 		productimg.productimgIsProductimg = true
 		if(productimg.openType != 'add'){
-			await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
+			await new Promise(async (res,reject)=>{
+				await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
+				setTimeout(()=>{
+					res('')
+				},1000)
+			})
+			// await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
 		}
 		// setPrductimg([{taskId:"f785fbbf-425c-4d9b-b4d0-0f38f480c64e-83"}])
 		// return
@@ -504,6 +497,7 @@ setup(props:any,{emit}) {
 							}
 							isEnd = true
 							clearInterval(remPrductimgTime)
+							store.dispatch('getCredits')
 						}else if(rv[0].status == 'Fail'){
 							message.info(t('ProductImg.jsContent3'))
 							isEnd = true
@@ -674,7 +668,9 @@ setup(props:any,{emit}) {
 	}
 	const cancelDsign = async ()=>{
 		if(productimg.productimgIsProductimg){
-			if(!productimg.productimgRemProductimg)return
+			if(!productimg.productimgRemProductimg){
+				return message.info(t('Generate.generateLoading'))
+			}
 		}
 		if(productimg.isGenerate){
 			if(productimg.productimgIsProductimg){

src/component/home/design/index.vue

@@ -1231,6 +1231,7 @@ export default defineComponent({
 								// setFail([element.taskId])
 								upDataSuccess(element)
 								data = data.filter((item:any) => item !== element.taskId);
+								store.dispatch('getCredits')
 							}else if(element?.status == 'Fail' || element?.status == 'Invalid'){
 								data = data.filter((item:any) => item !== element.taskId);
 								setFail([element.taskId])
@@ -1984,33 +1985,6 @@ export default defineComponent({
 					this.isShowMark = false;
 				});
 		},
-		getWorks(userGroupId: any, type: any) {
-			let data:any = {
-				"accountId": 0,
-				"collectionId": 0,
-				"coverId": 0,
-				"createDate": "",
-				"id": userGroupId,
-				"isDeleted": 0,
-				"portfolioDes": "",
-				"portfolioName": "",
-				"portfolioType": "",
-				"status": 0,
-				"updateDate": "",
-				"userLikeGroupId":'' 
-			}
-			this.isShowMark = true;
-			Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
-					(rv: any) => {
-						this.setPortfolio(rv.portfolioDTO)
-						this.store.commit("setUserGroupId", rv.userGroupId);
-						this.dealHistoryChooseData(rv, type);
-						this.isShowMark = false;
-					}
-				).catch((res)=>{
-					this.isShowMark = false;
-				});
-		},
 		//处理选择组的数据
 		dealHistoryChooseData(data: any, type: any) {
 			let collectionData = {

src/component/home/index.vue

@@ -100,12 +100,7 @@ export default defineComponent({
 							store.commit("createProbject");
 							store.commit("clearAllData");
 						}
-						if(query.type == 'Works'){
+						getHistory(query.id || query.history)
-							getWorks(query.id || query.history)
-						}else{
-							// setProjectData({id:query.id,process:'toProduct'})
-							getHistory(query.id || query.history)
-						}
 					}else{
 						data.dataLoad = false
 						createData()
@@ -127,29 +122,7 @@ export default defineComponent({
 				store.commit("clearAllBoardData",item);
 			})
 		}
-		const getWorks = (id:any)=>{
+		
-			let value:any = {
-				"accountId": 0,
-				"collectionId": 0,
-				"coverId": 0,
-				"createDate": "",
-				id,
-				"isDeleted": 0,
-				"portfolioDes": "",
-				"portfolioName": "",
-				"portfolioType": "",
-				"status": 0,
-				"updateDate": "",
-				"userLikeGroupId":'' 
-			}
-			Https.axiosPost(Https.httpUrls.setPorfolioChoose, value).then(
-					(rv: any) => {
-					setProjectData(rv)
-					}
-				).catch((res)=>{
-					data.isShowMark = false
-				});
-		}
 		const getHistory = (id:any)=>{
 			let value = {
 				id,

src/component/home/tools/poseTransfer/index.vue

@@ -87,12 +87,12 @@
 						<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 					</div>
 				</div>
-				<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn">
+				<div v-show="isGenerate && remGenerate" class="generage_btn started_btn">
 					<i class="fi fi-br-loading"></i>
 				</div>
-				<div v-show="remGenerate" @click="setRemoveGenerate" class="generage_btn started_btn">
+				<!-- <div v-show="remGenerate" @click="setRemoveGenerate" class="generage_btn started_btn">
 					{{$t('Generate.Close')}}
-				</div>
+				</div> -->
 			</div>
 		</div>
 		<div class="likeBox">

src/component/home/tools/toProduct/index.vue

@@ -134,12 +134,12 @@
 									<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 								</div>
 							</div>
-							<div v-show="isProductimg && !remProductimg" class="generage_btn started_btn" @click="getPrductimg">
+							<div v-show="isProductimg && remProductimg" class="generage_btn started_btn" @click="getPrductimg">
 								<i class="fi fi-br-loading"></i>
 							</div>
-							<div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
+							<!-- <div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
 								{{$t('Generate.Close')}}
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>

src/component/mainPage/signUp/registerModel.vue

@@ -370,7 +370,7 @@ export default defineComponent({
       passwordConditionShow: false,
 	  userI18n: {
 		en:{
-			title:'Register for AiDA 3.0',
+			title:'Register for AiDA',
 			Name:'Name',
 			inputName:'Enter your username',
 			Password:'Password',
@@ -391,7 +391,7 @@ export default defineComponent({
 			wechat:'Register with wechat',
 		},
 		cn:{
-			title:'注册 AiDA 3.0',
+			title:'注册 AiDA',
 			Name:'用户名',
 			inputName:'请输入用户名',
 			Password:'密码',

src/component/modules/generalDrag.vue

@@ -337,7 +337,18 @@ export default defineComponent({
 		flex: 1;
 		overflow-y: auto;
 		overflow-x: hidden;
-		
+		scrollbar-width: none; /* Firefox */
+		-ms-overflow-style: none; /* IE 10+ */
+		/* Webkit 浏览器 */
+		&::-webkit-scrollbar {
+			display: none;
+			width: 0;
+			height: 0;
+			background: transparent;
+		}
+		&::-webkit-scrollbar-horizontal {
+			display: none;
+		}
 		> .generalDragBox{
 			
 			min-height: 100%;

src/lang/cn.ts

@@ -234,7 +234,7 @@ export default {
     jsContent4: "您的订阅将在 {days} 天 {hours} 小时后到期。为确保服务不中断，请点击此处续订->",
     jsContent8: "续订订阅。",
     jsContent7: "友情提示",
-    jsContent5: "我们很高兴让您体验AiDA 3.0。请注意，部分服务在试用期间可能会受到限制。如果您已经准备好全身心投入并享受完整的体验，我们诚挚地邀请您订阅。只需访问",
+    jsContent5: "我们很高兴让您体验AiDA。请注意，部分服务在试用期间可能会受到限制。如果您已经准备好全身心投入并享受完整的体验，我们诚挚地邀请您订阅。只需访问",
     jsContent6: " 就可以开始订阅。感谢您试用我们的服务！",
     jsContent9: "您确定要清除当前系列并重新开始吗?",
     jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
@@ -553,6 +553,7 @@ export default {
 	GoldSunflower: "金色向日葵",
 	EmrldJungle: "翠绿丛林天幕",
 	PinkSakura: "粉色樱花绽放",
+	generateLoading: "正在识别文字图片信息请稍等几秒后在试",
     jsContent1: "您只能上传图片文件！",
     jsContent2: "图片必须小于5MB",
     jsContent3: "请输入内容~",

src/lang/en.ts

@@ -234,7 +234,7 @@ export default {
     jsContent4: "Your subscription will expire in {days} days and {hours} hours. To ensure uninterrupted service, please click here to renew ->  ",
     jsContent8: "Renew Subscription.",
     jsContent7: "Friendly Reminder",
-    jsContent5: "We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+    jsContent5: "We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
     jsContent6: " to get started. Thank you for trying our services!",
     jsContent9: "Are you sure to erase current collection and start over?",
     jsContent10: "Re-created works are not allowed to use 'design', but you can use 'redesign'",
@@ -553,6 +553,7 @@ export default {
 	GoldSunflower: "Golden Sunflower",
 	EmrldJungle: "Emerald Jungle Canopy",
 	PinkSakura: "Pink Sakura Blossom",
+	generateLoading: "Please wait while we extract text from your images. This will just take a moment.",
     jsContent1: "You can only upload Image file!",
     jsContent2: "Image must smaller than 5MB!",
     jsContent3: "Please enter content",

src/lang/fr.ts

@@ -62,7 +62,7 @@ export default {
 		jsContent4: "Votre abonnement expire dans {days} jour(s) et {hours} heure(s). Pour garantir un service sans interruption, veuillez cliquer ici pour renouveler ->",
 		jsContent8: "Renouveler l'abonnement.",
 		jsContent7:"Friendly Reminder",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/it.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "La tua sottoscrizione scadrà tra {days} giorni e {hours} ore. Per garantire un servizio ininterrotto, fai clic qui per rinnovare ->",
 		jsContent8: "Rinnova l'abbonamento.",
 		jsContent7:"Friendly Reminder",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/ja.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "あなたのサブスクリプションは、{days} 日 {hours} 時間後に期限切れになります。サービスの中断を防ぐために、ここをクリックして更新してください->",
 		jsContent8: "サブスクリプションを更新する。",
 		jsContent7:"Friendly Reminder",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/kr.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "구독이 {days} 일 {hours} 시간 후에 만료됩니다. 중단없는 서비스를 보장하려면 여기를 클릭하여 갱신하십시오->",
 		jsContent8: "구독 갱신하기.",
 		jsContent7:"Friendly Reminder:",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/ru.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "Ваша подписка истекает через {days} дней и {hours} часов. Чтобы обеспечить бесперебойное обслуживание, пожалуйста, нажмите здесь, чтобы продлить ->",
 		jsContent8: "Обновить подписку.",
 		jsContent7:"Friendly Reminder:",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/th.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "การสมัครสมาชิกของคุณจะหมดอายุในอีก {days} วัน {hours} ชั่วโมง หากต้องการบริการต่อเนื่องโปรดคลิกที่นี่เพื่อต่ออายุ ->",
 		jsContent8: "ต่ออายุการสมัครสมาชิก",
 		jsContent7:"Friendly Reminder:",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/lang/vn.ts

@@ -61,7 +61,7 @@ export default {
 		jsContent4: "Đăng ký của bạn sẽ hết hạn trong {days} ngày và {hours} giờ. Để đảm bảo dịch vụ không bị gián đoạn, vui lòng nhấp vào đây để gia hạn ->",
 		jsContent8: "Gia hạn đăng ký.",
 		jsContent7:"Friendly Reminder:",
-		jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
+		jsContent5:"We're delighted to have you experience AiDA. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ",
 		jsContent6:" to get started. Thank you for trying our services!",
 	},
 	LibraryPage:{

src/store/Detail/designDetail.ts

@@ -270,7 +270,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 					state.selectDetail.scale = [1,1]
 					state.selectDetail.offset = [0,0]
 					state.selectDetail.printObject = item.printObject
-					state.selectDetail.trims = item.trims.prints
+					state.selectDetail.trims = item.trims
 					state.selectDetail.type = item.type
 					state.selectDetail.undividedLayer = item.undividedLayer
 					if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){

src/store/userHabit/userHabit.ts

@@ -419,6 +419,18 @@ const userHabit : Module<UserHabit,RootState> = {
 				})
 			}
 			return await Promise.all([...getList.map(item => axiosGet(item)),getUserDetail(),getmannequinStyle()])
+		},
+		getUserDetail(context){
+			return new Promise((resolve,reject) => {
+				Https.axiosPost(Https.httpUrls.accountDetail).then((rv: any) => {
+					if(rv){
+						context.commit('setUserDetail',rv)
+					}
+					resolve('')
+				}).catch(()=>{
+					reject('')
+				})
+			})
 		}
     }
 }

src/views/HomeView/Works.vue

@@ -37,6 +37,7 @@ import { useI18n } from "vue-i18n";
 import generalMenu from "@/component/HomePage/generalMenu.vue";
 import { useRouter,useRoute } from 'vue-router'
 import Falls from "@/component/WorksPage/Falls.vue";
+import { useStore } from "vuex";
 export default defineComponent({
     components: {
         newScaleImage,
@@ -61,14 +62,11 @@ export default defineComponent({
 			 type:String,
 			 default:'',
 		 },
-		 userId:{
-			 type:String,
-			 default:'-1',
-		 },
 	},
     setup(prop) {
 		const router = useRouter() as any
 		const route = useRoute() as any
+        const store = useStore();
 		let filter:any = reactive({
 			worksSelect: 'all',
 			isNull:true,
@@ -217,10 +215,11 @@ export default defineComponent({
 		});
 		let getPorfolio = ()=>{
 			let data = filter.getListDate
+			
 			if(filter.isShowMark && !filter.isNoData)return
 			filter.isShowMark = true
 			if(prop.otherUsers){
-				data.accountId = prop.userId
+				data.accountId = store.state.UserHabit.userDetail.userId
 			}
 			Https.axiosPost(Https.httpUrls.getPorfolio, data)
                 .then((rv) => {

src/views/Login.vue

@@ -40,7 +40,7 @@
           <div class="title">
 			<i class="fi fi-br-angle-left" @click="loginBack"></i>
             <!-- <i class="fi fi-rr-arrow-left" @click="()=>loginType = ''"></i> -->
-            <span>Log on to AiDA 3.0</span>
+            <span>Log on to AiDA</span>
           </div>
 		  <div class="info" v-show="!loginType">Please fill your information below</div>
           <personal ref="personal" v-if="loginType == 'personal'"></personal>

src/views/feedbackSurvey.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="feedbackSurvey" :class="{'active': forbid}">
         <main id="main">
-            <h1 id="title">AiDA 3.0 Feedback Survey</h1>
+            <h1 id="title">AiDA Feedback Survey</h1>
             <p id="description" v-if="!forbid">Please take the survey</p>
             <div id="survey-form" :class="{'active': !forbid}">
                 <h2 class="section-title">Personal Information</h2>
@@ -392,7 +392,7 @@
                     </label>
                 </div>
                 <div class="section">
-                    <p>3. Will you subscribe to AiDA 3.0?<span class="fontColor">*</span></p>
+                    <p>3. Will you subscribe to AiDA?<span class="fontColor">*</span></p>
                     <label>
                         <input
 							:disabled="forbid"

src/views/feedbackSurveyCN.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="feedbackSurvey">
         <main id="main">
-            <h1 id="title">AiDA 3.0 调查问卷</h1>
+            <h1 id="title">AiDA 调查问卷</h1>
             <p id="description">请填写调查问卷表</p>
             <div id="survey-form">
                 <h2 class="section-title">参与者信息</h2>
@@ -360,7 +360,7 @@
                     </label>
                 </div>
                 <div class="section">
-                    <p>3. 您会订阅AiDA 3.0吗？<span class="fontColor">*</span></p>
+                    <p>3. 您会订阅AiDA吗？<span class="fontColor">*</span></p>
                     <label>
                         <input
                             type="radio"