From ef65369441ba1684eb068f3cba71da17ac654a11 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 17 Jan 2025 14:17:14 +0800
Subject: [PATCH 1/4] env

---
 .env.development | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 513a670..35bdebe 100644
--- a/.env.development
+++ b/.env.development
@@ -10,15 +10,15 @@ ENV = 'development'
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-#  VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
+  VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+#VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
-#  VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
+  VITE_IMAGE_BASE_PATH = http://localhost:9999
+#VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址

From fad6c2a6d31ab2afe96ec5272f87a907baf40137 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 20 Jan 2025 10:29:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=A1=8C=E5=B0=BE=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet-recharge-apply/preview-excel.vue   | 93 +++++++++++++++++--
 1 file changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index a8a3b02..07be34a 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -6,7 +6,14 @@
 					<right-toolbar class="ml10 mr20" style="float: right" :search="false" @queryTable="getList" />
 				</div>
 			</el-row>
-			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle">
+			<el-table
+				:data="data.list"
+				v-loading="state.loading"
+				border
+				:header-cell-style="tableStyle.headerCellStyle"
+				show-summary
+				:summary-method="getSummaries"
+			>
 				<el-table-column type="index" label="#" align="center" width="60" />
 				<el-table-column prop="username" label="用户" align="center" />
 				<el-table-column prop="userAvatar" label="头像" align="center">
@@ -15,13 +22,13 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="userMobile" label="手机号" align="center" />
-				<el-table-column prop="username" label="操作金额" align="center">
+				<el-table-column prop="currentImport_price" label="操作金额" align="center">
 					<template #default="{ row }">
 						<div class="color-success">{{ displayPrice(row.currentImport_price) }}</div>
 					</template>
 				</el-table-column>
 				<slot v-if="data.tableList && data.tableList.length">
-					<el-table-column v-for="(v, i) in data.tableList" :key="i" align="center">
+					<el-table-column :prop="`${'aaa' + i}`" v-for="(v, i) in data.tableList" :key="i" align="center">
 						<template #header>
 							<div>
 								{{ data.tableListStr[i] }}
@@ -30,21 +37,21 @@
 						<template #default="{ row }">
 							<div class="change">
 								<div v-if="row[`${v}_price`] >= 0" class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div class="change_text">
-									<div v-if="row[`${v}_transaction_price`]">
+								<!-- <div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div> -->
+								<!-- <div class="change_text"> -->
+								<!-- <div v-if="row[`${v}_transaction_price`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ displayPrice(row[`${v}_transaction_price`]) }}
 										</span>
-									</div>
-									<div v-if="row[`${v}_transaction_percent`]">
+									</div> -->
+								<!-- <div v-if="row[`${v}_transaction_percent`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ row[`${v}_transaction_percent`] }}%
 										</span>
-									</div>
-								</div>
+									</div> -->
+								<!-- </div> -->
 							</div>
 						</template>
 					</el-table-column>
@@ -56,10 +63,19 @@
 </template>
 
 <script setup lang="ts" name="preview-excel">
+import { computed } from "vue"
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply"
+import type { VNode } from "vue"
+import type { TableColumnCtx } from "element-plus"
+import { h } from "vue"
+
+interface SummaryMethodProps<T = any> {
+	columns: TableColumnCtx<T>[]
+	data: T[]
+}
 
 const { query } = useRoute()
 
@@ -115,10 +131,67 @@ const getList = async () => {
 		data.list = pageData.page.records
 		data.total = pageData.page.total
 		data.tableList = pageData.tableList
+		console.log(pageData.tableList)
 		data.tableListStr = pageData.tableListStr
 		state.pagination.total = pageData.page.total
 	} finally {
 		state.loading = false
 	}
 }
+
+// 表格行尾合计
+const getSummaries = (param: SummaryMethodProps) => {
+	const { columns, data: data1 } = param
+	const sums: (string | VNode | number)[] = []
+	columns.forEach((column, index) => {
+		if (index === 0) {
+			sums[index] = "合计"
+			return
+		}
+		if (column.property === "currentImport_price") {
+			const values = data1.map((item) => Number(item[column.property]))
+			if (!values.every((value) => Number.isNaN(value))) {
+				sums[index] = h("span", { style: { color: "#67C260" } }, [
+					displayPrice(
+						values.reduce((prev, curr) => {
+							const value = Number(curr)
+							if (!Number.isNaN(value)) {
+								return prev + curr
+							} else {
+								return prev
+							}
+						}, 0),
+					),
+				])
+			} else {
+				sums[index] = "NaN"
+			}
+		} else if (column.property === "aaa0") {
+			const str = data.tableList[0] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else if (column.property === "aaa1") {
+			const str = data.tableList[1] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else if (column.property === "aaa2") {
+			const str = data.tableList[2] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else {
+			sums[index] = ""
+		}
+	})
+
+	return sums
+}
 </script>

From f23553686f49edf470dd1df3aac24c256948fa5a Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 20 Jan 2025 11:26:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/component/password.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/login/component/password.vue b/src/views/login/component/password.vue
index 3ea46fa..990733c 100644
--- a/src/views/login/component/password.vue
+++ b/src/views/login/component/password.vue
@@ -105,8 +105,8 @@ const state = reactive({
 	isShowPassword: false, // 是否显示密码
 	ruleForm: {
 		// 表单数据
-		username: 'admin', // 用户名
-		password: '123456', // 密码
+		username: '', // 用户名
+		password: '', // 密码
 		code: '', // 验证码
 		randomStr: 'blockPuzzle', // 验证码随机数
 	},

From ad538192152538fcc07303a7c8b84e93d119d113 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 20 Jan 2025 15:11:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet-recharge-apply/preview-excel.vue   | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index 07be34a..d692139 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -28,7 +28,7 @@
 					</template>
 				</el-table-column>
 				<slot v-if="data.tableList && data.tableList.length">
-					<el-table-column :prop="`${'aaa' + i}`" v-for="(v, i) in data.tableList" :key="i" align="center">
+					<el-table-column :prop="v" v-for="(v, i) in data.tableList" :key="i" align="center">
 						<template #header>
 							<div>
 								{{ data.tableListStr[i] }}
@@ -37,21 +37,21 @@
 						<template #default="{ row }">
 							<div class="change">
 								<div v-if="row[`${v}_price`] >= 0" class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<!-- <div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div> -->
-								<!-- <div class="change_text"> -->
-								<!-- <div v-if="row[`${v}_transaction_price`]">
+								<div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
+								<div class="change_text">
+									<div v-if="row[`${v}_transaction_price`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ displayPrice(row[`${v}_transaction_price`]) }}
 										</span>
-									</div> -->
-								<!-- <div v-if="row[`${v}_transaction_percent`]">
+									</div>
+									<div v-if="row[`${v}_transaction_percent`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ row[`${v}_transaction_percent`] }}%
 										</span>
-									</div> -->
-								<!-- </div> -->
+									</div>
+								</div>
 							</div>
 						</template>
 					</el-table-column>
@@ -166,25 +166,22 @@ const getSummaries = (param: SummaryMethodProps) => {
 			} else {
 				sums[index] = "NaN"
 			}
-		} else if (column.property === "aaa0") {
-			const str = data.tableList[0] + "_price"
+		} else if (column.property === data.tableList[0]) {
 			sums[index] = displayPrice(
-				data.list.reduce((prev, curr) => {
-					return prev + curr[str]
+				data.list.reduce((prev: any, curr: any) => {
+					return prev + curr[data.tableList[0] + "_price"]
 				}, 0),
 			)
-		} else if (column.property === "aaa1") {
-			const str = data.tableList[1] + "_price"
+		} else if (column.property === data.tableList[1]) {
 			sums[index] = displayPrice(
-				data.list.reduce((prev, curr) => {
-					return prev + curr[str]
+				data.list.reduce((prev: any, curr: any) => {
+					return prev + curr[data.tableList[1] + "_price"]
 				}, 0),
 			)
-		} else if (column.property === "aaa2") {
-			const str = data.tableList[2] + "_price"
+		} else if (column.property === data.tableList[2]) {
 			sums[index] = displayPrice(
-				data.list.reduce((prev, curr) => {
-					return prev + curr[str]
+				data.list.reduce((prev: any, curr: any) => {
+					return prev + curr[data.tableList[2] + "_price"]
 				}, 0),
 			)
 		} else {