feat:激活

src/views/wallet/wallet-active/index.vue

@@ -69,9 +69,9 @@
 			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="usernaem" label="用户" show-overflow-tooltip />
+				<el-table-column prop="username" label="用户" show-overflow-tooltip />
+				<el-table-column prop="userMobile" label="手机号" show-overflow-tooltip />
 				<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
-				<el-table-column prop="merchantName" label="商户" show-overflow-tooltip />
 				<el-table-column prop="cardNumber" label="用户卡号" show-overflow-tooltip />
 				<el-table-column prop="isActiveHardware" label="是否激活" show-overflow-tooltip>
 					<template #default="{ row }">

src/views/wallet/wallet-freeze/index.vue

@@ -78,9 +78,7 @@
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
-						<el-button v-if="row.processStatus != 1" icon="Promotion" text type="primary" @click="doInfo(row)">
-							查看审批
-						</el-button>
+						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
 						<el-button
 							v-if="false"
 							icon="edit-pen"

src/views/wallet/wallet-manage/index.vue

@@ -91,7 +91,7 @@
 						<dict-tag :options="yes_no_type" :value="row.isFreeze" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="activeBindStatus" width="120" label="饭卡绑定状态" />
+				<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 				<el-table-column prop="createTime" width="200" label="创建时间" />
 				<el-table-column label="操作" fixed="right" width="200">
 					<template #default="{ row }">

src/views/wallet/wallet-recharge-apply/preview-excel.vue

@@ -7,7 +7,7 @@
 				</div>
 			</el-row>
 			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle">
-				<el-table-column type="index" label="#" align="center" width="40" />
+				<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">
 					<template #default="{ row }">
@@ -107,7 +107,11 @@ const currentChangeHandle = (e: any) => {
 const getList = async () => {
 	state.loading = true
 	try {
-		const { data: pageData } = await walletRechargeApplyApi.comparePageJoin(state.queryForm)
+		const _pa = {
+			...state.pagination,
+			...state.queryForm,
+		}
+		const { data: pageData } = await walletRechargeApplyApi.comparePageJoin(_pa)
 		data.list = pageData.page.records
 		data.total = pageData.page.total
 		data.tableList = pageData.tableList