From 45c15dd277824d940551a2c1208522e2cdca5bc9 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Nov 2025 13:23:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |   1 +
 src/views/member/recent/index.vue             |  29 ++-
 src/views/member/user/UserForm.vue            |  42 +----
 .../user/components/UserBalanceUpdateForm.vue |  40 ++--
 .../user/components/UserMemberTagForm.vue     |  81 ++++++++
 src/views/member/user/index.vue               | 178 ++++++------------
 .../WalletRechargePackageForm.vue             |  16 +-
 .../pay/wallet/rechargePackage/index.vue      |  92 +++------
 8 files changed, 207 insertions(+), 272 deletions(-)
 create mode 100644 src/views/member/user/components/UserMemberTagForm.vue

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 99ffd3ca..44083657 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -173,6 +173,7 @@ export enum DICT_TYPE {
   MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
   MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
   MEMBER_OPEN_TYPE_STATUS = 'open_type_status', // 会员开通类型状态
+  MEMBER_RECENT_TAG = 'member_recent_tag', // 会员标签状态
 
   // ========== MALL - 商品模块 ==========
   PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
diff --git a/src/views/member/recent/index.vue b/src/views/member/recent/index.vue
index 480d3954..e4bbb3a5 100644
--- a/src/views/member/recent/index.vue
+++ b/src/views/member/recent/index.vue
@@ -2,12 +2,8 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      <el-form-item label="发布-省" prop="issueProvince">
-        <el-input v-model="queryParams.issueProvince" placeholder="请输入发布-省" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="发布-市" prop="issueCity">
-        <el-input v-model="queryParams.issueCity" placeholder="请输入发布-市" clearable @keyup.enter="handleQuery"
+      <el-form-item label="用户" prop="memberNickname">
+        <el-input v-model="queryParams.memberNickname" placeholder="请输入用户" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -36,7 +32,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="用户" align="center" width="250" prop="memberId">
+      <el-table-column label="用户" align="center" width="250">
         <template #default="{ row }">
           <div class="flex items-center gap-2">
             <PreviewImage :src="row.member.memberAvatar" />
@@ -75,6 +71,16 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="用户标签" align="center" width="200">
+        <template #default="{ row }">
+          <div class="flex gap-2">
+            <dict-tag v-for="v in row.memberTagList" :key="v.tagBizType" :type="DICT_TYPE.MEMBER_RECENT_TAG"
+              :value="v.tagBizType">
+              {{ v }}
+            </dict-tag>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="发布地址" align="center" width="300">
         <template #default="{ row }">
           <div class="flex flex-col items-start">
@@ -162,14 +168,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  coverPic: undefined,
-  describe: undefined,
-  issueLong: undefined,
-  issueLat: undefined,
-  issueProvince: undefined,
-  issueCity: undefined,
-  issueDistrict: undefined,
-  issueAddress: undefined,
+  memberNickname: '',
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
diff --git a/src/views/member/user/UserForm.vue b/src/views/member/user/UserForm.vue
index fc4851ee..ccc37a99 100644
--- a/src/views/member/user/UserForm.vue
+++ b/src/views/member/user/UserForm.vue
@@ -1,22 +1,12 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
       <el-form-item label="手机号" prop="mobile">
         <el-input v-model="formData.mobile" placeholder="请输入手机号" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :value="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :value="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
@@ -27,40 +17,26 @@
       <el-form-item label="头像" prop="avatar">
         <UploadImg v-model="formData.avatar" :limit="1" :is-show-tip="false" />
       </el-form-item>
-      <el-form-item label="真实名字" prop="name">
+      <el-form-item v-if="false" label="真实名字" prop="name">
         <el-input v-model="formData.name" placeholder="请输入真实名字" />
       </el-form-item>
       <el-form-item label="用户性别" prop="sex">
         <el-radio-group v-model="formData.sex">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
-            :key="dict.value"
-            :value="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value" :value="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="出生日期" prop="birthday">
-        <el-date-picker
-          v-model="formData.birthday"
-          type="date"
-          value-format="x"
-          placeholder="选择出生日期"
-        />
+        <el-date-picker v-model="formData.birthday" type="date" value-format="x" placeholder="选择出生日期" />
       </el-form-item>
-      <el-form-item label="所在地" prop="areaId">
-        <el-tree-select
-          v-model="formData.areaId"
-          :data="areaList"
-          :props="defaultProps"
-          :render-after-expand="true"
-        />
+      <el-form-item v-if="false" label="所在地" prop="areaId">
+        <el-tree-select v-model="formData.areaId" :data="areaList" :props="defaultProps" :render-after-expand="true" />
       </el-form-item>
-      <el-form-item label="用户标签" prop="tagIds">
+      <el-form-item v-if="false" label="用户标签" prop="tagIds">
         <MemberTagSelect v-model="formData.tagIds" show-add />
       </el-form-item>
-      <el-form-item label="用户分组" prop="groupId">
+      <el-form-item v-if="false" label="用户分组" prop="groupId">
         <MemberGroupSelect v-model="formData.groupId" />
       </el-form-item>
       <el-form-item label="会员备注" prop="mark">
diff --git a/src/views/member/user/components/UserBalanceUpdateForm.vue b/src/views/member/user/components/UserBalanceUpdateForm.vue
index aa019e9f..0e919ee3 100644
--- a/src/views/member/user/components/UserBalanceUpdateForm.vue
+++ b/src/views/member/user/components/UserBalanceUpdateForm.vue
@@ -1,19 +1,13 @@
 <template>
-  <Dialog v-model="dialogVisible" title="修改用户余额" width="600">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="130px"
-    >
+  <Dialog v-model="dialogVisible" title="修改用户宝石" width="600">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="130px">
       <el-form-item label="用户编号" prop="id">
         <el-input v-model="formData.id" class="!w-240px" disabled />
       </el-form-item>
       <el-form-item label="用户昵称" prop="nickname">
         <el-input v-model="formData.nickname" class="!w-240px" disabled />
       </el-form-item>
-      <el-form-item label="变动前余额(元)" prop="balance">
+      <el-form-item label="变动前宝石" prop="balance">
         <el-input :model-value="formData.balance" class="!w-240px" disabled />
       </el-form-item>
       <el-form-item label="变动类型" prop="changeType">
@@ -22,16 +16,10 @@
           <el-radio :label="-1">减少</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="变动余额(元)" prop="changeBalance">
-        <el-input-number
-          v-model="formData.changeBalance"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="!w-240px"
-        />
+      <el-form-item label="变动宝石" prop="changeBalance">
+        <el-input-number v-model="formData.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="变动后余额(元)">
+      <el-form-item label="变动后宝石">
         <el-input :model-value="balanceResult" class="!w-240px" disabled />
       </el-form-item>
     </el-form>
@@ -46,7 +34,7 @@ import * as UserApi from '@/api/member/user'
 import * as WalletApi from '@/api/pay/wallet/balance'
 import { convertToInteger, formatToFraction } from '@/utils'
 
-/** 修改用户余额表单 */
+/** 修改用户宝石表单 */
 defineOptions({ name: 'UpdateBalanceForm' })
 
 const { t } = useI18n() // 国际化
@@ -62,7 +50,7 @@ const formData = ref({
   changeType: 1
 })
 const formRules = reactive({
-  changeBalance: [{ required: true, message: '变动余额不能为空', trigger: 'blur' }]
+  changeBalance: [{ required: true, message: '变动宝石不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -79,8 +67,8 @@ const open = async (id?: number) => {
       formData.value.id = user.id
       formData.value.nickname = user.nickname
       formData.value.balance = formatToFraction(wallet.balance)
-      formData.value.changeType = 1 // 默认增加余额
-      formData.value.changeBalance = 0 // 变动余额默认0
+      formData.value.changeType = 1 // 默认增加宝石
+      formData.value.changeBalance = 0 // 变动宝石默认0
     } finally {
       formLoading.value = false
     }
@@ -97,11 +85,11 @@ const submitForm = async () => {
   if (!valid) return
 
   if (formData.value.changeBalance <= 0) {
-    message.error('变动余额不能为零')
+    message.error('变动宝石不能为零')
     return
   }
   if (convertToInteger(balanceResult.value) < 0) {
-    message.error('变动后的余额不能小于 0')
+    message.error('变动后的宝石不能小于 0')
     return
   }
 
@@ -134,11 +122,11 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-/** 变动后的余额 */
+/** 变动后的宝石 */
 const balanceResult = computed(() =>
   formatToFraction(
     convertToInteger(formData.value.balance) +
-      convertToInteger(formData.value.changeBalance) * formData.value.changeType
+    convertToInteger(formData.value.changeBalance) * formData.value.changeType
   )
 )
 </script>
diff --git a/src/views/member/user/components/UserMemberTagForm.vue b/src/views/member/user/components/UserMemberTagForm.vue
new file mode 100644
index 00000000..c4d723ee
--- /dev/null
+++ b/src/views/member/user/components/UserMemberTagForm.vue
@@ -0,0 +1,81 @@
+<template>
+  <Dialog title="修改用户标签" v-model="dialogVisible" width="40%">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+      <el-form-item label="用户标签" prop="memberRecentTagList">
+        <el-select v-model="formData.memberRecentTagList" multiple placeholder="请选择用户标签" clearable class="!w-240px">
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.MEMBER_RECENT_TAG)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+import * as UserApi from '@/api/member/user'
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const formLoading = ref(false)
+const formData = ref<any>({
+  id: undefined,
+  memberRecentTagList: [],
+})
+const formRules = reactive({
+  memberRecentTagList: [{ required: true, message: '用户标签不能为空', trigger: 'blur' }]
+})
+const formRef = ref()
+
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UserApi.getUser(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await UserApi.updateUser(formData.value)
+
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    memberRecentTagList: [],
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index 9fd2885d..1481195a 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -3,60 +3,32 @@
 
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      ref="queryFormRef"
-      :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
-      label-width="68px"
-    >
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" class="-mb-15px" label-width="68px">
       <el-form-item label="用户昵称" prop="nickname">
-        <el-input
-          v-model="queryParams.nickname"
-          class="!w-240px"
-          clearable
-          placeholder="请输入用户昵称"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.nickname" class="!w-240px" clearable placeholder="请输入用户昵称"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          class="!w-240px"
-          clearable
-          placeholder="请输入手机号"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.mobile" class="!w-240px" clearable placeholder="请输入手机号"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="注册时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
+        <el-date-picker v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" end-placeholder="结束日期"
+          start-placeholder="开始日期" type="daterange" value-format="YYYY-MM-DD HH:mm:ss" />
       </el-form-item>
       <el-form-item label="登录时间" prop="loginDate">
-        <el-date-picker
-          v-model="queryParams.loginDate"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
+        <el-date-picker v-model="queryParams.loginDate" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px" end-placeholder="结束日期" start-placeholder="开始日期" type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss" />
       </el-form-item>
-      <el-form-item label="用户标签" prop="tagIds">
+      <el-form-item v-if="false" label="用户标签" prop="tagIds">
         <MemberTagSelect v-model="queryParams.tagIds" />
       </el-form-item>
-      <el-form-item label="用户等级" prop="levelId">
+      <el-form-item v-if="false" label="用户等级" prop="levelId">
         <MemberLevelSelect v-model="queryParams.levelId" />
       </el-form-item>
-      <el-form-item label="用户分组" prop="groupId">
+      <el-form-item v-if="false" label="用户分组" prop="groupId">
         <MemberGroupSelect v-model="queryParams.groupId" />
       </el-form-item>
       <el-form-item>
@@ -75,104 +47,69 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :show-overflow-tooltip="true"
-      :stripe="true"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="用户编号" prop="id" width="120px" />
       <el-table-column align="center" label="头像" prop="avatar" width="80px">
-        <template #default="scope">
-          <img :src="scope.row.avatar" style="width: 40px" />
+        <template #default="{ row }">
+          <div class="w-[50px] h-[50px]">
+            <PreviewImage :src="row.avatar" />
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" label="手机号" prop="mobile" width="120px" />
-      <el-table-column align="center" label="昵称" prop="nickname" width="80px" />
+      <el-table-column align="center" label="昵称" prop="nickname" width="120px" />
       <el-table-column align="center" label="等级" prop="levelName" width="100px" />
       <el-table-column align="center" label="分组" prop="groupName" width="100px" />
-      <el-table-column
-        :show-overflow-tooltip="false"
-        align="center"
-        label="用户标签"
-        prop="tagNames"
-      >
-        <template #default="scope">
-          <el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index" class="mr-5px">
-            {{ tagName }}
-          </el-tag>
+      <el-table-column :show-overflow-tooltip="false" align="center" label="用户标签">
+        <template #default="{ row }">
+          <div class="flex gap-2">
+            <dict-tag v-for="v in row.memberTagList" :key="v.tagBizType" :type="DICT_TYPE.MEMBER_RECENT_TAG"
+              :value="v.tagBizType">
+              {{ v }}
+            </dict-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" label="积分" prop="point" width="100px" />
       <el-table-column align="center" label="状态" prop="status" width="100px">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="登录时间"
-        prop="loginDate"
-        width="180px"
-      />
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="注册时间"
-        prop="createTime"
-        width="180px"
-      />
-      <el-table-column
-        :show-overflow-tooltip="false"
-        align="center"
-        fixed="right"
-        label="操作"
-        width="100px"
-      >
-        <template #default="scope">
+      <el-table-column :formatter="dateFormatter" align="center" label="登录时间" prop="loginDate" width="180px" />
+      <el-table-column :formatter="dateFormatter" align="center" label="注册时间" prop="createTime" width="180px" />
+      <el-table-column :show-overflow-tooltip="false" align="center" fixed="right" label="操作" width="100px">
+        <template #default="{ row }">
           <div class="flex items-center justify-center">
-            <el-button link type="primary" @click="openDetail(scope.row.id)">详情</el-button>
-            <el-dropdown
-              v-hasPermi="[
-                'member:user:update',
-                'member:user:update-level',
-                'member:user:update-point',
-                'pay:wallet:update-balance'
-              ]"
-              @command="(command) => handleCommand(command, scope.row)"
-            >
+            <el-button link type="primary" @click="openDetail(row.id)">详情</el-button>
+            <el-dropdown v-hasPermi="[
+              'member:user:update',
+              'member:user:update-level',
+              'member:user:update-point',
+              'pay:wallet:update-balance'
+            ]" @command="(command) => handleCommand(command, row)">
               <el-button link type="primary">
                 <Icon icon="ep:d-arrow-right" />
                 更多
               </el-button>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item
-                    v-if="checkPermi(['member:user:update'])"
-                    command="handleUpdate"
-                  >
+                  <el-dropdown-item v-if="checkPermi(['member:user:update'])" command="handleUpdate">
                     编辑
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    v-if="checkPermi(['member:user:update-level'])"
-                    command="handleUpdateLevel"
-                  >
+                  <el-dropdown-item v-if="checkPermi(['member:user:update-level'])" command="handleUpdateLevel">
                     修改等级
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    v-if="checkPermi(['member:user:update-point'])"
-                    command="handleUpdatePoint"
-                  >
+                  <el-dropdown-item v-if="checkPermi(['member:user:update-point'])" command="handleUpdatePoint">
                     修改积分
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    v-if="checkPermi(['pay:wallet:update-balance'])"
-                    command="handleUpdateBlance"
-                  >
-                    修改余额
+                  <el-dropdown-item v-if="checkPermi(['pay:wallet:update-balance'])" command="handleUpdateBlance">
+                    修改宝石
+                  </el-dropdown-item>
+                  <el-dropdown-item v-if="checkPermi(['pay:wallet:update-member-tag'])" command="handleUpdateMemberTag">
+                    修改用户标签
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
@@ -182,12 +119,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -200,6 +133,8 @@
   <UserBalanceUpdateForm ref="UpdateBalanceFormRef" @success="getList" />
   <!-- 发送优惠券弹窗 -->
   <CouponSendForm ref="couponSendFormRef" />
+  <!-- 修改用户标签弹窗 -->
+  <UserMemberTagForm ref="updateMemberTagFormRef" @success="getList" />
 </template>
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
@@ -212,6 +147,7 @@ import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect
 import UserLevelUpdateForm from './components/UserLevelUpdateForm.vue'
 import UserPointUpdateForm from './components/UserPointUpdateForm.vue'
 import UserBalanceUpdateForm from './components/UserBalanceUpdateForm.vue'
+import UserMemberTagForm from "./components/UserMemberTagForm.vue"
 import { CouponSendForm } from '@/views/mall/promotion/coupon/components'
 import { checkPermi } from '@/utils/permission'
 
@@ -237,6 +173,7 @@ const queryFormRef = ref() // 搜索的表单
 const updateLevelFormRef = ref() // 修改会员等级表单
 const updatePointFormRef = ref() // 修改会员积分表单
 const UpdateBalanceFormRef = ref() // 修改用户余额表单
+const updateMemberTagFormRef = ref() // 修改用户标签表单
 const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
 
 /** 查询列表 */
@@ -305,6 +242,9 @@ const handleCommand = (command: string, row: UserApi.UserVO) => {
     case 'handleUpdateBlance':
       UpdateBalanceFormRef.value.open(row.id)
       break
+    case 'handleUpdateMemberTag':
+      updateMemberTagFormRef.value.open(row.id)
+      break
     default:
       break
   }
diff --git a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
index 70ccde13..409b45a5 100644
--- a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
+++ b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
@@ -1,28 +1,18 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-      v-loading="formLoading"
-    >
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="150px" v-loading="formLoading">
       <el-form-item label="套餐名" prop="name">
         <el-input v-model="formData.name" placeholder="请输入套餐名" />
       </el-form-item>
       <el-form-item label="支付金额(元)" prop="payPrice">
         <el-input-number v-model="formData.payPrice" :min="0" :precision="2" :step="0.01" />
       </el-form-item>
-      <el-form-item label="赠送金额(元)" prop="bonusPrice">
+      <el-form-item label="获得宝石(个)" prop="bonusPrice">
         <el-input-number v-model="formData.bonusPrice" :min="0" :precision="2" :step="0.01" />
       </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :value="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :value="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
diff --git a/src/views/pay/wallet/rechargePackage/index.vue b/src/views/pay/wallet/rechargePackage/index.vue
index ebbb0ee8..2918f0f6 100644
--- a/src/views/pay/wallet/rechargePackage/index.vue
+++ b/src/views/pay/wallet/rechargePackage/index.vue
@@ -1,52 +1,30 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="套餐名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入套餐名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+        <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['pay:wallet-recharge-package:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['pay:wallet-recharge-package:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
       </el-form-item>
@@ -59,51 +37,33 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="套餐名" align="center" prop="name" />
       <el-table-column label="支付金额" align="center" prop="payPrice">
-        <template #default="{ row }"> {{ fenToYuan(row.payPrice) }} 元</template>
+        <template #default="{ row }"> {{ fenToYuan(row.payPrice) }}元</template>
       </el-table-column>
-      <el-table-column label="赠送金额" align="center" prop="bonusPrice">
-        <template #default="{ row }"> {{ fenToYuan(row.bonusPrice) }} 元</template>
+      <el-table-column label="获得宝石" align="center" prop="bonusPrice">
+        <template #default="{ row }"> {{ fenToYuan(row.bonusPrice) }}个</template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['pay:wallet-recharge-package:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['pay:wallet-recharge-package:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['pay:wallet-recharge-package:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"
+            v-hasPermi="['pay:wallet-recharge-package:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -176,7 +136,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 /** 初始化 **/
 onMounted(() => {