Merge remote-tracking branch 'origin/dev' into member_dev

# Conflicts: # src/views/member/user/UserForm.vue
2025-09-23 05:33:28 +08:00 · 2023-08-23 10:22:03 +08:00
parent e9120f06cf 55772cbba0
commit 2e68a5239d
51 changed files with 2277 additions and 1438 deletions
--- a/src/views/member/group/GroupForm.vue
+++ b/src/views/member/group/GroupForm.vue
@@ -10,9 +10,6 @@
      <el-form-item label="名称" prop="name">
        <el-input v-model="formData.name" placeholder="请输入名称" />
      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-radio-group v-model="formData.status">
          <el-radio
@@ -24,6 +21,9 @@
          </el-radio>
        </el-radio-group>
      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+      </el-form-item>
    </el-form>
    <template #footer>
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
--- a/src/views/member/group/components/MemberGroupSelect.vue
+++ b/src/views/member/group/components/MemberGroupSelect.vue
@@ -8,7 +8,6 @@
    />
  </el-select>
 </template>
-
 <script lang="ts" setup>
 import * as GroupApi from '@/api/member/group'

--- a/src/views/member/level/LevelForm.vue
+++ b/src/views/member/level/LevelForm.vue
@@ -38,9 +38,9 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
-          <el-form-item label="享受折扣(%)" prop="discount">
+          <el-form-item label="享受折扣(%)" prop="discountPercent">
            <el-input-number
-              v-model="formData.discount"
+              v-model="formData.discountPercent"
              :min="0"
              :max="100"
              :precision="0"
@@ -100,7 +100,7 @@ const formData = ref({
  name: undefined,
  experience: undefined,
  level: undefined,
-  discount: undefined,
+  discountPercent: undefined,
  icon: undefined,
  backgroundUrl: undefined,
  status: CommonStatusEnum.ENABLE
@@ -109,7 +109,7 @@ const formRules = reactive({
  name: [{ required: true, message: '等级名称不能为空', trigger: 'blur' }],
  experience: [{ required: true, message: '升级经验不能为空', trigger: 'blur' }],
  level: [{ required: true, message: '等级不能为空', trigger: 'blur' }],
-  discount: [{ required: true, message: '享受折扣不能为空', trigger: 'blur' }],
+  discountPercent: [{ required: true, message: '享受折扣不能为空', trigger: 'blur' }],
  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
@@ -165,7 +165,7 @@ const resetForm = () => {
    name: undefined,
    experience: undefined,
    level: undefined,
-    discount: undefined,
+    discountPercent: undefined,
    icon: undefined,
    backgroundUrl: undefined,
    status: CommonStatusEnum.ENABLE
--- a/src/views/member/level/components/MemberLevelSelect.vue
+++ b/src/views/member/level/components/MemberLevelSelect.vue
@@ -8,7 +8,6 @@
    </el-option>
  </el-select>
 </template>
-
 <script lang="ts" setup>
 import * as LevelApi from '@/api/member/level'

--- a/src/views/member/level/index.vue
+++ b/src/views/member/level/index.vue
@@ -62,7 +62,7 @@
      <el-table-column label="等级名称" align="center" prop="name" min-width="100" />
      <el-table-column label="等级" align="center" prop="level" min-width="60" />
      <el-table-column label="升级经验" align="center" prop="experience" min-width="80" />
-      <el-table-column label="享受折扣(%)" align="center" prop="discount" min-width="110" />
+      <el-table-column label="享受折扣(%)" align="center" prop="discountPercent" min-width="110" />
      <el-table-column label="状态" align="center" prop="status" min-width="70">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
--- a/src/views/member/point/config/index.vue
+++ b/src/views/member/point/config/index.vue
@@ -58,7 +58,7 @@
  </ContentWrap>
 </template>
 <script lang="ts" setup>
-import * as ConfigApi from '@/api/point/config'
+import * as ConfigApi from '@/api/member/point/config'

 defineOptions({ name: 'MemberPointConfig' })

--- a/src/views/member/point/record/index.vue
+++ b/src/views/member/point/record/index.vue
@@ -25,7 +25,7 @@
          class="!w-240px"
        >
          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
@@ -41,16 +41,6 @@
          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.MEMBER_POINT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
      <el-form-item label="获得时间" prop="createDate">
        <el-date-picker
          v-model="queryParams.createDate"
@@ -78,48 +68,32 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="用户" align="center" prop="nickname" />
-      <el-table-column label="积分标题" align="center" prop="title" />
-      <el-table-column label="积分描述" align="center" prop="description" />
+      <el-table-column label="编号" align="center" prop="id" width="180" />
      <el-table-column
        label="获得时间"
        align="center"
        prop="createTime"
        :formatter="dateFormatter"
+        width="180"
      />
-      <el-table-column label="积分" align="center" prop="point">
+      <el-table-column label="用户" align="center" prop="nickname" width="200" />
+      <el-table-column label="获得积分" align="center" prop="point" width="100">
        <template #default="scope">
          <el-tag v-if="scope.row.point > 0" class="ml-2" type="success" effect="dark">
-            {{ scope.row.point }}
+            +{{ scope.row.point }}
          </el-tag>
          <el-tag v-else class="ml-2" type="danger" effect="dark"> {{ scope.row.point }} </el-tag>
        </template>
      </el-table-column>
-      <el-table-column label="变动后的积分" align="center" prop="totalPoint" />
+      <el-table-column label="总积分" align="center" prop="totalPoint" width="100" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="描述" align="center" prop="description" />
      <el-table-column label="业务编码" align="center" prop="bizId" />
      <el-table-column label="业务类型" align="center" prop="bizType">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.MEMBER_POINT_BIZ_TYPE" :value="scope.row.bizType" />
        </template>
      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MEMBER_POINT_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="冻结时间"
-        align="center"
-        prop="freezingTime"
-        :formatter="dateFormatter"
-      />
-      <el-table-column
-        label="解冻时间"
-        align="center"
-        prop="thawingTime"
-        :formatter="dateFormatter"
-      />
    </el-table>
    <!-- 分页 -->
    <Pagination
@@ -135,9 +109,9 @@
 </template>

 <script lang="ts" setup>
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as RecordApi from '@/api/point/record'
+import * as RecordApi from '@/api//member/point/record'

 defineOptions({ name: 'PointRecord' })

@@ -149,9 +123,7 @@ const queryParams = reactive({
  pageSize: 10,
  nickname: null,
  bizType: null,
-  type: null,
  title: null,
-  status: null,
  createDate: []
 })
 const queryFormRef = ref() // 搜索的表单
--- a/src/views/member/signin/config/SignInConfigForm.vue
+++ b/src/views/member/signin/config/SignInConfigForm.vue
@@ -10,12 +10,23 @@
      <el-form-item label="签到天数" prop="day">
        <el-input-number v-model="formData.day" :min="1" :max="7" :precision="0" />
        <el-text class="mx-1" style="margin-left: 10px" type="danger">
-          只允许设置1-7，默认签到7天为一个周期</el-text
-        >
+          只允许设置 1-7，默认签到 7 天为一个周期
+        </el-text>
      </el-form-item>
      <el-form-item label="签到分数" prop="point">
        <el-input-number v-model="formData.point" :precision="0" />
      </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"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
    </el-form>
    <template #footer>
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -24,7 +35,9 @@
  </Dialog>
 </template>
 <script lang="ts" setup>
-import * as SignInConfigApi from '@/api/point/signInConfig'
+import * as SignInConfigApi from '@/api/member/signin/config'
+import { CommonStatusEnum } from '@/utils/constants'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'

 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -92,7 +105,8 @@ const resetForm = () => {
  formData.value = {
    id: undefined,
    day: undefined,
-    point: undefined
+    point: undefined,
+    status: CommonStatusEnum.ENABLE
  }
  formRef.value?.resetFields()
 }
--- a/src/views/member/signin/config/index.vue
+++ b/src/views/member/signin/config/index.vue
@@ -21,17 +21,9 @@
        :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
      />
      <el-table-column label="获得积分" align="center" prop="point" />
-      <el-table-column label="是否开启" align="center">
+      <el-table-column label="状态" align="center" prop="status">
        <template #default="scope">
-          <div>
-            <el-switch
-              v-model="scope.row.enable"
-              @change="handleSwitchChange(scope.row, $event)"
-              inline-prompt
-              active-text="开启"
-              inactive-text="关闭"
-            />
-          </div>
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center">
@@ -60,11 +52,10 @@
  <!-- 表单弹窗：添加/修改 -->
  <SignInConfigForm ref="formRef" @success="getList" />
 </template>
-
 <script lang="ts" setup>
-import * as SignInConfigApi from '@/api/point/signInConfig'
+import * as SignInConfigApi from '@/api/member/signin/config'
 import SignInConfigForm from './SignInConfigForm.vue'
-import { SignInConfigVO } from '@/api/point/signInConfig'
+import { DICT_TYPE } from '@/utils/dict'

 defineOptions({ name: 'SignInConfig' })

@@ -78,7 +69,7 @@ const list = ref([]) // 列表的数据
 const getList = async () => {
  loading.value = true
  try {
-    const data = await SignInConfigApi.getSignInConfigPage()
+    const data = await SignInConfigApi.getSignInConfigList()
    console.log(data)
    list.value = data
  } finally {
@@ -105,14 +96,6 @@ const handleDelete = async (id: number) => {
  } catch {}
 }

-const handleSwitchChange = async (row, e) => {
-  console.log('开关状态变更，id:', row, '新状态：', e)
-  // 创建对象
-  const signInConfig: SignInConfigVO = { enable: e }
-  ;({ id: signInConfig.id, day: signInConfig.day, point: signInConfig.point, enable: e } = row)
-  await SignInConfigApi.updateSignInConfig(signInConfig)
-}
-
 /** 初始化 **/
 onMounted(() => {
  getList()
--- a/src/views/member/signin/record/index.vue
+++ b/src/views/member/signin/record/index.vue
@@ -40,15 +40,6 @@
      <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="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['point:sign-in-record:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
      </el-form-item>
    </el-form>
  </ContentWrap>
@@ -57,7 +48,6 @@
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
      <el-table-column label="编号" align="center" prop="id" />
-      <!-- TODO @xiaqing：展示用户昵称  -->
      <el-table-column label="签到用户" align="center" prop="nickname" />
      <el-table-column
        label="签到天数"
@@ -65,7 +55,14 @@
        prop="day"
        :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
      />
-      <el-table-column label="获得积分" align="center" prop="point" />
+      <el-table-column label="获得积分" align="center" prop="point" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.point > 0" class="ml-2" type="success" effect="dark">
+            +{{ scope.row.point }}
+          </el-tag>
+          <el-tag v-else class="ml-2" type="danger" effect="dark"> {{ scope.row.point }} </el-tag>
+        </template>
+      </el-table-column>
      <el-table-column
        label="签到时间"
        align="center"
@@ -81,15 +78,11 @@
      @pagination="getList"
    />
  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <SignInRecordForm ref="formRef" @success="getList" />
 </template>

 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import * as SignInRecordApi from '@/api/point/signInRecord'
+import * as SignInRecordApi from '@/api/member/signin/record'

 defineOptions({ name: 'SignInRecord' })

@@ -132,21 +125,6 @@ const resetQuery = () => {
  handleQuery()
 }

-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SignInRecordApi.exportSignInRecord(queryParams)
-    download.excel(data, '用户签到积分.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
 /** 初始化 **/
 onMounted(() => {
  getList()
--- a/src/views/member/user/components/account-info.vue
+++ b/src/views/member/user/components/account-info.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-descriptions :column="2">
+    <!-- TODO @梦：要不 icon 也给加下？ -->
+    <!-- TODO @梦：积分、成长值、等级，已经可以读取了，可以看下 -->
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 等级 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 成长值 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 当前积分 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 总积分 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 当前余额 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 支出金额 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+    <el-descriptions-item>
+      <template #label>
+        <div class="cell-item"> 充值金额 </div>
+      </template>
+      {{ 0 }}
+    </el-descriptions-item>
+  </el-descriptions>
+</template>
+<script lang="ts" setup>
+defineComponent({
+  name: 'AccountInfo'
+})
+</script>
+<style scoped lang="scss">
+.cell-item {
+  display: inline;
+}
+.cell-item::after {
+  content: ':';
+}
+</style>
--- a/src/views/member/user/components/address-list.vue
+++ b/src/views/member/user/components/address-list.vue
@@ -0,0 +1,14 @@
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'AddressList'
+})
+</script>
+
+<!-- TODO @梦：可以读 address 表 -->
+<template>
+  <div>收货地址列表</div>
+</template>
+
+<style scoped lang="scss"></style>
--- a/src/views/member/user/components/balance-list.vue
+++ b/src/views/member/user/components/balance-list.vue
@@ -0,0 +1,14 @@
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'BalanceList'
+})
+</script>
+
+<!-- TODO @芋艿：未来实现，等周建的 -->
+<template>
+  <div>余额列表</div>
+</template>
+
+<style scoped lang="scss"></style>
--- a/src/views/member/user/components/card-title.vue
+++ b/src/views/member/user/components/card-title.vue
@@ -0,0 +1,36 @@
+<script lang="ts" setup>
+defineComponent({
+  name: 'CardTitle'
+})
+
+const { title } = defineProps({
+  title: {
+    type: String,
+    required: true
+  }
+})
+</script>
+
+<template>
+  <span class="card-title">{{ title }}</span>
+</template>
+
+<style scoped lang="scss">
+.card-title {
+  font-size: 14px;
+  font-weight: 600;
+  &::before {
+    content: '';
+    display: inline-block;
+    width: 3px;
+    height: 14px;
+    //background-color: #105cfb;
+    background: var(--el-color-primary);
+    position: relative;
+    left: -5px;
+    top: 8px;
+    border-radius: 5px;
+    transform: translateY(-50%);
+  }
+}
+</style>
--- a/src/views/member/user/components/growth-list.vue
+++ b/src/views/member/user/components/growth-list.vue
@@ -0,0 +1,14 @@
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'GrowthList'
+})
+</script>
+
+<!-- TODO @梦：可以读取 member_experience_log 表 -->
+<template>
+  <div>成长值列表</div>
+</template>
+
+<style scoped lang="scss"></style>
--- a/src/views/member/user/components/point-list.vue
+++ b/src/views/member/user/components/point-list.vue
@@ -0,0 +1,156 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="业务类型" prop="bizType">
+        <el-select
+          v-model="queryParams.bizType"
+          placeholder="请选择业务类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_POINT_BIZ_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="积分标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入积分标题"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="获得时间" prop="createDate">
+        <el-date-picker
+          v-model="queryParams.createDate"
+          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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" width="180" />
+      <el-table-column
+        label="获得时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column label="用户" align="center" prop="nickname" width="200" />
+      <el-table-column label="获得积分" align="center" prop="point" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.point > 0" class="ml-2" type="success" effect="dark">
+            +{{ scope.row.point }}
+          </el-tag>
+          <el-tag v-else class="ml-2" type="danger" effect="dark"> {{ scope.row.point }} </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="总积分" align="center" prop="totalPoint" width="100" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="业务编码" align="center" prop="bizId" />
+      <el-table-column label="业务类型" align="center" prop="bizType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MEMBER_POINT_BIZ_TYPE" :value="scope.row.bizType" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as RecordApi from '@/api//member/point/record'
+
+defineOptions({ name: 'PointList' })
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  bizType: undefined,
+  title: null,
+  createDate: [],
+  userId: null
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RecordApi.getRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+// TODO @梦:改成 userId 哈
+const { memberId } = defineProps({
+  memberId: {
+    type: Number,
+    required: true
+  }
+})
+
+/** 初始化 **/
+onMounted(() => {
+  queryParams.userId = memberId
+  getList()
+})
+</script>
--- a/src/views/member/user/components/sign-list.vue
+++ b/src/views/member/user/components/sign-list.vue
@@ -0,0 +1,138 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="签到用户" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          placeholder="请输入签到用户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="签到天数" prop="day">
+        <el-input
+          v-model="queryParams.day"
+          placeholder="请输入签到天数"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </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-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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="签到用户" align="center" prop="nickname" />
+      <el-table-column
+        label="签到天数"
+        align="center"
+        prop="day"
+        :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')"
+      />
+      <el-table-column label="获得积分" align="center" prop="point" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.point > 0" class="ml-2" type="success" effect="dark">
+            +{{ scope.row.point }}
+          </el-tag>
+          <el-tag v-else class="ml-2" type="danger" effect="dark"> {{ scope.row.point }} </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="签到时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as SignInRecordApi from '@/api/member/signin/record'
+
+defineOptions({ name: 'SignList' })
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  nickname: null,
+  day: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SignInRecordApi.getSignInRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+// TODO @梦:改成 userId 哈
+const { memberId } = defineProps({
+  memberId: {
+    type: Number,
+    required: true
+  }
+})
+
+/** 初始化 **/
+onMounted(() => {
+  queryParams.userId = memberId
+  getList()
+})
+</script>
--- a/src/views/member/user/detail/index.vue
+++ b/src/views/member/user/detail/index.vue
@@ -0,0 +1,237 @@
+<template>
+  <div v-loading="loading">
+    <el-row :gutter="10" class="detail-info-warp">
+      <!-- 左上角：基本信息 -->
+      <el-col :span="14" class="detail-info-item">
+        <el-card shadow="never">
+          <template #header>
+            <div class="card-header">
+              <!-- TODO @梦：如果不要小蓝线，是不是直接用 el-card 自带的 title 即可？ -->
+              <CardTitle title="基本信息" />
+              <el-button
+                v-if="user.id"
+                type="primary"
+                size="small"
+                text
+                @click="openForm('update', user.id)"
+              >
+                编辑
+              </el-button>
+            </div>
+          </template>
+          <el-row>
+            <el-col :span="4">
+              <ElAvatar shape="square" :size="140" :src="user.avatar || undefined" />
+            </el-col>
+            <el-col :span="20">
+              <el-descriptions :column="2">
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:user" />
+                      用户名
+                    </div>
+                  </template>
+                  {{ user.name || '空' }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:user" />
+                      昵称
+                    </div>
+                  </template>
+                  {{ user.nickname }}
+                </el-descriptions-item>
+                <el-descriptions-item label="手机号">
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:phone" />
+                      手机号
+                    </div>
+                  </template>
+                  {{ user.mobile }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="fa:mars-double" />
+                      性别
+                    </div>
+                  </template>
+                  <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="user.sex" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:location" />
+                      所在地
+                    </div>
+                  </template>
+                  <!-- TODO @梦：这里后端返回的时候，要返回 areaName -->
+                  {{ user.areaId }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:position" />
+                      注册 IP
+                    </div>
+                  </template>
+                  {{ user.registerIp }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="fa:birthday-cake" />
+                      生日
+                    </div>
+                  </template>
+                  {{ user.birthday ? formatDate(user.birthday) : '空' }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:calendar" />
+                      注册时间
+                    </div>
+                  </template>
+                  {{ user.createTime ? formatDate(user.createTime) : '空' }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template #label>
+                    <div class="cell-item">
+                      <Icon icon="ep:calendar" />
+                      最后登录时间
+                    </div>
+                  </template>
+                  {{ user.loginDate ? formatDate(user.loginDate) : '空' }}
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+
+      <!-- 右上角：账户信息 -->
+      <el-col :span="10" class="detail-info-item">
+        <el-card shadow="never">
+          <template #header>
+            <CardTitle title="账户信息" />
+          </template>
+          <AccountInfo />
+        </el-card>
+      </el-col>
+
+      <!-- 下边：账户明细 -->
+      <!-- TODO 芋艿：【收货地址】【订单管理】【售后管理】【收藏记录】【优惠劵】 -->
+      <el-card header="账户明细" style="width: 100%; margin-top: 20px" shadow="never">
+        <template #header>
+          <CardTitle title="账户明细" />
+        </template>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="积分" name="point">
+            <PointList v-if="user.id" :member-id="user.id" />
+          </el-tab-pane>
+          <el-tab-pane label="签到" name="sign">
+            <SignList v-if="user.id" :member-id="user.id" />
+          </el-tab-pane>
+          <el-tab-pane label="成长值" name="third">成长值(WIP)</el-tab-pane>
+          <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
+        </el-tabs>
+      </el-card>
+    </el-row>
+  </div>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UserForm ref="formRef" @success="getUserData(user.id)" />
+</template>
+<script setup lang="ts">
+// TODO @梦：组件对应的 vue，都大写
+import PointList from '@/views/member/user/components/point-list.vue'
+import SignList from '@/views/member/user/components/sign-list.vue'
+import CardTitle from '@/views/member/user/components/card-title.vue'
+// TODO @梦：参考别的模块，UserApi 这样去引用
+import { getUser, UserBaseInfoVO } from '@/api/member/user'
+import { formatDate } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import UserForm from '@/views/member/user/UserForm.vue'
+// TODO @梦：把用户信息，也抽成一个组件，类似 AccountInfo
+import AccountInfo from '@/views/member/user/components/account-info.vue'
+
+defineOptions({ name: 'MemberDetail' })
+
+const activeName = ref('point') // 账户明细 选中的 tabs
+const loading = ref(true) // 加载中
+let user = ref<UserBaseInfoVO>({
+  areaId: undefined,
+  avatar: undefined,
+  birthday: undefined,
+  createTime: undefined,
+  id: undefined,
+  loginDate: undefined,
+  loginIp: '',
+  mark: '',
+  mobile: '',
+  name: '',
+  nickname: '',
+  password: null,
+  registerIp: undefined,
+  sex: 0,
+  status: 0
+})
+
+/** 获得用户 */
+const getUserData = async (id: number) => {
+  loading.value = true
+  try {
+    user.value = await getUser(id)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 初始化 */
+const route = useRoute()
+const router = useRouter()
+// TODO @梦：改成 id 路径参数，而不是 query
+// TODO @梦：会员列表，把【详情】按钮加上哈
+const member_id = route.query.member_id as number
+onMounted(() => {
+  if (!member_id) {
+    // TODO
+    ElMessage.warning('参数错误，会员编号不能为空！')
+    router.back()
+    return
+  }
+  getUserData(member_id)
+})
+</script>
+<style scoped lang="css">
+/** TODO 这 3 个 css 貌似没用？ */
+.detail-info-item:first-child {
+  padding-left: 0 !important;
+}
+/* first-child 不生效有没有大佬给看下q.q */
+.detail-info-item:nth-child(2) {
+  padding-right: 0 !important;
+}
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.cell-item {
+  display: inline;
+}
+/** TODO 下面 css 貌似没啥用？ */
+.cell-item::after {
+  content: ':';
+}
+</style>
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -84,10 +84,12 @@
        :show-overflow-tooltip="false"
      >
        <template #default="scope">
-          <el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index">{{ tagName }}</el-tag>
+          <el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index" class="mr-5px">
+            {{ tagName }}
+          </el-tag>
        </template>
      </el-table-column>
-      <el-table-column label="积分" align="center" width="100px" />
+      <el-table-column label="积分" align="center" prop="point" width="100px" />
      <el-table-column label="状态" align="center" prop="status" width="100px">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />