From 56bc037884aac27314f8c441759292844375f7a3 Mon Sep 17 00:00:00 2001 From: WangXiaoDong <1627315083@qq.com> Date: Tue, 19 Mar 2024 20:31:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/util.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tool/util.js b/src/tool/util.js index 9dbc18f6..795db646 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})$/ + 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 } From 26cfcc708060215f98d509577a3289d239766ec0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 22 Mar 2024 12:02:43 +0800 Subject: [PATCH 02/10] fix --- src/views/HomeView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 608e8956..3e5258de 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -404,7 +404,7 @@ export default defineComponent({ if(days < 30){ setTimeout(() => { let text = { - str:`${this.t('HomeView.jsContent4',{days:1,hours:2})}${this.t('HomeView.jsContent8')}`, + str:`${this.t('HomeView.jsContent4',{days:days,hours:hours})}${this.t('HomeView.jsContent8')}`, title:`${this.t('HomeView.jsContent7')}`, } this.affiche(text) From f0b6a66c1d4985c92e29cd51a22952213a0693a4 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 22 Mar 2024 15:45:06 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tool/util.js b/src/tool/util.js index 795db646..201c2bdd 100644 --- a/src/tool/util.js +++ b/src/tool/util.js @@ -1,7 +1,7 @@ import Fingerprint2 from 'fingerprintjs2';//获取浏览器唯一标识 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 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 } From 2dd755a43fc17c3389d35c89d0df7e4ca9ea985f Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 27 Mar 2024 10:26:14 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 17 +++++++++-------- src/views/Upgrade.vue | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index fa7a54bf..d190cdc8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,8 +8,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - redirect: "/login" - // redirect: "/upgrade" + // redirect: "/login" + redirect: "/upgrade" }, { path: '/login', @@ -70,12 +70,13 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { // 系统维护 - // const toName = to.name === 'upgrade'; - // if (toName) { - // next(); - // } else { - // next({ name: 'upgrade' }); - // } + const toName = to.name === 'upgrade'; + if (toName) { + next(); + } else { + next({ name: 'upgrade' }); + } + return // 检查路由是否存在 // 机房用户 let murmurStr: any = localStorage.getItem('murmurStr') 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 @@
System maintenance
-
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.
We apologize for any inconvenience this may cause and appreciate your understanding.
+
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.
We apologize for any inconvenience this may cause and appreciate your understanding.
From 55b2b4b7212b900c16eb04c7fce32ba022565cd5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 27 Mar 2024 11:40:06 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index d190cdc8..854fc17a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,8 +8,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - // redirect: "/login" - redirect: "/upgrade" + redirect: "/login" + // redirect: "/upgrade" }, { path: '/login', @@ -70,13 +70,13 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { // 系统维护 - const toName = to.name === 'upgrade'; - if (toName) { - next(); - } else { - next({ name: 'upgrade' }); - } - return + // const toName = to.name === 'upgrade'; + // if (toName) { + // next(); + // } else { + // next({ name: 'upgrade' }); + // } + // return // 检查路由是否存在 // 机房用户 let murmurStr: any = localStorage.getItem('murmurStr') From ac96f930533b3ddeb3fe4ba2f99e6f2c12a597b6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 2 Apr 2024 10:16:42 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trialApproval.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue index 8bad919d..162cc0e4 100644 --- a/src/views/trialApproval.vue +++ b/src/views/trialApproval.vue @@ -166,9 +166,9 @@ export default defineComponent({ if(record.value == 0){ str ='pending' }else if(record.value == 1){ - str ='consent' + str ='agree' }else if(record.value == 2){ - str ='reject' + str ='rejected' } return str; }, @@ -219,11 +219,11 @@ export default defineComponent({ value:'', }, { - name:'unprocessed', + name:'pending', value:0, }, { - name:'pending', + name:'agree', value:1, }, { From 365de042b4af92cac0fed665661219826ee4cb05 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 2 Apr 2024 10:32:42 +0800 Subject: [PATCH 07/10] fix --- src/views/trialApproval.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue index 162cc0e4..6d6a69a5 100644 --- a/src/views/trialApproval.vue +++ b/src/views/trialApproval.vue @@ -328,7 +328,7 @@ export default defineComponent({ const formData = new FormData() formData.append('ids',record.id) let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*' }} - Https.axiosPost(Https.httpUrls.trialOrderApproval, {ids:record.id}).then( + Https.axiosPost(Https.httpUrls.trialOrderApproval, formData,config).then( (rv: any) => { message.success('同意成功~') } From 692a5755b4e73527a1ea74b634e16514959da2d2 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 8 Apr 2024 17:17:30 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlibrary=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/Material.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue index 2453b8cb..5d2c63ce 100644 --- a/src/component/HomePage/Material.vue +++ b/src/component/HomePage/Material.vue @@ -256,6 +256,9 @@ export default defineComponent({ init(code:any){ this.selectCode = code // this.myMaterialModalShow = true + this.currentPage = 1 + this.pageSize = 12 + this.imgList = [] this.getLibraryList('') }, From f894897d9803f6c5891fe025b73db0f111d8dd3b Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Apr 2024 17:23:07 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81=E5=90=8E=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E8=A1=A3=E6=9C=8D=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index f96273e2..63078ea2 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -829,6 +829,7 @@ export default defineComponent({ this.imgDesignImg = true }, clothesOpen(index:any){ + if(this.deleteShow) return this.clothesDetail('',index) this.clothesOpenActive(index) }, From 15bfb23f5954fe2b80042d06f83197c23d9bb5b2 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 24 Apr 2024 10:15:33 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpreview=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignPrintOperation.vue | 4 ++-- src/component/Detail/DesignPrintOperationMobile.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 68be3558..84fe9e8d 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 6afe2bec..73696fb5 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 }