diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index c0dbc2e1..cfad2dab 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -202,10 +202,10 @@ li {
   background: #353535;
 }
 .gallery_btn {
-  padding: 0 1.8rem;
-  line-height: 6rem;
+  padding: 0 2rem;
+  line-height: 5.4rem;
   border-radius: 4rem;
-  font-size: 1.8rem;
+  font-size: 1.6rem;
   transition: all 0.3s;
   display: inline-block;
   color: #fff;
@@ -911,7 +911,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
   padding: 0;
   height: 100%;
   font-size: 1.4rem;
-  padding: calc(5rem*1.2) calc(6rem*1.2);
+  padding: 6rem 7rem;
   position: relative;
 }
 .generalModel .fi-rr-down-to-line,
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 29b531e7..e5dfe43e 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -206,11 +206,11 @@ input:focus{
 	background: #353535;
 }
 .gallery_btn{
-	padding: 0 1.8rem;
-	line-height: 6rem;
+	padding: 0 2rem;
+	line-height: 5.4rem;
 	border-radius: 4rem;
 	// line-height: 6rem;
-	font-size: 1.8rem;
+	font-size: 1.6rem;
 	transition: all .3s;
 	display: inline-block;
 	color: #fff;
@@ -996,7 +996,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 		padding: 0;
 		height: 100%;
 		font-size: 1.4rem;
-		padding: calc(5rem*1.2) calc(6rem*1.2);
+		padding: 6rem 7rem;
 		position: relative;
 
 	}
diff --git a/src/component/Administrator/coupons/addAllUser.vue b/src/component/Administrator/coupons/addAllUser.vue
index 27b9d047..bbc91b4c 100644
--- a/src/component/Administrator/coupons/addAllUser.vue
+++ b/src/component/Administrator/coupons/addAllUser.vue
@@ -41,6 +41,7 @@
 				<span>percentOff(%): <span>*</span></span>
 				<input
 					:class="{active:title != 'Add'}"
+					:disabled="title != 'Add'"
 					v-model="percentOff"
 					placeholder="Please enter percentOff"
 					type="text"
@@ -51,6 +52,7 @@
 				<span>Commission Rate: <span>*</span></span>
 				<input
 					:class="{active:title != 'Add'}"
+					:disabled="title != 'Add'"
 					v-model="commissionRate"
 					placeholder="Please enter commission rate"
 					type="text"
@@ -68,6 +70,7 @@
 				<span>MaxRedemptions:</span>
 				<input
 					:class="{active:title != 'Add'}"
+					:disabled="title != 'Add'"
 					v-model="maxRedemptions"
 					placeholder="Please enter maximum"
 					type="text"
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
deleted file mode 100644
index 6b332475..00000000
--- a/src/component/Detail/habit.vue
+++ /dev/null
@@ -1,1172 +0,0 @@
-<template>
-    <div class="habit">
-		<div v-show="openType.habit" class="habit_mask"></div>
-        <div class="habit_button Guide_1_27" @click.stop="setOpenType('habit')" >
-			{{ $t('Habit.Workspace') }}
-            <i class="fi fi-bs-angle-down"></i>
-        </div>
-        <div class="habit_content Guide_1_28" :class="[driver__.driver?'showEvents':'']" v-fade="openType.habit">
-            <div class="habit_title">
-                <h3>{{ $t('Habit.WorkspaceSetting') }}</h3>
-                <div class="habit_intro">{{ $t('Habit.settingWorkspace') }}</div>
-            </div>
-            <div class="habit_type" trigger="['click']" >
-                <a-dropdown placement="bottomRight" @click.stop="setOpenType('workspace')">
-                    <a-button>
-                        <UserOutlined />
-                        {{workspaceItem.workSpaceName}}
-                        <DownOutlined />
-                    </a-button>
-                </a-dropdown>
-				<div class="habit_model_show habit_workspace_show"  v-fade="openType.workspace">
-					<ul class="habit_model_list">
-						<li v-for="item,index in workspace.workspaceList">
-							<div @click.stop="setWorkspace(item.id)" v-show="!item.putName">{{ item.workSpaceName }}</div>
-							<input v-show="item.putName" type="text" v-model="workspaceItemName">
-							<i @click.stop="putName(index,'put')" v-show="!item.putName" class="fi fi-rr-edit"></i>
-							<i @click.stop="putName(index,'affirm')" v-show="item.putName" class="fi fi-br-check"></i>
-							<i @click.stop="putName(index,'delete')" class="fi fi-rr-trash"></i>
-						</li>
-						<li @click="newWorkspace" class="newWorkspace">
-							<input v-show="openType.addWorkspace" type="text" v-model="workspaceItemName">
-							<i @click.stop="putName(-1,'affirm')" v-show="openType.addWorkspace" class="fi fi-br-check"></i>
-							<div v-show="!openType.addWorkspace">+</div>
-						</li>
-						<div v-show="total > workspace.workspaceList?.length && total != 0" class="material_content_list_loding" v-observe>
-							<img src="@/assets/images/homePage/loading.gif" alt="">
-						</div>
-					</ul>
-				</div>
-            </div>
-			<div class="habit_Overal_Single" :class="[driver__.index == 2?driver__.driver?'Guide_active':'':'']">
-				<a-dropdown @click.stop="setOpenType('sex')">
-                    <a-button>
-                        <UserOutlined />
-                        {{ workspaceItem?.sexEnum?.name }}
-                        <!-- {{ workspaceItem.sex.label }} -->
-                        <DownOutlined />
-                    </a-button>
-                </a-dropdown>
-				<div class="habit_model_show habit_sex_show"  v-fade="openType.sex">
-					<ul class="habit_model_list">
-						<li v-for="item,index in sex">
-							<div @click.stop="setSex(item)">{{ item.name }}</div>
-						</li>
-					</ul>
-				</div>
-            </div>
-            <div class="habit_Overal_Single habit_style">
-				<div class="habit_style_left">
-					<div>{{ $t('Habit.Style') }}:</div>
-					<span :title="workspaceItem.styleName">{{ workspaceItem.styleName }}</span>
-				</div>
-				<!-- <div class="button_second">选择</div> -->
-				<div class="started_btn" :class="[driver__.driver?'hideEvents':'']" @click="setStyle">{{ $t('Habit.Select') }}</div>
-			</div>
-            <div class="habit_Overal_Single">
-                <div
-                    class="habit_Overal_Single_text"
-                    :class="{ active: !workspaceItem.overallSingle }"
-                >
-				{{ $t('Habit.Overall') }}
-                </div>
-                <a-switch @click="setOverallSingle" v-model:checked="workspaceItem.overallSingle" />
-                <div
-                    class="habit_Overal_Single_text"
-                    :class="{ active: workspaceItem.overallSingle }"
-                >
-				{{ $t('Habit.Single') }}
-                </div>
-            </div>
-            <div class="habit_habit_singleton" v-show="workspaceItem.overallSingle">
-                <a-dropdown @click.stop="setOpenType('singleton')">
-                    <a-button>
-                        <UserOutlined />
-                        {{ workspaceItem?.positionEnum?.name }}
-                        <DownOutlined />
-                    </a-button>
-                </a-dropdown>
-				<div class="habit_model_show habit_singleton_show"  v-fade="openType.singleton">
-					<ul class="habit_model_list">
-						<li v-for="item,index in singleTypeList">
-							<div @click.stop="setSingle(item)">{{ item.name }}</div>
-						</li>
-					</ul>
-				</div>
-            </div>
-			<div class="habit_System_Designer">
-				<a-slider class="system_silder"
-                    v-model:value="workspaceItem.systemDesignerPercentage"
-                    @afterChange="setSystemDesigner"
-					:tip-formatter="formatter"
-					:tooltipVisible="false"
-				>
-                </a-slider>
-                <div class="habit_System_Designer_text_max">
-                    <div class="habit_System_Designer_text">
-						
-						{{ $t('Habit.System') }}<span>({{systemDesigner.designer}}%)</span>
-					</div>
-                    <div class="habit_System_Designer_text">
-					
-						{{ $t('Habit.Designer') }}<span>({{systemDesigner.system}}%)</span>
-					</div>
-                </div>
-            </div>
-			<div class="habit_model" :class="[driver__.index == 3?driver__.driver?'Guide_active':'':'']">
-                <a-dropdown placement="bottomRight"
-					trigger="['click']"
-					@click.stop="setOpenType('model')"
-					>
-                    <a-button>
-                        <UserOutlined />
-                        {{ $t('Habit.Mannequin') }}
-                        <DownOutlined />
-                    </a-button>
-                </a-dropdown>
-            </div>
-			<div id="modelShow" class="habit_model_show Guide_1_29" :class="[driver__.driver?'showEvents':'']" v-fade="openType.model">
-				<div class="habit_btn">
-					<div class="model_current">
-					<div class="model_text">{{ $t('Habit.Current') }}</div>
-					<div class="model_img generalScroll">
-						<img :src="workspaceItem.mannequinUrl" alt="">
-					</div>
-				</div>
-				<div class="model_Designer">
-					<div class="model_text">
-						<div
-							class="habit_System_Seleves_text"
-							:class="{ active: !systemSeleves }"
-						>
-						{{ $t('Habit.System') }}
-						</div>
-						<a-switch :disabled="mannequins?.[0]==null?true:false" v-model:checked="systemSeleves" />
-						<div
-							class="habit_System_Seleves_text"
-							:class="{ active: systemSeleves }"
-						>
-						{{ $t('Habit.User') }}	
-						</div>
-					</div>
-					<div class="model_img generalScroll" v-show="systemSeleves" v-mousewheel>
-						<div class="model_img_item">
-							<div v-for="(item,index) in mannequins?.[0]?.modelList" :key="item.id">
-								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')" :class="[driver__.index == 4?driver__.driver?'Guide_img':'':'']">
-							</div>
-						</div>
-					</div>
-					<div class="model_img generalScroll" v-show="!systemSeleves" v-mousewheel>
-						<div class="model_img_item">
-							<div v-for="(item,index) in mannequins?.[1]?.modelList" :key="item.id">
-								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')" :class="[driver__.index == 4?driver__.driver?'Guide_img':'':'']">
-							</div>
-						</div>
-					</div>
-				</div>
-				</div>
-			</div>
-			<habitSetStyle ref="habitSetStyle" @setParentData=setParentData @setWorkspaceStyle=setWorkspaceStyle></habitSetStyle>
-        </div>
-    </div>
-	<div class="mark_loading" v-show="isShowMark">
-		<a-spin size="large" />
-	</div>
-</template>
-<script lang="ts">
-import { useStore } from "vuex";
-import { defineComponent, createVNode,nextTick, computed,ref,Ref} from "vue";
-import { UserOutlined, DownOutlined } from "@ant-design/icons-vue";
-import { Https } from "@/tool/https";
-// import type { MenuProps } from "ant-design-vue";
-import { Modal,message,Upload} from 'ant-design-vue';
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-import { openGuide,driverObj__ } from "@/tool/guide";
-import { useI18n } from "vue-i18n";
-import habitSetStyle from "@/component/Detail/habitSetStyle.vue";
-import { position } from "html2canvas/dist/types/css/property-descriptors/position";
-export default defineComponent({
-    components: {
-        DownOutlined,
-        UserOutlined,
-		habitSetStyle,
-    },
-	setup(){
-        const store = useStore();
-		let workspaceItem:any = ref({
-			id:-1,
-			id_:1,
-			workSpaceName:"工作台1",
-			putName:false,
-			systemDesignerPercentage:30,
-			position:'',
-			sex:'',
-			overallSingle:false,
-			mannequinUrl:'',
-			mannequinType:'',
-			mannequinId:'',
-		})
-		let systemDesigner:any = ref({
-			system:0,
-			designer:0,
-		})
-		let mannequins:any = ref([{},{}])
-		let systemSeleves= ref(false);
-		let total= ref(0);
-		let openType:any = ref({
-			workspace:false,
-			singleton:false,
-			habit:false,
-			model:false,
-			addWorkspace:false,
-			sex:false,
-			slider:false,
-		})
-		let driver__:any = computed(()=>{
-			return store.state.Guide.guide
-		})
-		let workspace:any = ref({
-			
-		});
-		let workspaceItemName = ref('')//设置单独name公共使用
-		let singleTypeList:any = ref([
-			
-		])
-		let sex = ref([
-		])
-		let position = ref([
-			{
-				name:'FemalePosition',
-				value:[],
-			},{
-				name:'MalePosition',
-				value:[],
-			},
-		])
-		const {t} = useI18n()
-		let styleList = ref([])
-		let isShowMark = ref(true)
-	return{
-			systemSeleves,
-			mannequins,
-			systemDesigner,
-			openType,
-			total,
-			driver__,
-			workspace,
-			workspaceItem,
-			workspaceItemName,
-			singleTypeList,
-			sex,
-			position,
-			t,
-			styleList,
-			isShowMark
-		}
-    },
-	watch:{
-		'openType.habit':{
-			handler(newVal:any,oldVal:any){
-				// this.store.state.Workspace.workspace
-				if(!newVal){
-					this.openType.slider = newVal
-					if(!this.workspaceItem.overallSingle){
-						this.workspaceItem.position = 'Overall'
-					}
-					let data = this.workspaceItem
-					delete data.isLastIndex
-					this.putWorkspace(data,this.workspaceItem.id)
-					this.openType.model = false
-					// this.getDetail(this.workspaceItem.id)
-					this.store.commit("setWorkspace", this.workspaceItem);
-				}else{
-					this.getworkspace('detail')
-				}
-			}
-		},
-		
-		driver__:{
-			handler(newVal:any,oldVal:any){
-				if(newVal.index>=5){
-					this.openType.habit = false
-				}
-			}
-		},
-		'workspace.id':{
-			handler(newVal:any,oldVal:any){
-				// this.workspace.workspaceList.forEach((v:any)=>{
-				// 	if(v.id == this.workspaceItem.id_){
-				// 		this.workspaceItem = v
-				// 		this.workspaceItem.id_ = v.id
-				// 	}
-				// 	if(v.id == oldVal){
-				// 		delete v.isLastIndex
-				// 		this.putWorkspace(v,newVal)
-				// 		this.getDetail(newVal)
-				// 	}
-				// })
-				this.getDetail(newVal)
-			}
-		},
-		'openType.workspace':{
-			handler(newVal:any,oldVal:any){
-				this.openType.addWorkspace = false
-				this.workspace.workspaceList.forEach((item:any) => {
-					item.putName = false
-				});
-			}
-		},
-		'workspaceItem.overallSingle':{
-			handler(newVal:any,oldVal:any){
-				if(this.driver__.driver){
-					driverObj__.refresh();
-				}
-			}
-		},
-		'openType.sex':{
-			handler(newVal:any,oldVal:any){
-				if(this.driver__.driver && oldVal){
-					driverObj__.moveTo(3);
-				}
-			}
-		},
-	
-		workspaceItem:{
-			handler(newVal:any,oldVal:any){
-				this.store.commit("setWorkspace", this.workspaceItem);
-			}
-		}
-	},
-    data() {
-        return {
-            store: useStore(),
-        };
-    },
-   async mounted() {
-		// new Promise((resolve) => {
-		// 	this.getPosition(resolve)
-		// })
-		await this.getPosition()//获取衣服类型
-		this.getworkspace('')
-		this.getSex()
-	},
-	directives:{
-		fade:{
-			mounted (el,binding) {
-				el.addEventListener('click',()=>{
-					
-				})
-			},
-			updated (el,model){
-				if(model.value){
-					el.style.display="block"
-					setTimeout(() => {
-						el.classList.add("active")
-						let value:any = model.instance
-						value.openType.slider = true
-					}, 100);
-				}else{
-					el.classList.remove("active")
-					setTimeout(() => {
-					el.style.display="none"
-					}, 100);
-				}
-			}
-		},
-		mousewheel:{
-			mounted (el) {
-				el.addEventListener('wheel',(e:WheelEvent)=>{
-					let num = 0
-					if(e.deltaY > 0){
-						num = 25
-					}else{
-						num = -25
-					}
-					el.scrollBy(num, 0);
-				},{ passive: true })
-			}
-		},
-		observe:{
-			mounted (el,binding) {
-				// console.log(binding.instance);
-				const ob = new IntersectionObserver(callback,{
-					root:null,
-					threshold:[0.1]
-				})
-				ob.observe(el)
-				// this.currentPage = 1
-				// this.pageSize = 12
-				let this_:any = binding.instance
-				function callback(entries:any, observer:any) {
-					entries.forEach((entry:any) => {
-						if (entry.isIntersecting) {
-							this_.getworkspace('di')
-						} else {
-						}
-					});
-				}
-			},
-		},
-	},
-    methods: {
-		async getSex(){
-			await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => {
-				if (rv) {
-					rv.forEach((item:any) => {
-						let name = item.name
-						item.name = item.value
-						item.value = name
-					});
-					this.store.commit("setWorkspaceSex", rv);
-					this.sex = rv
-				}
-			})
-		},
-		setPosition(str:any){
-			let num
-			if(this.workspaceItem.sexEnum.value == 'Female'){
-				num = 0
-			}else{
-				num = 1
-			}
-			this.singleTypeList = this.position[num].value
-			this.store.commit("setWorkspacePosition", this.position[num].value);
-
-			if(str == 'sex'){
-				this.workspaceItem.position = this.singleTypeList[0].value
-				this.workspaceItem.positionEnum = this.singleTypeList[0]
-			}
-		},
-		async getPosition(){
-			await new Promise(async (resolve) => {
-				await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => {
-					if (rv) {
-						rv.forEach((item:any) => {
-							let name = item.name
-							item.name = item.value
-							item.value = name
-						});
-						this.position[0].value = rv
-					}
-				})
-				await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => {
-					if (rv) {
-						rv.forEach((item:any) => {
-							let name = item.name
-							item.name = item.value
-							item.value = name
-						});
-						this.position[1].value = rv
-					}
-				})
-				resolve('')
-			})
-			this.store.commit("setWorkspaceAllPosition", [...this.position[0].value,...this.position[1].value]);
-			// this.getworkspace()
-			// this.setPosition('')
-		},
-		getworkspace(str:any){
-			// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => {
-			// 	if (rv) {
-			// 		console.log(rv,'workspace');
-			// 	}
-			// })
-			let data = {
-				page:1,
-				size:10,
-			}
-			// data.page = this.workspace.workspaceList?.[0]?.id != undefined?this.workspace.workspaceList?.length / data.size+1:1
-			data.size = this.workspace.workspaceList?.[0]?.id != undefined?this.workspace.workspaceList?.length + data.size+1:10
-
-			Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => {
-				if (rv) {
-					// rv.page.content.forEach((v:any) => {
-					// 	v.id_ = v.id
-					// 	if(v.position == "Overall"){
-					// 		v.overallSingle = false
-					// 	}else{
-					// 		v.overallSingle = true
-					// 	}
-					// 	v.putName = false
-					// });
-					this.workspace.id = rv.id
-					if(str == 'detail') this.getDetail(rv.id)
-					this.total = rv.page.total
-					this.workspace.workspaceList = rv.page.content
-					
-					// this.workspaceItem = v
-					
-					// this.setMannequinsSex()
-					// this.setPosition('')
-				}
-			})
-		},
-		getDetail(id:any){//
-			Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => {
-				if (rv) {
-					this.isShowMark = false
-					if(rv.position == "Overall"){
-						rv.overallSingle = false
-					}else{
-						rv.overallSingle = true
-					}
-					let positionEnumName = rv.positionEnum.name
-					rv.positionEnum.name = rv.positionEnum.value
-					rv.positionEnum.value = positionEnumName
-					let sexEnumName = rv.sexEnum.name
-					rv.sexEnum.name = rv.sexEnum.value
-					rv.sexEnum.value = sexEnumName
-					rv.putName = false
-					this.workspaceItem = rv
-					this.setMannequinsSex()
-					this.setPosition('')
-					// this.getworkspace()
-				}
-			}).catch((res)=>{
-				this.isShowMark = false
-				// this.getworkspace()
-            });
-		},
-		getMannequins(isSetmannequins:any){//获取模特
-			let styleData = this.workspaceItem.style?this.workspaceItem.style:''
-			return new Promise((resolve,reject)=>{
-				Https.axiosGet(Https.httpUrls.getMannequins,{params:{sex:this.workspaceItem.sex,style:styleData}}).then(async (rv: any) => {
-					if (rv) {
-						if(rv[0].type == 'System'){
-							let a = rv[0]
-							rv[0] = rv[1]
-							rv[1] = a
-						}
-						this.mannequins = rv
-						if(this.mannequins?.[0]==null){
-							this.systemSeleves = false
-						}
-						if(isSetmannequins){
-							// this.workspaceItem.femalePresignedUrl = this.mannequins?.[1]?.modelList[0].presignedUrl
-							// this.workspaceItem.mannequinFemaleType  = 'System'
-							// this.workspaceItem.mannequinFemaleId = this.mannequins?.[1]?.modelList[0].id
-							await this.setMannequins(this.mannequins?.[1]?.modelList[0],'System')
-							// this.workspaceItem.mannequinUrl = this.mannequins?.[1]?.modelList[0].presignedUrl
-							// this.workspaceItem.mannequinType = 'System'
-							// this.workspaceItem.mannequinId = this.mannequins?.[1]?.modelList[0].id
-						}
-						resolve('')
-					}
-				})
-			})
-		},
-		putWorkspace(data:any,index:any){//修改workspace
-			if(this.workspaceItem.id == -1){
-				return
-			}
-			this.openType.model = false
-			Https.axiosPost(Https.httpUrls.workspacesaveOrUpdate,data).then((rv: any) => {
-				if (rv) {
-					if(index){
-						// this.getDetail(index)
-					}else{
-					}
-					if(index){
-						this.getDetail(index)
-					}else{
-						this.getworkspace('')
-					}
-					this.workspace.workspaceList[index].workSpaceName = this.workspaceItemName 
-					this.workspace.workspaceList[index].putName = false
-					this.openType.addWorkspace = false
-				}
-			}).catch((res)=>{
-				// this.getworkspace()
-            });
-		},
-		deleteWorkspace(data:any){
-			Https.axiosDelete(Https.httpUrls.workspaceRemove,data).then((rv: any) => {
-				if (rv) {
-					this.getworkspace('')
-				}
-			})
-		},
-		//
-		setOverallSingle(){
-			if(this.workspaceItem.overallSingle){
-				this.workspaceItem.position = this.singleTypeList[0].value
-				this.workspaceItem.positionEnum = this.singleTypeList[0]
-			}else{
-				this.workspaceItem.position = 'Overall'
-			}
-		},
-
-		cancelDsign(index:any){
-            let _this = this
-            Modal.confirm({
-                title: _this.t('Habit.jsContent1'),
-                icon: createVNode(ExclamationCircleOutlined),
-                okText: 'Yes',
-                cancelText: 'No',
-				mask:false,
-				wrapClassName:'habit',
-				zIndex:999999999,
-                centered:true,
-                onOk() {
-					let data = [{
-						id:_this.workspace.workspaceList[index].id,
-					}]
-					let id = _this.workspace.workspaceList[index].id
-					_this.deleteWorkspace(data)
-                }
-            });
-        },
-		//修改名字
-		putName(index:number,v:string){
-			this.workspace.workspaceList.forEach((v:any )=> {
-				v.putName = false
-			});
-			this.openType.addWorkspace = false
-			if(v == 'put'){
-				this.workspaceItemName = this.workspace.workspaceList[index].workSpaceName
-				this.workspace.workspaceList[index].putName = true
-			}else if (v == 'delete'){
-				this.cancelDsign(index)
-				// let data = [{
-				// 		id:this.workspace.workspaceList[index].id,
-				// 	}]
-				// 	let id = this.workspace.workspaceList[index].id
-				// 	this.deleteWorkspace(data)
-			}else{
-				if(this.workspaceItemName == ''){
-					message.info(this.t('Habit.jsContent2'));
-				}else{
-					if(index == -1){
-						
-						let data = {
-							workSpaceName:this.workspaceItemName,
-						}
-						this.putWorkspace(data,'')
-					}else{
-						let data:any
-						this.workspace.workspaceList.forEach((item:any)=>{
-							if(this.workspace.workspaceList[index].id == item.id){
-								// item.putName = true
-								data = item
-							}
-						})
-						data.workSpaceName = this.workspaceItemName
-						this.putWorkspace(data,this.workspaceItem.id)
-						
-					}
-				}
-				
-			}
-		},
-		//设置系统设计占比
-        setSystemDesigner(num: number) {
-			this.workspaceItem.systemDesignerPercentage = num
-        },
-		formatter(value: number) {
-			this.systemDesigner.system = 100 - value
-			this.systemDesigner.designer = value
-			let num = Math.abs((value-50)*2)
-			return `${num}%`;
-		},
-
-		//根据id设置当前参数
-		setWorkspace(num:number){
-			this.openType.addWorkspace = false
-			this.workspace.workspaceList.forEach((v:any) => {
-				v.putName = false
-			});
-			this.putWorkspace(this.workspaceItem,'')
-			this.workspace.id = num
-			// this.workspaceItem.id_ = num
-			this.openType.workspace = false
-		},
-		//新建参数
-		newWorkspace(){
-			this.workspaceItemName = ''
-			this.openType.addWorkspace = true
-			this.workspace.workspaceList.forEach((item:any) => {
-				item.putName = false
-			});
-		},
-		setSex(v:any){
-			this.workspaceItem.sexEnum = v
-			this.openType.sex = false
-			this.workspaceItem.sex = v.value
-			this.getMannequins(false)
-			this.setMannequinsSex()
-			this.setPosition('sex')
-			
-		},
-		//设置single & overall
-		setSingle(v:any){
-			this.openType.singleton = false
-			this.workspaceItem.position = v.value
-			this.workspaceItem.positionEnum = v
-
-		},
-		setMannequins(item:any,str:string){//设置模特
-			// this.workspaceItem.mannequinId = item.id
-			// this.workspaceItem.mannequinType = str
-			// this.workspaceItem.mannequinUrl = item.presignedUrl
-			return new Promise((resolve, reject) => {
-				let id
-				if(this.workspaceItem.sexEnum.value == 'Female'){
-					id = this.workspaceItem.mannequinFemaleId
-					this.workspaceItem.femalePresignedUrl = item.presignedUrl
-					this.workspaceItem.mannequinFemaleType  = str
-					this.workspaceItem.mannequinFemaleId = item.id
-				}else if(this.workspaceItem.sexEnum.value == 'Male'){
-					id = this.workspaceItem.mannequinMaleId
-					this.workspaceItem.malePresignedUrl = item.presignedUrl
-					this.workspaceItem.mannequinMaleType  = str
-					this.workspaceItem.mannequinMaleId = item.id
-				}
-				// if(id != item.id){
-				if(this.driver__.driver){
-					// this.openType.habit = false
-					nextTick().then(()=>{
-						// driverObj__.moveTo(2);
-						setTimeout(() => {
-							driverObj__.moveNext();
-						}, 300);
-						this.openType.model = false
-
-						// driverObj__.moveNext();
-					})
-				}
-				// }
-				this.workspaceItem.mannequinUrl = item.presignedUrl
-				this.workspaceItem.mannequinType = str
-				this.workspaceItem.mannequinId = item.id
-				resolve('')
-			})
-		
-		},
-		// FEMALE     MALE
-		setMannequinsSex(){
-			if(this.workspaceItem.sexEnum.value == 'Female'){
-				this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl
-				this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType
-				this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId
-			}else if(this.workspaceItem.sexEnum.value == 'Male'){
-				this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl
-				this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType
-				this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId
-			}
-		},
-		setOpenType(v:string){
-			if(v == 'habit'){
-				this.openType.habit = !this.openType.habit
-				if(this.driver__.driver){
-					nextTick().then(()=>{
-						driverObj__.moveNext();
-						// driverObj__.moveTo(29);
-					})
-				}
-			}else if(v == 'workspace'){
-				this.openType.singleton = false
-				this.openType.sex = false
-				// this.workspace.workspaceList.forEach((v:any) => {
-				// 	v.putName = false
-				// });
-				this.openType.workspace = !this.openType.workspace
-			}else if(v == 'model'){
-				this.openType.singleton = false
-				this.openType.workspace = false
-				this.openType.sex = false
-				this.openType.model = !this.openType.model
-				this.getMannequins(false)
-				if(this.driver__.driver && this.openType.model){
-					nextTick().then(()=>{
-						driverObj__.moveTo(4);
-						// driverObj__.moveNext();
-					})
-				}
-			}else if(v == 'singleton'){
-				this.openType.singleton = !this.openType.singleton
-				this.openType.workspace = false
-				this.openType.sex = false
-			}else if(v == 'sex'){
-				this.openType.sex = !this.openType.sex
-				this.openType.workspace = false
-				this.openType.singleton = false
-				
-			}
-			let mask = document.getElementsByClassName("habit_mask")[0]
-			mask.addEventListener("click", this.documentClick,true);
-		},
-		documentClick(){
-			let mask = document.getElementsByClassName("habit_mask")[0]
-			mask.removeEventListener("click", this.documentClick);
-			this.openType.habit = false
-			this.openType.workspace = false
-			this.openType.model = false
-			this.openType.singleton = false
-			this.openType.sex = false
-		},
-		// //选择模特
-		// selectModels() {
-		// 	let modelsModal: any = this.$refs.modelsModal;
-		// 	modelsModal.init();
-		// },
-
-		// //确定选择模特
-		// sureSelectModel(event: any) {
-		// 	this.store.commit("setTemplateData", event);
-		// },
-		async setWorkspaceStyle(data: any){
-			
-			// this.workspaceItem.styleId = data.id
-			this.workspaceItem.styleName = data.name
-			this.workspaceItem.style = data.value
-			this.workspaceItem.styleId = data.id
-			if(data.isRevampModel){
-				await this.getMannequins(true)
-			}
-			if(!this.workspaceItem.overallSingle){
-				this.workspaceItem.position = 'Overall'
-			}
-			this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
-		},
-		setStyle(){
-			// this.openType.habit = false
-			let habitSetStyle:any = this.$refs.habitSetStyle;
-			// habitSetStyle.habitSetStyleMask = true
-			// habitSetStyle.styleList = this.styleList
-			habitSetStyle.init(this.workspaceItem);
-		},
-		setParentData(){
-			// this.openType.habit = true
-			// this.getDetail(this.workspaceItem.id)
-		},
-    },
-});
-</script>
-<style lang="less" scoped>
-.habit {
-    position: relative;
-    .habit_button {
-		background-color: #fff;
-        border: solid 2px #000;
-		border-radius: 4rem;
-        font-weight: 600;
-        font-size: 1.8rem;
-		padding: 0 1.8rem;
-		cursor: pointer;
-		position: relative;
-		line-height: 6rem;
-        .fi-bs-angle-down {
-            margin-left: calc(1rem*1.2);
-            display: inline-block;
-            transform: translateY(2px);
-        }
-    }
-	.habit_mask{
-		position: absolute;
-		top: -20px;
-		left: auto;
-		right: -30px;
-		bottom: 0;
-		// background: #000;
-		opacity: 0;
-		width: 100vw;
-		height: 100vh;
-	}
-    .habit_content {
-        border: solid 2px #000;
-        border-radius: calc(1rem*1.2);
-        padding: calc(2rem*1.2);
-		// zoom: .75;
-		font-size: calc(1.6rem*1.2);
-        transform-origin: top right;
-        position: absolute;
-        right: calc(-.3rem*1.2);
-        top: 110%;
-        background: #fff;
-        // width: 25rem*1.2);
-		width: calc(30rem*1.2);
-		opacity: 0;
-		transition: all .3s;
-        transform: scale(0.75)translateY(10%);
-		display: none;
-		overflow: inherit !important;
-		&.active{
-			opacity: 1;
-			transform: scale(0.75)translateY(0%);
-		}
-        .habit_title {
-            h3 {
-                font-size: calc(1.6rem*1.2);
-                font-weight: 600;
-                color: #000;
-                margin: 0;
-            }
-            .habit_intro {
-                font-size: calc(1.2rem*1.2);
-                color: rgba(0, 0, 0, 0.5);
-                font-weight: 500;
-            }
-        }
-        .habit_type {
-            margin-top: calc(1.5rem*1.2);
-			cursor: pointer;
-			position: relative;
-			
-			.habit_workspace_show{
-				width: 100%;
-				z-index: 1;
-				transform: translateY(10%);
-				top: calc(4rem*1.2);
-				height: calc(14rem*1.2);
-				overflow-x: hidden;
-				cursor: auto;
-				&.active{
-					transform: translateY(0%);
-				}
-			}
-        }
-        .habit_Overal_Single {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin: calc(3rem*1.2) 0;
-			position: relative;
-			&.habit_style{
-				justify-content: space-between;
-				.habit_style_left{
-					display: flex;
-					flex: 1;
-					overflow: hidden;
-					div{
-						font-weight: 900;
-						margin-right: 2rem;
-					}
-					span{
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						flex: 1;
-					}
-				}
-			}
-            .habit_Overal_Single_text {
-                font-weight: 600;
-                color: rgba(0, 0, 0, 0.5);
-                &.active {
-                    color: rgba(0, 0, 0, 0.7);
-                    font-weight: 900;
-                }
-                
-            }
-            :deep(.ant-switch) {
-                margin: 0 calc(1rem*1.2);
-            }
-			.habit_sex_show{
-				width: 100%;
-				z-index: 1;
-				transform: translateY(10%);
-				top: calc(4rem*1.2);
-				height: calc(14rem*1.2);
-				overflow-x: hidden;
-				cursor: auto;
-				&.active{
-					transform: translateY(0%);
-				}
-			}
-        }
-        .habit_habit_singleton {
-            margin-bottom: calc(3rem*1.2);
-			position: relative;
-			.habit_singleton_show{
-				width: 100%;
-				z-index: 1;
-				transform: translateY(10%);
-				top: calc(4rem*1.2);
-				height: calc(14rem*1.2);
-				overflow-x: hidden;
-				cursor: auto;
-				&.active{
-					transform: translateY(0%);
-				}
-			}
-			
-        }
-        .habit_System_Designer {
-			// margin-top: calc(8rem*1.2);
-            
-           
-            .habit_System_Designer_text_max {
-                display: flex;
-                justify-content: space-between;
-				text-align: center;
-				
-                .habit_System_Designer_text {
-					>span{
-						font-size: 1.2rem;
-						font-weight: 600;
-						color: #2d2e76;
-					}
-                }
-            }
-        }
-		.habit_model{
-			margin-top: calc(2rem*1.2);
-		}
-		
-		.habit_model_show{
-			position: absolute;
-			background-color: #fff;
-			border: solid 2px #000;
-			border-radius: calc(1rem*1.2);
-			padding: calc(2rem*1.2);
-			bottom: calc(-.5rem*1.2);
-			transform: translateY(110%);
-			right: calc(-.2rem*1.2);
-			width: calc(40rem*1.2);
-			// width: 35rem*1.2);
-			opacity: 0;
-			transition: all .3s;
-			display: none;
-			&.active{
-				opacity: 1;
-				transform: translateY(100%);
-			}
-			.habit_btn{
-				min-height: calc(26rem*1.2);
-				display: flex;
-				justify-content: space-between;
-				.model_current{
-					margin-right: calc(3rem*1.2);
-					display: flex;
-					flex-direction: column;
-					.model_text{
-						text-align: center;
-					}
-				}
-			}
-			.habit_model_list{
-				margin: 0;
-				li{
-					padding: calc(.5rem*1.2) 0;
-					display: flex;
-					input{
-						border: 0;
-						width: 80%;
-						background: rgba(0,0,0,0);
-					}
-					>div{
-						cursor: pointer;
-						width: 80%;
-						white-space: nowrap;
-						text-overflow:ellipsis;
-						overflow:hidden;
-					}
-					&.newWorkspace{
-						text-align: center;
-						justify-content: center;
-
-						div{
-							border-radius: 50%;
-							border: 1px solid #000;
-							display: inline-block;
-							width: calc(2rem*1.2);
-							height: calc(2rem*1.2);
-							line-height: calc(2rem*1.2);
-							text-align: center;
-						}
-						i{
-							flex: 1;
-						}
-					}
-					i{
-						cursor: pointer;
-					}
-					.fi-rr-trash{
-						margin-left: calc(1rem*1.2);
-					}
-				}
-				li:hover{
-					background: rgba(0, 0, 0, 0.1);
-				}
-				.material_content_list_loding{
-					width: 100%;
-					height: calc(4rem*1.2);
-					display: flex;
-					img{
-						width: auto;
-						margin: 0 auto;
-						height: 100%;
-					}
-				}
-
-			}
-			.model_Designer{
-				flex: 1;
-				overflow: hidden;
-				display: flex;
-				flex-direction: column;
-				.model_text{
-					display: flex;
-					justify-content: center;
-					:deep(.ant-switch) {
-						margin: 0 calc(1rem*1.2);
-					}
-					.habit_System_Seleves_text {
-						font-weight: 600;
-						color: rgba(0, 0, 0, 0.5);
-						&.active {
-							color: rgba(0, 0, 0, 0.7);
-							font-weight: 900;
-						}
-						:deep(.ant-switch-checked) {
-							background-color: #000;
-						}
-					}
-				}
-			}
-			.model_img{
-				display: flex;
-				flex: 1;
-				align-items: center;
-				overflow-x: auto;
-				
-				>div{
-					display: flex;
-					
-				}
-				div{
-					width: auto;
-					margin-right: calc(1rem*1.2);
-				}
-				img{
-					width: calc(10rem*1.2);
-					cursor: pointer;
-				}
-			}
-		}
-		
-    }
-}
-.habit :deep(.ant-dropdown-button) {
-    margin-right: 8px;
-    margin-bottom: 8px;
-}
-.habit :deep(.ant-btn) {
-    box-shadow: none !important;
-	height: 4.2rem;
-    color: rgba(0, 0, 0, 0.5);
-    box-shadow: none;
-    border: none;
-    background: #f6f6f6;
-    width: 100%;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-	font-size: calc(1.4rem*1.2);
-	 > .anticon + span{
-		max-width: 80%;
-		overflow: hidden;
-	}
-}
-</style>
\ No newline at end of file
diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue
index 63b57c8a..c49d5554 100644
--- a/src/component/DetailCopy/designDetail.vue
+++ b/src/component/DetailCopy/designDetail.vue
@@ -264,7 +264,7 @@ export default defineComponent({
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
 				let data:any = {
 					changed:false,
-					color:(newData && detailData.currentDetailType == 'color' && isCurrent)?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`,
+					color:(detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`,
 					designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType,
 					id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id,
 					// maskMinioUrl:'',
diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue
index 486cf197..22b9ec1a 100644
--- a/src/component/DetailCopy/model/modelPosition.vue
+++ b/src/component/DetailCopy/model/modelPosition.vue
@@ -260,8 +260,8 @@ export default defineComponent({
 		const getSubmitData = (value:any)=>{
 			let parentNode = document.getElementsByClassName('molepositon')[0].getElementsByClassName("designOpenrtion_imgMask")[0].getBoundingClientRect()
 			let ratio = detailData.frontBack.body.layersObject[0].imageSize[0]/parentNode.width
-			let arr:any = sort(detailData.frontBack.front)
-			// let arr:any = sort(JSON.parse(JSON.stringify(detailData.frontBack.front)))
+			// let arr:any = sort(detailData.frontBack.front)
+			let arr:any = sort(JSON.parse(JSON.stringify(detailData.frontBack.front)))
 			let num = 10
 			arr.forEach((item:any)=>{
 				item.priority = num++
diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index fed52001..6d2a6841 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -32,7 +32,6 @@
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from 'vue'
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
 import { Https } from "@/tool/https";
 import { message, Upload, Modal } from "ant-design-vue";
diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue
deleted file mode 100644
index e9276f33..00000000
--- a/src/component/HomePage/Header.vue
+++ /dev/null
@@ -1,838 +0,0 @@
-<template>
-    <div class="header_max">
-		
-        <header class="header_component">
-            <div class="header_right_content">
-                <div class="header_user_icon"></div>
-                <!-- <div class="header_icon icon iconfont icon-touxiang3"></div> -->
-                <div class="header_user_content">
-                    <div v-if="isTest" class="username"><span>/</span> {{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
-                    <div v-else class="username"><span>/</span> {{$t('Header.hello')}}@{{ userInfo?.userName }}</div>
-                    <div
-						v-if="!isMurmur"
-                        :class="[
-                            'icon',
-                            'iconfont',
-                            'icon-xiala',
-                            isShowOperate ? 'icon_rotate' : '',
-                        ]"
-                        @click.stop="changeShowOperateContent()"
-                    ></div>
-                   
-                </div>
-				<div @click="openTask">abc</div>
-				<!-- <div class="header_user_content marLeft2">
-					<span class="username">{{$t('Header.language')}}</span>
-					<div
-                        :class="[
-                            'icon',
-                            'iconfont',
-                            'icon-xiala',
-                            isLanguage ? 'icon_rotate' : '',
-                        ]"
-                        @click.stop="changeLanguage()"
-                    ></div>
-				</div> -->
-				<div
-					class="trialApproval button_second credits hideChecked"
-                >
-					Credits:&nbsp;
-					<span :title="credits">
-						<!-- <div>{{ String(credits.value[credits.value.legnth-1]) }}</div> -->
-						<div class="credits_item" v-for="item in String(credits)" :style="{'transform': 'translateY('+item*-100+'%)'}">
-							<div v-for="numItem in 10">{{ numItem-1 }}</div>
-						</div>
-					</span>
-					<i @click="getCredits" class="fi fi-br-refresh" :class="[activeCredits?'active':'']"></i>
-					<i @click="Assignment" class="fi fi-rr-gift" title="Assignment"></i>
-					<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
-                </div>
-            </div>
-            <nav class="header_nav_content">
-                <div :class="['nav_item',$route.name === 'home' ? 'select_nav' : '',
-                    ]"
-                    @click="turnToPage('home')"
-                >
-					{{$t('Header.HOME')}}
-                </div>
-                <div
-                    :class="['nav_item', $route.name === 'library' ? 'select_nav' : '',]"
-                    @click="turnToPage('library')"
-                >
-					{{$t('Header.LIBRARY')}}
-                </div>
-                <div
-                    :class="['nav_item',$route.name === 'history' ? 'select_nav' : '',]"
-                    @click="turnToPage('history')"
-                >
-					{{$t('Header.HISTORY')}}
-                    
-                </div>
-            </nav>
-           
-			<div class="header_right">
-				<img
-                class="header_logo"
-                @click="turnToNewPage('https://www.aidlab.hk/en/')"
-                src="@/assets/images/loginPage/aida_logo.png"
-            />
-				<Habit></Habit>
-			</div>
-        </header>
-		<nav class="select_block" v-show="isShowOperate">
-			<!-- <div class="select_item" @click="showBindEmailModal()">
-				<span class="icon iconfont icon-youxiang"></span><span class="select_item_des">{{$t('Header.bindEmail')}}</span>
-			</div> -->
-			<div class="select_item" @click.stop="isLanguage = !isLanguage">
-				<span class="icon iconfont icon-yuyan"></span>
-				<span class="select_item_des">{{$t('Header.language')}}</span>
-			</div>
-			<div class="select_item" @click="orderForm()">
-				
-				<i class="fi fi-rs-notebook"></i>
-				<span class="select_item_des">View Orders</span>
-			</div>
-			<div class="select_item" @click="logout()">
-				<span class="icon iconfont icon-tuichu"></span
-				><span class="select_item_des">{{$t('Header.logOff')}}</span>
-			</div>
-			
-		</nav>
-		<ul class="select_block select_list" v-show="isLanguage">
-			<li class="select_item" v-for="item in language"  @click="setLocale(item.value)">
-				<span class="select_item_des">{{ item.name }}</span>
-			</li>
-		</ul>
-        <a-modal
-            class="modal_component"
-            v-model:visible="bindEmailVisible"
-            :footer="null"
-            title="Mailbox binding"
-            width="56rem"
-            :maskClosable="false"
-			:keyboard="false"
-            :centered="true"
-        >
-            <template #closeIcon v-if="!isHaveBindEmail && bindEmailStep === 1">
-                <div class="skip_content">{{$t('Header.skip')}}</div>
-            </template>
-            <div class="bind_email_content" v-if="isHaveBindEmail">
-                <div class="bind_email_tip">{{$t('Header.emailContent')}}</div>
-                <div class="bind_email">{{ userInfo.email }}</div>
-            </div>
-            <div class="bind_email_content" v-else>
-                <!-- 绑定邮箱第一步 start -->
-                <div v-show="bindEmailStep === 1">
-                    <div class="bind_email_form_content">
-                        <div class="bind_email_form_title">{{$t('Header.Email')}}</div>
-                        <input
-                            class="bind_email_form_input"
-                            placeholder="Enter a new email"
-                            v-model="email"
-                            @keydown.enter="emailNextStepFun()"
-                        />
-                    </div>
-                    <div
-                        class="bind_email_submit_button"
-                        @click="emailNextStepFun()"
-                    >
-                        {{$t('Header.NextStep')}}
-                    </div>
-                </div>
-                <!-- 绑定邮箱第一步 end -->
-
-                <!-- 绑定邮箱第二步 start -->
-                <div v-show="bindEmailStep === 2">
-                    <div @click="emailLastStepFun()">
-                        <span class="icon iconfont icon--shangyibu"></span
-                        ><span class="email_last_step_content"
-                            >{{$t('Header.verification')}}</span
-                        >
-                    </div>
-                    <div class="email_last_step_des">
-                        <div class="sent_email_content">
-                            {{$t('Header.SentTo')}} {{ email }}
-                        </div>
-                        <div class="tip_content">
-                            <span v-show="time">{{ time }}s</span>
-                            <span v-show="!time" @click="emailNextStepFun()"
-                                >{{$t('Header.Resend')}}Resend</span
-                            >
-                        </div>
-                    </div>
-                    <VerificationCodeInput
-                        :ct="emailCode"
-                        @sendCaptcha="submitBindEmail($event)"
-                    ></VerificationCodeInput>
-                </div>
-                <!-- 绑定邮箱第一步 end -->
-            </div>
-        </a-modal>
-		<payOrder ref="payOrder"></payOrder>
-		<UpgradePlan ref="UpgradePlan"></UpgradePlan>
-		<TaskPage ref="TaskPage"></TaskPage>
-    </div>
-</template>
-<script >
-import { defineComponent, createVNode, ref, computed } from "vue";
-import { isEmail } from "@/tool/util";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
-import payOrder from "@/component/Pay/payOrder.vue";
-import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
-import Habit from "@/component/Detail/habit.vue";
-import TaskPage from "@/component/HomePage/TaskPage.vue";
-import UpgradePlan from "@/component/HomePage/UpgradePlan.vue";
-import { Https } from "@/tool/https";
-import { Modal, message } from "ant-design-vue";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { useStore } from "vuex";
-import { setLang } from "@/tool/guide";
-import { useI18n } from "vue-i18n";
-export default defineComponent({
-    components: {
-        VerificationCodeInput,
-		Habit,
-		UpgradePlan,
-		payOrder,
-		TaskPage,
-    },
-	setup(){
-        const store = useStore();
-		const {t} = useI18n()
-		const {locale} = useI18n()
-		let isTest = ref()
-		let isMurmur = ref()
-		let credits = computed(()=>{
-			return store.state.UserHabit.credits.value
-		})
-		let activeCredits = ref(false)
-		return {
-			store,
-			t,
-			locale,
-			isTest,
-			isMurmur,
-			credits,
-			activeCredits,
-		}
-	},
-    data() {
-        return {
-            isShowOperate: false,
-            bindEmailVisible: false,
-            isHaveBindEmail: false,
-            bindEmailStep: 1,
-            email: "",
-            emailCode: ["", "", "", "", "", ""], //邮箱验证码
-            time: 60, //60秒倒计时
-            timer: 0,
-            userInfo: {},
-            timerOperate: null,
-            numTime: 30,
-            timerSec: null,
-            modalWarning: null,
-            isLanguage: false,
-
-			language:[
-				{name:'English',value:'ENGLISH'},
-				{name:'中文',value:'CHINESE_SIMPLIFIED'},
-				// {name:'한국인',value:'KOREAN'},
-				// {name:'にほんご',value:'JAPANESE'},
-				// {name:'Русский',value:'RUSSIAN'},
-				// {name:'Français',value:'FRENCH'},
-				// {name:'แบบไทย',value:'THAI'},
-				// {name:'Tiếng Việt',value:'VIETNAMESE'},
-				// {name:'Italiano',value:'ITALIAN'},       
-			],
-        };
-    },
-	watch: {
-		// credits.value(newVal,oldVal){
-		// 	console.log(String(newVal).length);
-		// }
-	},
-    mounted() {
-        let isTest = getCookie('isTest')//获取是否是试用用户
-        this.isTest =JSON.parse(isTest)
-        let isMurmur = getCookie('isMurmur')//获取是否是试用用户
-        this.isMurmur =JSON.parse(isMurmur)
-        this.userInfo = JSON.parse(getCookie("userInfo"));
-        if (!this.userInfo) {
-            this.$router.replace("/");
-        } else {
-            this.accountIsLogin(this.userInfo);
-        }
-        this.isHaveBindEmail = this.userInfo?.email ? true : false;
-		if(!this.isMurmur){
-			this.operateClick();
-			document.addEventListener("click", this.operateClick);
-		}
-		this.getCredits()
-		this.getLang('')
-    },
-    methods: {
-        turnToNewPage(url) {
-            window.open(url);
-        },
-
-        turnToPage(name) {
-            let noRefresh = name === "home" ? true : false;
-            this.$router.push({ name: name, params: { noRefresh: noRefresh } });
-        },
-		UpgradePlan(){//购买积分
-			let UpgradePlan = this.$refs.UpgradePlan
-			UpgradePlan.init()
-		},
-		Assignment(){//任务
-			// let num = 123+this.credits
-			// this.store.commit('setCredits',num)
-		},
-		getCredits(){//刷新当前积分
-			if(!this.activeCredits){
-				this.activeCredits = true
-				this.store.dispatch('getCredits').then((rv)=>{
-					setTimeout(()=>{
-						this.activeCredits = false
-					},300)
-				})
-			}else{
-				this.activeCredits = false
-			}
-			
-			
-		},
-        //点击下拉图标出现操作
-        changeShowOperateContent() {
-            this.isShowOperate = !this.isShowOperate;
-            document.addEventListener(
-                "click",
-                this.closeShowOperateContent,
-                false
-            );
-        },
-		changeLanguage(){
-			this.isLanguage = !this.isLanguage;
-            document.addEventListener(
-                "click",
-                this.closeShowOperateContent,
-                false
-            );
-		},
-
-        //关闭下拉图标
-        closeShowOperateContent() {
-            this.isShowOperate = false;
-			this.isLanguage = false
-            document.removeEventListener("click", this.closeShowOperateContent);
-        },
-
-        //打开绑定邮箱弹窗
-        showBindEmailModal() {
-            this.bindEmailVisible = true;
-        },
-
-        emailNextStepFun() {
-            if (!isEmail(this.email)) {
-                message.info(this.t('Header.jsContent1'));
-                return;
-            }
-            let data = {
-                email: this.email,
-                operationType: "BIND_MAILBOX",
-            };
-            const hide = message.loading("loading", 0);
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data)
-                .then((rv) => {
-                    if (rv) {
-                        this.bindEmailStep = 2;
-                        (this.emailCode = ["", "", "", "", "", ""]),
-                            this.createTimer();
-                        hide();
-                        message.success(this.t('Header.jsContent2'));
-                    }
-                })
-                .catch((res) => {
-                    hide();
-                });
-        },
-
-        //绑定邮箱的上一步
-        emailLastStepFun() {
-            this.bindEmailStep = 1;
-            this.email = "";
-            (this.emailCode = ["", "", "", "", "", ""]), this.clearTimer();
-        },
-
-        //创建定时器
-        createTimer() {
-            this.timer = setInterval(() => {
-                this.time--;
-                if (!this.time) {
-                    clearInterval(this.timer);
-                }
-            }, 1000);
-        },
-
-        //清除定时器
-        clearTimer() {
-            this.time = 60;
-            if (this.timer) {
-                clearInterval(this.timer);
-            }
-        },
-		//查看订单
-		orderForm(){
-			let payOrder = this.$refs.payOrder
-			payOrder.init()
-		},
-        //登出
-        async logout() {
-            let data = {
-                userId: this.userInfo.userId,
-            };
-			let isTest = getCookie('isTest')
-			// console.log(getCookie("token"));
-			if(JSON.parse(isTest)){
-				await Https.axiosGet(Https.httpUrls.trialUserLogout,).then((rv) => {
-					Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
-						this.$router.replace("/login");
-						WriteCookie("token");
-					});
-				})
-			}else{
-				await Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
-					WriteCookie("token");
-				});
-				this.$router.replace("/login");
-			}
-			// window.location.reload()
-            
-        },
-
-        //绑定邮箱
-        submitBindEmail(emailVerifyCode) {
-            let data = {
-                userEmail: this.email,
-                userId: this.userInfo.userId,
-                emailVerifyCode: emailVerifyCode,
-            };
-            Https.axiosPost(Https.httpUrls.accountBindEmail, data).then(
-                (rv) => {
-                    if (rv) {
-                        this.userInfo.email = this.email;
-                        (this.bindEmailVisible = false),
-                            (this.bindEmailStep = 1);
-                        this.clearTimer();
-                        this.emailCode = ["", "", "", "", "", ""];
-                    }
-                }
-            );
-        },
-
-        //判断是否登录
-        accountIsLogin(userInfo) {
-            let data = {
-                userId: userInfo.userId,
-            };
-            Https.axiosPost(Https.httpUrls.accountIsLogin, data).then((rv) => {
-                if (!rv) {
-                    this.$router.replace("/");
-                }
-            });
-        },
-
-        //点击重置判断是否长时间五操作
-        operateClick() {
-            if (this.timer) {
-                clearTimeout(this.timer);
-            }
-            let _this = this;
-            let timeNum = 1000 * 60 * 120;
-            this.timer = setTimeout(() => {
-                this.modalWarning = Modal.warning({
-                    title: () =>
-						this.t('Header.jsContent3',{numTime:_this.numTime}),
-                    icon: createVNode(ExclamationCircleOutlined),
-                    okText: "Ok",
-					centered:true,
-                    onOk() {
-                        _this.numTime = 30;
-                        clearInterval(_this.timerSec);
-                    },
-                });
-                _this.numCounter();
-            }, timeNum);
-        },
-
-        numCounter() {
-            this.timerSec = setInterval(() => {
-                if (this.numTime > 0) {
-                    this.numTime = this.numTime - 1;
-                } else {
-                    clearTimeout(this.timer);
-                    clearInterval(this.timerSec);
-                    this.logout();
-                    this.modalWarning.destroy();
-                }
-            }, 1000);
-        },
-		//获取当前语言
-		getLang(v){
-			let data
-			Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
-                (rv) => {
-                    if (rv) {
-						this.locale = rv
-						setLang(rv)
-                    }
-                }
-            );
-		},
-		setLang(v){
-			
-			Https.axiosGet(Https.httpUrls.changeUserLanguage,{params:{language:v}}).then((rv) => {
-				if (rv) {
-					if (rv) {
-                        let token = rv;
-                        setCookie("token", token);
-						this.getLang('')
-						// if(this.$router.currentRoute._value.path == '/home'){
-						// 	this.$router.push("/home")
-						// }else{
-						// 	this.$router.push("/home")
-						// }
-						this.store.commit('clearAllData')
-						window.location.reload()
-                    }
-				}
-			})
-		},
-		
-		setLocale(v){
-			this.setLang(v)
-		},
-		openTask(){
-			let taskPage = this.$refs.TaskPage
-			taskPage.init()
-		},
-    },
-});
-</script>
-
-<style lang="less" scoped>
-.header_max{
-	position: relative;
-}
-.header_component {
-    display: flex;
-	justify-content: space-between;
-	// padding: 0 30px;
-	padding-left: 0;
-    width: 100%;
-    height: 7rem;
-    background: rgba(255, 255, 255, 0.2);
-    // border-bottom: 0.1rem solid rgba(3, 3, 3, 0.1);
-    position: relative;
-    align-items: center;
-
-	z-index: 1049;
-	background-color: #fff;
-	.header_right{
-		width: 33%;
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-	}
-    .header_logo {
-        width: 14.4rem;
-        height: 3.2rem;
-        margin: 2.1rem 2.8rem 0 ;
-		// position: absolute;
-		margin-top: 0;
-    }
-
-    .header_nav_content {
-        display: flex;
-        // margin-left: 28.9rem;
-		// margin-left: 46.2rem;
-        align-items: center;
-
-        .nav_item {
-            padding: 1.1rem 1rem;
-            border-bottom: 0.1rem solid transparent;
-            margin-right: 3.4rem;
-            font-size: 1.6rem;
-            line-height: 1.3rem;
-            // color: #333333;
-            color: #000;
-            cursor: pointer;
-            font-weight: 900;
-			&.nav_item:nth-child(3){
-				margin: 0;
-			}
-			&.nav_item::before {
-				position: absolute;
-				content: "";
-				display: block;
-				background: #000;
-				height: .3rem;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: .3rem;
-				width: 0px;
-				transition: 0.3s all;
-			}
-			&.select_nav {
-				color: #000;
-				transform: scale(1.15);
-			}
-			&.select_nav::before {
-				width: 80%;
-			}
-        }
-    }
-
-    .header_right_content {
-        // position: absolute;
-        top: 0;
-        // right: 3.2rem;
-		left: 0;
-        display: flex;
-		width: 33%;
-		height: 100%;
-		align-items: center;
-		overflow: hidden;
-        .header_icon {
-            font-size: 3.6rem;
-            position: relative;
-            top: 0.3rem;
-        }
-		.header_user_icon{
-			height: 4rem;
-			width: 4rem;
-			background-color: #000;
-			border-radius: 50%;
-			transform: translateX(-40%)scale(1.3);
-		}
-        .header_user_content {
-            // margin-left: 2rem;
-            display: flex;
-            align-items: center;
-            position: relative;
-            // top: 1.2rem;
-            height: 3.7rem;
-			&.marLeft2{
-				margin-left: 2rem;
-			}
-            .username {
-                font-size: 1.8rem;
-                color: #1a1a1a;
-                margin: 0 0.8rem;
-				font-weight: 900;
-				span{
-					margin: .7rem;
-				}
-            }
-			
-            .icon-xiala {
-                font-size: 1.4rem;
-                cursor: pointer;
-				transition: .3s all;
-            }
-
-            .icon_rotate {
-                -moz-transform: rotate(180deg);
-                -webkit-transform: rotate(180deg);
-                transform: rotate(180deg);
-                animation-direction: 0.5s;
-            }
-        }
-		.credits{
-			font-size: 1.8rem;
-			color: #1a1a1a;
-			font-weight: 900;
-			width: auto;
-			padding: 0 1rem;
-			cursor: auto;
-			display: flex;
-			span{
-				width: 5rem;
-				display: inline-block;
-				overflow: hidden;
-				display: flex;
-				margin-right: .9rem;
-				.credits_item{
-					transition: .3s all;
-					div{
-						height: 100%;
-					}
-				}
-			}
-			i{
-				height: 100%;
-				display: inline-block;
-				border-left: .1rem solid ;
-				padding-left: .9rem;
-				margin-left: .9rem;
-				font-size: 1.8rem;
-				cursor: pointer;
-			}
-			.fi-br-refresh{
-				margin-left: 0;
-				border-left: none;
-				padding-left: 0;
-				&.active{
-					transition: all .3s;
-					transform: rotate(360deg);
-				}
-			}
-		}
-		.trialApproval{
-			margin-left: 2rem;
-		}
-    }
-    
-}
-.select_block {
-	z-index: 1050;
-	position: absolute;
-	left: 6.5rem;
-	top: 4.7rem;
-	width: 11.4rem;
-	background: #ffffff;
-	box-shadow: 0px 0.4rem 0.4rem 0px rgba(0, 0, 0, 0.1);
-	overflow: hidden;
-	border: 1px solid #000000;
-	&.select_list{
-		// display: none;
-		transform: translateX(105%);
-		// transform: translateX(120%);
-	}
-	.select_item {
-		padding-left: 1.5rem;
-		height: 4.1rem;
-		color: #4d4d4d;
-		display: flex;
-		align-items: center;
-		cursor: pointer;
-		user-select: none;
-
-		&:hover {
-			background: #f7f7f7;
-		}
-
-		.iconfont {
-			font-size: 1.4rem;
-		}
-
-		.select_item_des {
-			font-size: 1.3rem;
-			margin-left: 0.8rem;
-		}
-	}
-}
-.modal_component {
-    .skip_content {
-        width: 6rem;
-        height: 3rem;
-        line-height: 2.8rem;
-        border: 0.1rem solid #343579;
-        font-size: 1.4rem;
-        color: #343579;
-        position: absolute;
-        top: 1.8rem;
-        right: 1.8rem;
-        cursor: pointer;
-    }
-
-    .bind_email_content {
-        padding: 4.8rem 9.2rem 6rem;
-
-        .bind_email_tip {
-            font-size: 1.8rem;
-            color: #a5b0c2;
-            line-height: 1.9rem;
-            text-align: center;
-        }
-        .bind_email {
-            margin-top: 2rem;
-            font-size: 2.2rem;
-            font-weight: 400;
-            color: #030303;
-            text-align: center;
-        }
-
-        .bind_email_form_content {
-            .bind_email_form_title {
-                font-size: 2.2rem;
-                font-weight: bold;
-                color: #030303;
-                line-height: 2.4rem;
-            }
-
-            .bind_email_form_input {
-                width: 100%;
-                height: 4.6rem;
-                margin-top: 1rem;
-                border: 0.1rem solid #b4bed7;
-                padding-left: 2.1rem;
-                line-height: 4.6rem;
-                font-size: 1.8rem;
-                box-sizing: border-box;
-
-                &::placeholder {
-                    color: #a5b0c2;
-                }
-            }
-        }
-
-        .bind_email_submit_button {
-            height: 4.6rem;
-            line-height: 4.6rem;
-            background: #343579;
-            font-size: 1.6rem;
-            font-weight: 500;
-            color: #ffffff;
-            width: 12.8rem;
-            text-align: center;
-            cursor: pointer;
-            margin: 3rem auto 0;
-        }
-
-        .icon--shangyibu {
-            font-size: 2.5rem;
-            font-weight: bold;
-            color: #030303;
-        }
-
-        .email_last_step_content {
-            margin-left: 1rem;
-            font-size: 2.2rem;
-            font-family: PingFang SC;
-            font-weight: bold;
-            color: #030303;
-        }
-
-        .tip_content {
-            font-size: 1.3rem;
-            font-weight: bold;
-            color: #343579;
-            cursor: pointer;
-        }
-
-        .email_last_step_des {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            margin-top: 2.5rem;
-            margin-bottom: 1.5rem;
-
-            .sent_email_content {
-                font-size: 1.8rem;
-                font-weight: bold;
-                color: #a5b0c2;
-            }
-        }
-    }
-}
-</style>
diff --git a/src/component/HomePage/index/model/design/index.vue b/src/component/HomePage/index/model/design/index.vue
index 15584d32..405d9659 100644
--- a/src/component/HomePage/index/model/design/index.vue
+++ b/src/component/HomePage/index/model/design/index.vue
@@ -211,7 +211,6 @@
 <script lang="ts">
 import { defineComponent, h, ref, computed, reactive, toRefs, inject,provide,nextTick,createVNode,onBeforeUnmount, toRef} from "vue";
 // import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 import CollectionModal from "@/component/HomePage/collectionModal.vue";
 import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
 import productImg from "@/component/HomePage/productImg.vue";
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue
index 72d57954..95dc0c24 100644
--- a/src/component/HomePage/renew.vue
+++ b/src/component/HomePage/renew.vue
@@ -5,7 +5,7 @@
 		:get-container="() => $refs.renew"
 		v-model:visible="renewModel"
 		:footer="null"
-		:width="pageWidth"
+		width="130rem"
 		height="auto"
 		:maskClosable="false"
 		:centered="true"
@@ -27,80 +27,136 @@
 			</div>
 		</div>
 		<div class="renewContent">
-			<div class="generalModelTitle">
-				{{ $t('Renew.title') }}
+			<div class="left">
+				<div class="title">Unlock the Pro Advantage</div>
+				<div class="content">
+					<div class="benefits">
+						<div>Benefits</div>
+						<div class="contrast">
+							<div>Free</div>
+							<div>PRO</div>
+						</div>
+					</div>
+					<div class="benefitsItem">
+						<div class="describe">
+							<div class="icon">
+								<img src="https://storage.googleapis.com/chatapp-website-assets/stars.webp" >
+							</div>
+							<div class="text">
+								<p class="title">GPT-4o - DeepSeek-R1 - Gemini Pro and more</p>
+								<p class="info">More accurate answers with multiple latest AI models</p>
+							</div>
+						</div>
+						<div class="contrast">
+							<div>√</div>
+							<div>×</div>
+						</div>
+					</div>
+					<div class="benefitsItem">
+						<div class="describe">
+							<div class="icon">
+								<img src="https://storage.googleapis.com/chatapp-website-assets/stars.webp" >
+							</div>
+							<div class="text">
+								<p class="title">GPT-4o - DeepSeek-R1 - Gemini Pro and more</p>
+								<p class="info">More accurate answers with multiple latest AI models</p>
+							</div>
+						</div>
+						<div class="contrast">
+							<div>√</div>
+							<div>×</div>
+						</div>
+					</div>
+					<div class="benefitsItem">
+						<div class="describe">
+							<div class="icon">
+								<img src="https://storage.googleapis.com/chatapp-website-assets/stars.webp" >
+							</div>
+							<div class="text">
+								<p class="title">GPT-4o - DeepSeek-R1 - Gemini Pro and more</p>
+								<p class="info">More accurate answers with multiple latest AI models</p>
+							</div>
+						</div>
+						<div class="contrast">
+							<div>√</div>
+							<div>×</div>
+						</div>
+					</div>
+					<div class="benefitsItem">
+						<div class="describe">
+							<div class="icon">
+								<img src="https://storage.googleapis.com/chatapp-website-assets/stars.webp" >
+							</div>
+							<div class="text">
+								<p class="title">GPT-4o - DeepSeek-R1 - Gemini Pro and more</p>
+								<p class="info">More accurate answers with multiple latest AI models</p>
+							</div>
+						</div>
+						<div class="contrast">
+							<div>√</div>
+							<div>×</div>
+						</div>
+					</div>
+				</div>
 			</div>
-			<div class="renew_detail">
-				<div class="name generalModelTitle">{{ current?.title }}</div>
-				<div class="price_box">
-					<div class="price">
-						<sub>$</sub>
-						{{ current?.price[current?.type] }} <span>{{ current?.unit[current?.type] }}</span>
-					</div>
-					<div class="type" v-if="current.typeList.length > 1">
-						<label>
-							<input name="pric" type="radio" value="monthly" v-model="current.type" @change="setPricType('monthly')">
-							{{ $t('Renew.Monthly') }}
-						</label>
-						<label>
-							<input name="pric" type="radio" value="year" v-model="current.type" @change="setPricType('year')">
-							{{ $t('Renew.Yearly') }}
-						</label>
-					</div>
-					<div class="type promotion">
-						<div class="text">{{ $t('Renew.promotionCode') }}:</div>
-						<div class="succeed" v-show="promotionData.error == 'true'">
-							{{promotionData.code}}
-							<i class="fi fi-sr-times-hexagon" @click="clearPromotionCode"></i>
+			<div class="right">
+				<div class="title">
+					{{ $t('Renew.title') }}
+				</div>
+				<div class="info">Get started today for unlimited access!</div>
+				<div class="content">
+					<div class="productItem" :class="{active:item.price == current.price,sellWell:item.sellWell}" v-for="item in personage" :key="item.price" @click="setPromotionData(item)">
+						<div class="popular" v-show="item.sellWell">MOST POPULAR</div>
+						<div class="priceBox">
+							<div class="left">
+								<p class="productType">1 {{ item.type.label }}</p>
+								<p class="price">${{ item.price }}</p>
+							</div>
+							<div class="right">
+								<div class="promotion">
+									<div class="succeed" v-show="item.promotionData.error == 'true'">
+										{{item.promotionData.code}}
+										<i class="fi fi-sr-times-hexagon" @click="clearPromotionCode"></i>
+									</div>
+									<div class="input" @click.stop v-show="!item.promotionData.error || item.promotionData.error == 'false'">
+										<input type="text" :placeholder="$t('Renew.promotionCode')" v-model="item.promotionData.code">
+										<div style="cursor: pointer;" @click="examine(item)">{{ $t('Renew.use') }}</div>
+									</div>
+									<div class="error" v-show="item.promotionData.error == 'false'">{{item.promotionData.str}}</div>
+								</div>
+								<p class="discountsPrice" v-show="item.promotionData.price" style="text-align: center;">${{ item.promotionData.price }}</p>
+							</div>
 						</div>
-						<div class="input" v-show="!promotionData.error || promotionData.error == 'false'">
-							<input type="text" v-model="promotionData.code">
-							<div style="cursor: pointer;" @click="examine">{{ $t('Renew.use') }}</div>
+					</div>
+				</div>
+				<div class="payment">
+					<div class="allocation">
+						<div class="selectType">
+							<div class="text">{{ $t('Renew.Payment') }}:</div>
+							<label>
+								<input name="payment" type="radio" value="CreditCard" v-model="current.PaymentType" @change="setPaymentType('CreditCard')">
+								{{ $t('Renew.CreditCard') }}
+							</label>
+							<label>
+								<input name="payment" type="radio" value="Alipay" v-model="current.PaymentType" @change="setPaymentType('Alipay')">
+								{{ $t('Renew.Alipay') }}
+							</label>
 						</div>
-						<div class="error" v-show="promotionData.error == 'false'">{{promotionData.str}}</div>
 					</div>
-					<div class="type payment">
-						<div class="text">{{ $t('Renew.Payment') }}:</div>
-						<label>
-							<input name="payment" type="radio" value="CreditCard" v-model="current.PaymentType" @change="setPaymentType('CreditCard')">
-							{{ $t('Renew.CreditCard') }}
-						</label>
-						<label>
-							<input name="payment" type="radio" value="Alipay" v-model="current.PaymentType" @change="setPaymentType('Alipay')">
-							{{ $t('Renew.Alipay') }}
-						</label>
+					<div class="gallery_btn gallery_btn_radius" @click="payment">
+						Continue
 					</div>
-					<!-- <div class="autoRenewal">
-						<label>
-							{{ current.autoRenewal.text }} : 
-							<a-switch v-model:checked="current.autoRenewal.value" />
-						</label>
-					</div> -->
-					<div class="info">{{ current?.info }}</div>
 					<div class="payMethod_payAffirm_clause" ref="labelDisclaimer">
 						<label>
 							<input type="checkbox" v-model="clause">
 							<span class="generalModelDescription">{{ $t('upgradePlan.policy1') }}<a href="https://code-create.com.hk/aida-terms-and-conditions/" target="_blank">{{ $t('upgradePlan.policy2') }}</a>{{ $t('upgradePlan.policy3') }}<a href="https://code-create.com.hk/aida-subscription-agreement/" target="_blank">{{ $t('upgradePlan.policy4') }}</a>. *</span>
 						</label>
 					</div>
+					<!-- <div class="paySecure">
+						<svg data-v-4715f595="" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 17" class="shield-icon"><path fill="#4AA181" stroke="#4AA181" stroke-width=".395" d="M7.44.957 1.914 3.398a1.38 1.38 0 0 0-.822 1.256v3.69c0 1.648.443 3.257 1.218 4.667 1.577 2.154 3.835 3.222 5.986 3.222 2.152 0 4.206-1.069 5.387-3.21a9.7 9.7 0 0 0 1.225-4.679v-3.69a1.38 1.38 0 0 0-.822-1.256L8.56.957zm0 0h.001m-.001 0h.001m0 0c.351-.158.758-.159 1.119 0z"></path><g clip-path="url(#a)"><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.184" d="M10.634 6.563 7.016 10.18 5.37 8.536"></path></g><defs><clipPath id="a"><path fill="#fff" d="M4.055 4.586h7.895v7.895H4.055z"></path></clipPath></defs></svg>
+						<span>Pay safe & secure </span>
+					</div> -->
 				</div>
-				<div class="gallery_btn gallery_btn_radius" @click="payment">{{ $t('Renew.SubscribeNow') }}</div>
-			</div>
-			<div
-				class="login_footer_item_text"
-				@click="turnToWindow(
-					'https://code-create.com.hk/aida-terms-and-conditions/'
-				)"
-			>
-				Terms&Conditions
-			</div>
-			<div
-				class="login_footer_item_text"
-				@click="turnToWindow(
-					'https://code-create.com.hk/aida-subscription-agreement/'
-				)"
-			>
-				Privacy Policy
 			</div>
 		</div>
 		<div class="mark_loading" v-show="isShowMark_">
@@ -140,35 +196,65 @@ export default defineComponent({
 		})
 		let payMethodData = reactive({
 			clause:false,
-			labelDisclaimer:null,
+			labelDisclaimer:null as any,
 			newWindow:null as any,
 			isShowMark:false,
 			isShowMark_:false,
 		})
 		let renewData = reactive({
-			promotionData:{
-				code:'',
-				error:'',
-				str:'',
-				oldPrice:'',
-			},
-			personage:computed(()=>{
-			    return {
-					title:t('Renew.PersonalVersion'),
-					price:{
-						monthly:'500',
-						year:'5,000',
+			
+			personage:[
+					{
+						price:'500',
+						sellWell:true,
+						activity:false,//活动打折
+						type:{
+							value:'Month',
+							label:'Month',
+						},
+						PaymentType:'',
+						promotionData:{
+							code:'',
+							error:'',
+							str:'',
+							price:'',
+						},
 					},
-					unit:{
-						monthly:t('Renew.HKDMonth'),
-						year:t('Renew.HKDYear'),
+					{
+						price:'5,000',
+						sellWell:false,
+						activity:false,//活动打折
+						typeValue:'year',
+						type:{
+							value:'Year',
+							label:'Year',
+						},
+						PaymentType:'',
+						promotionData:{
+							code:'',
+							error:'',
+							str:'',
+							price:'',
+						},
 					},
-					type:'monthly',
-					PaymentType:'',
-					typeList:['monthly','year'],
-					info:'Tax, VAT not included.',
-				}
-			}),
+				],
+			// personage:computed(()=>{
+			//     return {
+			// 		title:t('Renew.PersonalVersion'),
+			// 		price:{
+			// 			monthly:'500',
+			// 			year:'5,000',
+			// 		},
+			// 		unit:{
+			// 			monthly:t('Renew.HKDMonth'),
+			// 			year:t('Renew.HKDYear'),
+			// 		},
+			// 		type:'monthly',
+			// 		PaymentType:'',
+			// 		typeList:['monthly','year'],
+			// 		info:'Tax, VAT not included.',
+			// 	}
+			// }),
 			firm:computed(()=>{
 			    return {
 					title:'Education Edition',
@@ -185,6 +271,7 @@ export default defineComponent({
 					},
 					typeList:['year'],
 					info:'Customised plan',
+
 				}
 			}),
 			education:computed(()=>{
@@ -212,14 +299,11 @@ export default defineComponent({
 		})
 		const init = ()=>{
 			renew.renewModel = true
-			renewData.current = renewData.personage
+			renewData.current = renewData.personage[0]
 		}
 		const cancelDsign = () => {
 			renew.renewModel = false
 		}
-		const setPricType=(str:any)=>{
-			renewData.current.type = str
-		}
 		const setPaymentType = (str:any)=>{
 			renewData.current.PaymentType = str
 		}
@@ -234,10 +318,7 @@ export default defineComponent({
 				}
 				return
 			}
-
-			let subscribeType = 'Year'
 			if(!renewData.current.PaymentType)return message.info(t('Renew.PleaseSelectPayment'))
-			if(renewData.current.type == 'monthly')subscribeType= 'Month'
 			// let data = {
 			// 	autoRenewal:renewData.current.PaymentType != 'Alipay',//one_time为不自动续费
 			// 	productName:'Subscription',
@@ -249,9 +330,9 @@ export default defineComponent({
 				productName:'Subscription',
 				quantity:1,
 				returnUrl:url,
-				subscribeType:subscribeType,//yearly为年费，monthly为月费
+				subscribeType:renewData.current.type.value,//yearly为年费，monthly为月费
 				wallet:'ALIPAYHK',
-				promotionCode:renewData.promotionData.code,				
+				promotionCode:renewData.current.promotionData.code,				
 			}
 			let httpsUrl = Https.httpUrls.payStripe
 			payMethodData.isShowMark_ = true
@@ -288,37 +369,41 @@ export default defineComponent({
 			renew.renewModel = false
 			setPaidBack()
 		}
-		const examine = ()=>{
+		const examine = (item:any)=>{
 			// renewData.promotionData.error
-			let price = renewData.current?.price[renewData.current?.type]
+			let price = item?.price
 			const normalNumber = Number(price.replace(/,/g, ''));
-			if(!renewData.promotionData.code){
+			if(!item.promotionData.code){
 				return
 			}
 			let data = {
-				promotionCode:renewData.promotionData.code,
+				promotionCode:item.promotionData.code,
 				price:normalNumber,
 			}
 			Https.axiosGet(Https.httpUrls.checkCoupon,{params:data}).then((rv:any)=>{
 				if(rv){
-					if(rv.status == "valid"){
-						renewData.promotionData.error = 'true'
-						renewData.promotionData.oldPrice = renewData.current?.price[renewData.current?.type]
-						renewData.current.price[renewData.current.type] = (Number(rv.discountedPrice)).toLocaleString()
-
-					}else{
-						renewData.promotionData.error = 'false'
-						renewData.promotionData.str = rv.message
-					}
+					renewData.personage.forEach((personageItem:any)=>{
+						if(personageItem.price == item.price){
+							if(rv.status == "valid"){
+								item.promotionData.error = 'true'
+								item.promotionData.price = (Number(rv.discountedPrice)).toLocaleString()
+							}else{
+								item.promotionData.error = 'false'
+								item.promotionData.str = rv.message
+							}
+						}
+					})
 				}else{
 				}
 			})
 		}
 		const clearPromotionCode = ()=>{
-			renewData.promotionData.error = '';
-			renewData.promotionData.code = ''
-			renewData.current.price[renewData.current.type] = renewData.promotionData.oldPrice
-			renewData.promotionData.oldPrice = ''
+			renewData.current.promotionData.error = '';
+			renewData.current.promotionData.code = ''
+			renewData.current.promotionData.price = ''
+		}
+		const setPromotionData = (item:any)=>{
+			renewData.current = item
 		}
         return{
 			store,
@@ -327,13 +412,13 @@ export default defineComponent({
 			...toRefs(payMethodData),
 			init,
 			cancelDsign,
-			setPricType,
 			setPaymentType,
 			payment,
 			setPaidBack,
 			completePayment,
 			examine,
 			clearPromotionCode,
+			setPromotionData
         }
     },
     data() {
@@ -350,159 +435,332 @@ export default defineComponent({
 </script>
 <style lang="less" scoped>
 .renew {
+	:deep(.ant-modal-body){
+		padding: 0;
+	}
    .renewContent{
-	display: flex;
-    flex-direction: column;
-    align-items: center;
-		.generalModelTitle{
-			text-align: center;
-		}
-		.renew_detail{
-			width: 58rem;
-			height: 60rem;
-			// height: 53rem;
-			border-radius: 3rem;
-			margin-bottom: 5rem;
-			border: 2px solid #000;
-			padding: 6rem 3rem 5rem;
-			display: flex;
-			flex-direction: column;
-			.price_box{
+		display: flex;
+		border-radius: 3rem;
+		overflow: hidden;
+		> .left,> .right{
+			> .title{
+				text-align: center;
+				font-size: 3.2rem;
+				font-weight: 600;
+				line-height: 4rem;
+			}
+			> .info{
+				text-align: center;
+				opacity: .6;
+				font-weight: 400;
+				margin-top: .8rem;
+				font-size: 1.6rem;
+			}
+			> .content{
+				margin-top: 2rem;
 				display: flex;
 				flex-direction: column;
-				align-items: center;
-				flex: 1;
-				justify-content: space-between;
-				margin-bottom: 3rem;
 			}
-			.price{
-				font-size: 6rem;
-				sub{
-					font-size: 2rem;
-					top: -3rem;
-				}
-				span{
-					font-size: 2rem;
-				}
+		}
+		> .left{
+			width: 60%;
+			background: #0f0f0f;
+			color: #fff;
+			padding: 4rem 3.2rem;
+			> .title{
+				opacity: .6;
 			}
-			.type{
-				display: flex;
-				&.promotion{
-					flex-wrap: wrap;
-					justify-content: center;
-					align-items: center;
-					> .succeed{
-						padding: 1rem;
+			> .content{
+				> .benefits,> .benefitsItem{
+					display: flex;
+					> .contrast{
+						margin-left: auto;
 						display: flex;
 						align-items: center;
-						border-radius: 1rem;
-						background: #eee;
-						> i{
+						> div{
+							width: 8rem;
+							text-align: center;
+						}
+						> div:nth-child(1){
+							margin-right: 2.4rem;
+							opacity: .5;
+						}
+						> div:nth-child(2){
+							opacity: 1;
+							color: #38c793;
+							text-shadow: 0 4px 27.1px #38c793b3;
+						}
+					}
+				}
+				> .benefits{
+					> div:nth-child(1){
+						opacity: .5;
+					}
+					font-weight: 600;
+					font-size: 2rem;
+					margin: 1rem 0;
+					padding: 0 1.6rem;
+				}
+				> .benefitsItem{
+					border: 1px solid #27272a;
+					border-radius: 2.4rem;
+					margin-bottom: 1.6rem;
+					padding: 1.6rem;
+					> .describe{
+						display: flex;
+						align-items: center;
+						> .icon{
+							border: 1px solid #27272a;
+							background: linear-gradient(#1d1d1d,#000);
+							border-radius: 1.4rem;
+							margin-right: 1.6rem;
+							padding: 1.4rem;
+							> img{
+								width: 3.5rem;
+								height: 3.5rem;
+							}
+						}
+						> .text{
+							> p{
+								margin: 0;
+							}
+							> .title{
+								font-size: 1.8rem;
+								font-weight: 600;
+							}
+							> .info{
+								font-weight: 400;	
+								margin-top: .4rem;
+								font-size: 1.6rem;
+								opacity: .5;
+							}
+						}
+					}
+				}
+			}
+		}
+		> .right{
+			width: 40%;	
+			flex-direction: column;
+			align-items: center;
+			padding: 4rem 3.2rem;
+			> .content{
+				margin-top: 2rem;
+				> .productItem{
+					margin-bottom: 1rem;
+					border-radius: 1rem;
+					overflow: hidden;
+					border: 2px solid #eaecf0;
+					
+					> .popular{
+						background: #2d9f75;
+						font-weight: 600;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						color: #fff;
+						padding: .8rem 1.2rem;
+					}
+					> .priceBox{
+						height: 11rem;
+						padding: 1rem 1.2rem;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						> .left,> .right{
+							p{
+								margin: 0;
+							}
+							> .discountsPrice ,> .price{
+								font-size: 1.8rem;
+								margin-top: .4rem;
+								opacity: .4;
+								font-weight: 500;
+							}
+						}
+						> .left{
+							> p:nth-child(1){
+								font-size: 2rem;
+								opacity: .7;
+								font-weight: 700;
+							}
+						}
+						> .right{
+							> .promotion{
+								display: flex;
+								align-items: center;
+								flex-direction: column;
+								> .text{
+									font-size: 1.4rem;
+									font-weight: 600;
+									margin-right: 2rem;
+								}
+								> .succeed{
+									padding: 1rem;
+									display: flex;
+									align-items: center;
+									border-radius: 1rem;
+									background: #eee;
+									// color: #fff;
+									// font-weight: 600;
+									> i{
+										display: flex;
+										margin-left: 1rem;
+										cursor: pointer;
+									}
+								}
+								> .input{
+									display: flex;
+									align-items: center;
+									border-radius: 2rem;
+									border: 2px solid #000;
+									overflow: hidden;
+									padding: 0 1rem;
+									input{
+										border: none;
+										height: 3rem;
+										width: 10rem;
+										font-size: 1.2rem;
+										background: rgba(0, 0, 0, 0);
+									}
+								}
+								> .error{
+									color: red;
+									text-align: center;
+									font-size: 1.2rem;
+								}
+							}
+							> .discountsPrice{
+								font-weight: 600;
+								color: red;
+							}
+						}
+					}
+					&.active{
+						background: #0ea98233;
+						border: 2px solid #0ea982;
+						> .priceBox{
+							> .left{
+								> p:nth-child(1){
+									opacity: 1;
+								}
+							}
+							> .right{
+								> .discountsPrice{
+									opacity: 1;
+								}
+							}
+						}
+					}
+					&.sellWell{
+						border: 2px solid #0ea982;
+					}
+				}
+				> .productItem:last-child{
+					margin-bottom: 2rem;
+				}
+			}
+			> .payment{
+				margin-top: auto;
+				> .allocation{
+					// border-radius: 1rem;
+					// border: 2px solid #eaecf0;
+					// padding: 1rem 1.2rem;
+					
+					> .selectType{
+						display: flex;
+						> .text{
+							font-size: 1.4rem;
+							font-weight: 600;
+							margin-right: 2rem;
+						}
+						label{
+							margin-right: 1rem;
 							display: flex;
-							margin-left: 1rem;
 							cursor: pointer;
+							input{
+								margin-right: .5rem;
+							}
 						}
 					}
-					> .input{
-						display: flex;
-						align-items: center;
-						border-radius: 2rem;
-						border: 2px solid #000;
-						overflow: hidden;
-						padding: 0 1rem;
-						input{
-							border: none;
-							height: 3rem;
-						}
-					}
-					> .error{
-						color: red;
-						width: 100%;
-						text-align: center;
-						font-size: 1.2rem;
-					}
-				}
-				> .text{
-					margin-right: 2rem;
-					// font-weight: 600;
 				}
 				
-				label{
-					display: flex;
-					align-items: center;
-					margin-right: 3rem;
-					input{
-						margin-right: 1rem;
-					}
+				> .gallery_btn{
+					width: 100%;
+					margin: 2rem 0;
+					margin-top: 1rem;
 				}
-				&.payment{
+				> .payMethod_payAffirm_clause{
 					label{
-						margin-right: 1rem;
 						input{
-							margin-right: .5rem;
+							margin-right: 1rem;
+							cursor: pointer;
+							vertical-align: middle;
+						}
+						span{
+							vertical-align: top;
+							font-size: 1.4rem;
+							a{
+								color: #000;
+								text-decoration: underline;
+							}
+						}
+					}
+					&.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);
+							}
 						}
 					}
 				}
-				label:last-child{
-				    margin-right: 0rem;
-				}
-			}
-		}
-		.login_footer_item_text{
-			text-align: center;
-			margin-bottom: 1.5rem;
-			text-decoration: underline;
-		}
-		.login_footer_item_text:last-child{
-			margin-bottom: 0rem;
-		}
-		.payMethod_payAffirm_clause{
-			label{
-				cursor: pointer;
-				input{
-					margin-right: 1rem;
-					cursor: pointer;
-					vertical-align: middle;
-				}
-				span{
-					vertical-align: top;
-					a{
-						color: #000;
-						text-decoration: underline;
-					}
-				}
-			}
-			&.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);
-					}
-				}
+				// > .paySecure{
+				// 	display: flex;
+				// 	margin-top: 1rem;
+				// 	> svg{
+				// 		width: 1.6rem;
+				// 		height: 1.6rem;
+				// 	}
+				// 	> span{
+				// 		font-weight: 600;
+				// 		font-size: 1.4rem;
+				// 	}
+				// }
 			}
 		}
+		// .login_footer_item_text{
+		// 	text-align: center;
+		// 	margin-bottom: 1.5rem;
+		// 	text-decoration: underline;
+		// }
+		// .login_footer_item_text:last-child{
+		// 	margin-bottom: 0rem;
+		// }
    }
    .mark_loading{
 		position: absolute;
 		z-index: 2;
 		background: #fff;
+		border-radius: 3rem;
 		.mark_loading_title{
 		font-size: 3rem;
 		// text-decoration: underline;
 		font-weight: 600;
 		margin-bottom: 2rem;
+		overflow: hidden;
 		// color: #fff;
 	}
 	.mark_loading_intro{
diff --git a/src/component/LibraryPage/brandDetail.vue b/src/component/LibraryPage/brandDetail.vue
index 0adcb335..e0e23f27 100644
--- a/src/component/LibraryPage/brandDetail.vue
+++ b/src/component/LibraryPage/brandDetail.vue
@@ -41,7 +41,7 @@
 					<i v-else class="fi fi-br-check" @click="editChek('brandSlogan')"></i>
 				</div>
 			</div>
-			<div style="flex:1;text-align: right;" v-show="imgList.length > 0">
+			<div style="flex:1;text-align: right;" v-show="fall?.list?.length > 0">
 				<div class="gallery_btn" v-show="schedule.num == 1||(schedule.num == 0 && !schedule.state)" @click="compute">Compute</div>
 				<div v-show="schedule.num != 1">
 					<a-progress  style="width:20rem;" :percent="schedule.num * 100" size="small" :showInfo="false" />
@@ -139,7 +139,6 @@ export default defineComponent({
 			upload:{},
 			token:getCookie("token"),
 			isShowMark:false,
-			imgList:[],
 			total:0,
 			pageSize:10,
 			currentPage:1,
diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue
index c797e2b4..7554d0c4 100644
--- a/src/component/WorksPage/Falls.vue
+++ b/src/component/WorksPage/Falls.vue
@@ -83,7 +83,7 @@ export default defineComponent({
 	setup(){
 		let list = ref([])
 		let wait_list = ref([])
-		let width = ref(250)
+		let width = ref(300)
 		let num_x = ref(1)
 		let gap_x = ref(0)
 		let gap_y = ref(0)
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 43dffb16..0cafc354 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -689,7 +689,8 @@ export default {
 		jsContent2:'The current network cannot load Google',
 	},
 	Renew:{
-		title:'Select The Best Plan For Your Needs',
+		// title:'Select The Best Plan For Your Needs',
+		title:'Find Your Ideal Plan',
 		Monthly:'Monthly',
 		Yearly:'Yearly',
 		promotionCode:'Promotion code',
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index f0934034..5905f36c 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -255,7 +255,7 @@ const userHabit : Module<UserHabit,RootState> = {
 			 */
 			state.userDetail.affiliate = data.affiliate
 			state.userDetail.systemUser = data.systemUser
-			// state.userDetail.systemUser = 3
+			state.userDetail.systemUser = 3
 			// 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户
 			state.userDetail.systemList = []
 			if(data.systemUser != 0)state.userDetail.systemList.push(1)
diff --git a/src/tool/listData.js b/src/tool/listData.js
index 7f46a14c..c0b04fc4 100644
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -231,4 +231,114 @@ const projectList = {
 		}
 	],
 }
-export {projectList}
\ No newline at end of file
+const openTypeList = (t)=>{
+	return {
+		tools:{
+			icon:'fi-rr-magic-wand',
+			label:'Advanced tools',
+			value:'advancedTools',
+			list:[
+				{
+					icon:'',
+					label:'All',
+					value:'all',
+				}
+			]
+		},
+		library:{
+			icon:'fi-rr-followcollection',
+			label:'Library',
+			value:'library',
+			router:'/home/library',
+			list:[
+				{
+					icon:'fi-rr-grid',
+					label:t('LibraryPage.Moodboard'),
+					value:'Moodboard',
+					router:'library=Moodboard'
+				},{
+					icon:'fi-rs-objects-column',
+					label:t('LibraryPage.Prints'),
+					value:'Printboard',
+					router:'library=Printboard'
+				},{
+					icon:'icon iconfont icon-a-waitao_changkuanwaitao11x',
+					label:t('LibraryPage.Sketches'),
+					value:'Sketchboard',
+					router:'library=Sketchboard'
+				},{
+					icon:'fi-ss-puzzle-piece',
+					label:t('LibraryPage.DesignElements'),
+					value:'DesignElements',
+					router:'library=DesignElements'
+				},{
+					icon:'fi-rs-people',
+					label:t('LibraryPage.Mannequins'),
+					value:'Models',
+					router:'library=Models'
+				},{
+					icon:'fi-ss-gem',
+					label:t('LibraryPage.brandDNA'),
+					value:'MyBrand',
+					router:'library=MyBrand'
+				},
+			]
+		},
+		history:{
+			icon:'fi-br-time-past',
+			label:'History',
+			value:'history',
+			list:[
+				{
+					icon:'',
+					label:'All',
+					value:'all',
+				}
+			]
+		},
+		gallery:{
+			icon:'fi-rr-gallery',
+			label:'Gallery',
+			value:'works',
+			router:'/home/works',
+			list:[
+				{
+					icon:'',
+					label:'All',
+					value:'all',
+					router:'works=all'
+				},{
+					icon:'',
+					label:'Like Works',
+					value:'favoriteWorks',
+					router:'works=favoriteWorks'
+				},{
+					icon:'',
+					label:'My Works',
+					value:'myWorks',
+					router:'works=myWorks'
+				},{
+					icon:'',
+					label:'New Year 2025',
+					value:'NewYear_2025',
+					router:'works=NewYear_2025'
+				},
+			]
+		},
+		event:{
+			icon:'fi-rr-calendar-star',
+			label:'Event',
+			value:'event',
+			router:'/home/events',
+			list:[
+				{
+					icon:'',
+					label:'All',
+					value:'all',
+					router:''
+				}
+			]
+		},
+	}
+}
+export {projectList,openTypeList}
\ No newline at end of file
diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue
index 3b8742a7..793eb5e3 100644
--- a/src/views/Administrator.vue
+++ b/src/views/Administrator.vue
@@ -305,6 +305,8 @@ export default defineComponent({
 	.administrator_page_right{
 		flex: 1;
 		width: 80%;
+		display: flex;
+		flex-direction: column;
 		.administrator_page_right_header{
 			display: flex;
             justify-content: space-between;
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index f9e514b0..24ff9094 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -1,102 +1,158 @@
 <template>
-    <div class="homeMain_max Guide_1_16_1">
-        <header class="homeMain_heade">
-            <div class="homeMain_right_content">
-                <div class="homeMain_user">
-					<div class="homeMain_user_icon" @click="openAccount">
-						<img :src="userDetail.avatar" alt="">
+    <div class="homeMain_max">
+		<div class="leftBox">
+			<div class="left">
+				<div class="title">
+					<span>AiDA</span>
+					<svg xmlns="http://www.w3.org/2000/svg" width="2rem" height="2rem" fill="currentColor" viewBox="0 0 24 24" data-v-1c7326d6=""><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h2V5H6Zm4 0v14h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-8ZM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6Z" clip-rule="evenodd" data-v-1c7326d6=""></path></svg>
+				</div>
+				<div class="newObj marginT2">
+					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.5 5v14m-7-7h14"></path></svg>
+					<p>New Chat</p>
+				</div>
+				<div class="navList marginT2">
+					<div class="tools list" v-for="item in openTypeList" :class="{active:openType == item.value}">
+						<div class="titleBox" @click="setOpenType(item.value)">
+							<div class="left">
+								<i :class="['fi',item.icon]"></i>
+								<span>{{item.label}}</span>
+							</div>
+							<div class="right">
+								<i class="fi fi-br-angle-small-down"></i>
+							</div>
+						</div>
+						<div class="detailBox">
+							<div class="detail" v-show="openType == item.value">
+								<div class="detailItem" v-for="childItem in item.list" @click="setRouter(item,childItem)" :class="{active:openTypeChild == childItem.value}">
+									<i v-show="childItem.icon" :class="['fi',childItem.icon]"></i>
+									<span>{{ childItem.label }}</span>
+								</div>
+							</div>
+						</div>
 					</div>
-					<div class="homeMain_user_detail">
+				</div>
+				<div class="navListBottom">
+					<div class="tools marginT2 list language" :class="{active:isLanguage}">
+						<div class="titleBox" @click="()=>isLanguage = !isLanguage">
+							<div class="left">
+								<i class="fi fi-br-angle-small-down"></i>
+								<span>Advanced Tools</span>
+							</div>
+							<div class="right">
+								<i class="fi fi-br-angle-small-down"></i>
+							</div>
+						</div>
+						<div class="detailBox">
+							<div class="detail" v-show="isLanguage">
+								<div class="detailItem">
+									<!-- <i class="fi fi-br-angle-small-down"></i> -->
+									<span>AI Image Generator</span>
+								</div>
+								<div class="detailItem active">
+									<svg data-v-2396c87a="" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14" class="dark-icon sidebar-lang-icon" width="20" height="20"><path stroke="#52525b" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.167" d="M11.667 3.5 5.25 9.917 2.334 7"></path></svg>
+									<span>AI Image Generator</span>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div v-if="userDetail.systemUser == 0 || userDetail.systemUser == 3" @click="openUpgradeToPro" class="gallery_btn gallery_btn_radius" style="width: 100%;">Upgrade to Pro</div>
+			</div>
+		</div>
+		<div class="rightBox">
+			<div class="right">
+				<div class="user">
+					<div class="homeMain_user">
 						<div class="homeMain_user_icon" @click="openAccount">
 							<img :src="userDetail.avatar" alt="">
 						</div>
-						<div v-if="userDetail.systemUser == 3" class="username">{{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
-						<div v-else class="username">{{$t('Header.hello')}}@{{ userDetail.userName }}</div>
-						<div class="homeMain_user_detail_attention">
-							<div class="attention_item">
-							<!-- 点击事件就用下面的div -->
-							<!-- <div class="attention_item attention_item_active"> -->
-								<div>{{ userDetail?.followeeCount }}</div>
-								<span>{{$t('account.Follow')}}</span>
+						<div class="homeMain_user_detail">
+							<div class="homeMain_user_icon" @click="openAccount">
+								<img :src="userDetail.avatar" alt="">
 							</div>
-							<div class="attention_item">
-								<div>{{ userDetail?.followerCount }}</div>
-								<span>{{$t('account.Fans')}}</span>
-							</div>
-							<!-- <div class="attention_item">
-								<div>22</div>
-								<span>作品数</span>
-							</div> -->
-						</div>
-						<div class="homeMain_subscribe">
-							<div>
-								<span class="font">Status</span>
-								<span v-if="userDetail.timeData.isExpiration" class="stateSucsess font">Valid <i class="fi fi-ss-check-circle"></i></span>
-								<span v-else class="stateError font">Expire <i class="fi fi-ss-check-circle"></i></span>
-								<span class="time">{{ userDetail.timeData.text }}</span>
-							</div>
-							<!-- <div>
-								<span class="font">Cancel Renewal <i class="fi fi-rr-arrow-small-right"></i></span>
-							</div> -->
-						</div>
-						<div class="homeMain_select">
-							<div class="select_item_box" @click.stop="isLanguage = !isLanguage">
-								<div class="select_item">
-									<span class="icon iconfont icon-yuyan"></span>
-									<span class="select_item_des">{{$t('Header.language')}}</span>
-									<span class="icon iconfont icon-xiala" :class="{'active': isLanguage}"></span>
+							<div v-if="userDetail.systemUser == 3" class="username">{{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
+							<div v-else class="username">{{$t('Header.hello')}}@{{ userDetail.userName }}</div>
+							<div class="homeMain_user_detail_attention">
+								<div class="attention_item">
+								<!-- 点击事件就用下面的div -->
+									<div>{{ userDetail?.followeeCount }}</div>
+									<span>{{$t('account.Follow')}}</span>
+								</div>
+								<div class="attention_item">
+									<div>{{ userDetail?.followerCount }}</div>
+									<span>{{$t('account.Fans')}}</span>
 								</div>
-								<ul class="select_list" :class="{'active': isLanguage}" @click.stop="">
-									<li class="select_item" v-for="item in language"  @click="setLocale(item.value)">
-										<span class="select_item_des">{{ item.name }}</span>
-									</li>
-								</ul>
 							</div>
-							<div class="select_item" @click="orderForm()">
-								
-								<i class="fi fi-rs-notebook"></i>
-								<span class="select_item_des">{{$t('Header.ViewOrders')}}</span>
+							<div class="homeMain_subscribe">
+								<div>
+									<span class="font">Status</span>
+									<span v-if="userDetail.timeData.isExpiration" class="stateSucsess font">Valid <i class="fi fi-ss-check-circle"></i></span>
+									<span v-else class="stateError font">Expire <i class="fi fi-ss-check-circle"></i></span>
+									<span class="time">{{ userDetail.timeData.text }}</span>
+								</div>
 							</div>
-							<router-link class="select_item" v-if="userDetail.systemList.indexOf(3) >= 0"  :to="`/administrator`">
-								<span class="icon iconfont icon-yonghu"></span>
-								<span class="select_item_des">Administrator</span>
-							</router-link>
-							<router-link class="select_item" :to="`/Affiliate`" v-if="userDetail.systemList.indexOf(2) >= 0">
-								<span class="icon iconfont icon-yonghu"></span>
-								<span class="select_item_des">Affiliate</span>
-							</router-link>
-							<div class="select_item" @click="getTutorial()">
-								<span class="fi fi-rr-book-user"></span>
-								<span class="select_item_des">{{$t('Header.Tutorial')}}</span>
-							</div>
-							<div class="select_item_long"></div>
-							<div class="select_item" @click="logout()">
-								<span class="icon iconfont icon-tuichu"></span>
-								<span class="select_item_des">{{$t('Header.logOff')}}</span>
+							<div class="homeMain_select">
+								<div class="select_item_box" @click.stop="isLanguage = !isLanguage">
+									<div class="select_item">
+										<span class="icon iconfont icon-yuyan"></span>
+										<span class="select_item_des">{{$t('Header.language')}}</span>
+										<span class="icon iconfont icon-xiala" :class="{'active': isLanguage}"></span>
+									</div>
+									<ul class="select_list" :class="{'active': isLanguage}" @click.stop="">
+										<li class="select_item" v-for="item in language"  @click="setLocale(item.value)">
+											<span class="select_item_des">{{ item.name }}</span>
+										</li>
+									</ul>
+								</div>
+								<div class="select_item" @click="orderForm()">
+									
+									<i class="fi fi-rs-notebook"></i>
+									<span class="select_item_des">{{$t('Header.ViewOrders')}}</span>
+								</div>
+								<router-link class="select_item" v-if="userDetail.systemList.indexOf(3) >= 0"  :to="`/administrator`">
+									<span class="icon iconfont icon-yonghu"></span>
+									<span class="select_item_des">Administrator</span>
+								</router-link>
+								<router-link class="select_item" :to="`/Affiliate`" v-if="userDetail.systemList.indexOf(2) >= 0">
+									<span class="icon iconfont icon-yonghu"></span>
+									<span class="select_item_des">Affiliate</span>
+								</router-link>
+								<div class="select_item" @click="getTutorial()">
+									<span class="fi fi-rr-book-user"></span>
+									<span class="select_item_des">{{$t('Header.Tutorial')}}</span>
+								</div>
+								<div class="select_item_long"></div>
+								<div class="select_item" @click="logout()">
+									<span class="icon iconfont icon-tuichu"></span>
+									<span class="select_item_des">{{$t('Header.logOff')}}</span>
+								</div>
 							</div>
 						</div>
-						
 					</div>
 				</div>
+				<div class="router">
+					<router-view v-if="!getLangIsShowMark" @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
+					</router-view>
+				</div>
+			</div>
+		</div>
+        <header class="homeMain_heade" v-show="false">
+            <div class="homeMain_right_content">
+                
 				<div
 					class="trialApproval button_second credits hideChecked"
                 >
 					{{$t('Header.Credits')}}:&nbsp;
 					<span :title="credits">
-						<!-- <div>{{ String(credits.value[credits.value.legnth-1]) }}</div> -->
 						<div class="credits_item" v-for="item in String(credits)" :style="{'transform': 'translateY('+item*-100+'%)'}">
 							<div v-for="numItem in 10">{{ numItem-1 }}</div>
 						</div>
 					</span>
 					<i @click="getCredits" class="fi fi-br-refresh" :class="[activeCredits?'active':'']"></i>
-					<!-- <i @click="Assignment" class="fi fi-rr-gift" title="Assignment"></i> -->
 					<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
                 </div>
-				<!-- <div class="gallery_btn" style="margin-left: 3rem;" @click="subscribe">{{$t('Header.SubscribeNow')}}</div> -->
-				<div v-if="userDetail.systemUser == 0 || userDetail.systemUser == 3" class="gallery_btn" style="margin-left: 3rem;" @click="subscribe">{{$t('Header.SubscribeNow')}}</div>
-				<div v-else style="width: 30rem;"></div>
             </div>
-			<navRouter :routerList="navRouterList"></navRouter>
+			<!-- <navRouter :routerList="navRouterList"></navRouter> -->
 			<div class="homeMain_right">
 				<div class="trialApproval credits message">
 					<div class="message_iconItem">
@@ -114,7 +170,6 @@
 							</div>
 					</div>
 				</div>
-
 				<!-- <Habit></Habit> -->
 			</div>
 			
@@ -122,16 +177,8 @@
 			<UpgradePlan ref="UpgradePlan"></UpgradePlan>
 			<TaskPage ref="TaskPage"></TaskPage>
         </header>
-		<div class="homeMain_content_body">
-			<!-- <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 v-if="!getLangIsShowMark" @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
-			</router-view>
-		</div>
+
+
 		<div class="mark_loading" v-show="getLangIsShowMark">
 			<a-spin size="large" />
 		</div>
@@ -144,7 +191,7 @@
     </div>
 </template>
 <script >
-import { defineComponent, createVNode, ref,toRefs, reactive, computed, onMounted, nextTick } from "vue";
+import { defineComponent, createVNode, ref,toRefs, reactive, computed, onMounted, nextTick, watch } from "vue";
 import { isEmail } from "@/tool/util";
 import { setCookie, getCookie, WriteCookie,clonAllCookie } from "@/tool/cookie";
 import payOrder from "@/component/Pay/payOrder.vue";
@@ -169,6 +216,8 @@ import { gsap, TweenMax,TweenLite } from "gsap";
 import { ScrollTrigger } from "gsap/ScrollTrigger";
 import MyWs from "@/tool/webSocket";
 import MyEvent from "@/tool/myEvents";
+import { useRouter,useRoute } from 'vue-router'
+import {openTypeList} from "@/tool/listData.js";
 export default defineComponent({
     components: {
         VerificationCodeInput,
@@ -187,6 +236,32 @@ export default defineComponent({
         const store = useStore();
 		const {t} = useI18n()
 		const {locale} = useI18n()
+		const route = useRoute()
+		const router = useRouter()
+		const homeMainData = reactive({
+			openType:'',
+			openTypeChild:'',
+			isLanguage:false,
+			openTypeList:openTypeList(t),
+		})
+		watch(() => route.query,
+			(query, oldQuery) => {
+				// if(oldQuery && query?.works == oldQuery?.works)return
+				console.log(query,oldQuery,Object.keys(query)[0]);
+				// homeMainData.openTypeList[Object.keys(query)[0]]
+				nextTick(()=>{
+					const key = Object.keys(query)?.[0]
+					if(key){
+						homeMainData.openType = Object.keys(query)[0]
+						homeMainData.openTypeChild = query[Object.keys(query)[0]]
+					}else{
+						homeMainData.openType = ''
+						homeMainData.openTypeChild = ''
+					}
+				})
+			},
+			{ immediate: true } // 立即触发一次以处理初始参数
+		);
 		let userDetail= computed(()=>{
 			return store.state.UserHabit.userDetail
 		})
@@ -272,7 +347,7 @@ export default defineComponent({
             document.removeEventListener("click", closeShowOperateContent);
         }
 		let renew = ref(null)
-		const subscribe = ()=>{
+		const openUpgradeToPro = ()=>{
 			renew.value.init()
 		}
 		onMounted(()=>{
@@ -301,10 +376,26 @@ export default defineComponent({
 				},
 			]
 		})
+		const setOpenType = (type)=>{
+			if(homeMainData.openType == type){
+				homeMainData.openType = ''
+			}else {
+				homeMainData.openType = type
+				if(type == 'history'){
+
+				}
+			}
+		}
+		const setRouter = (item,childItem)=>{
+			let itemRouter = item.router 
+			if(childItem.router)itemRouter = itemRouter + '?' + childItem.router
+			router.push(itemRouter)
+		}
 		return {
 			store,
 			userDetail,
 			t,
+			...toRefs(homeMainData),
 			locale,
 			isMurmur,
 			credits,
@@ -319,7 +410,9 @@ export default defineComponent({
 			changeLanguage,
 			closeShowOperateContent,
 			renew,
-			subscribe,
+			openUpgradeToPro,
+			setOpenType,
+			setRouter,
 		}
 	},
     data() {
@@ -612,12 +705,367 @@ export default defineComponent({
 	display: flex;
 	height: 100%;
 	box-sizing: border-box;
-	flex-direction: column;
-	.homeMain_content_body{
+	> .leftBox{
+		height: 100%;
+		background: #f5f5f5;
+		> .left{
+			width: 26rem;
+			height: 100%;
+			padding: 2rem;
+			display: flex;
+			flex-direction: column;
+			.marginT2{
+				margin-top: 2rem;
+			}
+			.list{
+				display: flex;
+				flex-direction: column;
+				// padding: 1.2rem;
+				max-height: 5rem;
+				border-radius: 2rem;
+				> .titleBox{
+					padding: 1.2rem;
+					display: flex;
+					font-size: 1.4rem;
+					cursor: pointer;
+					justify-content: space-between;
+					align-items: center;
+					font-weight: 600;
+					i{
+						display: flex;
+					}
+					> .left{
+						display: flex;
+						align-items: center;
+						> i{
+							margin-right: .8rem;
+						}
+						> span{
+							line-height: 2.4rem;
+							color: #52525b;
+							transition: all .3s;
+						}
+					}
+					> .right{
+						> i{
+							transition: all .3s;
+						}
+					}
+					&:hover{
+						> .left{
+							> span{
+								color: #000;
+							}
+						}
+					}
+				}
+				> .detailBox{
+					overflow: auto;
+					scrollbar-width: none;
+					flex: 1;
+					> .detail{
+						height: 100%;
+						> .detailItem{
+							cursor: pointer;
+							padding: 1.2rem 1.1rem 1.2rem 2.2rem;
+							font-size: 1.4rem;
+							font-weight: 400;
+							margin-bottom: .4rem;
+							border-radius: .8rem;
+							display: flex;
+							align-items: center;
+							> i{
+								margin-right: .8rem;
+								display: flex;
+							}
+							&.active{
+								background: #f5f5f5;
+							}
+							&:hover{
+								background: #f5f5f5;
+							}
+						}
+						> .detailItem:last-child{
+							margin-bottom: 0;
+						}
+					}
+				}
+				&.active{
+					padding: 1.2rem;
+					overflow: hidden;
+					max-height: 100%;
+					background: #00000008;
+					> .titleBox{
+						padding: 0;
+						margin-bottom: 1.6rem;
+						> .right{
+							> i{
+								transform: rotate(180deg);
+							}
+						}
+					}
+				}
+				&.language{
+					> .titleBox{
+						padding: .8rem;
+						background: #00000000;
+						> .left{
+							> i{
+								margin-right: 2rem;
+							}
+						}
+					}
+					> .detailBox{
+						> .detail{
+							> .detailItem{
+								padding: .8rem;
+								> svg{
+									margin-right: 2.5rem;
+									width: 2rem;
+									height: 2rem;
+								}
+								> span{
+									color: #111a18;
+									opacity: .5;
+									margin-left: 4.5rem;
+									font-weight: 600;
+								}
+								&.active{
+									> span{
+										color: #52525b;
+										opacity: 1;
+										margin-left: 0px;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			> .title{
+				display: flex;
+				padding: .4rem;
+				align-items: center;
+				justify-content: space-between;
+				> span{
+					font-size: 2rem;
+					font-weight: 600;
+				}
+				> svg{
+					cursor: pointer;
+				}
+			}
+			> .newObj{
+				border-radius: 1.2rem;
+				padding: 1.6rem 1.2rem;
+				border: 1px solid #0003;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				cursor: pointer;
+				> svg{
+					margin-right: .4rem;
+					width: 2.4rem;
+					height: 2.4rem;
+				}
+				> p{
+					font-size: 1.6rem;
+					font-weight: 600;
+					margin: 0;
+				}
+			}
+			> .navList{
+				height: 100%;
+				overflow: hidden;
+				display: flex;
+				flex-direction: column;
+			}
+			> .navListBottom{
+				display: flex;
+				flex-direction: column;
+			}
+			> .gallery_btn{
+				margin-top: 1.2rem;
+			}
+			
+		}
+	}
+	> .rightBox{
 		flex: 1;
-		height: calc(100% - 20rem);
-		// height: calc(100vh - 7rem);
 		overflow: hidden;
+		> .right{
+			display: flex;
+			width: 100%;
+			height: 100%;
+			flex-direction: column;
+			> .user{
+				margin-bottom: 1rem;
+				.homeMain_user{
+					height: 6rem;
+					width: 6rem;
+					margin-left: auto;
+					position: relative;
+					.homeMain_user_icon{
+						height: 6rem;
+						width: 6rem;
+						position: relative;
+						transform-origin: top;
+						overflow: hidden;
+						z-index: 2;
+						left: 0;
+						border-radius: 50%;
+						cursor: pointer;
+						background: #fff;
+						img{
+							width: 100%;
+							height: 100%;
+							object-fit: contain;
+						}
+						// transition: all .3s;
+					}
+					.homeMain_user_detail{
+						z-index: 999;
+						position: absolute;
+						top: calc(100% + .5rem);
+						background: #fff;
+						width: 32rem;
+						height: auto;
+						opacity: 0;
+						right: 0px;
+						display: none;
+						// box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
+						text-align: center;
+						flex-direction: column;
+						align-items: center;
+						padding: 1.2rem 2rem;
+						border: 2px solid #000;
+						border-radius: 2rem;
+						.username,.homeMain_user_detail_attention,.homeMain_subscribe{
+							margin-bottom: 2rem;
+						}
+						.homeMain_user_icon{
+							position: relative;
+						}
+						.homeMain_subscribe{
+							padding: 2rem;
+							background: #f3f3f6;
+							border-radius: 1.4rem;
+							cursor: pointer;
+							width: 100%;
+							> div{
+								display: flex;
+								margin-bottom: 2rem;
+							}
+							> div:last-child{
+								margin-bottom: 0;
+							}
+							.font{
+								font-size: 1.6rem;
+								font-weight: 600;
+								margin-right: 1rem;
+							}
+							.stateSucsess{
+								color: #3ab45c;
+							}
+							.stateError{
+								color: #b43a3a;
+							}
+							.time{
+								font-size: 1.4rem;
+								font-weight: 400;
+								margin-left: auto;
+							}
+						}
+						.homeMain_select{
+							width: 100%;
+							.select_item {
+								padding: 0 1rem;
+								border-radius: .8rem;
+								line-height: 4rem;
+								color: #4d4d4d;
+								display: flex;
+								align-items: center;
+								cursor: pointer;
+								user-select: none;
+								width: 100%;
+								flex-wrap: wrap;
+								&:hover {
+									background: #f3f3f6;
+								}
+
+								.iconfont ,.fi-rr-book-user {
+									// font-size: 1.4rem;
+								}
+
+								.select_item_des {
+									font-size: 1.6rem;
+									margin-left: 1rem;
+									font-weight: 500;
+								}
+							}
+							.select_item_long{
+								border-bottom: 1px solid #eceaea;
+								margin: 2rem 0;
+							}
+							.icon-xiala{
+								margin-left: auto;
+								&.active{
+									transform: rotate(180deg);
+								}
+							}
+							.select_list{
+								height: 0;
+								overflow: hidden;
+								transition: all .3s;
+								width: 100%;
+								margin: 0;
+								> li{
+									padding-left: 2.5rem;
+								}
+								&.active{
+									height: auto;
+								}
+							}
+						}
+						.homeMain_user_detail_attention{
+							width: 100%;
+							display: flex;
+							justify-content: space-between;
+							padding-left: 3.5rem;
+							padding-right: 3.5rem;
+							.attention_item{
+								display: flex;
+								flex-direction: column;
+								align-items: center;
+							}
+							.attention_item_active{
+								cursor: pointer;
+							}
+							.attention_item_active:hover{
+								color: #39215b;
+								span{
+									color: #39215b;
+								}
+							}
+							div{
+								font-size: 1.6rem;
+								font-weight: 600;
+							}
+							span{
+								font-size: 1.4rem;
+								color: #949eae;
+							}
+						}
+					}
+					
+				}
+			}
+			> .router{
+				flex: 1;
+				overflow: hidden;
+				padding: 0 6rem;
+			}
+		}
 	}
 }
 .homeMain_heade {
@@ -702,159 +1150,7 @@ export default defineComponent({
             position: relative;
             top: 0.3rem;
         }
-		.homeMain_user{
-			.homeMain_user_icon{
-				height: 6rem;
-				width: 6rem;
-				position: relative;
-				transform-origin: top;
-				overflow: hidden;
-				z-index: 2;
-				left: 0;
-				border-radius: 50%;
-				cursor: pointer;
-				background: #fff;
-				img{
-					width: 100%;
-					height: 100%;
-					object-fit: contain;
-				}
-				// transition: all .3s;
-			}
-			.homeMain_user_detail{
-				position: absolute;
-				top: calc(100% + .5rem);
-				background: #fff;
-				width: 32rem;
-				height: auto;
-				opacity: 0;
-				display: none;
-				// box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
-				text-align: center;
-				flex-direction: column;
-				align-items: center;
-				padding: 1.2rem 2rem;
-				border: 2px solid #000;
-				border-radius: 2rem;
-				.username,.homeMain_user_detail_attention,.homeMain_subscribe{
-					margin-bottom: 2rem;
-				}
-				.homeMain_user_icon{
-					position: relative;
-				}
-				.homeMain_subscribe{
-					padding: 2rem;
-					background: #f3f3f6;
-					border-radius: 1.4rem;
-					cursor: pointer;
-					width: 100%;
-					> div{
-						display: flex;
-						margin-bottom: 2rem;
-					}
-					> div:last-child{
-					    margin-bottom: 0;
-					}
-					.font{
-						font-size: 1.6rem;
-						font-weight: 600;
-						margin-right: 1rem;
-					}
-					.stateSucsess{
-						color: #3ab45c;
-					}
-					.stateError{
-						color: #b43a3a;
-					}
-					.time{
-						font-size: 1.4rem;
-						font-weight: 400;
-						margin-left: auto;
-					}
-				}
-				.homeMain_select{
-					width: 100%;
-					.select_item {
-						padding: 0 1rem;
-						border-radius: .8rem;
-						line-height: 4rem;
-						color: #4d4d4d;
-						display: flex;
-						align-items: center;
-						cursor: pointer;
-						user-select: none;
-						width: 100%;
-						flex-wrap: wrap;
-						&:hover {
-							background: #f3f3f6;
-						}
-
-						.iconfont ,.fi-rr-book-user {
-							// font-size: 1.4rem;
-						}
-
-						.select_item_des {
-							font-size: 1.6rem;
-							margin-left: 1rem;
-							font-weight: 500;
-						}
-					}
-					.select_item_long{
-						border-bottom: 1px solid #eceaea;
-						margin: 2rem 0;
-					}
-					.icon-xiala{
-						margin-left: auto;
-						&.active{
-							transform: rotate(180deg);
-						}
-					}
-					.select_list{
-						height: 0;
-						overflow: hidden;
-						transition: all .3s;
-						width: 100%;
-						margin: 0;
-						> li{
-							padding-left: 2.5rem;
-						}
-						&.active{
-							height: auto;
-						}
-					}
-				}
-				.homeMain_user_detail_attention{
-					width: 100%;
-					display: flex;
-					justify-content: space-between;
-					padding-left: 3.5rem;
-					padding-right: 3.5rem;
-					.attention_item{
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-					}
-					.attention_item_active{
-						cursor: pointer;
-					}
-					.attention_item_active:hover{
-						color: #39215b;
-						span{
-							color: #39215b;
-						}
-					}
-					div{
-						font-size: 1.6rem;
-						font-weight: 600;
-					}
-					span{
-						font-size: 1.4rem;
-						color: #949eae;
-					}
-				}
-			}
-			
-		}
+		
 		.username {
 			font-size: 1.8rem;
 			color: #1a1a1a;
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index 1beab27c..8f2aac96 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -57,7 +57,6 @@ import { defineComponent, toRefs, reactive, ref , nextTick,computed, onMounted,
 import { isEmail } from "@/tool/util";
 import { setCookie, getCookie, WriteCookie,clonAllCookie } from "@/tool/cookie";
 import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
-import Habit from "@/component/Detail/habit.vue";
 import { Https } from "@/tool/https";
 import { Modal, message } from "ant-design-vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
@@ -70,7 +69,6 @@ import { ScrollTrigger } from "gsap/ScrollTrigger";
 export default defineComponent({
     components: {
         VerificationCodeInput,
-		Habit,
     },
 	setup(){
         const store = useStore();
diff --git a/src/views/HomeView/Events.vue b/src/views/HomeView/Events.vue
index f76cf933..9d3b6c5f 100644
--- a/src/views/HomeView/Events.vue
+++ b/src/views/HomeView/Events.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="events_page" :class="{active:isScroll}">
-		<div class="modal_title_text modal_search">
+		<!-- <div class="modal_title_text modal_search">
 			<div v-show="isScroll || userDetail.systemUser>-1" v-for="item in worksType" :key="item" class="gallery_btn white" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
 			<div v-show="!isScroll && userDetail.systemUser == -1" class="gallery_btn active">All</div>
-		</div>
+		</div> -->
         <div class="page_content" >
 			<div class="page_content_itemBox">
 				<div class="page_content_item" v-for="item,index in eventsList" :key="eventsList[eventsList.length-1-index].id"  v-fadeIn="isScroll">
@@ -27,7 +27,6 @@
 </template>
 <script lang="ts">
 import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from 'vue'
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
 import { Https } from "@/tool/https";
 import { useI18n } from "vue-i18n";
@@ -204,14 +203,12 @@ export default defineComponent({
 .events_page {
 	border-radius: 4rem;
     width: 100%;
-	// overflow: hidden;
     // height: 100%;
 	height: auto;
 	min-height: 100%;
-	padding: 0 6rem;
-	// min-width: 1440px;
+	// padding: 0 6rem;
 	position: relative;
-	padding-top: 5rem;
+	// padding-top: 5rem;
 	display: flex;
     flex-direction: column;
 	.modal_title_text{
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index cf6f6f2e..4c28a3dc 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -7,7 +7,6 @@
 <script lang="ts">
 import { defineComponent, h, ref, computed, reactive, toRefs, inject,provide,nextTick,createVNode,onBeforeUnmount, toRef} from "vue";
 // import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 import CollectionModal from "@/component/HomePage/collectionModal.vue";
 import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
 import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
@@ -34,7 +33,6 @@ const FileSaver = require("file-saver");
 export default defineComponent({
 	name: "homePage",
 	components: {
-		// HeaderComponent,
 		homeIndex,
 		NewCollectionReview,
 		DesignDetail,
diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue
index ac713242..9937b396 100644
--- a/src/views/HomeView/Works.vue
+++ b/src/views/HomeView/Works.vue
@@ -1,20 +1,16 @@
 <template>
-    <div class="works_page" :class="{active:isScroll,'otherUsersActive':otherUsers,'positionLogin':position=='login'}">
-		<!-- <div class="modal_title_text">
-			<div>Works</div>
-		</div> -->
-		<div class="modal_title_text modal_search" v-if="!otherUsers && position!='login'">
+    <div class="works_page" :class="{active:isScroll,'otherUsersActive':otherUsers,'positionLogin':true}">
+		<!-- <div class="works_page" :class="{active:isScroll,'otherUsersActive':otherUsers,'positionLogin':position=='login'}"> -->
+
+		<!-- <div class="modal_title_text modal_search" v-if="!otherUsers && position!='login'">
 			<div v-show="isScroll" v-for="item in worksType" :key="item" class="gallery_btn white" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
 			<div v-show="!isScroll" class="modal_title_text_assistant gallery_btn white" :class="{active:'all' == worksSelect}" @click="setWorksSelect({value:'all'})">All</div>
 			<div v-show="!isScroll" class="modal_title_text_assistant gallery_btn white" :class="{active:'NewYear_2025' == worksSelect}" @click="setWorksSelect({value:'NewYear_2025'})">NewYear_2025</div>
-			<!-- <div class="modal_search_menu">
-				<generalMenu :dataList="menuList" @setprintModel="setprintModel" :item="selectMenu"></generalMenu>
-			</div> -->
-		</div>
+		</div> -->
         <div class="page_content" >
-			<Falls ref="fall" @loadend="isShowMark = false"  @setPortfolioLike="setPortfolioLike" :isScroll="isScroll" @getImgScale="getImgScale"></Falls>
+			<Falls ref="fall" @loadend="isShowMark = false" @setPortfolioLike="setPortfolioLike" :isScroll="isScroll" @getImgScale="getImgScale"></Falls>
 			<div class="page_loading_box" v-show="!isNoData">
 				<span class="page_loading" v-show="!isShowMark"></span>
 				<span v-show="isShowMark">
@@ -32,8 +28,7 @@
 </template>
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
-import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from 'vue'
-// import HeaderComponent from "@/component/HomePage/Header.vue";
+import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,watch,computed} from 'vue'
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
 import { Https } from "@/tool/https";
 import newScaleImage from "@/component/WorksPage/newScaleImage.vue";
@@ -68,7 +63,8 @@ export default defineComponent({
 		 },
 	},
     setup(prop) {
-		const router = useRouter()
+		const router = useRouter() as any
+		const route = useRoute() as any
 		let filter:any = reactive({
 			worksSelect: 'all',
 			isNull:true,
@@ -135,18 +131,18 @@ export default defineComponent({
 		let newScaleImageMobile:any = ref()
 		let fall:any = ref()
 		let setWorksSelect = (val:any) => {
-			filter.worksSelect = val.value
+			filter.worksSelect = val
 			filter.getListDate.getLikePortfolio = 0
 			filter.getListDate.getMyPortfolio = 0
 			filter.getListDate.tagId = ''
-			if(val.value == 'all'){
-			}else if(val.value == 'favoriteWorks'){
+			if(val == 'all'){
+			}else if(val == 'favoriteWorks'){
 				filter.getListDate.getLikePortfolio = 1
-			}else if(val.value == 'myWorks'){
+			}else if(val == 'myWorks'){
 				filter.getListDate.getMyPortfolio = 1
-			}else if(val.value == 'RCAworkshop_2024'){
+			}else if(val == 'RCAworkshop_2024'){
 				filter.getListDate.tagId = 1
-			}else if(val.value == 'NewYear_2025'){
+			}else if(val == 'NewYear_2025'){
 				filter.getListDate.tagId = 3
 			}
 			filter.getListDate.page = 0
@@ -226,7 +222,7 @@ export default defineComponent({
 		let setPorfolioDom = ()=>{
 			filter.isShowMark = false
 			filter.isNoData = false
-			getPorfolio()
+			// getPorfolio()
 			let worksPage:any = document.querySelector('.works_page')
 			let imgParent:any = document.querySelector('.works_page .page_loading')
 			new IntersectionObserver(
@@ -240,6 +236,17 @@ export default defineComponent({
 				// { root:worksPage }
 			).observe(imgParent);
 		}
+		watch(() => route.query,
+			(query, oldQuery) => {
+				if(oldQuery && query?.works == oldQuery?.works)return
+				let str = query.works
+				if(!str)str = 'all'
+				nextTick(()=>{
+					setWorksSelect(str)
+				})
+			},
+			{ immediate: true } // 立即触发一次以处理初始参数
+			);
 		onMounted (()=>{
 			nextTick(()=>{
 				setPorfolioDom()
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index 80c328ef..b3432a00 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -88,7 +88,6 @@
 </template>
 <script lang="ts">
 import { defineComponent,ref,createVNode,computed,nextTick,provide} from 'vue'
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 import HistoryDetail from "@/component/Detail/HistoryDetail.vue";
 import { Https } from "@/tool/https";
 import { formatTime } from "@/tool/util"
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 63464fd8..b68d84e7 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -8,7 +8,7 @@
             <div class="page_content_body">
                 <!-- <HeaderComponent></HeaderComponent> -->
                 <div class="library_page_body">
-                    <div class="library_body_left">
+                    <!-- <div class="library_body_left">
 						<div>
 							<div class="library_menu_list" v-for="(menu,index) in menuList" :key="menu.title">
 								<div :class="['menu_item', selectCode==menu.code ? 'select_menu_item' :'']"  @click="selectMenuItem(menu,index)">
@@ -24,7 +24,7 @@
 								</div>
 							</div>
 						</div>
-                    </div>
+                    </div> -->
 
 					
                     <div class="library_body_right">
@@ -485,7 +485,6 @@
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import { defineComponent,h ,ref,createVNode,nextTick,watch,provide,computed,reactive,toRefs} from 'vue'
-// import HeaderComponent from "@/component/HomePage/Header.vue";
 import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue';
 // import ModelPlacement from '@/component/LibraryPage/ModelPlacementUpdata.vue';
 import setLabel from '@/component/LibraryPage/setLabel.vue';
@@ -511,7 +510,6 @@ import generalMenu from "@/component/HomePage/generalMenu.vue";
 import UpgradePlan from "@/component/HomePage/UpgradePlan.vue";
 export default defineComponent({
     components: {
-        // HeaderComponent,
         ModelPlacement,
 		setLabel,
         ModelPlacementMobile,
@@ -893,14 +891,6 @@ export default defineComponent({
         };
     },
 	watch:{
-		searchPictureName(newVal,oldVal){
-			// clearTimeout(this.getLibraryListInputTime)
-			// this.getLibraryListInputTime = setTimeout(() => {
-			// 	if(newVal != oldVal){
-			// 		this.currentPage = 1
-			// 	}
-			// }, 500);
-		},
 		scene:{
 			handler(newVal,oldVal){
 				if(this.selectCode == 'Printboard' && newVal.value == 'Slogan'){
@@ -911,6 +901,19 @@ export default defineComponent({
 					this.isSloganHint = ''
 				}
 			}
+		},
+		'$route.query':{
+			handler(query, oldQuery) {
+				if(oldQuery && query?.library == oldQuery?.library)return
+				let str = query.library
+				if(!str)str = 'Moodboard'
+				nextTick(()=>{
+					console.log()
+					this.selectMenuItem({code:str})
+					// setWorksSelect(str)
+				})
+			},
+			immediate: true,
 		}
 	},
     async mounted(){
@@ -920,6 +923,7 @@ export default defineComponent({
         this.uploadUrl = getUploadUrl()
 		this.token = getCookie("token") || "";
     },
+	
     methods:{
 
 		
@@ -958,71 +962,67 @@ export default defineComponent({
 				});
 			}
 		},
-        selectMenuItem(menu:any,index:any){
-            if(menu.children?.length){ //证明是有子菜单
-                menu.showChildren = !menu.showChildren
-            }else{
-				
-				if(menu.code != this.upload.level1Type){
-					this.selectCode = menu.code
-					this.currentPage = 1
-					this.total = 0
-					if(menu.code == 'MyBrand'){
-						this.getBrandDNAList()
-						return
-					}
-					this.searchPictureName = ''
-					this.imgList = [],
-					this.selectImgList = []
-					this.isTextarea = false
-					this.value.labelValue = []
-					if(this.designTypeList[this.selectCode].length >= 1){
-						this.designType = this.designTypeList[this.selectCode][0].value
-					}else{
-						this.designType = ''
-					}
-					if(this.selectCode != 'DesignElements'){
-						this.getClass()
-					}
-					if(this.selectCode == 'Sketchboard' || this.selectCode == 'Models')this.getSex()
-					if(this.selectCode == 'Sketchboard'){
-						this.positionType = computed(() => {
-							return this.store.state.UserHabit.Position;
-						});
-						this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
-						let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg']
-						this.printModelList.forEach((item:any,index:number)=>{
-							item.img = imgList[index]
-						})
-					}
-					if(this.selectCode == 'Printboard'){
-						this.printModelList = [
-							{
-								num:1,
-								optype:false,
-								value:'Painting Style',
-								label:this.t('Generate.Model1')
-							},{
-								num:2,
-								optype:false,
-								value:'Illustration Style',
-								label:this.t('Generate.Model2')
-							},{
-								num:3,
-								optype:false,
-								value:'Real Style',
-								label:this.t('Generate.Model3')
-							},
-						]
-					}
-					if(this.printModelList[0])this.printModel = this.printModelList[0]
-					this.captionGeneration = ''
-					this.selectGenerateList = []
-					this.inputShow = false
-					this.uploadGenerateOpen('Upload')
+        selectMenuItem(menu:any){
+           
+			if(menu.code != this.upload.level1Type){
+				this.selectCode = menu.code
+				this.currentPage = 1
+				this.total = 0
+				if(menu.code == 'MyBrand'){
+					this.getBrandDNAList()
+					return
 				}
-				this.upload.level1Type = menu.code
-            }
+				this.searchPictureName = ''
+				this.imgList = [],
+				this.selectImgList = []
+				this.isTextarea = false
+				this.value.labelValue = []
+				if(this.designTypeList[this.selectCode].length >= 1){
+					this.designType = this.designTypeList[this.selectCode][0].value
+				}else{
+					this.designType = ''
+				}
+				if(this.selectCode != 'DesignElements'){
+					this.getClass()
+				}
+				if(this.selectCode == 'Sketchboard' || this.selectCode == 'Models')this.getSex()
+				if(this.selectCode == 'Sketchboard'){
+					this.positionType = computed(() => {
+						return this.store.state.UserHabit.Position;
+					});
+					this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
+					let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg']
+					this.printModelList.forEach((item:any,index:number)=>{
+						item.img = imgList[index]
+					})
+				}
+				if(this.selectCode == 'Printboard'){
+					this.printModelList = [
+						{
+							num:1,
+							optype:false,
+							value:'Painting Style',
+							label:this.t('Generate.Model1')
+						},{
+							num:2,
+							optype:false,
+							value:'Illustration Style',
+							label:this.t('Generate.Model2')
+						},{
+							num:3,
+							optype:false,
+							value:'Real Style',
+							label:this.t('Generate.Model3')
+						},
+					]
+				}
+				if(this.printModelList[0])this.printModel = this.printModelList[0]
+				this.captionGeneration = ''
+				this.selectGenerateList = []
+				this.inputShow = false
+				this.uploadGenerateOpen('Upload')
+			}
+			this.upload.level1Type = menu.code
         },
 
 		async sexChange(){
@@ -1860,7 +1860,6 @@ export default defineComponent({
     width: 100%;
 	overflow: hidden;
     height: 100%;
-	padding: 0 6rem;
 	// min-width: 1440px;
 	position: relative;
 	.mark_loading{
@@ -1956,7 +1955,8 @@ export default defineComponent({
                     }
                 }
                 .library_body_right{
-                    width: calc(100% - 23.5rem);
+                    width: 100%;
+                    // width: calc(100% - 23.5rem);
                     height: 100%;
 					.header_operate_item{
 						margin-right: 5rem;
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 3a630c55..4be5f109 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,7 +1,16 @@
 <template>
 	<div class="loginPage">
 		<div class="left">
-			<Works :isScroll="true" :position="'login'"></Works>
+			<Works :isScroll="!isMask" :position="'login'"></Works>
+			<div class="mask" v-show="isMask" @click="()=>isMask = !isMask">
+				<div class="content">
+					<div class="userNum">
+						<div class="title">5 000 000 +</div>
+						<div>HAPPY USERS</div>
+					</div>
+					<div class="info">Millions trust AI products every day</div>
+				</div>
+			</div>
 		</div>
 		<div class="right">
 			<div class="Text" v-show="!loginType">
@@ -14,9 +23,9 @@
 						Continue with one of these:
 					</div>
 					<div class="typeList">
-						<div class="gallery_btn" @click="setLoginType('personal')">personal</div>
-						<div class="gallery_btn" @click="setLoginType('school')">school</div>
-						<div class="gallery_btn" @click="setLoginType('enterprise')">enterprise</div>
+						<div class="gallery_btn white" @click="setLoginType('personal')">personal</div>
+						<div class="gallery_btn white" @click="setLoginType('school')">school</div>
+						<div class="gallery_btn white" @click="setLoginType('enterprise')">enterprise</div>
 					</div>
 				</div>
 				<div class="login" v-show="loginType">
@@ -57,6 +66,7 @@ export default defineComponent({
 		const store = useStore();
 		const loginData = reactive({
 			loginType:'',
+			isMask:true,
 		})
 		const dataDom = reactive({
 		})
@@ -87,6 +97,42 @@ export default defineComponent({
 		> .left{
 			width: 60%;
 			background: #f7f8fa;
+			position: relative;
+			> .mask{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				top: 0;
+				left: 0;
+				background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, rgba(0, 0, 0, .8) 100%);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #fff;
+				cursor: pointer;
+				> .content{
+					text-align: center;
+					padding: 15rem;
+					//黑色径向渐变
+					background: radial-gradient(ellipse at center, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0) 70%);
+					.userNum{
+						line-height: 1;
+						margin-bottom: 3rem;
+						> .title{
+							font-size: 8rem;
+							font-weight: 900;
+						}
+						> div{
+							font-size: 3rem;
+							font-weight: 500;
+						}
+					}	
+					> .info{
+						font-size: 4rem;
+						font-weight: 500;
+					}
+				}
+			}
 		}
 		> .right{
 			display: flex;
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
deleted file mode 100644
index 28d2b9aa..00000000
--- a/src/views/LoginPage.vue
+++ /dev/null
@@ -1,1055 +0,0 @@
-<template>
-    <div class="login_page">
-        <div class="page_content">
-            <img
-                class="login_logo"
-                src="@/assets/images/loginPage/aida_Logo_login.png"
-            />
-            <!-- 账号密码和邮箱登录  start-->
-            <div class="login_content" v-if="isLogin === 1">
-                <div class="login_content_left">
-                    <div class="login_type_list">
-                        <div
-                            :class="[
-                                'login_type_item',
-                                'username_login_item',
-                                'login_active',
-                            ]"
-                        >
-                            Log on to AiDA 3.0
-                        </div>
-                    </div>
-                    <!-- 账号密码登录 start -->
-                    <!-- v-show="loginType == 'username'" -->
-                    <div>
-                        <div class="login_form_content" :state="emailStap">
-                            <!-- <div class="login_form_title">Name</div>
-                            <input
-                                class="login_form_input"
-                                placeholder="Enter your username"
-                                v-model="username"
-                            /> -->
-							<div v-show="emailStap === 1">
-								<div class="login_form_title marign_top30">
-									Email
-								</div>
-								<input
-									class="login_form_input"
-									placeholder="Enter your email address"
-									v-model="email"
-									@keydown.enter="submitPerLogin()"
-								/>
-								<div class="login_form_title marign_top30">
-									<div>Password</div>
-								</div>
-								<div class="password_input_block">
-									<input
-										class="login_form_input"
-										:type="passwordType"
-										placeholder="Enter your password"
-										v-model="password"
-										@keydown.enter="submitPerLogin()"
-									/>
-									<div
-										class="icon iconfont icon-yanjing_yincang_o password_show_icon"
-										@click="changePasswordType()"
-									></div>
-								</div>
-							</div>
-							
-
-                            <!-- 邮箱登录 start -->
-                            <div
-								v-show="emailStap === 2"
-                                class="login_form_email"
-                                :class="{ active: emailStap === 2 }"
-                            >
-                                <div
-                                    v-show="emailStap === 2"
-                                    class="email_last_step"
-                                >
-                                    <div class="email_last_step_block">
-                                        <span class="email_last_step_content"
-                                            >Verify with one-time verification
-                                            code</span
-                                        >
-                                        <i
-                                            class="fi fi-br-cross email_last_step_block_icon"
-                                            @click="emailLastStepFun()"
-                                        ></i>
-                                    </div>
-                                    <div class="email_last_step_bottom">
-                                        <div class="email_last_step_des">
-                                            <div class="sent_email_content">
-                                                Sent to {{ email }}
-                                            </div>
-                                            <div class="tip_content">
-                                                <span v-show="time"
-                                                    >{{ time }}s</span
-                                                >
-                                                <span
-                                                    v-show="!time"
-                                                    @click="emailNextStepFun()"
-                                                    >Resend</span
-                                                >
-                                            </div>
-                                        </div>
-                                        <VerificationCodeInput
-                                            :ct="emailCode"
-                                            @sendCaptcha="
-                                                submitEmailLogin($event)
-                                            "
-                                        ></VerificationCodeInput>
-
-                                        <div class="email_last_step_des">
-                                            <div
-                                                class="sent_email_content email_tip_content"
-                                            >
-                                                Please check the junk box if you
-                                                haven't received verification
-                                                code
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="login_form_title marign_top30">
-                            <label :class="{ active: emailStap == 2 }">
-                                <input
-                                    :state="emailStap"
-                                    type="checkbox"
-                                    v-model="checked"
-                                />
-                                <span
-                                    >I agree to all Term, Privacy Policy and
-                                    Fees</span
-                                >
-                            </label>
-                        </div>
-						<div class="thirdPartyLogin marign_top30">
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<googleLogin @googelLogin="googelLogin"></googleLogin>
-							</div>
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<weiXinLogin></weiXinLogin>
-							</div>
-							<!-- <phoneLogin></phoneLogin> -->
-						</div>
-                        <div
-                            class="login_submit_button marign_top40"
-                            :state="emailStap"
-                            @click="submitPerLogin()"
-                        >
-                            Sign in
-                        </div>
-
-                        <div class="login_text">
-                            <div
-                                class="forget_password_text"
-                                @click="changeIsLogin(2)"
-                            >
-                                Forgot your password
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 账号密码登录 end -->
-                </div>
-
-                <!-- 邮箱登录 end -->
-                <div class="login_content_right mdhidden">
-                    <img
-                        src="@/assets/images/loginPage/aida_logo_centent.jpg"
-                    />
-                    <!-- <img src="https://www.aida.com.hk/download/aida_V2_images/image/login-right-image.jpg" alt=""> -->
-                </div>
-            </div>
-
-            <!-- 忘记密码 start -->
-            <div class="forget_password_content" v-else>
-                <div
-                    class="forget_password_content_block"
-                    @click="forgetPasswordLastStepFun()"
-                >
-                    <!-- <span class="icon iconfont fi-br-arrow-left"></span
-                    > -->
-                    <i class="fi fi-br-arrow-left"></i>
-                    <span class="forget_password_content_title"
-                        >Retrieve password</span
-                    >
-                </div>
-                <div v-show="frogetPasswordStep === 1">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Email</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter your email"
-                            v-model="forgetPasswordEmail"
-                            @keydown.enter="forgetPasswordNextStepFun()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="forgetPasswordNextStepFun()"
-                    >
-                        Next step
-                    </div>
-                </div>
-
-                <div v-show="frogetPasswordStep === 2">
-                    <div class="forget_verif_code_des">Verification Code</div>
-                    <div class="email_last_step_des">
-                        <div class="sent_email_content">
-                            Sent to {{ forgetPasswordEmail }}
-                        </div>
-                        <div class="tip_content">
-                            <span v-show="time">{{ time }}s</span>
-                            <span
-                                v-show="!time"
-                                @click="forgetPasswordNextStepFun()"
-                                >Resend</span
-                            >
-                        </div>
-                    </div>
-                    <VerificationCodeInput
-                        :ct="emailCode"
-                        @sendCaptcha="submitPasswordCode($event)"
-                    ></VerificationCodeInput>
-                </div>
-
-                <div v-show="frogetPasswordStep === 3">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Password</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter a new password"
-                            v-model="newPassword"
-                            @keydown.enter="submitResetPassword()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="submitResetPassword()"
-                    >
-                        Submit
-                    </div>
-                </div>
-            </div>
-            <!-- 忘记密码 end -->
-        </div>
-
-
-
-        <!-- <div class="login_footer">
-            <div class="login_footer_item">
-                <div class="login_footer_item_text">
-                    ©2025 Code-Create Limited
-                </div>
-            </div>
-            <div class="login_footer_item">
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-terms-and-conditions/'
-                        )
-                    "
-                >
-                    Terms&Conditions
-                </div>
-                <div class="login_footer_line"></div>
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-subscription-agreement/'
-                        )
-                    "
-                >
-                    Privacy Policy
-                </div>
-            </div>
-        </div> -->
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, onMounted } from "vue";
-import { Https } from "@/tool/https";
-import { isEmail } from "@/tool/util";
-import { setCookie, WriteCookie } from "@/tool/cookie";
-import { message } from "ant-design-vue";
-import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
-import googleLogin from "@/component/LoginPage/googleLogin.vue";
-import weiXinLogin from "@/component/LoginPage/weiXinLogin.vue";
-import phoneLogin from "@/component/LoginPage/phoneLogin.vue";
-import { useStore } from "vuex";
-import { useI18n } from "vue-i18n";
-import { setLang } from "@/tool/guide";
-const md5 = require("md5");
-export default defineComponent({
-    components: {
-        VerificationCodeInput,googleLogin,weiXinLogin,phoneLogin
-    },
-    setup() {
-        let timer: any = 0;
-        const { locale } = useI18n();
-        const store = useStore();
-		let loadingShow = ref(false)
-        return {
-            store,
-            timer,
-            locale,
-			loadingShow,
-        };
-    },
-    data() {
-        return {
-            checked: false,
-            isLogin: 1, //是否为登录 1-登录， 2-忘记密码
-            loginType: "username",
-            emailStap: 1, // 邮箱登录步骤
-            emailCode: ["", "", "", "", "", ""], //邮箱验证码
-            emailNextStep: true,
-            username: "",
-            password: localStorage.getItem("loginPassword") || '',
-            email: localStorage.getItem("loginEmail") || '', //邮箱登录邮箱
-            frogetPasswordStep: 1, //忘记密码的步骤
-            forgetPasswordEmail: "",
-            forgetEmailCode: ["", "", "", "", "", ""], //忘记密码的邮箱验证码
-            forgetEmailValue: "", //忘记密码的邮箱验证码保存值
-            newPassword: "", //新密码
-            isCheckRobot: false,
-            time: 60, //60秒倒计时
-            passwordType: "password",
-            userId: "",
-            loginTime: true,
-        };
-    },
-	
-    methods: {
-        changeLoginType(type: string) {
-            this.loginType = type;
-        },
-
-        //是否忘记密码页面
-        changeIsLogin(isLogin: number) {
-            if (isLogin === 1) {
-                //登录
-                this.forgetPasswordEmail = "";
-                this.frogetPasswordStep = 1;
-                this.forgetEmailCode = ["", "", "", "", "", ""];
-                this.emailStap = 1;
-                this.clearTimer();
-            } else {
-                this.username = "";
-                this.password = "";
-            }
-            this.isLogin = isLogin;
-        },
-
-        //邮箱登录的下一步
-        emailNextStepFun() {
-            if (!isEmail(this.email)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.email,
-                operationType: "LOGIN",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.emailStap = 2;
-                        this.time = 60;
-                        this.emailCode = ["", "", "", "", "", ""];
-                        this.createTimer();
-                    }
-                }
-            );
-        },
-
-        //邮箱登录的上一步
-        emailLastStepFun() {
-            this.emailStap = 1;
-            (this.username = ""), (this.password = ""), (this.email = "");
-            (this.checked = false),
-                (this.loginType = "username"),
-                (this.emailCode = ["", "", "", "", "", ""]),
-                this.clearTimer();
-        },
-
-        //忘记密码的下一步
-        forgetPasswordNextStepFun() {
-            if (!isEmail(this.forgetPasswordEmail)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.forgetPasswordEmail,
-                operationType: "FORGET_PWD",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.frogetPasswordStep = 2;
-                        (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                            this.createTimer();
-                    }
-                }
-            );
-        },
-        //忘记密码的上一步
-        forgetPasswordLastStepFun() {
-            if (this.frogetPasswordStep === 1) {
-                this.changeIsLogin(1);
-            } else {
-                this.frogetPasswordStep = this.frogetPasswordStep - 1;
-                this.forgetPasswordEmail = "";
-                (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                    this.clearTimer();
-            }
-        },
-
-        //忘记密码填写完邮箱验证码进行下一步
-        submitPasswordCode(emailVerifyCode: any) {
-            // console.log(123123);
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: emailVerifyCode,
-                password: "",
-                verifyEmail: true,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.forgetEmailValue = emailVerifyCode;
-                        this.frogetPasswordStep = 3;
-                        this.clearTimer();
-                    }
-                }
-            );
-        },
-
-        //改变勾选是否是机器人
-        checkRobot() {
-            this.isCheckRobot = !this.isCheckRobot;
-        },
-
-        //提交账号密码预先登录
-        submitPerLogin() {
-            //输入账号密码
-            if (this.emailStap >= 2) {
-                return;
-            } else {
-                if (!this.password) {
-                    message.info(
-                        "Please enter your account number or password"
-                    );
-                    return;
-                }
-                //输入邮箱
-                if (!this.email) {
-                    message.info("Please enter your email address");
-                    return;
-                }
-                //判断邮箱格式是否正确
-                if (!isEmail(this.email)) {
-                    message.info("The email format is incorrect");
-                    return;
-                }
-                //判断是否同意隐私政策
-                if (!this.checked) {
-                    message.info(
-                        "Agree to all terms, privacy fees and policies"
-                    );
-                    return;
-                }
-                let data = {
-                    password: md5(this.password + "abc"),
-                    userName: 'a',
-                    // userName: this.username,
-                    email: this.email,
-                    operationType: "LOGIN",
-                    ip: "",
-                };
-                // this.loginType = 'email'
-                if (this.loginTime) {
-                    this.loginTime = false;
-                    Https.axiosPost(Https.httpUrls.preLogin, data)
-                        .then((rv: any) => {
-                            // if (rv) {
-                            //     this.loginType = 'email'
-                            // }
-                            this.emailStap = 2;
-                            if (rv) {
-                                this.userId = rv.userId;
-                                this.loginType = "email";
-                                this.time = 60;
-                                this.emailCode = ["", "", "", "", "", ""];
-                                this.createTimer();
-								localStorage.setItem("loginEmail", this.email);
-								localStorage.setItem("loginPassword", this.password);
-                            }
-                        })
-                        .catch((res) => {
-                            this.emailStap = 1;
-                        });
-                    setTimeout(() => {
-                        this.loginTime = true;
-                    }, 2000);
-                }
-            }
-        },
-
-        changePasswordType() {
-            this.passwordType =
-                this.passwordType === "password" ? "text" : "password";
-        },
-
-        //邮箱登录提交
-        submitEmailLogin(emailVerifyCode: any) {
-            let data = {
-                email: this.email,
-                emailVerifyCode: emailVerifyCode,
-                loginType: "EMAIL",
-                userId: this.userId,
-            };
-            Https.axiosPost(Https.httpUrls.accountLogin, data)
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-        },
-		isCheckAgreement(){
-			message.info(
-					"Agree to all terms, privacy fees and policies"
-				);
-		},
-		//微信登录
-		wechatLogin(value:any) {
-			let data = {
-				code : value.code,
-				type:2
-			}
-			this.loadingShow = true
-		    Https.axiosGet(Https.httpUrls.parseWeChatCode, {params:data})
-                .then((rv: any) => {
-					this.loadingShow = false
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {this.loadingShow = false});
-		},
-		//谷歌登录
-		googelLogin(value:any) {
-			let data = {credential : value,type:2}
-		    Https.axiosGet(Https.httpUrls.parseGoogleCredential, {params:data})
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-		},
-		//登陆成功设置参数
-		setSuccessLogin(rv:any){
-			if (rv) {
-				if (rv.systemUser == 4) {
-					rv.systemUser = 1;
-				}
-				this.createTimer();
-				let isTest = rv.systemUser == 3 ? true : false;
-				let isBeginner = rv.isBeginner == 1 ? true : false;
-				let token = rv.token;
-				setCookie("isMurmur", false);
-				setCookie("token", token);
-				setCookie("isTest", isTest);
-				setCookie("isBeginner", isBeginner);
-				setCookie("isBeginnerNum", 0); //从第一步开始，机器人开始的话就是从第二部开始
-				setCookie("userInfo", JSON.stringify(rv));
-				let userid:any = {
-					ueserId:rv.userId,
-					systemUser:rv.systemUser,
-				}
-				if(rv.email)userid.email = rv.email
-				this.store.commit("upUserDetail", userid);
-				
-				if (window.innerWidth < 768) {
-					message.info(
-						"If you need to design, please log in using an iPad or computer."
-					);
-					this.turnToHomePage("/Square");
-				} else {
-					this.turnToHomePage("/home");
-				}
-				sessionStorage.setItem(
-					"isTimeOne",
-					JSON.stringify(false)
-				); //是否需要公告 提示 弹窗
-				let randomNum: any =
-					Math.floor(Math.random() * 9000000000000000) +
-					1000000000000000;
-				sessionStorage.setItem("sessionId", randomNum);
-				sessionStorage.setItem("record", JSON.stringify([]));
-			}
-		},
-        //修改密码提交
-        submitResetPassword() {
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: this.forgetEmailValue,
-                password: md5(this.newPassword + "abc"),
-                verifyEmail: false,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        message.success("Changing the password successfully");
-                        this.changeIsLogin(1);
-                    }
-                }
-            );
-        },
-
-        //创建定时器
-        createTimer() {
-            this.timer = setInterval(() => {
-                this.time--;
-                if (!this.time) {
-                    clearInterval(this.timer);
-                }
-            }, 1000);
-        },
-
-        //清除定时器
-        clearTimer() {
-            this.time = 60;
-            if (this.timer) {
-                clearInterval(this.timer);
-            }
-        },
-
-        //跳转到首页
-        turnToHomePage(str: any) {
-            // this.getLang();
-            // this.$router.push("/home");
-            // console.log(window.location.search.substring(1));
-            this.store.commit("clearAllData");
-            this.store.commit("clearAllCollection");
-            this.store.commit("setAllBoardDataChoose", {});
-            this.store.commit("clearShowSketchboard", {});
-            this.$router.push(str);
-        },
-        //获取当前语言
-        // getLang() {
-        //     let data = {};
-        //     Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
-        //         (rv: any) => {
-        //             if (rv) {
-        //                 this.locale = rv;
-        //                 setLang(rv);
-        //             }
-        //         }
-        //     );
-        // },
-    },
-	mounted() {
-		const data = this.$route.query
-		if(data?.state == 'weiXin'){
-			this.wechatLogin(data)
-		}
-	},
-});
-</script>
-<style lang="less" scoped>
-.login_page {
-    width: 100%;
-    height: 100%;
-    .page_content {
-        // position: relative;
-
-        .login_logo {
-            position: absolute;
-            left: 4rem;
-            top: 2.5rem;
-            width: 11rem;
-        }
-
-        .login_content {
-            position: relative;
-			// width: 100%;
-			// height: 100%;
-			width: 70%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-            @media (max-width: 768px) {
-                width: 100%;
-            }
-            .login_content_left {
-                width: 60%;
-                // padding: 0 20rem;
-				padding-right: 20rem;
-                @media (max-width: 768px) {
-                    width: 100%;
-                }
-                .login_form_email {
-                    position: relative;
-                    width: 100%;
-                    height: 100%;
-                    background: #fff;
-                    transform: scale(0);
-                    transition: 0.3s all;
-                    border: 2px solid;
-                    border-radius: 20px;
-                    .email_last_step {
-                        width: 100%;
-                        height: 100%;
-                        #app {
-                            height: auto;
-                        }
-                    }
-                }
-                .active {
-                    transform: scale(1);
-                }
-            }
-            .login_content_right {
-				height: 100%;
-                width: 50%;
-                img {
-                    width: 100%;
-					height: 100%;
-					object-fit: contain;
-                }
-            }
-            .login_type_list {
-                width: 100%;
-                display: flex;
-
-                .login_type_item {
-                    text-align: center;
-                    font-size: 3.6rem;
-                    font-weight: bold;
-                    color: #d7d7d7;
-                    cursor: pointer;
-                    height: 4rem;
-                    line-height: 4rem;
-
-                    &.login_active {
-                        color: #030303;
-                    }
-                }
-            }
-            .login_form_title {
-                font-size: 1.6rem;
-                // color: #666666;
-                font-weight: 900;
-                color: #000;
-                display: flex;
-                justify-content: space-between;
-                box-sizing: border-box;
-                label {
-                    display: flex;
-                    span {
-                        font-size: 1.6rem;
-                        margin-left: 10px;
-                        font-weight: normal;
-                    }
-                    &.active {
-                        pointer-events: none;
-                        input {
-                            pointer-events: none;
-                        }
-                    }
-                }
-            }
-
-            .login_form_content {
-                margin-top: 4rem;
-                position: relative;
-                &[state="2"] {
-                    > * {
-                        opacity: 0;
-                    }
-                    .login_form_email {
-                        opacity: 1;
-                    }
-                }
-                .password_input_block {
-                    position: relative;
-
-                    .password_show_icon {
-                        position: absolute;
-                        font-size: 2.4rem;
-                        right: 2rem;
-                        top: 1.7rem;
-                        cursor: pointer;
-                    }
-                }
-
-                .login_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-					transition: all .3s;
-					&:hover{
-						border: 0.1rem solid #000;
-					}
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .email_last_step {
-                // margin-top: 4rem;
-                .email_last_step_bottom {
-                    padding: 0 40px;
-                }
-                .email_last_step_block {
-                    padding: 10px;
-                    border-bottom: 2px solid;
-                    box-sizing: border-box;
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    .email_last_step_content {
-                        margin-left: 1rem;
-                        font-size: 2.2rem;
-                        font-weight: bold;
-                        color: #030303;
-                    }
-                    .email_last_step_block_icon {
-                        cursor: pointer;
-                        margin-right: 1rem;
-                        height: 20px;
-                    }
-                }
-
-                .fi-br-arrow-left {
-                    font-size: 2.5rem;
-                    font-weight: bold;
-                    color: #030303;
-                    transform: translateY(1rem);
-                    display: inline-block;
-                }
-            }
-
-            .login_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-				transition: all .3s;
-				&:hover{
-					background: #3C3C3C;
-				}
-                &[state="2"] {
-                    cursor: not-allowed;
-                }
-            }
-            .login_text {
-                font-size: 1.6rem;
-                margin-top: 4rem;
-                color: #151515;
-                display: flex;
-                justify-content: flex-end;
-
-                .forget_password_text {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .forget_password_content {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            width: 60rem;
-            background: #ffffff;
-            box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200, 200, 200, 0.3);
-            border-radius: 1rem;
-            padding: 3rem 6rem 6.5rem;
-            box-sizing: border-box;
-
-            .forget_password_content_block {
-                cursor: pointer;
-            }
-
-            .fi-br-arrow-left {
-                font-size: 3.8rem;
-                font-weight: bold;
-                color: #030303;
-                transform: translateY(1rem);
-                display: inline-block;
-            }
-            .forget_password_content_title {
-                font-size: 3.2rem;
-                font-weight: bold;
-                color: #030303;
-                margin-left: 2rem;
-            }
-
-            .forget_passored_form_content {
-                margin-top: 3.5rem;
-
-                .forget_passored_form_title {
-                    font-size: 2.4rem;
-                    font-weight: bold;
-                    color: #030303;
-                    display: flex;
-                    justify-content: space-between;
-                    box-sizing: border-box;
-                }
-
-                .forget_passored_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .forget_verif_code_des {
-                font-size: 2.4rem;
-                font-weight: bold;
-                color: #030303;
-                margin-top: 3.5rem;
-            }
-
-            .forget_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-            }
-        }
-    }
-
-    .login_footer {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        left: 0;
-        bottom: 3.5rem;
-        width: 100%;
-        padding: 0 4rem;
-
-        .login_footer_item {
-            display: flex;
-            align-items: center;
-
-            .login_footer_item_text {
-                font-size: 1.3rem;
-                color: #151515;
-            }
-
-            .footer_item_text_pointer {
-                cursor: pointer;
-            }
-
-            .login_footer_line {
-                width: 0.1rem;
-                height: 2rem;
-                margin: 0 2rem;
-                background: #b9b9b9;
-            }
-        }
-    }
-
-    .marign_top20 {
-        margin-top: 2rem;
-    }
-
-    .marign_top22 {
-        margin-top: 2.2rem;
-    }
-
-    .marign_top30 {
-        margin-top: 3rem;
-    }
-    .marign_top40 {
-        margin-top: 4rem;
-    }
-	.thirdPartyLogin{
-		display: flex;
-		// justify-content: flex-start;
-		> div{
-			position: relative;
-			margin-right: 1rem;
-			> .mask{
-				position: absolute;
-				width: 100%;
-				height: 100%;
-				top: 0;
-				left: 0;
-				z-index: 2;
-				cursor: pointer;
-			}
-		}
-	}
-    .tip_content {
-        font-size: 1.3rem;
-        font-weight: bold;
-        color: #343579;
-        cursor: pointer;
-    }
-
-    .email_last_step_des {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-top: 4rem;
-        margin-bottom: 2rem;
-
-        .sent_email_content {
-            font-size: 1.8rem;
-            font-weight: bold;
-            color: #a5b0c2;
-        }
-
-        .email_tip_content {
-            font-size: 1.4rem;
-            color: #030303;
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/LoginPageEnterprise.vue b/src/views/LoginPageEnterprise.vue
deleted file mode 100644
index 189c730a..00000000
--- a/src/views/LoginPageEnterprise.vue
+++ /dev/null
@@ -1,1121 +0,0 @@
-<template>
-    <div class="login_page">
-        <div class="page_content">
-            <img
-                class="login_logo"
-                src="@/assets/images/loginPage/aida_Logo_login.png"
-            />
-            <!-- 账号密码和邮箱登录  start-->
-            <div class="login_content" v-if="isLogin === 1">
-                <div class="login_content_left">
-                    <div class="login_type_list">
-                        <div
-                            :class="[
-                                'login_type_item',
-                                'username_login_item',
-                                'login_active',
-                            ]"
-                        >
-                            Log on to AiDA 3.0
-                        </div>
-                    </div>
-                    <!-- 账号密码登录 start -->
-                    <!-- v-show="loginType == 'username'" -->
-                    <div>
-                        <div class="login_form_content" :state="emailStap">
-							
-							<div v-show="emailStap === 1">
-								<div class="login_form_title marign_top30">
-									Enterprise
-								</div>
-								<div  class="generalModel_state">
-									<div class="generalModel_state_item" style="width: 100%; margin: 0;">
-										<a-select
-											placeholder="Select a school"
-											v-model:value="selectEnterprise"
-											:options="schoolList"
-											@change="schoolListChange"
-											style="width:100%"
-											show-search
-											size="large"
-											:fieldNames="{ label: 'name', value: 'value' }"
-											:filter-option="filterOption"
-											@focus="handleFocus"
-										>
-											<template #suffixIcon
-												><span
-													class="icon iconfont icon-xiala"
-													style="color: #343579"
-												></span
-											></template>
-										</a-select>
-									</div>
-								</div>
-								<div class="login_form_title marign_top30">
-									Email
-								</div>
-								<input
-									class="login_form_input"
-									placeholder="Enter your email address"
-									v-model="email"
-									@keydown.enter="submitPerLogin()"
-								/>
-								<div class="login_form_title marign_top30">
-									<div>Password</div>
-								</div>
-								<div class="password_input_block">
-									<input
-										class="login_form_input"
-										:type="passwordType"
-										placeholder="Enter your password"
-										v-model="password"
-										@keydown.enter="submitPerLogin()"
-									/>
-									<div
-										class="icon iconfont icon-yanjing_yincang_o password_show_icon"
-										@click="changePasswordType()"
-									></div>
-								</div>
-							</div>
-							
-
-                            <!-- 邮箱登录 start -->
-                            <div
-								v-show="emailStap === 2"
-                                class="login_form_email"
-                                :class="{ active: emailStap === 2 }"
-                            >
-                                <div
-                                    v-show="emailStap === 2"
-                                    class="email_last_step"
-                                >
-                                    <div class="email_last_step_block">
-                                        <span class="email_last_step_content"
-                                            >Verify with one-time verification
-                                            code</span
-                                        >
-                                        <i
-                                            class="fi fi-br-cross email_last_step_block_icon"
-                                            @click="emailLastStepFun()"
-                                        ></i>
-                                    </div>
-                                    <div class="email_last_step_bottom">
-                                        <div class="email_last_step_des">
-                                            <div class="sent_email_content">
-                                                Sent to {{ email }}
-                                            </div>
-                                            <div class="tip_content">
-                                                <span v-show="time"
-                                                    >{{ time }}s</span
-                                                >
-                                                <span
-                                                    v-show="!time"
-                                                    @click="emailNextStepFun()"
-                                                    >Resend</span
-                                                >
-                                            </div>
-                                        </div>
-                                        <VerificationCodeInput
-                                            :ct="emailCode"
-                                            @sendCaptcha="
-                                                submitEmailLogin($event)
-                                            "
-                                        ></VerificationCodeInput>
-
-                                        <div class="email_last_step_des">
-                                            <div
-                                                class="sent_email_content email_tip_content"
-                                            >
-                                                Please check the junk box if you
-                                                haven't received verification
-                                                code
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="login_form_title marign_top30">
-                            <label :class="{ active: emailStap == 2 }">
-                                <input
-                                    :state="emailStap"
-                                    type="checkbox"
-                                    v-model="checked"
-                                />
-                                <span
-                                    >I agree to all Term, Privacy Policy and
-                                    Fees</span
-                                >
-                            </label>
-                        </div>
-						<!-- <div class="thirdPartyLogin marign_top30">
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<googleLogin @googelLogin="googelLogin"></googleLogin>
-							</div>
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<weiXinLogin></weiXinLogin>
-							</div>
-						</div> -->
-                        <div
-                            class="login_submit_button marign_top40"
-                            :state="emailStap"
-                            @click="submitPerLogin()"
-                        >
-                            Sign in
-                        </div>
-
-                        <!-- <div class="login_text">
-                            <div
-                                class="forget_password_text"
-                                @click="changeIsLogin(2)"
-                            >
-                                Forgot your password
-                            </div>
-                        </div> -->
-                    </div>
-                    <!-- 账号密码登录 end -->
-                </div>
-
-                <!-- 邮箱登录 end -->
-                <div class="login_content_right mdhidden">
-                    <img
-                        src="@/assets/images/loginPage/aida_logo_centent.jpg"
-                    />
-                </div>
-            </div>
-
-            <!-- 忘记密码 start -->
-            <div class="forget_password_content" v-else>
-                <div
-                    class="forget_password_content_block"
-                    @click="forgetPasswordLastStepFun()"
-                >
-                    <i class="fi fi-br-arrow-left"></i>
-                    <span class="forget_password_content_title"
-                        >Retrieve password</span
-                    >
-                </div>
-                <div v-show="frogetPasswordStep === 1">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Email</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter your email"
-                            v-model="forgetPasswordEmail"
-                            @keydown.enter="forgetPasswordNextStepFun()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="forgetPasswordNextStepFun()"
-                    >
-                        Next step
-                    </div>
-                </div>
-
-                <div v-show="frogetPasswordStep === 2">
-                    <div class="forget_verif_code_des">Verification Code</div>
-                    <div class="email_last_step_des">
-                        <div class="sent_email_content">
-                            Sent to {{ forgetPasswordEmail }}
-                        </div>
-                        <div class="tip_content">
-                            <span v-show="time">{{ time }}s</span>
-                            <span
-                                v-show="!time"
-                                @click="forgetPasswordNextStepFun()"
-                                >Resend</span
-                            >
-                        </div>
-                    </div>
-                    <VerificationCodeInput
-                        :ct="emailCode"
-                        @sendCaptcha="submitPasswordCode($event)"
-                    ></VerificationCodeInput>
-                </div>
-
-                <div v-show="frogetPasswordStep === 3">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Password</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter a new password"
-                            v-model="newPassword"
-                            @keydown.enter="submitResetPassword()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="submitResetPassword()"
-                    >
-                        Submit
-                    </div>
-                </div>
-            </div>
-            <!-- 忘记密码 end -->
-        </div>
-
-
-
-        <!-- <div class="login_footer">
-            <div class="login_footer_item">
-                <div class="login_footer_item_text">
-                    ©2025 Code-Create Limited
-                </div>
-            </div>
-            <div class="login_footer_item">
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-terms-and-conditions/'
-                        )
-                    "
-                >
-                    Terms&Conditions
-                </div>
-                <div class="login_footer_line"></div>
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-subscription-agreement/'
-                        )
-                    "
-                >
-                    Privacy Policy
-                </div>
-            </div>
-        </div> -->
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, onMounted, reactive,toRefs } from "vue";
-import { Https } from "@/tool/https";
-import { isEmail } from "@/tool/util";
-import { setCookie, WriteCookie } from "@/tool/cookie";
-import { message } from "ant-design-vue";
-import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
-import googleLogin from "@/component/LoginPage/googleLogin.vue";
-import weiXinLogin from "@/component/LoginPage/weiXinLogin.vue";
-import phoneLogin from "@/component/LoginPage/phoneLogin.vue";
-import { useStore } from "vuex";
-import { useI18n } from "vue-i18n";
-import { setLang } from "@/tool/guide";
-const md5 = require("md5");
-export default defineComponent({
-    components: {
-        VerificationCodeInput,googleLogin,weiXinLogin,phoneLogin
-    },
-    setup() {
-        let timer: any = 0;
-        const { locale } = useI18n();
-        const store = useStore();
-		let loadingShow = ref(false)
-		const data = reactive({
-			selectEnterprise:'',
-			schoolList:[] as any,
-		})
-		const schoolListChange = (e:any)=>{
-		}
-		const filterOption = (e:any)=>{
-			let params = {
-				name:e,
-				type:'Enterprise'
-			}
-			Https.axiosPost(Https.httpUrls.organizationNameSearch,{},{params:params}).then((rv:any)=>{
-				data.schoolList = rv.map((item:any)=>{
-					return {
-						label:item,
-						value:item,
-					}	
-				})
-			})
-			
-		}
-		const handleFocus= ()=>{
-			if(data.schoolList.length == 0){
-				filterOption('')
-			}
-		}
-        return {
-			...toRefs(data),
-            store,
-            timer,
-            locale,
-			loadingShow,
-			schoolListChange,
-			filterOption,handleFocus
-        };
-    },
-    data() {
-        return {
-            checked: false,
-            isLogin: 1, //是否为登录 1-登录， 2-忘记密码
-            loginType: "username",
-            emailStap: 1, // 邮箱登录步骤
-            emailCode: ["", "", "", "", "", ""], //邮箱验证码
-            emailNextStep: true,
-            username: "",
-            password: localStorage.getItem("loginPassword") || '',
-            email: localStorage.getItem("loginEmail") || '', //邮箱登录邮箱
-            frogetPasswordStep: 1, //忘记密码的步骤
-            forgetPasswordEmail: "",
-            forgetEmailCode: ["", "", "", "", "", ""], //忘记密码的邮箱验证码
-            forgetEmailValue: "", //忘记密码的邮箱验证码保存值
-            newPassword: "", //新密码
-            isCheckRobot: false,
-            time: 60, //60秒倒计时
-            passwordType: "password",
-            userId: "",
-            loginTime: true,
-        };
-    },
-	
-    methods: {
-        changeLoginType(type: string) {
-            this.loginType = type;
-        },
-
-        //是否忘记密码页面
-        changeIsLogin(isLogin: number) {
-            if (isLogin === 1) {
-                //登录
-                this.forgetPasswordEmail = "";
-                this.frogetPasswordStep = 1;
-                this.forgetEmailCode = ["", "", "", "", "", ""];
-                this.emailStap = 1;
-                this.clearTimer();
-            } else {
-                this.username = "";
-                this.password = "";
-            }
-            this.isLogin = isLogin;
-        },
-
-        //邮箱登录的下一步
-        emailNextStepFun() {
-            if (!isEmail(this.email)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.email,
-                operationType: "LOGIN",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.emailStap = 2;
-                        this.time = 60;
-                        this.emailCode = ["", "", "", "", "", ""];
-                        this.createTimer();
-                    }
-                }
-            );
-        },
-
-        //邮箱登录的上一步
-        emailLastStepFun() {
-            this.emailStap = 1;
-            (this.username = ""), (this.password = ""), (this.email = "");
-            (this.checked = false),
-                (this.loginType = "username"),
-                (this.emailCode = ["", "", "", "", "", ""]),
-                this.clearTimer();
-        },
-
-        //忘记密码的下一步
-        forgetPasswordNextStepFun() {
-            if (!isEmail(this.forgetPasswordEmail)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.forgetPasswordEmail,
-                operationType: "FORGET_PWD",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.frogetPasswordStep = 2;
-                        (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                            this.createTimer();
-                    }
-                }
-            );
-        },
-        //忘记密码的上一步
-        forgetPasswordLastStepFun() {
-            if (this.frogetPasswordStep === 1) {
-                this.changeIsLogin(1);
-            } else {
-                this.frogetPasswordStep = this.frogetPasswordStep - 1;
-                this.forgetPasswordEmail = "";
-                (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                    this.clearTimer();
-            }
-        },
-
-        //忘记密码填写完邮箱验证码进行下一步
-        submitPasswordCode(emailVerifyCode: any) {
-            // console.log(123123);
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: emailVerifyCode,
-                password: "",
-                verifyEmail: true,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.forgetEmailValue = emailVerifyCode;
-                        this.frogetPasswordStep = 3;
-                        this.clearTimer();
-                    }
-                }
-            );
-        },
-
-        //改变勾选是否是机器人
-        checkRobot() {
-            this.isCheckRobot = !this.isCheckRobot;
-        },
-
-        //提交账号密码预先登录
-        submitPerLogin() {
-            //输入账号密码
-            if (this.emailStap >= 2) {
-                return;
-            } else {
-                if (!this.password) {
-                    message.info(
-                        "Please enter your account number or password"
-                    );
-                    return;
-                }
-                //输入邮箱
-                if (!this.email) {
-                    message.info("Please enter your email address");
-                    return;
-                }
-				if (!this.selectEnterprise) {
-                    message.info("Please select a school");
-                    return;
-                }
-                //判断邮箱格式是否正确
-                if (!isEmail(this.email)) {
-                    message.info("The email format is incorrect");
-                    return;
-                }
-                //判断是否同意隐私政策
-                if (!this.checked) {
-                    message.info(
-                        "Agree to all terms, privacy fees and policies"
-                    );
-                    return;
-                }
-                let data = {
-                    password: md5(this.password + "abc"),
-                    userName: 'a',
-                    // userName: this.username,
-					organizationName:this.selectEnterprise,
-                    email: this.email,
-                    operationType: "LOGIN",
-                    ip: "",
-                };
-                // this.loginType = 'email'
-                if (this.loginTime) {
-                    this.loginTime = false;
-                    Https.axiosPost(Https.httpUrls.enterpriseLogin, data)
-                        .then((rv: any) => {
-                            // if (rv) {
-                            //     this.loginType = 'email'
-                            // }
-                            this.emailStap = 2;
-                            if (rv) {
-                                this.userId = rv.userId;
-                                this.loginType = "email";
-                                this.time = 60;
-                                this.emailCode = ["", "", "", "", "", ""];
-                                this.createTimer();
-								localStorage.setItem("loginEmail", this.email);
-								localStorage.setItem("loginPassword", this.password);
-                            }
-                        })
-                        .catch((res) => {
-                            this.emailStap = 1;
-                        });
-                    setTimeout(() => {
-                        this.loginTime = true;
-                    }, 2000);
-                }
-            }
-        },
-
-        changePasswordType() {
-            this.passwordType =
-                this.passwordType === "password" ? "text" : "password";
-        },
-
-        //邮箱登录提交
-        submitEmailLogin(emailVerifyCode: any) {
-            let data = {
-                email: this.email,
-                emailVerifyCode: emailVerifyCode,
-                loginType: "EMAIL",
-                userId: this.userId,
-				organizationName:this.selectEnterprise
-            };
-            Https.axiosPost(Https.httpUrls.accountLogin, data)
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-        },
-		isCheckAgreement(){
-			message.info(
-					"Agree to all terms, privacy fees and policies"
-				);
-		},
-		//微信登录
-		wechatLogin(value:any) {
-			let data = {
-				code : value.code,
-				type:2
-			}
-			this.loadingShow = true
-		    Https.axiosGet(Https.httpUrls.parseWeChatCode, {params:data})
-                .then((rv: any) => {
-					this.loadingShow = false
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {this.loadingShow = false});
-		},
-		//谷歌登录
-		googelLogin(value:any) {
-			let data = {credential : value,type:2}
-		    Https.axiosGet(Https.httpUrls.parseGoogleCredential, {params:data})
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-		},
-		//登陆成功设置参数
-		setSuccessLogin(rv:any){
-			if (rv) {
-				if (rv.systemUser == 4) {
-					rv.systemUser = 1;
-				}
-				this.createTimer();
-				let isTest = rv.systemUser == 3 ? true : false;
-				let isBeginner = rv.isBeginner == 1 ? true : false;
-				let token = rv.token;
-				setCookie("isMurmur", false);
-				setCookie("token", token);
-				setCookie("isTest", isTest);
-				setCookie("isBeginner", isBeginner);
-				setCookie("isBeginnerNum", 0); //从第一步开始，机器人开始的话就是从第二部开始
-				setCookie("userInfo", JSON.stringify(rv));
-				let userid:any = {
-					ueserId:rv.userId,
-					systemUser:rv.systemUser,
-				}
-				if(rv.email)userid.email = rv.email
-				this.store.commit("upUserDetail", userid);
-				
-				if (window.innerWidth < 768) {
-					message.info(
-						"If you need to design, please log in using an iPad or computer."
-					);
-					this.turnToHomePage("/Square");
-				} else {
-					this.turnToHomePage("/home");
-				}
-				sessionStorage.setItem(
-					"isTimeOne",
-					JSON.stringify(false)
-				); //是否需要公告 提示 弹窗
-				let randomNum: any =
-					Math.floor(Math.random() * 9000000000000000) +
-					1000000000000000;
-				sessionStorage.setItem("sessionId", randomNum);
-				sessionStorage.setItem("record", JSON.stringify([]));
-			}
-		},
-        //修改密码提交
-        submitResetPassword() {
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: this.forgetEmailValue,
-                password: md5(this.newPassword + "abc"),
-                verifyEmail: false,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        message.success("Changing the password successfully");
-                        this.changeIsLogin(1);
-                    }
-                }
-            );
-        },
-
-        //创建定时器
-        createTimer() {
-            this.timer = setInterval(() => {
-                this.time--;
-                if (!this.time) {
-                    clearInterval(this.timer);
-                }
-            }, 1000);
-        },
-
-        //清除定时器
-        clearTimer() {
-            this.time = 60;
-            if (this.timer) {
-                clearInterval(this.timer);
-            }
-        },
-
-        //跳转到首页
-        turnToHomePage(str: any) {
-            // this.getLang();
-            // this.$router.push("/home");
-            // console.log(window.location.search.substring(1));
-            this.store.commit("clearAllData");
-            this.store.commit("clearAllCollection");
-            this.store.commit("setAllBoardDataChoose", {});
-            this.store.commit("clearShowSketchboard", {});
-            this.$router.push(str);
-        },
-        //获取当前语言
-        // getLang() {
-        //     let data = {};
-        //     Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
-        //         (rv: any) => {
-        //             if (rv) {
-        //                 this.locale = rv;
-        //                 setLang(rv);
-        //             }
-        //         }
-        //     );
-        // },
-    },
-	mounted() {
-		const data = this.$route.query
-		if(data?.state == 'weiXin'){
-			this.wechatLogin(data)
-		}
-	},
-});
-</script>
-<style lang="less" scoped>
-.login_page {
-    width: 100%;
-    height: 100%;
-    .page_content {
-        // position: relative;
-
-        .login_logo {
-            position: absolute;
-            left: 4rem;
-            top: 2.5rem;
-            width: 11rem;
-        }
-
-        .login_content {
-            position: relative;
-			// width: 100%;
-			// height: 100%;
-			width: 70%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-            @media (max-width: 768px) {
-                width: 100%;
-            }
-            .login_content_left {
-                width: 60%;
-                // padding: 0 20rem;
-				padding-right: 20rem;
-                @media (max-width: 768px) {
-                    width: 100%;
-                }
-                .login_form_email {
-                    position: relative;
-                    width: 100%;
-                    height: 100%;
-                    background: #fff;
-                    transform: scale(0);
-                    transition: 0.3s all;
-                    border: 2px solid;
-                    border-radius: 20px;
-                    .email_last_step {
-                        width: 100%;
-                        height: 100%;
-                        #app {
-                            height: auto;
-                        }
-                    }
-                }
-                .active {
-                    transform: scale(1);
-                }
-            }
-            .login_content_right {
-				height: 100%;
-                width: 50%;
-                img {
-                    width: 100%;
-					height: 100%;
-					object-fit: contain;
-                }
-            }
-            .login_type_list {
-                width: 100%;
-                display: flex;
-
-                .login_type_item {
-                    text-align: center;
-                    font-size: 3.6rem;
-                    font-weight: bold;
-                    color: #d7d7d7;
-                    cursor: pointer;
-                    height: 4rem;
-                    line-height: 4rem;
-
-                    &.login_active {
-                        color: #030303;
-                    }
-                }
-            }
-            .login_form_title {
-                font-size: 1.6rem;
-                // color: #666666;
-                font-weight: 900;
-                color: #000;
-                display: flex;
-                justify-content: space-between;
-                box-sizing: border-box;
-                label {
-                    display: flex;
-                    span {
-                        font-size: 1.6rem;
-                        margin-left: 10px;
-                        font-weight: normal;
-                    }
-                    &.active {
-                        pointer-events: none;
-                        input {
-                            pointer-events: none;
-                        }
-                    }
-                }
-            }
-			.generalModel_state{
-				>.generalModel_state_item{
-					:deep(.ant-select-selector){
-						border: 0.1rem solid #dfdfdf;
-						border-radius: 2.5rem;
-						height: 5rem !important;
-						width: 100%;
-						box-sizing: border-box;
-						&:hover{
-							border: 0.1rem solid #000;
-						}
-					}
-				}
-			}
-            .login_form_content {
-                margin-top: 4rem;
-                position: relative;
-				
-                &[state="2"] {
-                    > * {
-                        opacity: 0;
-                    }
-                    .login_form_email {
-                        opacity: 1;
-                    }
-                }
-                .password_input_block {
-                    position: relative;
-
-                    .password_show_icon {
-                        position: absolute;
-                        font-size: 2.4rem;
-                        right: 2rem;
-                        top: 1.7rem;
-                        cursor: pointer;
-                    }
-                }
-
-                .login_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-					transition: all .3s;
-					&:hover{
-						border: 0.1rem solid #000;
-					}
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .email_last_step {
-                // margin-top: 4rem;
-                .email_last_step_bottom {
-                    padding: 0 40px;
-                }
-                .email_last_step_block {
-                    padding: 10px;
-                    border-bottom: 2px solid;
-                    box-sizing: border-box;
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    .email_last_step_content {
-                        margin-left: 1rem;
-                        font-size: 2.2rem;
-                        font-weight: bold;
-                        color: #030303;
-                    }
-                    .email_last_step_block_icon {
-                        cursor: pointer;
-                        margin-right: 1rem;
-                        height: 20px;
-                    }
-                }
-
-                .fi-br-arrow-left {
-                    font-size: 2.5rem;
-                    font-weight: bold;
-                    color: #030303;
-                    transform: translateY(1rem);
-                    display: inline-block;
-                }
-            }
-
-            .login_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-				transition: all .3s;
-				&:hover{
-					background: #3C3C3C;
-				}
-                &[state="2"] {
-                    cursor: not-allowed;
-                }
-            }
-            .login_text {
-                font-size: 1.6rem;
-                margin-top: 4rem;
-                color: #151515;
-                display: flex;
-                justify-content: flex-end;
-
-                .forget_password_text {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .forget_password_content {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            width: 60rem;
-            background: #ffffff;
-            box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200, 200, 200, 0.3);
-            border-radius: 1rem;
-            padding: 3rem 6rem 6.5rem;
-            box-sizing: border-box;
-
-            .forget_password_content_block {
-                cursor: pointer;
-            }
-
-            .fi-br-arrow-left {
-                font-size: 3.8rem;
-                font-weight: bold;
-                color: #030303;
-                transform: translateY(1rem);
-                display: inline-block;
-            }
-            .forget_password_content_title {
-                font-size: 3.2rem;
-                font-weight: bold;
-                color: #030303;
-                margin-left: 2rem;
-            }
-
-            .forget_passored_form_content {
-                margin-top: 3.5rem;
-
-                .forget_passored_form_title {
-                    font-size: 2.4rem;
-                    font-weight: bold;
-                    color: #030303;
-                    display: flex;
-                    justify-content: space-between;
-                    box-sizing: border-box;
-                }
-
-                .forget_passored_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .forget_verif_code_des {
-                font-size: 2.4rem;
-                font-weight: bold;
-                color: #030303;
-                margin-top: 3.5rem;
-            }
-
-            .forget_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-            }
-        }
-    }
-
-    .login_footer {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        left: 0;
-        bottom: 3.5rem;
-        width: 100%;
-        padding: 0 4rem;
-
-        .login_footer_item {
-            display: flex;
-            align-items: center;
-
-            .login_footer_item_text {
-                font-size: 1.3rem;
-                color: #151515;
-            }
-
-            .footer_item_text_pointer {
-                cursor: pointer;
-            }
-
-            .login_footer_line {
-                width: 0.1rem;
-                height: 2rem;
-                margin: 0 2rem;
-                background: #b9b9b9;
-            }
-        }
-    }
-
-    .marign_top20 {
-        margin-top: 2rem;
-    }
-
-    .marign_top22 {
-        margin-top: 2.2rem;
-    }
-
-    .marign_top30 {
-        margin-top: 3rem;
-    }
-    .marign_top40 {
-        margin-top: 4rem;
-    }
-	.thirdPartyLogin{
-		display: flex;
-		// justify-content: flex-start;
-		> div{
-			position: relative;
-			margin-right: 1rem;
-			> .mask{
-				position: absolute;
-				width: 100%;
-				height: 100%;
-				top: 0;
-				left: 0;
-				z-index: 2;
-				cursor: pointer;
-			}
-		}
-	}
-    .tip_content {
-        font-size: 1.3rem;
-        font-weight: bold;
-        color: #343579;
-        cursor: pointer;
-    }
-
-    .email_last_step_des {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-top: 4rem;
-        margin-bottom: 2rem;
-
-        .sent_email_content {
-            font-size: 1.8rem;
-            font-weight: bold;
-            color: #a5b0c2;
-        }
-
-        .email_tip_content {
-            font-size: 1.4rem;
-            color: #030303;
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/LoginPageSchool.vue b/src/views/LoginPageSchool.vue
deleted file mode 100644
index 912a3d94..00000000
--- a/src/views/LoginPageSchool.vue
+++ /dev/null
@@ -1,1121 +0,0 @@
-<template>
-    <div class="login_page">
-        <div class="page_content">
-            <img
-                class="login_logo"
-                src="@/assets/images/loginPage/aida_Logo_login.png"
-            />
-            <!-- 账号密码和邮箱登录  start-->
-            <div class="login_content" v-if="isLogin === 1">
-                <div class="login_content_left">
-                    <div class="login_type_list">
-                        <div
-                            :class="[
-                                'login_type_item',
-                                'username_login_item',
-                                'login_active',
-                            ]"
-                        >
-                            Log on to AiDA 3.0
-                        </div>
-                    </div>
-                    <!-- 账号密码登录 start -->
-                    <!-- v-show="loginType == 'username'" -->
-                    <div>
-                        <div class="login_form_content" :state="emailStap">
-							
-							<div v-show="emailStap === 1">
-								<div class="login_form_title marign_top30">
-									School
-								</div>
-								<div  class="generalModel_state">
-									<div class="generalModel_state_item" style="width: 100%; margin: 0;">
-										<a-select
-											placeholder="Select a school"
-											v-model:value="selectSchool"
-											:options="schoolList"
-											@change="schoolListChange"
-											style="width:100%"
-											show-search
-											size="large"
-											:fieldNames="{ label: 'name', value: 'value' }"
-											:filter-option="filterOption"
-											@focus="handleFocus"
-										>
-											<template #suffixIcon
-												><span
-													class="icon iconfont icon-xiala"
-													style="color: #343579"
-												></span
-											></template>
-										</a-select>
-									</div>
-								</div>
-								<div class="login_form_title marign_top30">
-									Email
-								</div>
-								<input
-									class="login_form_input"
-									placeholder="Enter your email address"
-									v-model="email"
-									@keydown.enter="submitPerLogin()"
-								/>
-								<div class="login_form_title marign_top30">
-									<div>Password</div>
-								</div>
-								<div class="password_input_block">
-									<input
-										class="login_form_input"
-										:type="passwordType"
-										placeholder="Enter your password"
-										v-model="password"
-										@keydown.enter="submitPerLogin()"
-									/>
-									<div
-										class="icon iconfont icon-yanjing_yincang_o password_show_icon"
-										@click="changePasswordType()"
-									></div>
-								</div>
-							</div>
-							
-
-                            <!-- 邮箱登录 start -->
-                            <div
-								v-show="emailStap === 2"
-                                class="login_form_email"
-                                :class="{ active: emailStap === 2 }"
-                            >
-                                <div
-                                    v-show="emailStap === 2"
-                                    class="email_last_step"
-                                >
-                                    <div class="email_last_step_block">
-                                        <span class="email_last_step_content"
-                                            >Verify with one-time verification
-                                            code</span
-                                        >
-                                        <i
-                                            class="fi fi-br-cross email_last_step_block_icon"
-                                            @click="emailLastStepFun()"
-                                        ></i>
-                                    </div>
-                                    <div class="email_last_step_bottom">
-                                        <div class="email_last_step_des">
-                                            <div class="sent_email_content">
-                                                Sent to {{ email }}
-                                            </div>
-                                            <div class="tip_content">
-                                                <span v-show="time"
-                                                    >{{ time }}s</span
-                                                >
-                                                <span
-                                                    v-show="!time"
-                                                    @click="emailNextStepFun()"
-                                                    >Resend</span
-                                                >
-                                            </div>
-                                        </div>
-                                        <VerificationCodeInput
-                                            :ct="emailCode"
-                                            @sendCaptcha="
-                                                submitEmailLogin($event)
-                                            "
-                                        ></VerificationCodeInput>
-
-                                        <div class="email_last_step_des">
-                                            <div
-                                                class="sent_email_content email_tip_content"
-                                            >
-                                                Please check the junk box if you
-                                                haven't received verification
-                                                code
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="login_form_title marign_top30">
-                            <label :class="{ active: emailStap == 2 }">
-                                <input
-                                    :state="emailStap"
-                                    type="checkbox"
-                                    v-model="checked"
-                                />
-                                <span
-                                    >I agree to all Term, Privacy Policy and
-                                    Fees</span
-                                >
-                            </label>
-                        </div>
-						<!-- <div class="thirdPartyLogin marign_top30">
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<googleLogin @googelLogin="googelLogin"></googleLogin>
-							</div>
-							<div class="label">
-								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
-								<weiXinLogin></weiXinLogin>
-							</div>
-						</div> -->
-                        <div
-                            class="login_submit_button marign_top40"
-                            :state="emailStap"
-                            @click="submitPerLogin()"
-                        >
-                            Sign in
-                        </div>
-
-                        <!-- <div class="login_text">
-                            <div
-                                class="forget_password_text"
-                                @click="changeIsLogin(2)"
-                            >
-                                Forgot your password
-                            </div>
-                        </div> -->
-                    </div>
-                    <!-- 账号密码登录 end -->
-                </div>
-
-                <!-- 邮箱登录 end -->
-                <div class="login_content_right mdhidden">
-                    <img
-                        src="@/assets/images/loginPage/aida_logo_centent.jpg"
-                    />
-                </div>
-            </div>
-
-            <!-- 忘记密码 start -->
-            <div class="forget_password_content" v-else>
-                <div
-                    class="forget_password_content_block"
-                    @click="forgetPasswordLastStepFun()"
-                >
-                    <i class="fi fi-br-arrow-left"></i>
-                    <span class="forget_password_content_title"
-                        >Retrieve password</span
-                    >
-                </div>
-                <div v-show="frogetPasswordStep === 1">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Email</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter your email"
-                            v-model="forgetPasswordEmail"
-                            @keydown.enter="forgetPasswordNextStepFun()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="forgetPasswordNextStepFun()"
-                    >
-                        Next step
-                    </div>
-                </div>
-
-                <div v-show="frogetPasswordStep === 2">
-                    <div class="forget_verif_code_des">Verification Code</div>
-                    <div class="email_last_step_des">
-                        <div class="sent_email_content">
-                            Sent to {{ forgetPasswordEmail }}
-                        </div>
-                        <div class="tip_content">
-                            <span v-show="time">{{ time }}s</span>
-                            <span
-                                v-show="!time"
-                                @click="forgetPasswordNextStepFun()"
-                                >Resend</span
-                            >
-                        </div>
-                    </div>
-                    <VerificationCodeInput
-                        :ct="emailCode"
-                        @sendCaptcha="submitPasswordCode($event)"
-                    ></VerificationCodeInput>
-                </div>
-
-                <div v-show="frogetPasswordStep === 3">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Password</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter a new password"
-                            v-model="newPassword"
-                            @keydown.enter="submitResetPassword()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="submitResetPassword()"
-                    >
-                        Submit
-                    </div>
-                </div>
-            </div>
-            <!-- 忘记密码 end -->
-        </div>
-
-
-
-        <!-- <div class="login_footer">
-            <div class="login_footer_item">
-                <div class="login_footer_item_text">
-                    ©2025 Code-Create Limited
-                </div>
-            </div>
-            <div class="login_footer_item">
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-terms-and-conditions/'
-                        )
-                    "
-                >
-                    Terms&Conditions
-                </div>
-                <div class="login_footer_line"></div>
-                <div
-                    class="login_footer_item_text footer_item_text_pointer"
-                    @click="
-                        turnToWindow(
-                            'https://code-create.com.hk/aida-subscription-agreement/'
-                        )
-                    "
-                >
-                    Privacy Policy
-                </div>
-            </div>
-        </div> -->
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, onMounted, reactive,toRefs } from "vue";
-import { Https } from "@/tool/https";
-import { isEmail } from "@/tool/util";
-import { setCookie, WriteCookie } from "@/tool/cookie";
-import { message } from "ant-design-vue";
-import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
-import googleLogin from "@/component/LoginPage/googleLogin.vue";
-import weiXinLogin from "@/component/LoginPage/weiXinLogin.vue";
-import phoneLogin from "@/component/LoginPage/phoneLogin.vue";
-import { useStore } from "vuex";
-import { useI18n } from "vue-i18n";
-import { setLang } from "@/tool/guide";
-const md5 = require("md5");
-export default defineComponent({
-    components: {
-        VerificationCodeInput,googleLogin,weiXinLogin,phoneLogin
-    },
-    setup() {
-        let timer: any = 0;
-        const { locale } = useI18n();
-        const store = useStore();
-		let loadingShow = ref(false)
-		const data = reactive({
-			selectSchool:'',
-			schoolList:[] as any,
-		})
-		const schoolListChange = (e:any)=>{
-		}
-		const filterOption = (e:any)=>{
-			let params = {
-				name:e,
-				type:'School'
-			}
-			Https.axiosPost(Https.httpUrls.organizationNameSearch,{},{params:params}).then((rv:any)=>{
-				data.schoolList = rv.map((item:any)=>{
-					return {
-						label:item,
-						value:item,
-					}	
-				})
-			})
-			
-		}
-		const handleFocus= ()=>{
-			if(data.schoolList.length == 0){
-				filterOption('')
-			}
-		}
-        return {
-			...toRefs(data),
-            store,
-            timer,
-            locale,
-			loadingShow,
-			schoolListChange,
-			filterOption,handleFocus
-        };
-    },
-    data() {
-        return {
-            checked: false,
-            isLogin: 1, //是否为登录 1-登录， 2-忘记密码
-            loginType: "username",
-            emailStap: 1, // 邮箱登录步骤
-            emailCode: ["", "", "", "", "", ""], //邮箱验证码
-            emailNextStep: true,
-            username: "",
-            password: localStorage.getItem("loginPassword") || '',
-            email: localStorage.getItem("loginEmail") || '', //邮箱登录邮箱
-            frogetPasswordStep: 1, //忘记密码的步骤
-            forgetPasswordEmail: "",
-            forgetEmailCode: ["", "", "", "", "", ""], //忘记密码的邮箱验证码
-            forgetEmailValue: "", //忘记密码的邮箱验证码保存值
-            newPassword: "", //新密码
-            isCheckRobot: false,
-            time: 60, //60秒倒计时
-            passwordType: "password",
-            userId: "",
-            loginTime: true,
-        };
-    },
-	
-    methods: {
-        changeLoginType(type: string) {
-            this.loginType = type;
-        },
-
-        //是否忘记密码页面
-        changeIsLogin(isLogin: number) {
-            if (isLogin === 1) {
-                //登录
-                this.forgetPasswordEmail = "";
-                this.frogetPasswordStep = 1;
-                this.forgetEmailCode = ["", "", "", "", "", ""];
-                this.emailStap = 1;
-                this.clearTimer();
-            } else {
-                this.username = "";
-                this.password = "";
-            }
-            this.isLogin = isLogin;
-        },
-
-        //邮箱登录的下一步
-        emailNextStepFun() {
-            if (!isEmail(this.email)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.email,
-                operationType: "LOGIN",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.emailStap = 2;
-                        this.time = 60;
-                        this.emailCode = ["", "", "", "", "", ""];
-                        this.createTimer();
-                    }
-                }
-            );
-        },
-
-        //邮箱登录的上一步
-        emailLastStepFun() {
-            this.emailStap = 1;
-            (this.username = ""), (this.password = ""), (this.email = "");
-            (this.checked = false),
-                (this.loginType = "username"),
-                (this.emailCode = ["", "", "", "", "", ""]),
-                this.clearTimer();
-        },
-
-        //忘记密码的下一步
-        forgetPasswordNextStepFun() {
-            if (!isEmail(this.forgetPasswordEmail)) {
-                message.info("The email format is incorrect");
-                return;
-            }
-            let data = {
-                email: this.forgetPasswordEmail,
-                operationType: "FORGET_PWD",
-            };
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.frogetPasswordStep = 2;
-                        (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                            this.createTimer();
-                    }
-                }
-            );
-        },
-        //忘记密码的上一步
-        forgetPasswordLastStepFun() {
-            if (this.frogetPasswordStep === 1) {
-                this.changeIsLogin(1);
-            } else {
-                this.frogetPasswordStep = this.frogetPasswordStep - 1;
-                this.forgetPasswordEmail = "";
-                (this.forgetEmailCode = ["", "", "", "", "", ""]),
-                    this.clearTimer();
-            }
-        },
-
-        //忘记密码填写完邮箱验证码进行下一步
-        submitPasswordCode(emailVerifyCode: any) {
-            // console.log(123123);
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: emailVerifyCode,
-                password: "",
-                verifyEmail: true,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        this.forgetEmailValue = emailVerifyCode;
-                        this.frogetPasswordStep = 3;
-                        this.clearTimer();
-                    }
-                }
-            );
-        },
-
-        //改变勾选是否是机器人
-        checkRobot() {
-            this.isCheckRobot = !this.isCheckRobot;
-        },
-
-        //提交账号密码预先登录
-        submitPerLogin() {
-            //输入账号密码
-            if (this.emailStap >= 2) {
-                return;
-            } else {
-                if (!this.password) {
-                    message.info(
-                        "Please enter your account number or password"
-                    );
-                    return;
-                }
-                //输入邮箱
-                if (!this.email) {
-                    message.info("Please enter your email address");
-                    return;
-                }
-				if (!this.selectSchool) {
-                    message.info("Please select a school");
-                    return;
-                }
-                //判断邮箱格式是否正确
-                if (!isEmail(this.email)) {
-                    message.info("The email format is incorrect");
-                    return;
-                }
-                //判断是否同意隐私政策
-                if (!this.checked) {
-                    message.info(
-                        "Agree to all terms, privacy fees and policies"
-                    );
-                    return;
-                }
-                let data = {
-                    password: md5(this.password + "abc"),
-                    userName: 'a',
-                    // userName: this.username,
-					organizationName:this.selectSchool,
-                    email: this.email,
-                    operationType: "LOGIN",
-                    ip: "",
-                };
-                // this.loginType = 'email'
-                if (this.loginTime) {
-                    this.loginTime = false;
-                    Https.axiosPost(Https.httpUrls.schoolLogin, data)
-                        .then((rv: any) => {
-                            // if (rv) {
-                            //     this.loginType = 'email'
-                            // }
-                            this.emailStap = 2;
-                            if (rv) {
-                                this.userId = rv.userId;
-                                this.loginType = "email";
-                                this.time = 60;
-                                this.emailCode = ["", "", "", "", "", ""];
-                                this.createTimer();
-								localStorage.setItem("loginEmail", this.email);
-								localStorage.setItem("loginPassword", this.password);
-                            }
-                        })
-                        .catch((res) => {
-                            this.emailStap = 1;
-                        });
-                    setTimeout(() => {
-                        this.loginTime = true;
-                    }, 2000);
-                }
-            }
-        },
-
-        changePasswordType() {
-            this.passwordType =
-                this.passwordType === "password" ? "text" : "password";
-        },
-
-        //邮箱登录提交
-        submitEmailLogin(emailVerifyCode: any) {
-            let data = {
-                email: this.email,
-                emailVerifyCode: emailVerifyCode,
-                loginType: "EMAIL",
-                userId: this.userId,
-				organizationName:this.selectSchool
-            };
-            Https.axiosPost(Https.httpUrls.accountLogin, data)
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-        },
-		isCheckAgreement(){
-			message.info(
-					"Agree to all terms, privacy fees and policies"
-				);
-		},
-		//微信登录
-		wechatLogin(value:any) {
-			let data = {
-				code : value.code,
-				type:2
-			}
-			this.loadingShow = true
-		    Https.axiosGet(Https.httpUrls.parseWeChatCode, {params:data})
-                .then((rv: any) => {
-					this.loadingShow = false
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {this.loadingShow = false});
-		},
-		//谷歌登录
-		googelLogin(value:any) {
-			let data = {credential : value,type:2}
-		    Https.axiosGet(Https.httpUrls.parseGoogleCredential, {params:data})
-                .then((rv: any) => {
-					this.setSuccessLogin(rv)
-                })
-                .catch((res) => {});
-		},
-		//登陆成功设置参数
-		setSuccessLogin(rv:any){
-			if (rv) {
-				if (rv.systemUser == 4) {
-					rv.systemUser = 1;
-				}
-				this.createTimer();
-				let isTest = rv.systemUser == 3 ? true : false;
-				let isBeginner = rv.isBeginner == 1 ? true : false;
-				let token = rv.token;
-				setCookie("isMurmur", false);
-				setCookie("token", token);
-				setCookie("isTest", isTest);
-				setCookie("isBeginner", isBeginner);
-				setCookie("isBeginnerNum", 0); //从第一步开始，机器人开始的话就是从第二部开始
-				setCookie("userInfo", JSON.stringify(rv));
-				let userid:any = {
-					ueserId:rv.userId,
-					systemUser:rv.systemUser,
-				}
-				if(rv.email)userid.email = rv.email
-				this.store.commit("upUserDetail", userid);
-				
-				if (window.innerWidth < 768) {
-					message.info(
-						"If you need to design, please log in using an iPad or computer."
-					);
-					this.turnToHomePage("/Square");
-				} else {
-					this.turnToHomePage("/home");
-				}
-				sessionStorage.setItem(
-					"isTimeOne",
-					JSON.stringify(false)
-				); //是否需要公告 提示 弹窗
-				let randomNum: any =
-					Math.floor(Math.random() * 9000000000000000) +
-					1000000000000000;
-				sessionStorage.setItem("sessionId", randomNum);
-				sessionStorage.setItem("record", JSON.stringify([]));
-			}
-		},
-        //修改密码提交
-        submitResetPassword() {
-            let data = {
-                email: this.forgetPasswordEmail,
-                emailVerifyCode: this.forgetEmailValue,
-                password: md5(this.newPassword + "abc"),
-                verifyEmail: false,
-            };
-            Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
-                (rv: any) => {
-                    if (rv) {
-                        message.success("Changing the password successfully");
-                        this.changeIsLogin(1);
-                    }
-                }
-            );
-        },
-
-        //创建定时器
-        createTimer() {
-            this.timer = setInterval(() => {
-                this.time--;
-                if (!this.time) {
-                    clearInterval(this.timer);
-                }
-            }, 1000);
-        },
-
-        //清除定时器
-        clearTimer() {
-            this.time = 60;
-            if (this.timer) {
-                clearInterval(this.timer);
-            }
-        },
-
-        //跳转到首页
-        turnToHomePage(str: any) {
-            // this.getLang();
-            // this.$router.push("/home");
-            // console.log(window.location.search.substring(1));
-            this.store.commit("clearAllData");
-            this.store.commit("clearAllCollection");
-            this.store.commit("setAllBoardDataChoose", {});
-            this.store.commit("clearShowSketchboard", {});
-            this.$router.push(str);
-        },
-        //获取当前语言
-        // getLang() {
-        //     let data = {};
-        //     Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
-        //         (rv: any) => {
-        //             if (rv) {
-        //                 this.locale = rv;
-        //                 setLang(rv);
-        //             }
-        //         }
-        //     );
-        // },
-    },
-	mounted() {
-		const data = this.$route.query
-		if(data?.state == 'weiXin'){
-			this.wechatLogin(data)
-		}
-	},
-});
-</script>
-<style lang="less" scoped>
-.login_page {
-    width: 100%;
-    height: 100%;
-    .page_content {
-        // position: relative;
-
-        .login_logo {
-            position: absolute;
-            left: 4rem;
-            top: 2.5rem;
-            width: 11rem;
-        }
-
-        .login_content {
-            position: relative;
-			// width: 100%;
-			// height: 100%;
-			width: 70%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-            @media (max-width: 768px) {
-                width: 100%;
-            }
-            .login_content_left {
-                width: 60%;
-                // padding: 0 20rem;
-				padding-right: 20rem;
-                @media (max-width: 768px) {
-                    width: 100%;
-                }
-                .login_form_email {
-                    position: relative;
-                    width: 100%;
-                    height: 100%;
-                    background: #fff;
-                    transform: scale(0);
-                    transition: 0.3s all;
-                    border: 2px solid;
-                    border-radius: 20px;
-                    .email_last_step {
-                        width: 100%;
-                        height: 100%;
-                        #app {
-                            height: auto;
-                        }
-                    }
-                }
-                .active {
-                    transform: scale(1);
-                }
-            }
-            .login_content_right {
-				height: 100%;
-                width: 50%;
-                img {
-                    width: 100%;
-					height: 100%;
-					object-fit: contain;
-                }
-            }
-            .login_type_list {
-                width: 100%;
-                display: flex;
-
-                .login_type_item {
-                    text-align: center;
-                    font-size: 3.6rem;
-                    font-weight: bold;
-                    color: #d7d7d7;
-                    cursor: pointer;
-                    height: 4rem;
-                    line-height: 4rem;
-
-                    &.login_active {
-                        color: #030303;
-                    }
-                }
-            }
-            .login_form_title {
-                font-size: 1.6rem;
-                // color: #666666;
-                font-weight: 900;
-                color: #000;
-                display: flex;
-                justify-content: space-between;
-                box-sizing: border-box;
-                label {
-                    display: flex;
-                    span {
-                        font-size: 1.6rem;
-                        margin-left: 10px;
-                        font-weight: normal;
-                    }
-                    &.active {
-                        pointer-events: none;
-                        input {
-                            pointer-events: none;
-                        }
-                    }
-                }
-            }
-			.generalModel_state{
-				>.generalModel_state_item{
-					:deep(.ant-select-selector){
-						border: 0.1rem solid #dfdfdf;
-						border-radius: 2.5rem;
-						height: 5rem !important;
-						width: 100%;
-						box-sizing: border-box;
-						&:hover{
-							border: 0.1rem solid #000;
-						}
-					}
-				}
-			}
-            .login_form_content {
-                margin-top: 4rem;
-                position: relative;
-				
-                &[state="2"] {
-                    > * {
-                        opacity: 0;
-                    }
-                    .login_form_email {
-                        opacity: 1;
-                    }
-                }
-                .password_input_block {
-                    position: relative;
-
-                    .password_show_icon {
-                        position: absolute;
-                        font-size: 2.4rem;
-                        right: 2rem;
-                        top: 1.7rem;
-                        cursor: pointer;
-                    }
-                }
-
-                .login_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-					transition: all .3s;
-					&:hover{
-						border: 0.1rem solid #000;
-					}
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .email_last_step {
-                // margin-top: 4rem;
-                .email_last_step_bottom {
-                    padding: 0 40px;
-                }
-                .email_last_step_block {
-                    padding: 10px;
-                    border-bottom: 2px solid;
-                    box-sizing: border-box;
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    .email_last_step_content {
-                        margin-left: 1rem;
-                        font-size: 2.2rem;
-                        font-weight: bold;
-                        color: #030303;
-                    }
-                    .email_last_step_block_icon {
-                        cursor: pointer;
-                        margin-right: 1rem;
-                        height: 20px;
-                    }
-                }
-
-                .fi-br-arrow-left {
-                    font-size: 2.5rem;
-                    font-weight: bold;
-                    color: #030303;
-                    transform: translateY(1rem);
-                    display: inline-block;
-                }
-            }
-
-            .login_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-				transition: all .3s;
-				&:hover{
-					background: #3C3C3C;
-				}
-                &[state="2"] {
-                    cursor: not-allowed;
-                }
-            }
-            .login_text {
-                font-size: 1.6rem;
-                margin-top: 4rem;
-                color: #151515;
-                display: flex;
-                justify-content: flex-end;
-
-                .forget_password_text {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .forget_password_content {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            width: 60rem;
-            background: #ffffff;
-            box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200, 200, 200, 0.3);
-            border-radius: 1rem;
-            padding: 3rem 6rem 6.5rem;
-            box-sizing: border-box;
-
-            .forget_password_content_block {
-                cursor: pointer;
-            }
-
-            .fi-br-arrow-left {
-                font-size: 3.8rem;
-                font-weight: bold;
-                color: #030303;
-                transform: translateY(1rem);
-                display: inline-block;
-            }
-            .forget_password_content_title {
-                font-size: 3.2rem;
-                font-weight: bold;
-                color: #030303;
-                margin-left: 2rem;
-            }
-
-            .forget_passored_form_content {
-                margin-top: 3.5rem;
-
-                .forget_passored_form_title {
-                    font-size: 2.4rem;
-                    font-weight: bold;
-                    color: #030303;
-                    display: flex;
-                    justify-content: space-between;
-                    box-sizing: border-box;
-                }
-
-                .forget_passored_form_input {
-                    width: 100%;
-                    height: 5rem;
-                    margin-top: 1rem;
-                    border: 0.1rem solid #dfdfdf;
-                    border-radius: 2.5rem;
-                    padding-left: 2.1rem;
-                    line-height: 5rem;
-                    font-size: 1.4rem;
-                    box-sizing: border-box;
-                    outline: none;
-
-                    &::placeholder {
-                        color: #a5b0c2;
-                    }
-                }
-            }
-
-            .forget_verif_code_des {
-                font-size: 2.4rem;
-                font-weight: bold;
-                color: #030303;
-                margin-top: 3.5rem;
-            }
-
-            .forget_submit_button {
-                height: 5rem;
-                background: #000;
-                border-radius: 2.5rem;
-                line-height: 5rem;
-                text-align: center;
-                font-size: 1.8rem;
-                font-weight: 500;
-                color: #ffffff;
-                cursor: pointer;
-            }
-        }
-    }
-
-    .login_footer {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        left: 0;
-        bottom: 3.5rem;
-        width: 100%;
-        padding: 0 4rem;
-
-        .login_footer_item {
-            display: flex;
-            align-items: center;
-
-            .login_footer_item_text {
-                font-size: 1.3rem;
-                color: #151515;
-            }
-
-            .footer_item_text_pointer {
-                cursor: pointer;
-            }
-
-            .login_footer_line {
-                width: 0.1rem;
-                height: 2rem;
-                margin: 0 2rem;
-                background: #b9b9b9;
-            }
-        }
-    }
-
-    .marign_top20 {
-        margin-top: 2rem;
-    }
-
-    .marign_top22 {
-        margin-top: 2.2rem;
-    }
-
-    .marign_top30 {
-        margin-top: 3rem;
-    }
-    .marign_top40 {
-        margin-top: 4rem;
-    }
-	.thirdPartyLogin{
-		display: flex;
-		// justify-content: flex-start;
-		> div{
-			position: relative;
-			margin-right: 1rem;
-			> .mask{
-				position: absolute;
-				width: 100%;
-				height: 100%;
-				top: 0;
-				left: 0;
-				z-index: 2;
-				cursor: pointer;
-			}
-		}
-	}
-    .tip_content {
-        font-size: 1.3rem;
-        font-weight: bold;
-        color: #343579;
-        cursor: pointer;
-    }
-
-    .email_last_step_des {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-top: 4rem;
-        margin-bottom: 2rem;
-
-        .sent_email_content {
-            font-size: 1.8rem;
-            font-weight: bold;
-            color: #a5b0c2;
-        }
-
-        .email_tip_content {
-            font-size: 1.4rem;
-            color: #030303;
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/paySucceed.vue b/src/views/paySucceed.vue
index d32bd1dc..4e3ff761 100644
--- a/src/views/paySucceed.vue
+++ b/src/views/paySucceed.vue
@@ -14,7 +14,6 @@
 </template>
 <script lang="ts">
 import { defineComponent,ref,createVNode,computed} from 'vue'
-import HeaderComponent from "@/component/HomePage/Header.vue";
 import { Https } from "@/tool/https";
 import { Modal,message } from 'ant-design-vue';
 import RobotAssist from "@/component/HomePage/RobotAssist.vue";
@@ -24,7 +23,6 @@ import { useStore } from "vuex";
 import { useI18n } from 'vue-i18n';
 export default defineComponent({
     components: {
-        HeaderComponent,
 		RobotAssist,
 		payOrder,
     },
diff --git a/src/views/setIdentification.vue b/src/views/setIdentification.vue
index 3ce47fb2..d4486924 100644
--- a/src/views/setIdentification.vue
+++ b/src/views/setIdentification.vue
@@ -10,7 +10,6 @@
 <script lang="ts">
 import { defineComponent, ref, createVNode, computed } from "vue";
 import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
-import HeaderComponent from "@/component/HomePage/Header.vue";
 import HistoryDetail from "@/component/Detail/HistoryDetail.vue";
 import router from "@/router/index";
 import { Https } from "@/tool/https";
@@ -21,7 +20,6 @@ import { useI18n } from "vue-i18n";
 import Fingerprint2 from "fingerprintjs2"; //获取浏览器唯一标识
 export default defineComponent({
     components: {
-        HeaderComponent,
         HistoryDetail,
         RobotAssist,
     },
diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue
deleted file mode 100644
index 7696fa0e..00000000
--- a/src/views/trialApproval.vue
+++ /dev/null
@@ -1,574 +0,0 @@
-<template>
-    <div class="trial_page">
-        <div class="page_content">
-            <img
-                class="page_content_bg"
-                src="@/assets/images/homePage/bg1.jpg"
-            />
-            <div class="page_content_body">
-                <HeaderComponent></HeaderComponent>
-                <div class="trial_page_body">
-                    <div class="trial_table_search">
-						<div class="trial_table_voluntarily">
-							<span>voluntarily</span>
-							<a-switch v-model:checked="voluntarily" @change="setIsAutoApproval" />
-						</div>
-                        <a-range-picker
-                            class="range_picker"
-                            v-model:value="rangePickerValue"
-                            :placeholder="[
-                                $t('HistoryPage.StartDate'),
-                                $t('HistoryPage.EndDate'),
-                            ]"
-                            valueFormat="YYYY-MM-DD"
-                        >
-                            <template #suffixIcon>
-                                <span
-                                    class="icon iconfont range_picker_icon icon-rili"
-                                ></span>
-                            </template>
-                        </a-range-picker>
-                        <div class="trial_state">
-                            <div class="trial_current" @click="setState">
-								{{currentState.name}}
-								<div
-                                    :class="['icon', 'iconfont', 'icon-xiala']"
-                                    @click.stop=""
-                                ></div>
-							</div>
-                            <div class="header_user_content" :class="{active:currentState.state}">
-                                <!-- <span class="icon iconfont icon-yuyan"></span> -->
-								<div class="username" v-for="item,index in state" :key="item" @click.stop="setStateItem(item)">{{ item.name }}</div>
-                            </div>
-                        </div>
-                        <div class="content_search_block">
-                            <input
-                                class="search_input"
-                                :placeholder="$t('HistoryPage.inputContent1')"
-                                v-model="searchCollectionName"
-                                @keydown.enter="searchHistoryList()"
-                            />
-                            <div
-                                class="search_icon_block"
-                                @click="searchHistoryList()"
-                            >
-                                <span class="icon iconfont icon-sousuo"></span>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="trial_table_content" ref="historyTable">
-                        <a-table
-                            :columns="columns"
-                            :data-source="collectionList"
-                            :scroll="{ y: historyTableHeight }"
-                            @change="changePage"
-                            :pagination="{
-                                showSizeChanger: true,
-                                current: currentPage,
-                                pageSize: pageSize,
-                                total: total,
-                                showQuickJumper: true,
-                                bordered: false,
-                            }"
-                        >
-                            <template
-                                #bodyCell="{ column, text, record, index }"
-                            >
-                                <div
-                                    class="operate_list"
-                                    v-if="column?.Operations"
-                                >
-                                    <div
-										v-show="status == 0"
-                                        class="operate_item"
-                                        @click="setConsent(record, index)"
-                                    >
-										consent
-                                    </div>
-									<div
-										v-show="status == 0"
-                                        class="operate_item"
-                                        @click="setRefuse(record, index)"
-                                    >
-										refuse
-                                    </div>
-                                    <!-- <div
-                                        class="operate_item"
-                                        @click="deleteGroup(record, index)"
-                                    >
-										Delete
-                                    </div> -->
-									
-                                </div>
-                            </template>
-                        </a-table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script lang="ts">
-import { defineComponent, ref, createVNode, computed } from "vue";
-import HeaderComponent from "@/component/HomePage/Header.vue";
-import HistoryDetail from "@/component/Detail/HistoryDetail.vue";
-import router from "@/router/index";
-import { Https } from "@/tool/https";
-import { formatTime } from "@/tool/util";
-import { Modal, message } from "ant-design-vue";
-import { useStore } from "vuex";
-import RobotAssist from "@/component/HomePage/RobotAssist.vue";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { useI18n } from "vue-i18n";
-export default defineComponent({
-    components: {
-        HeaderComponent,
-        HistoryDetail,
-        RobotAssist,
-    },
-    setup() {
-        const store = useStore()
-        let rangePickerValue: any = ref([]);
-        let renameData: any = ref({}); //修改名字选中的数据
-        const columns: any = computed(() => {
-            return [
-                {
-                    title: 'Email',
-                    align: "center",
-                    ellipsis: true,
-                    width: 170,
-                    dataIndex: "email",
-                    key: "email",
-                },
-                {
-                    title: 'Create Time',
-                    align: "center",
-                    ellipsis: 200,
-                    dataIndex: "updateTime",
-                    key: "updateTime",
-                    // customRender: (record: any) => {
-                    //     let time = formatTime(
-                    //         record.text / 1000,
-                    //         "YYYY-MM-DD hh:mm:ss"
-                    //     );
-                    //     return time;
-                    // },
-                },
-				{
-                    title: 'State',
-                    align: "center",
-                    ellipsis: true,
-                    width: 150,
-                    dataIndex: "status",
-                    key: "status",
-					   customRender: (record: any) => {
-                        let str
-						if(record.value == 0){
-							str ='pending'
-						}else if(record.value == 1){
-							str ='agree'
-						}else if(record.value == 2){
-							str ='rejected'
-						}
-                        return str;
-                    },
-                },
-                {
-                    title: 'Address',
-                    align: "center",
-                    ellipsis: true,
-                    width: 150,
-                    dataIndex: "country",
-                    key: "country",
-                },
-				{
-                    title: 'Surname',
-                    align: "center",
-                    ellipsis: true,
-                    width: 150,
-                    dataIndex: "surname",
-                    key: "surname",
-                },
-				{
-                    title: 'Name',
-                    align: "center",
-                    ellipsis: true,
-                    width: 150,
-                    dataIndex: "userName",
-                    key: "userName",
-                },
-                {
-                    title: 'Operations',
-                    key: "operation",
-                    align: "center",
-                    fixed: "right",
-                    width: 200,
-                    // slots:{customRender:'action'}
-                    Operations: true,
-                },
-            ];
-        });
-		let currentState = ref({
-				name:'all',
-				value:'',
-				state:false,
-			},)
-		let state:any = ref([
-			{
-				name:'all',
-				value:'',
-			},
-			{
-				name:'pending',
-				value:0,
-			},
-			{
-				name:'agree',
-				value:1,
-			},
-			{
-				name:'rejected',
-				value:2,
-			},
-		])
-        let collectionList: any = ref([]);
-        let status: any = ref(0);
-        let voluntarily: any = ref(false);
-		let userDetail:any= computed(()=>{
-			return store.state.UserHabit.userDetail
-		})
-        return {
-            rangePickerValue,
-            columns,
-            collectionList,
-            renameData,
-            userDetail,
-            status,
-			currentState,
-			state,
-			voluntarily,
-        };
-    },
-    data() {
-        return {
-            currentPage: 1,
-            pageSize: 10,
-            total: 0,
-            historyTableHeight: 0,
-            newCollectionName: "",
-            renameVisivle: false, //修改名字弹窗
-            collectionName: "", //选中的名字
-            searchCollectionName: "",
-        };
-    },
-    mounted() {
-        let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
-        this.gettrialList();
-
-        if (this.userDetail.userId == 83 || this.userDetail.userId == 88 || this.userDetail.userId == 6) {
-        } else {
-            router.replace("/home");
-			return
-        }
-		this.getIsAutoApproval()
-    },
-    methods: {
-        //改变页码
-        changePage(e: any) {
-            this.currentPage = e.current;
-            this.pageSize = e.pageSize;
-            this.gettrialList();
-        },
-
-        //查询列表
-        searchHistoryList() {
-            this.currentPage = 1;
-            this.gettrialList();
-        },
-		//获取是否自动审批
-		getIsAutoApproval(){
-			Https.axiosPost(Https.httpUrls.getIsAutoApproval, {}).then(
-				(rv: any) => {
-					this.voluntarily = rv
-				}
-			);
-		},
-
-		setIsAutoApproval(){
-			Https.axiosPost(Https.httpUrls.switchIsAutoApproval, {}).then(
-				(rv: any) => {
-					this.getIsAutoApproval
-				}
-			);
-		},
-
-		//获取列表
-        gettrialList() {
-            let startDate: any = this.rangePickerValue
-                ? new Date(this.rangePickerValue[0]).getTime()
-                : "";
-            let endDate: any = this.rangePickerValue
-                ? new Date(this.rangePickerValue[1]).getTime()
-                : "";
-            let data = {
-                page: this.currentPage,
-                size: this.pageSize,
-                status: this.currentState.value,
-                // startDate:startDate,
-                // endDate:endDate
-            };
-            Https.axiosPost(Https.httpUrls.trialOrderList, data).then(
-                (rv: any) => {
-                    this.collectionList = rv.content;
-                }
-            );
-        },
-		setConsent(record: any, index: number){
-			const formData = new FormData()
-			formData.append('ids',record.id)
-			let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
-			Https.axiosPost(Https.httpUrls.trialOrderApproval, formData,config).then(
-				(rv: any) => {
-					message.success('同意成功~')
-				}
-			);
-		},
-		setRefuse(record: any, index: number){
-			const formData = new FormData()
-			formData.append('ids',record.id)
-			let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
-			Https.axiosPost(Https.httpUrls.trialOrderRefuse, formData,config).then(
-				(rv: any) => {
-					this.gettrialList();
-					message.success('拒绝成功~')
-				}
-			);
-		},
-        //删除分组
-        // deleteGroup(record: any, index: number) {
-        //     let deleteGroupFun = (id: any, index: number) => {
-        //         let data = {
-        //             userGroupId: id,
-        //         };
-        //         Https.axiosPost(Https.httpUrls.deleteUserGroup, data).then(
-        //             (rv: any) => {
-        //                 this.collectionList.splice(index, 1);
-        //             }
-        //         );
-        //     };
-        //     Modal.confirm({
-        //         title: "",
-        //         icon: createVNode(ExclamationCircleOutlined),
-        //         okText: "Yes",
-        //         cancelText: "No",
-        //         centered: true,
-        //         mask: false,
-        //         onOk() {
-        //             deleteGroupFun(record.id, index);
-        //         },
-        //     });
-        // },
-		setState(){
-			this.currentState.state = true
-		},
-		setStateItem(item:any){
-			this.currentState = item
-			this.currentState.state = false
-		},
-    },
-});
-</script>
-<style lang="less">
-.trial_page {
-    width: 100%;
-    height: 100%;
-    padding: 0 6rem;
-    overflow: hidden;
-    // min-width: 1440px;
-    position: relative;
-    .page_content {
-        position: relative;
-        .page_content_bg {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-        }
-
-        .page_content_body {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            box-sizing: border-box;
-
-            .trial_page_body {
-                width: 100%;
-                height: calc(100% - 7rem);
-                padding: 0 2.5rem 4rem;
-                box-sizing: border-box;
-                .trial_table_search {
-                    display: flex;
-                    align-items: center;
-                    margin-top: 5rem;
-					color: #fff;
-                    .range_picker {
-                        width: 36rem;
-                        height: 4.8rem;
-
-                        .ant-picker-input > input {
-                            font-size: 1.6rem;
-                        }
-
-                        .range_picker_icon {
-                            font-size: 2.2rem;
-                        }
-                    }
-					.trial_table_voluntarily{
-						padding: 0 2rem;
-						margin: 0 2rem;
-						margin-left: 0;
-						// border: 0.1rem solid #f1f1f1;
-						span{
-						}
-						>button{
-							transform: scale(.8);
-
-						}
-					}
-                    .content_search_block {
-                        margin-left: 4rem;
-                        display: flex;
-
-                        .search_input {
-                            width: 32.8rem;
-                            padding-left: 1.5rem;
-                            height: 4.8rem;
-                            line-height: 4.6rem;
-                            background: #ffffff;
-                            border: 0.1rem solid #f1f1f1;
-                            font-size: 1.6rem;
-                            font-weight: 400;
-                            &::placeholder {
-                                color: #c2c2c2;
-                            }
-                        }
-
-                        .search_icon_block {
-                            width: 7.2rem;
-                            height: 4.8rem;
-                            line-height: 4.8rem;
-                            text-align: center;
-                            background: #343579;
-                            cursor: pointer;
-
-                            .icon-sousuo {
-                                font-size: 2rem;
-                                color: #ffffff;
-                            }
-                        }
-                    }
-                    .trial_state {
-						border: 0.1rem solid #f1f1f1;
-                        position: relative;
-						width: 20rem;
-						margin: 0 2rem;
-						padding: 0 2rem;
-						cursor: pointer;
-						.trial_current{
-							width: 100%;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-						}
-                        .header_user_content {
-                            position: absolute;
-                            border: 2px solid;
-                            border-radius: 1rem;
-							overflow: hidden;
-							top: 0;
-							transform: translateY(6rem);
-							z-index: 2;
-							display: none;
-							margin-left: -2rem;
-							.username{
-								padding: 0 2rem;
-								background: #ffffff;
-								color: #000;
-							}
-							.username:hover{
-								background: #e1e1e1;
-							}
-							&.active{
-								display: block;
-							}
-                        }
-                    }
-                }
-
-                .trial_table_content {
-                    margin-top: 2.6rem;
-                    width: 100%;
-                    height: calc(100% - 13.7rem);
-                    background: rgba(255, 255, 255, 0.3);
-                    padding-bottom: 3rem;
-					border-radius: 2rem;
-					backdrop-filter: blur(3rem);
-					overflow: hidden;
-					box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.38);
-                    .ant-table {
-                        background: transparent;
-                    }
-
-                    .ant-table-body {
-                        overflow-y: auto !important;
-                        -ms-overflow-style: none;
-                        overflow: -moz-scrollbars-none;
-
-                        &::-webkit-scrollbar {
-                            width: 0 !important;
-                        }
-                    }
-                    .ant-table-thead > tr > th {
-                        background: #ffffff00;
-						color: #fff;
-						border-bottom: none;
-						backdrop-filter: blur(1rem);
-                    }
-
-                    .ant-table-tbody > tr > td {
-                        border: none;
-                        background: transparent;
-						// color: #fff;
-                    }
-
-                    .ant-table-tbody > tr {
-                        &:hover > td {
-                            background: #ffffff3a;
-                        }
-                    }
-
-                    .ant-table-pagination-right {
-                        padding-right: 3.5rem;
-                    }
-
-                    .operate_list {
-                        display: flex;
-                        align-items: center;
-                        justify-content: space-between;
-                        padding: 0 1rem;
-
-                        .operate_item {
-                            font-size: 1.4rem;
-                            font-family: Roboto;
-                            font-weight: 400;
-                            color: #343579;
-                            cursor: pointer;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-</style>
\ No newline at end of file