Merge remote-tracking branch 'origin/StableVersion' into dev_vite

src/component/Administrator/Transaction/TransactionTable.vue

@@ -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;

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

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

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;