布局修改 部分bug修复

src/component/Administrator/affiliate/affiliateAudit.vue

@@ -95,6 +95,7 @@ export default defineComponent({
                     width: 50,
                     dataIndex: "id",
                     key: "id",
+					sorter: true,
                     fixed: "left",
                 },
 				{
@@ -127,6 +128,7 @@ export default defineComponent({
                     dataIndex: "totalEarnings",
                     key: "totalEarnings",
 					openType:'month',
+					sorter: true,
                 },{
                     title: 'Monthly income',
                     align: "center",
@@ -200,7 +202,6 @@ export default defineComponent({
         let collectionList: any = ref([]);
         let status: any = ref(0);
 		const openDetail = (value:any,openType:string)=>{
-			console.log(value,openType);
 			let data = {
 				id:value.id,
 				type:openType
@@ -225,6 +226,7 @@ export default defineComponent({
             pageSize: 10,
             total: 0,
 			order:'',
+			orderBy:'',
 			affiliateId:'',
             historyTableHeight: 0,
             newCollectionName: "",
@@ -244,6 +246,16 @@ export default defineComponent({
             this.currentPage = e.current;
             this.pageSize = e.pageSize;
 			this.order = sorter.order == "descend" ? "DESC" : "ASC";
+			console.log(sorter.columnKey)
+			if(sorter.order){
+				if(sorter.columnKey == 'id'){
+					this.orderBy = 'id'
+				}else if(sorter.columnKey == "createTime"){
+					this.orderBy = 'createTime'
+				}else if(sorter.columnKey == "totalEarnings"){
+					this.orderBy = 'totalIncome'
+				}
+			}
             this.gettrialList();
         },
 		//查询列表
@@ -263,6 +275,7 @@ export default defineComponent({
                 page: this.currentPage,
                 size: this.pageSize,
                 order: this.order,
+				orderBy: this.orderBy,
                 status: this.currentState.value,
                 startTime:startDate,
                 endTime:endDate,

src/component/Administrator/affiliate/itemAffiliateDetail.vue

@@ -13,7 +13,7 @@
     >
 		<div class="generalModel_btn">
 			<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
-				<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
+				<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
 						<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
 						<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
 						<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>
@@ -70,6 +70,7 @@
 import { defineComponent, ref, createVNode, computed, reactive, toRefs, nextTick } from "vue";
 import { Https } from "@/tool/https";
 import { Modal, message } from "ant-design-vue";
+import { orderBy } from "element-plus/es/components/table/src/util.mjs";
 export default defineComponent({
     components: {
     },
@@ -87,6 +88,7 @@ export default defineComponent({
 			currentPage: 1,
 			pageSize: 10,
 			order:'',
+			orderBy:'',
 			total: 0,
 			historyTableHeight:0,
 			columns:computed(() => {
@@ -98,6 +100,7 @@ export default defineComponent({
 						dataIndex: "accountId",
 						key: "accountId",
 						fixed: "left",
+						sorter: true,
 					},{
 						title: 'User Name',
 						key: "username",
@@ -118,6 +121,7 @@ export default defineComponent({
 						width: 200,
 						dataIndex: "firstSubscriptionPaymentAmount",
 						key: "firstSubscriptionPaymentAmount",
+						sorter: true,
 					},{
 						title: 'Commission',
 						align: "center",
@@ -177,6 +181,15 @@ export default defineComponent({
 		const changePage = (e: any, filters:any, sorter:any)=>{
             itemAffiliateDetail.currentPage = e.current;
             itemAffiliateDetail.pageSize = e.pageSize;
+			if(sorter.order){
+				if(sorter.columnKey == 'accountId'){
+					itemAffiliateDetail.orderBy = 'id'
+				}else if(sorter.columnKey == "time"){
+					itemAffiliateDetail.orderBy = 'createTime'
+				}else if(sorter.columnKey == "firstSubscriptionPaymentAmount"){
+					itemAffiliateDetail.orderBy = 'totalIncome'
+				}
+			}
 			itemAffiliateDetail.order = sorter.order == "descend" ? "DESC" : "ASC";
             getDetailList();
         }
@@ -193,6 +206,7 @@ export default defineComponent({
 				endTime:endDate,
 				startTime:startDate,
 				order:itemAffiliateDetail.order,
+				orderBy:itemAffiliateDetail.orderBy,
 				page: itemAffiliateDetail.currentPage,
 				size: itemAffiliateDetail.pageSize,
 			}