From a757eebded664e28443e8359c73c562f19ddfa16 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 21 May 2024 15:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Pay/allOrder.vue      | 12 ++++---
 src/component/Pay/creditsDetail.vue | 55 +++++++++++++----------------
 src/lang/cn.ts                      |  4 +++
 src/lang/en.ts                      |  4 +++
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/component/Pay/allOrder.vue b/src/component/Pay/allOrder.vue
index 119e58dd..b9ede5fa 100644
--- a/src/component/Pay/allOrder.vue
+++ b/src/component/Pay/allOrder.vue
@@ -71,7 +71,7 @@
     </div>
 </template>
 <script lang="ts">
-import { defineComponent, ref, createVNode, computed } from "vue";
+import { defineComponent, ref, nextTick, computed } from "vue";
 import { Https } from "@/tool/https";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
@@ -166,9 +166,13 @@ export default defineComponent({
         };
     },
     mounted() {
-        let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
+        // let historyTable: any = this.$refs.historyTable;
+        // this.historyTableHeight = historyTable.clientHeight - 130;
 		this.getAllOrderList()
+		nextTick(()=>{
+			let historyTable: any = this.$refs.historyTable;
+			this.historyTableHeight = historyTable.clientHeight - 130;
+		})
     },
     methods: {
 		init(){
@@ -201,8 +205,6 @@ export default defineComponent({
 			// getCreditsDetail
 			// orderInfoList
             Https.axiosPost(Https.httpUrls.orderInfoList,data).then((rv: any) => {
-                this.total = rv.length;
-                this.collectionList = rv
 				if(this.currentPage > 1 && rv.content.length == 0){
 					this.currentPage = 1
 					this.getAllOrderList()
diff --git a/src/component/Pay/creditsDetail.vue b/src/component/Pay/creditsDetail.vue
index 04602d29..8f337a71 100644
--- a/src/component/Pay/creditsDetail.vue
+++ b/src/component/Pay/creditsDetail.vue
@@ -41,7 +41,7 @@
 		<div class="generalModel_table_content" ref="historyTable">
 			<a-table
 				:columns="columns"
-				:data-source="collectionList"
+				:data-source="creditsDetailList"
 				:scroll="{ y: historyTableHeight }"
 				@change="changePage"
 				:pagination="{
@@ -67,7 +67,7 @@
 						>
 							refund
 						</div> -->
-						<div class="operate_item">{{ $t('HistoryPage.Delete') }}</div>
+						<!-- <div class="operate_item">{{ $t('HistoryPage.Delete') }}</div> -->
 					</div>
 				</template>
 			</a-table>
@@ -75,7 +75,7 @@
     </div>
 </template>
 <script lang="ts">
-import { defineComponent, ref, createVNode, computed } from "vue";
+import { defineComponent, ref, nextTick, computed } from "vue";
 import { Https } from "@/tool/https";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
@@ -87,39 +87,32 @@ export default defineComponent({
         const columns: any = computed(() => {
             return [
 				{
-                    title: useI18n().t('allOrder.Serial'),
+                    title: useI18n().t('allOrder.changedCredits'),
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "orderNo",
-                    key: "orderNo",
+                    dataIndex: "changedCredits",
+                    key: "changedCredits",
                 },
                 {
-                    title: useI18n().t('allOrder.Title'),
+                    title: useI18n().t('allOrder.changeEvent'),
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "title",
-                    key: "title",
+                    dataIndex: "changeEvent",
+                    key: "changeEvent",
                 },
                 {
-                    title: useI18n().t('allOrder.Money'),
+                    title: useI18n().t('allOrder.createTime'),
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "totalFee",
-                    key: "totalFee",
+                    dataIndex: "createTime",
+                    key: "createTime",
                 },
                 {
-                    title: useI18n().t('allOrder.Payment'),
+                    title: useI18n().t('allOrder.credits'),
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "paymentType",
-                    key: "paymentType",
-                },
-                {
-                    title: useI18n().t('allOrder.State'),
-                    align: "center",
-                    ellipsis: true,
-                    dataIndex: "orderStatus",
-                    key: "orderStatus",
+                    dataIndex: "credits",
+                    key: "credits",
                 },
 
                 // {
@@ -133,7 +126,7 @@ export default defineComponent({
         });
         let dataList: any = ref([]);
         let rangePickerValue: any = ref([]);
-        let collectionList: any = ref([]);
+        let creditsDetailList: any = ref([]);
         let userInfo: any = {};
 		let currentState = ref({
 			value:'income',
@@ -153,7 +146,7 @@ export default defineComponent({
             dataList,
             renameData,
 			rangePickerValue,
-			collectionList,
+			creditsDetailList,
             userInfo,
 			currentState,
 			state,
@@ -170,15 +163,18 @@ export default defineComponent({
         };
     },
     mounted() {
-        let historyTable: any = this.$refs.historyTable;
-        this.historyTableHeight = historyTable.clientHeight - 130;
-		this.getCreditsDetailList()
+        
+		// this.getCreditsDetailList()
     },
     methods: {
 		init(){
 			this.currentPage = 1
 			this.pageSize = 10
 			this.getCreditsDetailList()
+			nextTick(()=>{
+				let historyTable: any = this.$refs.historyTable;
+				this.historyTableHeight = historyTable.clientHeight - 130;
+			})
 		},
         //改变页码
         changePage(e: any) {
@@ -208,17 +204,14 @@ export default defineComponent({
                 size:this.pageSize,
 				startTime: startDate
 			}
-			console.log(data);
 			// getCreditsDetail
 			// orderInfoList
             Https.axiosPost(Https.httpUrls.getCreditsDetail,data).then((rv: any) => {
-                this.total = rv.length;
-                this.collectionList = rv
 				if(this.currentPage > 1 && rv.content.length == 0){
 					this.currentPage = 1
 					this.getCreditsDetailList()
 				}else{
-					this.collectionList = rv.content
+					this.creditsDetailList = rv.content
 					this.total = rv.total
 				}
 				
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index d5d43ee4..bf82e306 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -31,6 +31,10 @@ export default {
 		State:'状态',
 		Income:'支出',
 		Expend:'收入',
+		credits:'积分',
+		changedCredits:'积分变更',
+		changeEvent:'增加/减少积分',
+		createTime:'创建时间',
 	},
 	payOrder:{
 		OrderInformation:'订单详情',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 468dcf15..5f0091ed 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -31,6 +31,10 @@ export default {
 		State:'State',
 		Income:'Income',
 		Expend:'Expend',
+		credits:'Credits',
+		changedCredits:'Changed Credits',
+		changeEvent:'Change Event',
+		createTime:'Create Time',
 	},
 	payOrder:{