From a28408bcd6baff155d87d1fc73822daa7a66e134 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 12 Mar 2025 16:46:23 +0800 Subject: [PATCH 01/21] =?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 | 26 +++++++++++++------------- src/tool/canvasGeneral.js | 3 +-- src/views/Upgrade.vue | 7 ++++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 77f898da..c1079fdf 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,8 +13,8 @@ const routes: Array = [ path: "/", // redirect重定向 meta:{enter:'all',}, - redirect: "/Square" - // redirect: "/upgrade" + // redirect: "/Square" + redirect: "/upgrade" }, { @@ -412,17 +412,17 @@ const setViewsIncrease = (value:any)=>{ let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 router.beforeEach((to:any, from, next) => { // 系统维护 - // const toName = to.name === 'upgrade'; - // if(upgradeList.indexOf(to.path) > -1){ - // next(); - // }else{ - // if (toName) { - // next(); - // } else { - // next({ name: 'upgrade' }); - // } - // } - // return + const toName = to.name === 'upgrade'; + if(upgradeList.indexOf(to.path) > -1){ + next(); + }else{ + if (toName) { + next(); + } else { + next({ name: 'upgrade' }); + } + } + return // 检查路由是否存在 // 机房用户 let herfData = window.location.search.substring(1) diff --git a/src/tool/canvasGeneral.js b/src/tool/canvasGeneral.js index 85853c7d..c092bcd8 100644 --- a/src/tool/canvasGeneral.js +++ b/src/tool/canvasGeneral.js @@ -106,8 +106,7 @@ class myCanvas { // this.canvas.on('mouse:up', function(event) { // if(this.canvasState != 'move')this.updateCanvasState('') // }); - this.canvas.on("object:added", (event)=>{ - if(!this.isLoadCanvas)this.updateCanvasState('') + this.canvas.on("object:added", (event)=> if(!this.isLoadCanvas)this.updateCanvasState('') }); return this.canvas } diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index 3f7544e7..0a90c838 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -8,14 +8,15 @@
System maintenance
+
The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.
-
Due to system server upgrades, we will be upgrading from Tuesday, February 4 at 9:30am (HKT) to Thursday, February 6. During this period, the AiDA system will be temporarily inaccessible.
We sincerely apologize for the inconvenience caused and thank you for your understanding
+


-
由于系统服务器升级，我们将于2月4日（星期二）上午9:30（香港时间）至2月6日（星期四）进行升级。
在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解
- +
由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解
+ From 6a4c00da520f801929b493cb2ec80b9462db7c4a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 12 Mar 2025 16:49:30 +0800 Subject: [PATCH 02/21] fix --- src/tool/canvasGeneral.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tool/canvasGeneral.js b/src/tool/canvasGeneral.js index c092bcd8..85853c7d 100644 --- a/src/tool/canvasGeneral.js +++ b/src/tool/canvasGeneral.js @@ -106,7 +106,8 @@ class myCanvas { // this.canvas.on('mouse:up', function(event) { // if(this.canvasState != 'move')this.updateCanvasState('') // }); - this.canvas.on("object:added", (event)=> if(!this.isLoadCanvas)this.updateCanvasState('') + this.canvas.on("object:added", (event)=>{ + if(!this.isLoadCanvas)this.updateCanvasState('') }); return this.canvas } From a5b9e7ab8136e7d9dc614b88ccb4a14a12abc247 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 12 Mar 2025 16:54:08 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=8F=96=E6=B6=88=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 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index c1079fdf..77f898da 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,8 +13,8 @@ const routes: Array = [ path: "/", // redirect重定向 meta:{enter:'all',}, - // redirect: "/Square" - redirect: "/upgrade" + redirect: "/Square" + // redirect: "/upgrade" }, { @@ -412,17 +412,17 @@ const setViewsIncrease = (value:any)=>{ let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 router.beforeEach((to:any, from, next) => { // 系统维护 - const toName = to.name === 'upgrade'; - if(upgradeList.indexOf(to.path) > -1){ - next(); - }else{ - if (toName) { - next(); - } else { - next({ name: 'upgrade' }); - } - } - return + // const toName = to.name === 'upgrade'; + // if(upgradeList.indexOf(to.path) > -1){ + // next(); + // }else{ + // if (toName) { + // next(); + // } else { + // next({ name: 'upgrade' }); + // } + // } + // return // 检查路由是否存在 // 机房用户 let herfData = window.location.search.substring(1) From cfc6d64d49ba67334ef0bb7ffa0006cab439213d Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Wed, 12 Mar 2025 18:43:21 +0800 Subject: [PATCH 04/21] =?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 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 77f898da..c1079fdf 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,8 +13,8 @@ const routes: Array = [ path: "/", // redirect重定向 meta:{enter:'all',}, - redirect: "/Square" - // redirect: "/upgrade" + // redirect: "/Square" + redirect: "/upgrade" }, { @@ -412,17 +412,17 @@ const setViewsIncrease = (value:any)=>{ let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 router.beforeEach((to:any, from, next) => { // 系统维护 - // const toName = to.name === 'upgrade'; - // if(upgradeList.indexOf(to.path) > -1){ - // next(); - // }else{ - // if (toName) { - // next(); - // } else { - // next({ name: 'upgrade' }); - // } - // } - // return + const toName = to.name === 'upgrade'; + if(upgradeList.indexOf(to.path) > -1){ + next(); + }else{ + if (toName) { + next(); + } else { + next({ name: 'upgrade' }); + } + } + return // 检查路由是否存在 // 机房用户 let herfData = window.location.search.substring(1) From d1a26dcdf1725f30bace374329b9550395b28fa2 Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Wed, 12 Mar 2025 18:49:04 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index c1079fdf..77f898da 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,8 +13,8 @@ const routes: Array = [ path: "/", // redirect重定向 meta:{enter:'all',}, - // redirect: "/Square" - redirect: "/upgrade" + redirect: "/Square" + // redirect: "/upgrade" }, { @@ -412,17 +412,17 @@ const setViewsIncrease = (value:any)=>{ let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 router.beforeEach((to:any, from, next) => { // 系统维护 - const toName = to.name === 'upgrade'; - if(upgradeList.indexOf(to.path) > -1){ - next(); - }else{ - if (toName) { - next(); - } else { - next({ name: 'upgrade' }); - } - } - return + // const toName = to.name === 'upgrade'; + // if(upgradeList.indexOf(to.path) > -1){ + // next(); + // }else{ + // if (toName) { + // next(); + // } else { + // next({ name: 'upgrade' }); + // } + // } + // return // 检查路由是否存在 // 机房用户 let herfData = window.location.search.substring(1) From 0bdea97ab8ecc465bdc012e914fe25d0bb644e34 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 18 Mar 2025 10:47:21 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E8=B0=83=E6=95=B4design=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=A6=81=E6=AD=A2like?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/HomeView/HomeView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 7984d307..b2563974 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -181,14 +181,14 @@ )"> -
- From cf8caedc58b3be75c271e657d6cd45613543e25d Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 18 Mar 2025 18:16:33 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=BD=98=E9=80=9A=E5=80=BC=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 8 ++++---- src/component/Detail/DesignDetailAlter.vue | 10 +++++----- src/component/Detail/DesignDetailEnd.vue | 2 +- src/component/HomePage/ExportNewCoolection.vue | 2 +- src/component/HomePage/NewCollectionReview.vue | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 77e87975..760b2bc2 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -119,9 +119,9 @@
-
+
-
+
{{current?.color?.tcx}}
{{current?.color?.name}}
@@ -735,7 +735,7 @@ export default defineComponent({ // let zIndex = 10 designItemDetail.clothes.forEach((item:any,index:number) => { let clothesItem:any = { - color: `${item.color.r} ${item.color.g} ${item.color.b}`, + color: item?.color?.r?`${item.color.r} ${item.color.g} ${item.color.b}`:null , id:item.id, path:item.minIOPath, gradient:{}, @@ -1094,7 +1094,7 @@ export default defineComponent({ this.current.sketchString = '' this.currentIndex = this.currentIndex>0?this.currentIndex:0 data.designSingleItemDTOList[this.currentIndex] = { - color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`, + color:this.current?.color?.r?`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`:null, id:this.current.id?this.current.id:'', changed:this.current.changed?this.current.changed:false, designType:this.current.designType?this.current.designType:'Library', diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 08742c77..f12f8568 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -227,8 +227,9 @@
-
+
+
@@ -610,14 +611,13 @@ export default defineComponent({ this.getLibraryList() }else{ let rgba = { - r:this.current.color.r+"", - g:this.current.color.g+"", - b:this.current.color.b+"", + r:this.current.color?.r+"", + g:this.current.color?.g+"", + b:this.current.color?.b+"", a:1 } let ind = 0 this.store.state.UploadFilesModule.allBoardData?.colorBoards?.forEach((item,index) => { - console.log(JSON.stringify(rgba) , JSON.stringify(item.rgbValue)); if(JSON.stringify(rgba) == JSON.stringify(item.rgbValue)){ ind+=1 }else{ diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 140bbe41..e8170a73 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -54,7 +54,7 @@
-
+
{{color.tcx}}
{{ color.name }}
diff --git a/src/component/HomePage/ExportNewCoolection.vue b/src/component/HomePage/ExportNewCoolection.vue index 15057e4a..57d22d86 100644 --- a/src/component/HomePage/ExportNewCoolection.vue +++ b/src/component/HomePage/ExportNewCoolection.vue @@ -35,7 +35,7 @@
-
+
{{color.tcx}}
{{color.name}}
diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index 0292836d..0319a1df 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -37,7 +37,7 @@
-
+
{{color.tcx}}
{{color.name}}
From 10d278b2defb9eaac51b38a744191de5e3d65f3b Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sun, 30 Mar 2025 22:26:15 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/Generate.vue | 1 + src/component/HomePage/renew.vue | 19 ++++++++++++++++--- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 0ba9180b..8e9dd14c 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -157,6 +157,7 @@
+ {{ workspace?.allKeywordsByStyle }}
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index b1d6cc32..e3ab48ad 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -35,7 +35,8 @@
$ - {{ current?.price[current?.type] }} {{ current?.unit[current?.type] }} + {{ current?.price[current?.type] }} + {{ current?.unit[current?.type] }}
+
{{ $t('Renew.activity1') }}
{{ $t('Renew.SubscribeNow') }}
Date: Tue, 1 Apr 2025 09:36:41 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/Generate.vue | 1 - src/component/HomePage/renew.vue | 6 +++--- src/component/HomePage/scaleImage.vue | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 8e9dd14c..0ba9180b 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -157,7 +157,6 @@
- {{ workspace?.allKeywordsByStyle }}
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index e3ab48ad..b184b168 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -73,7 +73,7 @@
-
{{ $t('Renew.activity1') }}
+
{{ $t('Renew.SubscribeNow') }}
-
-
- - + \ No newline at end of file diff --git a/src/component/Administrator/coupons/index.vue b/src/component/Administrator/coupons/index.vue new file mode 100644 index 00000000..9380859b --- /dev/null +++ b/src/component/Administrator/coupons/index.vue @@ -0,0 +1,390 @@ + + + \ No newline at end of file diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 53b8b55a..bcddf2ab 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -80,7 +80,7 @@ :class="[key == 'disposeMoodboard'?'exportCanvasBox_item_dispose':'',imgItem?.upScaleChecked?'active':'']" draggable @dragstart="onDragstart(key,imgItem)" - @click.stop="isMoible?setDragstart(key,imgItem):''" + @click.stop="setDragstart(key,imgItem)" >
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index b184b168..72d57954 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -35,8 +35,7 @@
$ - {{ current?.price[current?.type] }} - {{ current?.unit[current?.type] }} + {{ current?.price[current?.type] }} {{ current?.unit[current?.type] }}
+
+
{{ $t('Renew.promotionCode') }}:
+
+ {{promotionData.code}} + +
+
+ +
{{ $t('Renew.use') }}
+
+
{{promotionData.str}}
+
{{ $t('Renew.Payment') }}:
-
{{ $t('Renew.SubscribeNow') }}
{ return { title:t('Renew.PersonalVersion'), @@ -163,6 +179,10 @@ export default defineComponent({ year:'HKD / Year', }, type:'year', + autoRenewal:{ + text:t('Renew.automatically'), + value:true, + }, typeList:['year'], info:'Customised plan', } @@ -177,6 +197,10 @@ export default defineComponent({ year:'HKD / Year', }, type:'year', + autoRenewal:{ + text:t('Renew.automatically'), + value:true, + }, typeList:['year'], info:'Customised plan', } @@ -227,6 +251,7 @@ export default defineComponent({ returnUrl:url, subscribeType:subscribeType,//yearly为年费，monthly为月费 wallet:'ALIPAYHK', + promotionCode:renewData.promotionData.code, } let httpsUrl = Https.httpUrls.payStripe payMethodData.isShowMark_ = true @@ -263,6 +288,38 @@ export default defineComponent({ renew.renewModel = false setPaidBack() } + const examine = ()=>{ + // renewData.promotionData.error + let price = renewData.current?.price[renewData.current?.type] + const normalNumber = Number(price.replace(/,/g, '')); + if(!renewData.promotionData.code){ + return + } + let data = { + promotionCode:renewData.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 + } + }else{ + } + }) + } + const clearPromotionCode = ()=>{ + renewData.promotionData.error = ''; + renewData.promotionData.code = '' + renewData.current.price[renewData.current.type] = renewData.promotionData.oldPrice + renewData.promotionData.oldPrice = '' + } return{ store, ...toRefs(renew), @@ -275,6 +332,8 @@ export default defineComponent({ payment, setPaidBack, completePayment, + examine, + clearPromotionCode, } }, data() { @@ -315,17 +374,6 @@ export default defineComponent({ flex: 1; justify-content: space-between; margin-bottom: 3rem; - position: relative; - } - .activity{ - position: absolute; - top: 0; - background: linear-gradient(88.13deg, #fbd2ff .91%, #e6d3ff 52.5%, #b694ff 101.09%); - border-radius: 0 2.8rem 0 1rem; - font-size: 2.4rem; - font-weight: 600; - padding: 1.5rem 2rem; - right: 0; } .price{ font-size: 6rem; @@ -339,6 +387,41 @@ export default defineComponent({ } .type{ display: flex; + &.promotion{ + flex-wrap: wrap; + justify-content: center; + align-items: center; + > .succeed{ + padding: 1rem; + display: flex; + align-items: center; + border-radius: 1rem; + background: #eee; + > 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; + } + } + > .error{ + color: red; + width: 100%; + text-align: center; + font-size: 1.2rem; + } + } > .text{ margin-right: 2rem; // font-weight: 600; diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 52ddf233..4a933ea2 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -672,6 +672,9 @@ export default { Renew:{ title:'根据您的需求选择最佳计划', Monthly:'月付', + promotionCode:'优惠码', + use:'应用', + PromoCodeError:'请检查优惠码是否正确或者是否过期', Yearly:'年付', CreditCard:'信用卡', Alipay:'支付宝', diff --git a/src/lang/en.ts b/src/lang/en.ts index 5dd5dd40..3e3a2e73 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -672,6 +672,9 @@ export default { title:'Select The Best Plan For Your Needs', Monthly:'Monthly', Yearly:'Yearly', + promotionCode:'Coupon', + use:'Apply', + PromoCodeError:'Please check if the promo code is correct or if the date has expired', CreditCard:'Credit Card', Alipay:'Alipay', Payment:'Payment method', diff --git a/src/router/index.ts b/src/router/index.ts index 77f898da..fc5bfa6a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -195,6 +195,12 @@ const routes: Array = [ meta:{enter:3,}, component: _import_component('Administrator/allUser.vue'), }, + { + path:'coupons', + name:'coupons', + meta:{enter:3,}, + component: _import_component('Administrator/coupons/index.vue'), + }, { path:'testClickData', name:'testClickData', diff --git a/src/tool/https.js b/src/tool/https.js index 5db5d63d..8e01bde6 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -265,6 +265,12 @@ export const Https = { getUserInfo:`/api/inquiry/getUserInfo`,//查询所有用户 queryTransaction:`/api/inquiry/queryTransaction`,//查询交易记录 queryTransactionDownload:`/api/inquiry/queryTransaction/download`,//导出交易记录 + createCoupon:`/api/stripe/createCoupon`,//创建优惠码 + updatePromCodeInfo:`/api/stripe/updatePromCodeInfo`,//修改优惠码 + getAllCoupons:`/api/stripe/getAllCoupons`,//查询优惠码列表 + checkCoupon:`/api/stripe/checkCoupon`,//根据优惠码获取结算后的金额 + deletePromCode:`/api/stripe/deletePromCode`,//删除优惠券 + //查询某个时间内design点击次数 getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批 getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批 diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index f590226c..5de18fd0 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -242,7 +242,13 @@ export default defineComponent({ // isShow:true, // }, ], - }], + },{ + name:'Promotion Code', + icon:'usetime', + route:'/administrator/coupons', + key:'sub12', + isShow:true, + },], openKeys: [], selectedKeys: ['sub1'], nowPageName:'All User',//当前页面名称 diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index b958942f..fbd3587e 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -92,6 +92,8 @@
+
{{$t('Header.SubscribeNow')}}
+
{{$t('Header.SubscribeNow')}}
From d174a7a8f1be377453f12eb05f88785123c5c391 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 21 May 2025 22:09:52 +0800 Subject: [PATCH 18/21] fix --- src/views/HomeMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index fbd3587e..8fe3e609 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -92,7 +92,7 @@
-
{{$t('Header.SubscribeNow')}}
+
{{$t('Header.SubscribeNow')}}
From fb06427982db62073c85bc334a3fcb1a42430518 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 21 May 2025 22:35:28 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=B1=BB=E5=9E=8B=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/renew.vue | 10 +++++++--- src/views/HomeMain.vue | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index 72d57954..cb61b7a9 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -119,7 +119,7 @@