@@ -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;
diff --git a/src/component/Administrator/coupons/index.vue b/src/component/Administrator/coupons/index.vue
index dc83c547..cb1535d9 100644
--- a/src/component/Administrator/coupons/index.vue
+++ b/src/component/Administrator/coupons/index.vue
@@ -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
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index ccbe8c69..69d305d8 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -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
diff --git a/src/component/mainPage/signUp/index.vue b/src/component/mainPage/signUp/index.vue
index ce850e88..15d4aa0b 100644
--- a/src/component/mainPage/signUp/index.vue
+++ b/src/component/mainPage/signUp/index.vue
@@ -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;
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 0a90c838..d951246a 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -8,15 +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, September 2 at 00:00 (HKT) to Wednesday, September 3 at 00:00. During this period, the AiDA system will be temporarily inaccessible.
We sincerely apologize for the inconvenience caused and thank you for your understanding
-
由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解
-
+
+
由于系统服务器升级，我们将于9月2日（星期二）凌晨00:00（香港时间）至9月3日（星期三）凌晨00:00进行升级。
在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解