diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 41b196f5..e2d74080 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -846,6 +846,7 @@ export default defineComponent({
 			this.imgDesignImg = true
 		},
 		clothesOpen(index:any){
+			if(this.deleteShow) return
 			this.clothesDetail('',index)
 			this.clothesOpenActive(index)
 		},
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index e0082b40..dcc60ef3 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -343,7 +343,7 @@ export default defineComponent({
 			this.printStyleList[index].style.zIndex = this.printZIndex++
 			this.printStyleList[index].transform = {
 				scale:scale,
-				rotateZ:rotateZ,
+				rotateZ:rotateZ?rotateZ:0,
 			}
 			let imgDomWH = this.imgDom.getBoundingClientRect()
 			let left = Number(this.printStyleList[index].style.left.replace(/px/g,''))
@@ -544,7 +544,7 @@ export default defineComponent({
 				transform:{
 					// scale:scale<.2?.2:scale,//0.2-3
 					// rotateZ:rotateZ1-rotateZ2,
-					rotateZ:this.printStyleList[index].transform.rotateZ!=0?this.printStyleList[index].transform.rotateZ:0
+					rotateZ:this.printStyleList[index].transform.rotateZ?this.printStyleList[index].transform.rotateZ:0
 				},
 				designOpenrtionBtn:false
 			}
diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue
index f5b4b02f..d2ea18b8 100644
--- a/src/component/Detail/DesignPrintOperationMobile.vue
+++ b/src/component/Detail/DesignPrintOperationMobile.vue
@@ -343,7 +343,7 @@ export default defineComponent({
 			this.printStyleList[index].style.zIndex = this.printZIndex++
 			this.printStyleList[index].transform = {
 				scale:scale,
-				rotateZ:rotateZ,
+				rotateZ:rotateZ?rotateZ:0,
 			}
 			let imgDomWH = this.imgDom.getBoundingClientRect()
 			let left = Number(this.printStyleList[index].style.left.replace(/px/g,''))
@@ -546,7 +546,7 @@ export default defineComponent({
 				transform:{
 					// scale:scale<.2?.2:scale,//0.2-3
 					// rotateZ:rotateZ1-rotateZ2,
-					rotateZ:this.printStyleList[index].transform.rotateZ!=0?this.printStyleList[index].transform.rotateZ:0
+					rotateZ:this.printStyleList[index].transform.rotateZ?this.printStyleList[index].transform.rotateZ:0
 				},
 				designOpenrtionBtn:false
 			}
diff --git a/src/router/index.ts b/src/router/index.ts
index 6cf00b43..cf72e9b8 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -137,6 +137,7 @@ router.beforeEach((to, from, next) => {
 	// } else {
 	// 	next({ name: 'upgrade' });
 	// }
+	// return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);
diff --git a/src/tool/util.js b/src/tool/util.js
index b5927373..8621cec0 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -1,6 +1,7 @@
 import Fingerprint2 from 'fingerprintjs2';//获取浏览器唯一标识
-const isEmail = (email) => {//判断邮箱格式
-	let reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/
+const isEmail = (email) => {
+	// let reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,})$/
+	let reg = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
 	let result = reg.test(email)
 	return result
 }
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 32293322..a3171921 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -7,7 +7,7 @@
 			<div class="upgrade-content-wire"></div>
 			<!-- <div class="upgrade-content-text">System upgrading</div> -->
 			<div class="upgrade-content-text">System maintenance</div>
-			<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Monday, March 4th, from 10:00 AM to 3:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Monday, March 27th, from 10:30 AM to 11:30 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
 		</div>
 	</div>
 </template>
diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue
new file mode 100644
index 00000000..6d6a69a5
--- /dev/null
+++ b/src/views/trialApproval.vue
@@ -0,0 +1,573 @@
+<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 { 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";
+import { formatTime } from "@/tool/util";
+import { Modal, message } from "ant-design-vue";
+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() {
+        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 userInfo: any = {};
+        let status: any = ref(0);
+        let voluntarily: any = ref(false);
+        return {
+            rangePickerValue,
+            columns,
+            collectionList,
+            renameData,
+            userInfo,
+            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();
+		let userInfo:any = getCookie("userInfo")
+        this.userInfo = JSON.parse(userInfo);
+
+        if (this.userInfo.userId == 83 || this.userInfo.userId == 88 || this.userInfo.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 9rem;
+    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