Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
94
.eslintrc-auto-import.json
Normal file
94
.eslintrc-auto-import.json
Normal file
@@ -0,0 +1,94 @@
|
||||
{
|
||||
"globals": {
|
||||
"Component": true,
|
||||
"ComponentPublicInstance": true,
|
||||
"ComputedRef": true,
|
||||
"DirectiveBinding": true,
|
||||
"EffectScope": true,
|
||||
"ExtractDefaultPropTypes": true,
|
||||
"ExtractPropTypes": true,
|
||||
"ExtractPublicPropTypes": true,
|
||||
"InjectionKey": true,
|
||||
"MaybeRef": true,
|
||||
"MaybeRefOrGetter": true,
|
||||
"PropType": true,
|
||||
"Ref": true,
|
||||
"Slot": true,
|
||||
"Slots": true,
|
||||
"VNode": true,
|
||||
"WritableComputedRef": true,
|
||||
"cloneDeep": true,
|
||||
"cloneDeepWith": true,
|
||||
"computed": true,
|
||||
"createApp": true,
|
||||
"customRef": true,
|
||||
"debounce": true,
|
||||
"defineAsyncComponent": true,
|
||||
"defineComponent": true,
|
||||
"effectScope": true,
|
||||
"getCurrentInstance": true,
|
||||
"getCurrentScope": true,
|
||||
"h": true,
|
||||
"inject": true,
|
||||
"isArray": true,
|
||||
"isBoolean": true,
|
||||
"isDate": true,
|
||||
"isFunction": true,
|
||||
"isNaN": true,
|
||||
"isNull": true,
|
||||
"isNumber": true,
|
||||
"isObject": true,
|
||||
"isProxy": true,
|
||||
"isReactive": true,
|
||||
"isReadonly": true,
|
||||
"isRef": true,
|
||||
"isString": true,
|
||||
"isUndefined": true,
|
||||
"markRaw": true,
|
||||
"nextTick": true,
|
||||
"onActivated": true,
|
||||
"onBeforeMount": true,
|
||||
"onBeforeRouteLeave": true,
|
||||
"onBeforeRouteUpdate": true,
|
||||
"onBeforeUnmount": true,
|
||||
"onBeforeUpdate": true,
|
||||
"onDeactivated": true,
|
||||
"onErrorCaptured": true,
|
||||
"onMounted": true,
|
||||
"onRenderTracked": true,
|
||||
"onRenderTriggered": true,
|
||||
"onScopeDispose": true,
|
||||
"onServerPrefetch": true,
|
||||
"onUnmounted": true,
|
||||
"onUpdated": true,
|
||||
"onWatcherCleanup": true,
|
||||
"provide": true,
|
||||
"reactive": true,
|
||||
"readonly": true,
|
||||
"ref": true,
|
||||
"resolveComponent": true,
|
||||
"shallowReactive": true,
|
||||
"shallowReadonly": true,
|
||||
"shallowRef": true,
|
||||
"toRaw": true,
|
||||
"toRef": true,
|
||||
"toRefs": true,
|
||||
"toValue": true,
|
||||
"triggerRef": true,
|
||||
"unref": true,
|
||||
"useAttrs": true,
|
||||
"useCssModule": true,
|
||||
"useCssVars": true,
|
||||
"useId": true,
|
||||
"useLink": true,
|
||||
"useModel": true,
|
||||
"useRoute": true,
|
||||
"useRouter": true,
|
||||
"useSlots": true,
|
||||
"useTemplateRef": true,
|
||||
"watch": true,
|
||||
"watchEffect": true,
|
||||
"watchPostEffect": true,
|
||||
"watchSyncEffect": true
|
||||
}
|
||||
}
|
||||
BIN
public/image/events/Welcome-back-Cn.jpg
Normal file
BIN
public/image/events/Welcome-back-Cn.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 275 KiB |
BIN
public/image/events/Welcome-back-En.jpg
Normal file
BIN
public/image/events/Welcome-back-En.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 289 KiB |
BIN
src/assets/images/loginPage/logo_full.png
Normal file
BIN
src/assets/images/loginPage/logo_full.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.0 KiB |
@@ -12,6 +12,10 @@
|
||||
"id": 3,
|
||||
"title":"✨New Year 2025!🎉Let's kick off the year with a burst of inspiration and design!",
|
||||
"imgUrl": "/image/events/AiDA2025-En.jpg"
|
||||
},{
|
||||
"id": 4,
|
||||
"title":"Welcome back !Subscribe with the discount code to enjoy 50% OFF!",
|
||||
"imgUrl": "/image/events/Welcome-back-En.jpg"
|
||||
}
|
||||
],
|
||||
"eventsItem":[
|
||||
@@ -139,6 +143,59 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
},{
|
||||
"id":4,
|
||||
"title":"Welcome back !Subscribe with the discount code to enjoy 50% OFF!",
|
||||
"imgUrl": "/image/events/Welcome-back-En.jpg",
|
||||
"textList":[
|
||||
{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"💠 In February, AiDA underwent a legendary transformation"
|
||||
},{
|
||||
"text":"💠 A silky-smooth interface and a turbocharged upgrade to all functions"
|
||||
},{
|
||||
"text":"😆 Long-time users are saying: “Wait… is this still the AiDA I knew?!"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"Demo video👉 <a href='https://sg834.apps.aliyunpds.com/disk/s/R6SsxBaju9h' target='_blank'>https://sg834.apps.aliyunpds.com/disk/s/R6SsxBaju9h</a>"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"⚡️ To welcome back our trial users, we’ve prepared an exclusive design power-up:"
|
||||
},{
|
||||
"text":"✔️ Use the promo code「RIINRMKK」 and enjoy 50% off your subscription"
|
||||
},{
|
||||
"text":"✔️ Boost your efficiency by 60%—save hours on every project"
|
||||
},{
|
||||
"text":"✔️ sNo design background? No problem! Get stunning drafts in just 5 minutes"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"⏳ The countdown is on:"
|
||||
},{
|
||||
"text":"✨Ignite your creativity like a volcanic eruption"
|
||||
},{
|
||||
"text":"✨Let your inspiration flow like a cosmic waterfall"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"Promotional Code: <strong>RIINRMKK</strong>"
|
||||
},{
|
||||
"text":"Duration: June 10 to June 30, 2025 – After that, subscriptions return to full price. Don’t miss it!"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -12,6 +12,10 @@
|
||||
"id": 3,
|
||||
"title":"🎉搭上2025的列车!打开新设计的大门!",
|
||||
"imgUrl": "/image/events/AiDA2025-Cn.jpg"
|
||||
},{
|
||||
"id": 4,
|
||||
"title":"设计时速狂飙!AiDA 618半价让灵感永不限流!",
|
||||
"imgUrl": "/image/events/Welcome-back-Cn.jpg"
|
||||
}
|
||||
],
|
||||
"eventsItem":[
|
||||
@@ -139,6 +143,65 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
},{
|
||||
"id":4,
|
||||
"title":"设计时速狂飙!AiDA 618半价让灵感永不限流!",
|
||||
"imgUrl": "/image/events/Welcome-back-En.jpg",
|
||||
"textList":[
|
||||
{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"618的钟声敲响,AiDA的AI设计宇宙正式进入「超维折扣纪元」"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"💠 就在今年2月,AiDA完成史诗级进化"
|
||||
},{
|
||||
"text":"💠 界面如丝绸般顺滑,功能矩阵全面升级。"
|
||||
},{
|
||||
"text":"😆 旧版用户惊呼:这还是我认识的AiDA吗⁉️"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"演示视频👉 <a href='https://sg834.apps.aliyunpds.com/disk/s/R6SsxBaju9h' target='_blank'>https://sg834.apps.aliyunpds.com/disk/s/R6SsxBaju9h</a>"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"⚡️ 618特供「专属暴击福利」💥"
|
||||
},{
|
||||
"text":"✔️ 输入口令“RIINRMKK”订阅,直接享受半价!"
|
||||
},{
|
||||
"text":"✔️ 效率提升60%,设计实践节省一大半!"
|
||||
},{
|
||||
"text":"✔️ 零基础也能5分钟出稿,轻松搞定设计需求"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"⏳ 倒计时警报:"
|
||||
},{
|
||||
"text":"👉 让设计如火山喷发般炽热"
|
||||
},{
|
||||
"text":"👉 让灵感似银河倾泻般璀璨"
|
||||
}
|
||||
]
|
||||
},{
|
||||
"paragraph":[
|
||||
{
|
||||
"text":"优惠码:<strong>RIINRMKK</strong>"
|
||||
},{
|
||||
"text":"活动日期:2025.6.10-6.30(后续订阅费用将恢复至原价)"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1622,6 +1622,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
|
||||
.modal_title_text .modal_title_text_intro a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.modal_title_text .modal_title_text_intro strong {
|
||||
color: #000;
|
||||
font-weight: 900;
|
||||
}
|
||||
.modal_title_text .modal_title_text_assistant {
|
||||
font-size: var(--aida-fsize1-6);
|
||||
font-weight: 400;
|
||||
|
||||
@@ -1771,6 +1771,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
strong{
|
||||
color: #000;
|
||||
font-weight: 900;
|
||||
}
|
||||
}
|
||||
.modal_title_text_assistant{
|
||||
font-size: var(--aida-fsize1-6);
|
||||
|
||||
@@ -95,6 +95,9 @@
|
||||
allowClear
|
||||
show-search
|
||||
></a-select>
|
||||
</div>
|
||||
<div class="admin_state_item">
|
||||
<span>Total Amount:</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="admin_search">
|
||||
@@ -192,7 +195,7 @@ export default defineComponent({
|
||||
countryList: computed(()=>{
|
||||
return store.state.adminPage.country
|
||||
}),
|
||||
isAwayOrUnfold:false
|
||||
isAwayOrUnfold:false,
|
||||
});
|
||||
let filterData: any = reactive({
|
||||
rangePickerValue: [],
|
||||
@@ -291,6 +294,14 @@ export default defineComponent({
|
||||
key: "platform",
|
||||
width:150,
|
||||
ellipsis:true,
|
||||
},
|
||||
{
|
||||
title: "Email",
|
||||
align: "center",
|
||||
dataIndex: "email",
|
||||
key: "email",
|
||||
width:200,
|
||||
ellipsis:true,
|
||||
},{
|
||||
title: "Payment Amount",
|
||||
align: "center",
|
||||
@@ -451,8 +462,6 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.queryTransaction, data).then(
|
||||
(rv: any) => {
|
||||
if (rv) {
|
||||
console.log(rv);
|
||||
|
||||
// this.dataList = rv
|
||||
filter.dataList = rv.content;
|
||||
filterData.total = rv.total;
|
||||
|
||||
@@ -127,7 +127,7 @@ export default defineComponent({
|
||||
const columns: any = computed(() => {
|
||||
return [
|
||||
{
|
||||
title: 'User Id',
|
||||
title: 'Id',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "id",
|
||||
@@ -136,12 +136,14 @@ export default defineComponent({
|
||||
sorter: true,
|
||||
fixed: "left",
|
||||
},
|
||||
|
||||
{
|
||||
title: 'Max Redemptions',
|
||||
title: 'cooperator',
|
||||
align: "center",
|
||||
dataIndex: "maxRedemptions",
|
||||
key: "maxRedemptions",
|
||||
width:200,
|
||||
ellipsis: true,
|
||||
dataIndex: "cooperator",
|
||||
key: "cooperator",
|
||||
width:150,
|
||||
},
|
||||
|
||||
{
|
||||
@@ -153,7 +155,7 @@ export default defineComponent({
|
||||
width:150,
|
||||
},
|
||||
{
|
||||
title: 'redeemBy',
|
||||
title: 'Redeem By',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "redeemBy",
|
||||
@@ -161,7 +163,10 @@ export default defineComponent({
|
||||
width:150,
|
||||
customRender: (record: any) => {
|
||||
if(record.text){
|
||||
return new Date(record.text * 1000).toISOString().split('T')[0] // "2025-04-24"
|
||||
const startTime = new Date(record.text * 1000);
|
||||
const timezoneOffset = startTime.getTimezoneOffset() * 60000;
|
||||
const localDate = new Date(startTime.getTime() - timezoneOffset);
|
||||
return localDate.toISOString().split('T')[0] // "2025-04-24"
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -188,13 +193,22 @@ export default defineComponent({
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'cooperator',
|
||||
title: 'Start Time',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "cooperator",
|
||||
key: "cooperator",
|
||||
dataIndex: "startTime",
|
||||
key: "startTime",
|
||||
width:150,
|
||||
customRender: (record: any) => {
|
||||
if(record.text){
|
||||
const startTime = new Date(record.text * 1000);
|
||||
const timezoneOffset = startTime.getTimezoneOffset() * 60000;
|
||||
const localDate = new Date(startTime.getTime() - timezoneOffset);
|
||||
return localDate.toISOString().split('T')[0] // "2025-04-24"
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
title: 'Total Earnings',
|
||||
align: "center",
|
||||
@@ -212,7 +226,7 @@ export default defineComponent({
|
||||
width:150,
|
||||
},
|
||||
{
|
||||
title: 'Commission paid',
|
||||
title: 'Paid Commission',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "paidCommission",
|
||||
@@ -220,7 +234,7 @@ export default defineComponent({
|
||||
width:150,
|
||||
},
|
||||
{
|
||||
title: 'Unpaid commission',
|
||||
title: 'Unpaid Commission',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "unpaidCommission",
|
||||
@@ -229,13 +243,21 @@ export default defineComponent({
|
||||
},
|
||||
//
|
||||
{
|
||||
title: 'remark',
|
||||
title: 'Remark',
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
dataIndex: "remark",
|
||||
key: "remark",
|
||||
width:150,
|
||||
}, {
|
||||
},
|
||||
{
|
||||
title: 'Max Redemptions',
|
||||
align: "center",
|
||||
dataIndex: "maxRedemptions",
|
||||
key: "maxRedemptions",
|
||||
width:200,
|
||||
},
|
||||
{
|
||||
title: "Operations",
|
||||
key: "operation",
|
||||
width:120,
|
||||
@@ -315,14 +337,13 @@ export default defineComponent({
|
||||
changePage(e: any, filters:any, sorter:any) {
|
||||
this.currentPage = e.current;
|
||||
this.pageSize = e.pageSize;
|
||||
console.log(sorter)
|
||||
// this.gettrialList();
|
||||
// if(sorter.order){
|
||||
// if(sorter.columnKey == 'id'){
|
||||
// this.orderBy = 'id'
|
||||
// }
|
||||
// }
|
||||
if(sorter.order){
|
||||
if(sorter.columnKey == 'id'){
|
||||
this.orderBy = 'id'
|
||||
}
|
||||
}
|
||||
this.orderBy = sorter.order == "descend" ? "DESC" : "ASC";
|
||||
this.gettrialList();
|
||||
},
|
||||
|
||||
//查询列表
|
||||
@@ -366,13 +387,12 @@ export default defineComponent({
|
||||
cooperator:this.cooperator,//合作商
|
||||
isExpired:this.isExpired,//是否过期
|
||||
promotionCode:this.promotionCode,//优惠码
|
||||
orderById:null,//排序字段
|
||||
orderById:this.orderBy,//排序字段
|
||||
size:this.pageSize,
|
||||
page:this.currentPage,
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.getAllCoupons,data).then((rv: any) => {
|
||||
if (rv) {
|
||||
console.log(rv)
|
||||
this.dataList = rv.records
|
||||
this.total = rv.total
|
||||
// this.workspaceItem.position = this.singleTypeList[0].label
|
||||
|
||||
@@ -457,8 +457,9 @@ export default defineComponent({
|
||||
(rv) => {
|
||||
rv.imgUrl = rv.url
|
||||
rv.status = 'Success'
|
||||
rv.category = scaleImageList.value[scaleImageIndex.value]?.category
|
||||
rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue
|
||||
rv.category = scaleImageList.value[scaleImageIndex.value]?.category || rv.category
|
||||
rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue || scaleImageList.value[scaleImageIndex.value]?.level2Type
|
||||
rv.designType = scaleImageList.value[scaleImageIndex.value]?.designType || null
|
||||
isOverlay?(scaleImageList.value[scaleImageIndex.value] = rv):(scaleImageList.value.unshift(rv))
|
||||
loadingShow.value = false
|
||||
scaleImage.value = false
|
||||
|
||||
@@ -382,6 +382,19 @@
|
||||
.introduce{
|
||||
font-size: 2.4rem;
|
||||
text-decoration: underline;
|
||||
}
|
||||
.selectSignUp{
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@media (max-width: 768px) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
.gallery_list_box{
|
||||
|
||||
}
|
||||
.gallery_list{
|
||||
display: flex;
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
<!-- <div class="upgrade-content-text">System upgrading</div> -->
|
||||
<div class="upgrade-content-text">System maintenance</div>
|
||||
<!-- 没有截至时间 -->
|
||||
<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
|
||||
<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
|
||||
<!-- <div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
|
||||
<!-- 有截至时间 -->
|
||||
<!-- <div class="upgrade-content-textab">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. <br>We sincerely apologize for the inconvenience caused and thank you for your understanding</div> -->
|
||||
<div class="upgrade-content-textab">Due to system server upgrades, we will be upgrading from Tuesday, September 2 at 00:00 (HKT) to Wednesday, September 3 at 00:00. During this period, the AiDA system will be temporarily inaccessible. <br>We sincerely apologize for the inconvenience caused and thank you for your understanding</div>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<div class="upgrade-content-textab">由于系统服务器维护,AiDA系统暂时无法访问。对于由此造成的任何不便,我们深表歉意,并感谢您的理解</div>
|
||||
<!-- <div class="upgrade-content-textab">由于系统服务器升级,我们将于2月4日(星期二)上午9:30(香港时间)至2月6日(星期四)进行升级。<br>在此期间,AiDA系统将暂时无法访问。给您带来的不便,我们深表歉意,并感谢您的理解</div> -->
|
||||
<!-- <div class="upgrade-content-textab">由于系统服务器维护,AiDA系统暂时无法访问。对于由此造成的任何不便,我们深表歉意,并感谢您的理解</div> -->
|
||||
<div class="upgrade-content-textab">由于系统服务器升级,我们将于9月2日(星期二)凌晨00:00(香港时间)至9月3日(星期三)凌晨00:00进行升级。<br>在此期间,AiDA系统将暂时无法访问。给您带来的不便,我们深表歉意,并感谢您的理解</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user