Merge remote-tracking branch 'origin/StableVersion' into develop

src/component/Detail/DesignDetail.vue

@@ -1306,6 +1306,7 @@ export default defineComponent({
 					// display: block;
 					overflow: initial !important;
 					// width: 100%;
+					text-align: center;
 					.detail_modal_model{
 						z-index: 1;
 						position: relative;

src/component/Detail/DesignDetailAlter.vue

@@ -606,20 +606,22 @@ export default defineComponent({
 			if(num == 1 || num == 2 || num == 4){
 				this.clothesList = []
 				this.getLibraryList()
+			}else{
+				this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => {
+					this.colorList[index+1] = {
+						gradient:item.gradient,
+						rgba:item.rgbValue,
+						tcx:item.tcx,
+						name:item.name,
+					}
+					if(item.gradient){
+						this.colorList[index+1].gradient = item.gradient
+					}else{
+						delete this.colorList[index+1].gradient
+					}
+				})
 			}
-			this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => {
+			
-			    this.colorList[index+1] = {
-					gradient:item.gradient,
-					rgba:item.rgbValue,
-					tcx:item.tcx,
-					name:item.name,
-				}
-				if(item.gradient){
-					this.colorList[index+1].gradient = item.gradient
-				}else{
-					delete this.colorList[index+1].gradient
-				}
-			})
 			let DesignDetailEnd = this.$refs.DesignDetailEnd
 			DesignDetailEnd.init(num)
 			this.workspaceCom = computed(()=>{
@@ -774,16 +776,17 @@ export default defineComponent({
 		//请求我的印花&&模型
 		getLibraryList(){
 			let level2Type = ''
-			if(this.selectCode == 'Sketchboard' || this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){
+			if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){
 				level2Type = this.designType
+			}else if(this.selectCode == 'Sketchboard'){
+				level2Type = this.current.type
 			}
-			let type = this.body?this.current.type:level2Type
 			let workspace = this.store.state.Workspace.workspace
             let data = {
                 // level1Type:'Printboard',
                 level1Type:this.selectCode,
                 // level2Type:'Pattern',
-                level2Type:type,
+                level2Type:level2Type,
 				modelSex:workspace?.sex,
                 page:this.currentPage,
                 pictureName:this.searchPictureName,

src/component/Detail/DesignPrintOperation.vue

@@ -292,6 +292,7 @@ export default defineComponent({
 	},
     methods: {
 		init(){
+			this.designOpenrtion = true
 			let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 			this.currentFullBodyView = designItemDetail.currentFullBodyView?designItemDetail.currentFullBodyView:designItemDetail.designItemUrl
 			if(designItemDetail.others.length == 0){
@@ -299,36 +300,40 @@ export default defineComponent({
 			}
 			//设置前片后片
 			this.operationCurrent = Object.assign({},this.current)
-			this.designOpenrtion = true
 			this.clearModal()
-			this.overallSingle = this.current.printObject.ifSingle?true:false
-			this.ifListOver()
 			let printList = JSON.parse(JSON.stringify(this.current.printObject.prints))
 			this.setprintList(printList)
+
+			this.overallSingle = this.exhibitionOpenrtionList.overall.length>0?false:this.exhibitionOpenrtionList.single.length>0?true:false
+			this.ifListOver()
 			if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print))
 			if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
-			if(this.overallSingle == false && this.designOpenrtionList.length > 0){
+			// if(this.overallSingle == false && this.designOpenrtionList.length > 0){
-				this.designOpenrtionList[0].checked = true
+			// 	this.designOpenrtionList[0].checked = true
-			}else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
+			// }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
-				this.setpitch(this.designList[0],0)
+			// 	this.setpitch(this.designList[0],0)
-			}
+			// }
 			let skecth = new Image
-			skecth.src = this.current.path
 			skecth.onload=()=>{
 				this.sketch.width = skecth.width/10+'rem'
 				this.sketch.height = skecth.height/10+'rem'
 				skecth.remove()
 			}
-			if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){
+			skecth.src = this.current.path
+			if(this.exhibitionOpenrtionList.overall.length > 0){
 				let str = 'overall'
 				this.exhibitionOpenrtionList[str].forEach((item,index)=>{
 					this.setTemplate(item,index,str)
+					this.designOpenrtionList.forEach((openrtItem)=>{
+						if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true
+					})
 				})
-			}else if(!this.overallSingle){
-				let str = 'overall'
-				this.setOverallPosition(0,str)
 			}
-			if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){
+			// else if(!this.overallSingle){
+			// 	let str = 'overall'
+			// 	this.setOverallPosition(0,str)
+			// }
+			if(this.exhibitionOpenrtionList.single.length > 0){
 				let str = 'single'
 				this.exhibitionOpenrtionList[str].forEach((item,index)=>{
 					this.setTemplate(item,index,str)
@@ -633,39 +638,44 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designOpenrtionList
 			let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
-			let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
+			let sketchImg = new Image()
-			let scale
+			sketchImg.onload = ()=>{
-			scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
+				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
-			let zIndex = 1
+				let scale
-			let left = item.location[0]/sketchNum+'px'
+				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
-			let top = item.location[1]/sketchNum+'px'
+				let zIndex = 1
-			if(sketch.offsetWidth < item.location[0]/sketchNum){
+				let left = item.location[0]/sketchNum+'px'
-				left = sketch.offsetWidth +'px'
+				let top = item.location[1]/sketchNum+'px'
-			}
+				if(sketch.offsetWidth < item.location[0]/sketchNum){
-			if(sketch.offsetHeight < item.location[1]/sketchNum){
+					left = sketch.offsetWidth +'px'
-				top = sketch.offsetHeight +'px'
+				}
-			}
+				if(sketch.offsetHeight < item.location[1]/sketchNum){
-			this.systemDesignerPercentage = item.scale?item.scale*100:30
+					top = sketch.offsetHeight +'px'
-			this.printStyleList[str][index]={
+				}
-				centers:{
+				if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30
-					left:0,
+				this.printStyleList[str][index]={
-					top:0,
+					centers:{
-				},
+						left:0,
-				style:{
+						top:0,
-					left:left,
+					},
-					top:top,
+					style:{
-					right:"auto",
+						left:left,
-					bottom:"auto",
+						top:top,
-					width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
+						right:"auto",
-					height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
+						bottom:"auto",
-					zIndex:zIndex++
+						width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
-				},
+						height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
-				transform:{
+						zIndex:zIndex++
-					// scale:scale<.2?.2:scale,//0.2-3
+					},
-					rotateZ:item.angle,
+					transform:{
-				},
+						// scale:scale<.2?.2:scale,//0.2-3
-				designOpenrtionBtn:false
+						rotateZ:item.angle,
+					},
+					designOpenrtionBtn:false
+				}
+				sketchImg.remove()
 			}
+			sketchImg.src = sketch.src
         },
 		setOverallPosition(index,str){
 			nextTick(()=>{

src/component/Detail/DesignPrintOperationMobile.vue

@@ -293,6 +293,7 @@ export default defineComponent({
 	},
     methods: {
 		init(){
+			this.designOpenrtion = true
 			let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 			this.currentFullBodyView = designItemDetail.currentFullBodyView? designItemDetail.currentFullBodyView:designItemDetail.designItemUrl
 			if(designItemDetail.others.length == 0){
@@ -300,36 +301,40 @@ export default defineComponent({
 			}
 			//设置前片后片
 			this.operationCurrent = Object.assign({},this.current)
-			this.designOpenrtion = true
 			this.clearModal()
-			this.overallSingle = this.current.printObject.ifSingle?true:false
-			this.ifListOver()
 			let printList = JSON.parse(JSON.stringify(this.current.printObject.prints))
 			this.setprintList(printList)
+
+			this.overallSingle = this.exhibitionOpenrtionList.overall.length>0?false:this.exhibitionOpenrtionList.single.length>0?true:false
+			this.ifListOver()
 			if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print))
 			if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
-			if(this.overallSingle == false && this.designOpenrtionList.length > 0){
+			// if(this.overallSingle == false && this.designOpenrtionList.length > 0){
-				this.designOpenrtionList[0].checked = true
+			// 	this.designOpenrtionList[0].checked = true
-			}else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
+			// }else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
-				this.setpitch(this.designList[0],0)
+			// 	this.setpitch(this.designList[0],0)
-			}
+			// }
 			let skecth = new Image
-			skecth.src = this.current.path
 			skecth.onload=()=>{
 				this.sketch.width = skecth.width/10+'rem'
 				this.sketch.height = skecth.height/10+'rem'
 				skecth.remove()
 			}
-			if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){
+			skecth.src = this.current.path
+			if(this.exhibitionOpenrtionList.overall.length > 0){
 				let str = 'overall'
 				this.exhibitionOpenrtionList[str].forEach((item,index)=>{
 					this.setTemplate(item,index,str)
+					this.designOpenrtionList.forEach((openrtItem)=>{
+						if(item.minIOPath == openrtItem.minIOPath)openrtItem.checked=true
+					})
 				})
-			}else if(!this.overallSingle){
-				let str = 'overall'
-				this.setOverallPosition(0,str)
 			}
-			if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){
+			// else if(!this.overallSingle){
+			// 	let str = 'overall'
+			// 	this.setOverallPosition(0,str)
+			// }
+			if(this.exhibitionOpenrtionList.single.length > 0){
 				let str = 'single'
 				this.exhibitionOpenrtionList[str].forEach((item,index)=>{
 					this.setTemplate(item,index,str)
@@ -429,7 +434,7 @@ export default defineComponent({
 					location:[0,0],
 					ifSingle:true,
 				})
-				this.refetchTemplate(currentIndex,false)
+				this.refetchTemplate(currentIndex,true)
 			}
 		},
 		//设置移动
@@ -580,9 +585,6 @@ export default defineComponent({
 		},
         //随机重置图片顺序
         refetchTemplate(index,boor) {
-			// let scale = (Math.trunc(Math.random()*15)+1)*.1
-			let rotateZ1 = Math.trunc(Math.random()*360)+1
-			let rotateZ2 = Math.trunc(Math.random()*360)+1
 			let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0]
 			let width
 			let scale
@@ -637,39 +639,44 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designOpenrtionList
 			let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0]
-			let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
+			let sketchImg = new Image()
-			let scale
+			sketchImg.onload = ()=>{
-			scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
+				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
-			let zIndex = 1
+				let scale
-			let left = item.location[0]/sketchNum+'px'
+				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
-			let top = item.location[1]/sketchNum+'px'
+				let zIndex = 1
-			if(sketch.offsetWidth < item.location[0]/sketchNum){
+				let left = item.location[0]/sketchNum+'px'
-				left = sketch.offsetWidth +'px'
+				let top = item.location[1]/sketchNum+'px'
-			}
+				if(sketch.offsetWidth < item.location[0]/sketchNum){
-			if(sketch.offsetHeight < item.location[1]/sketchNum){
+					left = sketch.offsetWidth +'px'
-				top = sketch.offsetHeight +'px'
+				}
-			}
+				if(sketch.offsetHeight < item.location[1]/sketchNum){
-			this.systemDesignerPercentage = item.scale?item.scale*100:30
+					top = sketch.offsetHeight +'px'
-			this.printStyleList[str][index]={
+				}
-				centers:{
+				if(str == 'overall')this.systemDesignerPercentage = item.scale?item.scale*100:30
-					left:0,
+				this.printStyleList[str][index]={
-					top:0,
+					centers:{
-				},
+						left:0,
-				style:{
+						top:0,
-					left:left,
+					},
-					top:top,
+					style:{
-					right:"auto",
+						left:left,
-					bottom:"auto",
+						top:top,
-					width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
+						right:"auto",
-					height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
+						bottom:"auto",
-					zIndex:zIndex++
+						width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
-				},
+						height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
-				transform:{
+						zIndex:zIndex++
-					// scale:scale<.2?.2:scale,//0.2-3
+					},
-					rotateZ:item.angle,
+					transform:{
-				},
+						// scale:scale<.2?.2:scale,//0.2-3
-				designOpenrtionBtn:false
+						rotateZ:item.angle,
+					},
+					designOpenrtionBtn:false
+				}
+				sketchImg.remove()
 			}
+			sketchImg.src = sketch.src
 
         },
 		setOverallPosition(index,str){

src/component/HomePage/ExportModel.vue

@@ -712,32 +712,46 @@ export default defineComponent({
 				lockRotation: true,
 			});
 		}
-		let setExportCanvas = ()=>{
+		let setExportCanvas = async ()=>{
-			var objects = canvas.getObjects();
+			await calculateHeight()
-			var maxHeight = 0;
+			canvas.setDimensions({ height: canvasWH.value.height });
-
-			// 计算所有对象的最大高度
-			objects.forEach(function(obj) {
-				var objBottom = obj.top + obj.height*obj.scaleY;
-				if (objBottom > maxHeight) {
-					maxHeight = objBottom;
-				}
-			});
-			canvasWH.height = maxHeight+30
-			// 调整 Canvas 的高度
-			canvas.setDimensions({ height: canvasWH.height });
-
-			// 重新渲染 Canvas
 			canvas.renderAll();
 			return canvas.toDataURL({
-                format: "png", // 导出格式为 PNG
+				format: "png", // 导出格式为 PNG
-                quality: 1, // 图片质量为 1（最高质量）
+				quality: 1, // 图片质量为 1（最高质量）
-            });
+			});
+		}
+		let calculateHeight = ()=>{
+			return new Promise((resolve, reject) =>{
+				var objects = canvas.getObjects();
+				var maxHeight = 0;
+				Modal.confirm({
+					title: useI18.t('exportModel.jsContent9'),
+					okText: 'Yes',
+					cancelText: 'No',
+					mask:false,
+					centered:true,
+					onOk() {
+						objects.forEach(function(obj) {
+							var objBottom = obj.top + obj.height*obj.scaleY;
+							if (objBottom > maxHeight) {
+								maxHeight = objBottom;
+							}
+						});
+						canvasWH.value.height = Math.round(maxHeight)+30
+						
+						resolve(canvasWH.value.height)
+					},
+					onCancel(){
+						resolve(canvasWH.value.height)
+					}
+				});
+			})
 		}
         //设置导出
         let setExport = async () => {
 			initAligningGuidelines(canvas,false)
-            var imageDataURL = setExportCanvas()
+            var imageDataURL = await setExportCanvas()
             let a = document.createElement("a");
             let img = [];
             let index = 0;
@@ -1860,11 +1874,11 @@ export default defineComponent({
 		let toSvg = ()=>{
 			// console.log(canvas.toSvg());
 		}
-		let setShare = ()=>{
+		let setShare = async ()=>{
 			initAligningGuidelines(canvas,false)
 			let publishModal = publish.value
 			publishModal.publishMask = true
-			var imageDataURL = setExportCanvas()
+			var imageDataURL = await setExportCanvas()
 			let data = {
 				"imgUrl":imageDataURL,
 				userlikeGroupId:userlikeGroupId,

src/component/HomePage/productImg.vue

@@ -632,6 +632,7 @@ export default defineComponent({
 			scaleImage.value.isLike = false
 			scaleImage.value.productimgSearchName = productImgData.searchName[productimgMenu.value.value]
 			scaleImage.value.productimgSimilarity = productImgData.similarity
+			scaleImage.value.productimgBrightenValue = productImgData.brightenValue
 			scaleImage.value.productimgRelightDirection = RelightDirection.value
 			scaleImage.value.isComparison = true
 		}

src/component/WorksPage/newScaleImage.vue

@@ -406,7 +406,8 @@ export default defineComponent({
 			if(imgData.scaleImageData.openSource == 0){
 				return message.info(t('newScaleImage.jsContent2'))
 			}
-        	router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works',isDesign:0}})
+        	router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}})
+			store.commit('setChooseIsDesign',false)
         	// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
 		}
 		let setCommentReply = (value:any,str:any)=>{
@@ -621,8 +622,6 @@ export default defineComponent({
 				let commentBtn = parent.querySelector('.left_content_item_unfold')
 				let commentDomSon = el.querySelector('div')
 				let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
-				console.log(commentDomSon.offsetHeight , maxHeight);
-				
 				if(commentDomSon.offsetHeight > maxHeight){
 					commentBtn.style.display = 'block'
 				}else if(!binding.value.detailUnfold){

src/component/WorksPage/newScaleImageMobile.vue

@@ -573,8 +573,6 @@ export default defineComponent({
 				let commentBtn = parent.querySelector('.left_content_item_unfold')
 				let commentDomSon = el.querySelector('div')
 				let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
-				console.log(commentDomSon.offsetHeight , maxHeight);
-				
 				if(commentDomSon.offsetHeight > maxHeight){
 					commentBtn.style.display = 'block'
 				}else if(!binding.value.detailUnfold){

src/lang/cn.ts

@@ -74,6 +74,7 @@ export default {
 		jsContent6:'请选择需要超分的图片',
 		jsContent7:'保存成功~',
 		jsContent8:'是否继续编辑',
+		jsContent9:'是否需要自动裁剪画布多余空间',
 	},
 	upgradePlan:{
 		BuyCredlts:'购买积分',

src/lang/en.ts

@@ -74,6 +74,7 @@ export default {
 		jsContent6:'Please select the picture that requires upscale',
 		jsContent7:'save successfully',
 		jsContent8:'Whether to continue editing',
+		jsContent9:'Whether you need to automatically crop your canvas excess space',
 	},
 	upgradePlan:{
 		BuyCredlts:'Buy credits',

src/store/uploadFile/uploadFile.ts

@@ -23,6 +23,7 @@ interface UploadFiles{
     marketingSketchFiles:any,
     allBoardData:any, //备份的所有数据，点finish之后备份
     moodTemplateId:any,
+	chooseIsDesign:any,
 }
 
 const UploadFilesModule : Module<UploadFiles,RootState> = {
@@ -46,6 +47,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         marketingSketchFiles:[],
         allBoardData:{},
         moodTemplateId:'',
+		chooseIsDesign:{value:true},
 		
     },
     mutations:{
@@ -212,6 +214,9 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
         setAllBoardDataChoose(state,data){
             state.allBoardData = data
+        },
+		setChooseIsDesign(state,data){
+            state.chooseIsDesign.value = data
         },
         clearAllData(state){
             state.moodboard = []
@@ -232,6 +237,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			state.disposeMoodboard = []
 			state.disposeMoodboardPostition = {}
 			// state.showSketchboard = []
+			state.chooseIsDesign.value = true
         },
 		clearAllId(state){
             state.moodboard.forEach((v:any) => {

src/views/HomeView/HomeView.vue

@@ -336,7 +336,8 @@ export default defineComponent({
 		let allBoardData:any = computed(()=>{
 			return store.state.UploadFilesModule.allBoardData})
 		let isMannequinShow = ref(false)
-		let chooseIsDesign:any = ref(1)
+		let chooseIsDesign:any = computed(()=>{
+			return store.state.UploadFilesModule.chooseIsDesign})
 		return {
 			store,
 			likeDesignCollectionList,
@@ -473,7 +474,6 @@ export default defineComponent({
 			// this.store.commit("clearAllCollection");
 		}
 		if (this.$route.params.id) {
-			this.chooseIsDesign = this.$route.params.isDesign
 			if(this.$route.params.type == 'History'){
 				this.getHistoryChoose(this.$route.params.id, "normal");
 			}else if(this.$route.params.type == 'Works'){
@@ -607,7 +607,6 @@ export default defineComponent({
 					_this.store.commit("clearAllCollection");
 					_this.store.commit("setAllBoardDataChoose",{});
 					_this.store.commit("clearShowSketchboard",{});
-					_this.chooseIsDesign = 1;
 					_this.isHaveReviewCollection = false
 				}
 			});
@@ -667,7 +666,7 @@ export default defineComponent({
 
 		//设计新的collection
 		designNewCollection() {
-			if(this.chooseIsDesign == 0){
+			if(!this.chooseIsDesign.value){
 				message.info(this.t('HomeView.jsContent10'));
 				return
 			}

src/views/HomeView/history.vue

@@ -349,11 +349,13 @@ export default defineComponent({
         },
 
         retrieveHome(record:any){
-			let num = 1
+			let num = true
 			if(record.original == 0){
-				num = 0
+				num = false
 			}
-            this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}})
+            this.$router.push({name:'homePage',params: {id:record.id,type:'History'}})
+			this.store.commit('setChooseIsDesign',num)
+
         },
 		removeLabel(){
 			let setLabel:any = this.$refs.setLabel

src/views/Upgrade.vue

@@ -8,10 +8,10 @@
 			<div class="upgrade-content-text">System upgrading</div>
 			<!-- <div class="upgrade-content-text">System maintenance</div> -->
 			<!-- 没有截至时间 -->
-			<div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
 			<!-- 有截至时间 -->
 			<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until 17:00 PM on Tuesday, July 9. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
-			<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
+			<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
 		</div>
 	</div>
 </template>