From ed5183f9d1dbd6e824636afa55bfa1d7d957c60b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Apr 2026 11:54:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=85=91=E6=8D=A2=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/integral/integral-manage.ts           |  41 ++++++
 src/api/integral/integral-transaction.ts      |  41 ++++++
 .../components/coupon-setting-form.vue        |   6 +
 .../components/coupon-setting.vue             |   2 +-
 src/views/integral/integral-manage/form.vue   | 125 +++++++++++++++++
 src/views/integral/integral-manage/index.vue  | 128 ++++++++++++++++++
 src/views/wallet/wallet-manage/index.vue      |  97 ++++---------
 .../components/integral/index.vue             |  92 +++++++++++++
 .../components/off-line/index.vue             |  23 ++--
 src/views/wallet/wallet-setting/index.vue     |   3 +
 10 files changed, 472 insertions(+), 86 deletions(-)
 create mode 100755 src/api/integral/integral-manage.ts
 create mode 100755 src/api/integral/integral-transaction.ts
 create mode 100755 src/views/integral/integral-manage/form.vue
 create mode 100755 src/views/integral/integral-manage/index.vue
 create mode 100644 src/views/wallet/wallet-setting/components/integral/index.vue

diff --git a/src/api/integral/integral-manage.ts b/src/api/integral/integral-manage.ts
new file mode 100755
index 00000000..21191803
--- /dev/null
+++ b/src/api/integral/integral-manage.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/wallet/integral-manage/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/wallet/integral-manage',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/wallet/integral-manage/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/wallet/integral-manage',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/wallet/integral-manage',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/api/integral/integral-transaction.ts b/src/api/integral/integral-transaction.ts
new file mode 100755
index 00000000..19211211
--- /dev/null
+++ b/src/api/integral/integral-transaction.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/wallet/integral-transaction/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/wallet/integral-transaction',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/wallet/integral-transaction/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/wallet/integral-transaction',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/wallet/integral-transaction',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/act/act-ad-setting/components/coupon-setting-form.vue b/src/views/act/act-ad-setting/components/coupon-setting-form.vue
index 6e87d0f5..203b3d18 100644
--- a/src/views/act/act-ad-setting/components/coupon-setting-form.vue
+++ b/src/views/act/act-ad-setting/components/coupon-setting-form.vue
@@ -3,6 +3,11 @@
         <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px"
             v-loading="loading">
             <el-row :gutter="24">
+                <el-col :span="24" class="mb20">
+                    <el-form-item label="封面图" prop="coveImage">
+                        <upload-img v-model:imageUrl="form.coveImage" width="100px" height="100px" />
+                    </el-form-item>
+                </el-col>
                 <el-col :span="24" class="mb20">
                     <el-form-item label="状态" prop="status">
                         <dict-select v-model="form.status" dict-code="act_coupon_status" />
@@ -84,6 +89,7 @@ const defaultForm = {
     description: '',
     bindNotifyId: '',
     integralNum: '',
+    coveImage: '',
 };
 const form = reactive({ ...defaultForm });
 
diff --git a/src/views/act/act-ad-setting/components/coupon-setting.vue b/src/views/act/act-ad-setting/components/coupon-setting.vue
index 5a49c959..b647d7f0 100644
--- a/src/views/act/act-ad-setting/components/coupon-setting.vue
+++ b/src/views/act/act-ad-setting/components/coupon-setting.vue
@@ -35,7 +35,7 @@
             </el-table-column>
             <el-table-column label="需要兑换积分" width="120">
                 <template #default="{ row }">
-                    <span>{{ getIntegralNum(row) }}</span>
+                    <span>{{ getIntegralNum(row) }}积分</span>
                 </template>
             </el-table-column>
             <el-table-column label="优惠券限领">
diff --git a/src/views/integral/integral-manage/form.vue b/src/views/integral/integral-manage/form.vue
new file mode 100755
index 00000000..8d8610c9
--- /dev/null
+++ b/src/views/integral/integral-manage/form.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="部门id" prop="deptId">
+            <el-input v-model="form.deptId" placeholder="请输入部门id" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="积分总数" prop="integralNum">
+            <el-input v-model="form.integralNum" placeholder="请输入积分总数" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="累计积分支出" prop="totalExpense">
+            <el-input v-model="form.totalExpense" placeholder="请输入累计积分支出" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="累计积分获得" prop="totalRecharge">
+            <el-input v-model="form.totalRecharge" placeholder="请输入累计积分获得" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="冻结积分数" prop="integralFreeze">
+            <el-input v-model="form.integralFreeze" placeholder="请输入冻结积分数" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="IntegralManageDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as integralManageApi from "/@/api/integral/integral-manage";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  userId: '',
+  deptId: '',
+  integralNum: '',
+  totalExpense: '',
+  totalRecharge: '',
+  integralFreeze: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取integralManage信息
+  if (id) {
+    form.id = id
+    getintegralManageData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await integralManageApi.putObj(form) : await integralManageApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getintegralManageData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  integralManageApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/integral/integral-manage/index.vue b/src/views/integral/integral-manage/index.vue
new file mode 100755
index 00000000..c900d965
--- /dev/null
+++ b/src/views/integral/integral-manage/index.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-form-item style="width: 300px" label="用户" prop="userId">
+          <select-user v-model="state.queryForm.userId" />
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="Search" type="primary" @click="getDataList">
+            {{ $t("common.queryBtn") }}
+          </el-button>
+          <el-button icon="Refresh" @click="resetQuery">
+            {{ $t("common.resetBtn") }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <!-- :export="'wallet_integralManage_export'" -->
+          <right-toolbar v-model:showSearch="showSearch" @exportExcel="exportExcel" class="ml10 mr20"
+            style="float: right;" @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="username" width="150" label="用户" />
+        <el-table-column prop="userAvatar" width="80" label="头像">
+          <template #default="{ row }">
+            <preview-image :src="row.userAvatar" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="userMobile" width="150" label="手机号" />
+        <el-table-column prop="integralNum" label="积分总数" />
+        <el-table-column prop="totalExpense" label="累计积分支出" />
+        <el-table-column prop="totalRecharge" label="累计积分获得" />
+        <el-table-column prop="integralFreeze" label="冻结积分数" />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_integralManage_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_integralManage_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemIntegralManage">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as integralManageApi from "/@/api/integral/integral-manage";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: integralManageApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/integralManage/export', Object.assign(state.queryForm, { ids: selectObjs }), 'integralManage.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await integralManageApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index b2d425be..ff9258f6 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-form-item style="width: 300px" label="用户" prop="userId">
@@ -23,43 +16,25 @@
 							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 						</el-form-item>
 						<el-form-item>
-							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+							}}</el-button>
 							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 						</el-form-item>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button
-								plain
-								:disabled="multiple"
-								icon="Delete"
-								type="primary"
-								v-auth="'wallet_walletManage_del'"
-								@click="handleDelete(selectObjs)"
-							>
+							<el-button plain :disabled="multiple" icon="Delete" type="primary"
+								v-auth="'wallet_walletManage_del'" @click="handleDelete(selectObjs)">
 								删除
 							</el-button>
-							<right-toolbar
-								v-model:showSearch="showSearch"
-								:export="'wallet_walletManage_export'"
-								@exportExcel="exportExcel"
-								class="ml10 mr20"
-								style="float: right"
-								@queryTable="getDataList"
-							></right-toolbar>
+							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletManage_export'"
+								@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
+								@queryTable="getDataList"></right-toolbar>
 						</div>
 					</el-row>
-					<el-table
-						:data="state.dataList"
-						v-loading="state.loading"
-						border
-						:summary-method="getSummaries"
-						show-summary
-						:cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle"
-					>
+					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
+						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
 						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column prop="username" width="100" label="用户" />
@@ -103,49 +78,29 @@
 						</el-table-column>
 						<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="250"
-							v-auths="[
-								'wallet_walletManage_edit',
-								'wallet_walletTransaction_update_balance',
-								'wallet_walletRuleTransaction_transfer_accounts',
-							]"
-						>
+						<el-table-column label="操作" fixed="right" width="250" v-auths="[
+							'wallet_walletManage_edit',
+							'wallet_walletTransaction_update_balance',
+							'wallet_walletRuleTransaction_transfer_accounts',
+						]">
 							<template #default="{ row }">
 								<div class="flex items-start">
-									<el-button
-										icon="InfoFilled"
-										text
-										type="primary"
-										v-auth="'wallet_walletManage_edit'"
-										@click="formDialogRef.openDialog(row.id)"
-										>详情</el-button
-									>
-									<el-button
-										icon="Money"
-										text
-										type="primary"
+									<el-button icon="InfoFilled" text type="primary" v-auth="'wallet_walletManage_edit'"
+										@click="formDialogRef.openDialog(row.id)">详情</el-button>
+									<el-button icon="Money" text type="primary"
 										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="changeBalanceRef.openDialog(row.userId, row.id)"
-										>充值/扣款</el-button
-									>
-									<el-button
-										v-if="row.isRule == 1"
-										icon="SwitchFilled"
-										text
-										type="primary"
+										@click="changeBalanceRef.openDialog(row.userId, row.id)">充值/扣款</el-button>
+									<el-button v-if="row.isRule == 1" icon="SwitchFilled" text type="primary"
 										v-auth="'wallet_walletRuleTransaction_transfer'"
-										@click="doTransferAccounts(row)"
-									>
+										@click="doTransferAccounts(row)">
 										转账
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+						v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
diff --git a/src/views/wallet/wallet-setting/components/integral/index.vue b/src/views/wallet/wallet-setting/components/integral/index.vue
new file mode 100644
index 00000000..10b90ad7
--- /dev/null
+++ b/src/views/wallet/wallet-setting/components/integral/index.vue
@@ -0,0 +1,92 @@
+<template>
+    <div class="w100">
+        <div class="layout-padding-auto layout-padding-view">
+            <div class="flex justify-center flex-col">
+                <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="240px"
+                    v-loading="loading">
+                    <el-row :gutter="24">
+                        <el-col :span="24" class="mb20">
+                            <el-form-item label="看一个激励视频可以获取多少积分" prop="rewardedAdIntegral">
+                                <el-input :disabled="!auth('wallet_setting_edit')" style="width: 300px" type="number"
+                                    v-model="form.rewardedAdIntegral" placeholder="请输入">
+                                    <template #append>积分</template>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24" class="mb20">
+                            <el-form-item label="一天可以看多少个激励视频" prop="todayViewRewardedAdLimit">
+                                <el-input :disabled="!auth('wallet_setting_edit')" style="width: 300px" type="number"
+                                    v-model="form.todayViewRewardedAdLimit" placeholder="请输入">
+                                    <template #append>次</template>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+                <div class="flex items-center" v-auth="'wallet_setting_edit'">
+                    <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="integral">
+import { useDict } from "/@/hooks/dict"
+import { storePrice } from "/@/utils/formatMoney"
+import { useMessage } from "/@/hooks/message"
+import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+import { auth } from "/@/utils/authFunction"
+
+// 定义变量内容
+const dataFormRef = ref()
+const loading = ref(false)
+// 提交表单数据
+const form = reactive({
+    id: "",
+    rewardedAdIntegral: "",
+    todayViewRewardedAdLimit: "",
+})
+// 定义校验规则
+const dataRules = ref({
+    rewardedAdIntegral: [{ required: true, message: "请输入一个激励视频可以获取多少积分", trigger: "change" }],
+    todayViewRewardedAdLimit: [{ required: true, message: "请输入一天可以看多少个激励视频", trigger: "change" }],
+})
+
+// 提交
+const onSubmit = async () => {
+    const valid = await dataFormRef.value.validate().catch(() => { })
+    if (!valid) return false
+
+    try {
+        loading.value = true
+        const pa = {
+            ...form,
+        }
+        await putObj(pa)
+        useMessage().success("修改成功")
+    } catch (err: any) {
+        useMessage().error(err.msg)
+    } finally {
+        loading.value = false
+    }
+}
+
+onMounted(() => {
+    getSetting()
+})
+
+// 初始化表单数据
+const getSetting = () => {
+    // 获取数据
+    loading.value = true
+    getObj()
+        .then((res: any) => {
+            Object.assign(form, res.data)
+        })
+        .finally(() => {
+            loading.value = false
+        })
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/wallet/wallet-setting/components/off-line/index.vue b/src/views/wallet/wallet-setting/components/off-line/index.vue
index 78f60184..6b44e06f 100644
--- a/src/views/wallet/wallet-setting/components/off-line/index.vue
+++ b/src/views/wallet/wallet-setting/components/off-line/index.vue
@@ -3,19 +3,14 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="flex justify-center flex-col">
 				<div>
-					<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="180px" v-loading="loading">
+					<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="180px"
+						v-loading="loading">
 						<el-row :gutter="24">
 							<el-col :span="24" class="mb20">
 								<el-form-item label="离线订单是否需要审批" prop="offLineOrderApplyEnable">
-									<el-switch
-										:disabled="!auth('wallet_setting_edit')"
-										active-value="1"
-										inactive-value="0"
-										v-model="form.offLineOrderApplyEnable"
-										active-text="开启"
-										inactive-text="关闭"
-										inline-prompt
-									/>
+									<el-switch :disabled="!auth('wallet_setting_edit')" active-value="1"
+										inactive-value="0" v-model="form.offLineOrderApplyEnable" active-text="开启"
+										inactive-text="关闭" inline-prompt />
 								</el-form-item>
 							</el-col>
 						</el-row>
@@ -50,12 +45,12 @@ const dataRules = ref({
 })
 
 onMounted(() => {
-	getwalletRechargePackageData("1")
+	getwalletRechargePackageData()
 })
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {
@@ -73,10 +68,10 @@ const onSubmit = async () => {
 }
 
 // 初始化表单数据
-const getwalletRechargePackageData = (id: string) => {
+const getwalletRechargePackageData = () => {
 	// 获取数据
 	loading.value = true
-	getObj(id)
+	getObj()
 		.then((res: any) => {
 			Object.assign(form, res.data)
 		})
diff --git a/src/views/wallet/wallet-setting/index.vue b/src/views/wallet/wallet-setting/index.vue
index c536aa18..941c451d 100644
--- a/src/views/wallet/wallet-setting/index.vue
+++ b/src/views/wallet/wallet-setting/index.vue
@@ -17,6 +17,7 @@
 				<third-zy v-if="activeName == 60" />
 				<user-setting v-if="activeName == 70" />
 				<wallet-recharge v-if="activeName == 80" />
+				<integral-setting v-if="activeName == 90" />
 			</div>
 		</div>
 	</div>
@@ -31,6 +32,7 @@ const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/i
 const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue"))
 const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue"))
 const WalletRecharge = defineAsyncComponent(() => import("./components/wallet-recharge/index.vue"))
+const IntegralSetting = defineAsyncComponent(() => import("./components/integral/index.vue"))
 
 const data = {
 	tabList: [
@@ -42,6 +44,7 @@ const data = {
 		{ id: 60, label: "正元同步配置" },
 		{ id: 70, label: "用户同步配置" },
 		{ id: 80, label: "批量申请/扣款发票配置" },
+		{ id: 90, label: "积分配置" },
 	],
 }
 

From 3b83472a00dbe9cff0d2fb908bc9a5386c758b90 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Apr 2026 17:22:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E7=A7=AF=E5=88=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/integral/integral-transaction.ts      | 11 +++
 src/views/integral/integral-manage/form.vue   | 83 +++++++++++++------
 src/views/integral/integral-manage/index.vue  | 44 +++++++---
 .../integral-manage/transaction-list.vue      | 58 +++++++++++++
 .../wallet/wallet-manage/change-balance.vue   |  8 +-
 5 files changed, 164 insertions(+), 40 deletions(-)
 create mode 100644 src/views/integral/integral-manage/transaction-list.vue

diff --git a/src/api/integral/integral-transaction.ts b/src/api/integral/integral-transaction.ts
index 19211211..066c69f1 100755
--- a/src/api/integral/integral-transaction.ts
+++ b/src/api/integral/integral-transaction.ts
@@ -16,6 +16,17 @@ export function addObj(obj?: Object) {
   })
 }
 
+/**
+ * 更新积分
+ */
+export function updateIntegral(obj: any) {
+  return request({
+    url: '/wallet/integral-transaction/update-integral',
+    method: 'post',
+    data: obj
+  })
+}
+
 export function getObj(id?: string) {
   return request({
     url: '/wallet/integral-transaction/' + id,
diff --git a/src/views/integral/integral-manage/form.vue b/src/views/integral/integral-manage/form.vue
index 8d8610c9..5bb28f2e 100755
--- a/src/views/integral/integral-manage/form.vue
+++ b/src/views/integral/integral-manage/form.vue
@@ -1,35 +1,38 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
-    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+  <el-dialog :title="form.id ? '修改积分' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
       <el-row :gutter="24">
         <el-col :span="24" class="mb20">
-          <el-form-item label="用户id" prop="userId">
-            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          <el-form-item label="用户编号" prop="id">
+            <el-input v-model="form.id" placeholder="" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="mb20">
-          <el-form-item label="部门id" prop="deptId">
-            <el-input v-model="form.deptId" placeholder="请输入部门id" />
+          <el-form-item label="用户昵称" prop="nickname">
+            <el-input v-model="form.nickname" placeholder="" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="mb20">
-          <el-form-item label="积分总数" prop="integralNum">
-            <el-input v-model="form.integralNum" placeholder="请输入积分总数" />
+          <el-form-item label="变动前余额(元)" prop="balance">
+            <el-input v-model="form.integralNum" placeholder="" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="mb20">
-          <el-form-item label="累计积分支出" prop="totalExpense">
-            <el-input v-model="form.totalExpense" placeholder="请输入累计积分支出" />
+          <el-form-item label="变动类型" prop="changeType">
+            <el-radio-group v-model="form.changeType">
+              <el-radio :label="1">增加</el-radio>
+              <el-radio :label="-1">减少</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="24" class="mb20">
-          <el-form-item label="累计积分获得" prop="totalRecharge">
-            <el-input v-model="form.totalRecharge" placeholder="请输入累计积分获得" />
+          <el-form-item label="变动前积分" prop="changeBalance">
+            <el-input-number v-model="form.changeIntegralNum" :min="0" :precision="0" class="!w-240px" />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="mb20">
-          <el-form-item label="冻结积分数" prop="integralFreeze">
-            <el-input v-model="form.integralFreeze" placeholder="请输入冻结积分数" />
+          <el-form-item label="变动后积分" prop="balanceResult">
+            <el-input v-model="integralNumResult" placeholder="" disabled />
           </el-form-item>
         </el-col>
       </el-row>
@@ -46,8 +49,13 @@
 <script setup lang="ts" name="IntegralManageDialog">
 import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
-import * as integralManageApi from "/@/api/integral/integral-manage";
 import { rule } from '/@/utils/validate';
+
+import * as integralManageApi from "/@/api/integral/integral-manage";
+import * as integralTransactionApi from "/@/api/integral/integral-transaction";
+import * as AdminUserApi from "/@/api/admin/user"
+
+
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -57,12 +65,16 @@ const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
+
+
 const form = reactive({
   id: '',
+  nickname: '',
   userId: '',
   deptId: '',
   integralNum: '',
-  totalExpense: '',
+  changeIntegralNum: 0,
+  changeType: 1,
   totalRecharge: '',
   integralFreeze: '',
 });
@@ -71,20 +83,21 @@ const form = reactive({
 const dataRules = ref({
 })
 
+// 变动后的积分
+const integralNumResult = computed(() => Number(form.integralNum) + Number(form.changeIntegralNum))
+
 // 打开弹窗
 const openDialog = (id: string) => {
   visible.value = true
   form.id = ''
-
   // 重置表单数据
   nextTick(() => {
     dataFormRef.value?.resetFields();
   });
-
   // 获取integralManage信息
   if (id) {
     form.id = id
-    getintegralManageData(id)
+    getData(id)
   }
 };
 
@@ -92,10 +105,21 @@ const openDialog = (id: string) => {
 const onSubmit = async () => {
   const valid = await dataFormRef.value.validate().catch(() => { });
   if (!valid) return false;
-
+  if (form.changeIntegralNum <= 0) {
+    useMessage().error("变动积分不能为零")
+    return
+  }
+  if (integralNumResult.value < 0) {
+    useMessage().error("变动后的积分不能小于 0")
+    return
+  }
   try {
     loading.value = true;
-    form.id ? await integralManageApi.putObj(form) : await integralManageApi.addObj(form);
+    const _params: any = {
+      id: form.id,
+      integralNum: form.changeIntegralNum,
+    }
+    await integralTransactionApi.updateIntegral(_params);
     useMessage().success(form.id ? '修改成功' : '添加成功');
     visible.value = false;
     emit('refresh');
@@ -108,14 +132,21 @@ const onSubmit = async () => {
 
 
 // 初始化表单数据
-const getintegralManageData = (id: string) => {
+const getData = async (id: string) => {
   // 获取数据
   loading.value = true
-  integralManageApi.getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
+
+  try {
+    const { data }: any = await integralManageApi.getObj(id)
+    // 获取用户
+    const { data: user } = await AdminUserApi.getObj(data.userId)
+    form.nickname = user.name
+    Object.assign(form, data)
+  } catch (error) {
+    console.error("初始化表单数据,error:", error);
+  } finally {
     loading.value = false
-  })
+  }
 };
 
 // 暴露变量
diff --git a/src/views/integral/integral-manage/index.vue b/src/views/integral/integral-manage/index.vue
index c900d965..2f77e212 100755
--- a/src/views/integral/integral-manage/index.vue
+++ b/src/views/integral/integral-manage/index.vue
@@ -33,16 +33,35 @@
           </template>
         </el-table-column>
         <el-table-column prop="userMobile" width="150" label="手机号" />
-        <el-table-column prop="integralNum" label="积分总数" />
-        <el-table-column prop="totalExpense" label="累计积分支出" />
-        <el-table-column prop="totalRecharge" label="累计积分获得" />
-        <el-table-column prop="integralFreeze" label="冻结积分数" />
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_integralManage_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'wallet_integralManage_del'"
-              @click="handleDelete([scope.row.id])">删除</el-button>
+        <el-table-column prop="integralNum" label="积分总数">
+          <template #default="{ row }">
+            <span class="color-primary">{{ row.integralNum }}积分</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalExpense" label="累计支出">
+          <template #default="{ row }">
+            <span class="color-danger">{{ row.totalExpense }}积分</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalRecharge" label="累计获取">
+          <template #default="{ row }">
+            <span class="color-success">{{ row.totalRecharge }}积分</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="integralFreeze" label="冻结积分">
+          <template #default="{ row }">
+            <span class="color-danger">{{ row.integralFreeze }}积分</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="200">
+          <template #default="{ row }">
+            <el-button icon="InfoFilled" text type="primary" @click="transactionListRef.openDialog(row.id)">
+              详情
+            </el-button>
+            <el-button v-auth="'integral_transaction_update_integral'" icon="Money" text type="primary" v
+              @click="formDialogRef.openDialog(row.id)">
+              充值/扣款
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -51,7 +70,7 @@
 
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
+    <transaction-list ref="transactionListRef" />
   </div>
 </template>
 
@@ -63,10 +82,13 @@ import { useDict } from '/@/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const TransactionList = defineAsyncComponent(() => import('./transaction-list.vue'));
+
 // 定义查询字典
 
 // 定义变量内容
 const formDialogRef = ref()
+const transactionListRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
diff --git a/src/views/integral/integral-manage/transaction-list.vue b/src/views/integral/integral-manage/transaction-list.vue
new file mode 100644
index 00000000..c48cc82b
--- /dev/null
+++ b/src/views/integral/integral-manage/transaction-list.vue
@@ -0,0 +1,58 @@
+<template>
+    <el-dialog title="积分明细" v-model="visible" width="60%" :close-on-click-modal="false" draggable>
+        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+            :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
+            <el-table-column align="center" width="200" label="编号" prop="id" />
+            <el-table-column align="center" width="200" label="交易类型" prop="title" />
+            <el-table-column align="center" label="变动积分" prop="integralNum">
+                <template #default="{ row }"> {{ row.integralNum }} </template>
+            </el-table-column>
+            <el-table-column align="center" label="积分余额" prop="integralBalance">
+                <template #default="{ row }"> {{ row.integralBalance }} </template>
+            </el-table-column>
+            <el-table-column align="center" label="交易时间" prop="createTime" width="180px" />
+        </el-table>
+        <template #footer>
+            <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+                v-bind="state.pagination" />
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="WalletManageDialog">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+
+import * as integralTransactionApi from "/@/api/integral/integral-transaction"
+
+// 定义变量内容
+const visible = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({})
+const state: BasicTableProps = reactive<BasicTableProps>({
+    queryForm: {},
+    pageList: integralTransactionApi.fetchList,
+})
+
+//  table hook
+const { getDataList, total, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+    useTable(state)
+
+// 打开弹窗
+const openDialog = (id: string) => {
+    visible.value = true
+    form.id = ""
+    if (id) {
+        state.queryForm.walletId = id
+        state.dataList = []
+        getDataList()
+    }
+}
+
+// 暴露变量
+defineExpose({
+    openDialog,
+})
+</script>
diff --git a/src/views/wallet/wallet-manage/change-balance.vue b/src/views/wallet/wallet-manage/change-balance.vue
index b46dad29..6b3d1f05 100644
--- a/src/views/wallet/wallet-manage/change-balance.vue
+++ b/src/views/wallet/wallet-manage/change-balance.vue
@@ -1,6 +1,7 @@
 <template>
 	<el-dialog title="修改余额" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="用户编号" prop="id">
@@ -27,7 +28,8 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动余额(元)" prop="changeBalance">
-						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
+						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1"
+							class="!w-240px" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -98,7 +100,7 @@ const openDialog = (userId: string, id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 	if (form.changeBalance <= 0) {
 		useMessage().error("变动余额不能为零")