From 61fa401dcca2668a9b2d224c47a95cc58a2d3a04 Mon Sep 17 00:00:00 2001
From: cuiyouliang <cuiyouliang@lzzg365.com>
Date: Thu, 19 Jun 2025 18:08:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=BB=91=E5=90=8D=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E3=80=81=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ums/memberAddress.js       | 12 ++++-----
 src/views/ums/member/index.vue     | 42 +++++++++++++++---------------
 src/views/ums/memberCart/index.vue | 12 ++++++---
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/api/ums/memberAddress.js b/src/api/ums/memberAddress.js
index 8cf34ff..9f0739c 100644
--- a/src/api/ums/memberAddress.js
+++ b/src/api/ums/memberAddress.js
@@ -3,7 +3,7 @@ import request from '@/utils/request';
 // 查询会员收货地址列表
 export function listUmsMemberAddress(query, pageReq) {
   return request({
-    url: '/ums/memberAddress/list',
+    url: '/ums/member/address/list',
     method: 'post',
     data: query,
     params: pageReq
@@ -13,7 +13,7 @@ export function listUmsMemberAddress(query, pageReq) {
 // 查询会员收货地址详细
 export function getUmsMemberAddress(id) {
   return request({
-    url: '/ums/memberAddress/' + id,
+    url: '/ums/member/address/' + id,
     method: 'get'
   });
 }
@@ -21,7 +21,7 @@ export function getUmsMemberAddress(id) {
 // 新增会员收货地址
 export function addUmsMemberAddress(data) {
   return request({
-    url: '/ums/memberAddress/add',
+    url: '/ums/member/address/add',
     method: 'post',
     data: data
   });
@@ -30,7 +30,7 @@ export function addUmsMemberAddress(data) {
 // 修改会员收货地址
 export function updateUmsMemberAddress(data) {
   return request({
-    url: '/ums/memberAddress/update',
+    url: '/ums/member/address/update',
     method: 'post',
     data: data
   });
@@ -39,7 +39,7 @@ export function updateUmsMemberAddress(data) {
 // 删除会员收货地址
 export function delUmsMemberAddress(id) {
   return request({
-    url: '/ums/memberAddress/' + id,
+    url: '/ums/member/address/' + id,
     method: 'delete'
   });
 }
@@ -47,7 +47,7 @@ export function delUmsMemberAddress(id) {
 // 导出会员收货地址
 export function exportUmsMemberAddress(query) {
   return request({
-    url: '/ums/memberAddress/export',
+    url: '/ums/member/address/export',
     method: 'get',
     params: query
   });
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 2bee245..d4bd854 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -85,7 +85,7 @@
             <el-button text type="primary" icon="user" @click="showUserFansListModal(3, scope.row, true)">{{ scope.row.friendsCount }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="推广码" prop="spreadUid" width="150" />
+        <el-table-column label="推广码" prop="spreadCode" width="150" />
         <el-table-column label="推广人" prop="spreadUid" width="150" />
         <el-table-column label="openId" prop="openId" width="150" />
         <!--        <el-table-column label="注册时间" prop="createTime" width="180">
@@ -139,43 +139,40 @@
       <el-table v-loading="blackListTableLoading" :data="blackListModalInfo.data" border empty-text="暂无数据">
         <el-table-column label="手机号" prop="phone" width="150">
           <template v-slot="scope">
-            {{ scope.row.fan.phone }}
+            {{ scope.row.blockMember.phone }}
           </template>
         </el-table-column>
-        <el-table-column label="昵称" prop="nickname" width="150">
+        <el-table-column label="昵称" prop="nickname">
           <template v-slot="scope">
-            {{ scope.row.fan.nickname }}
+            {{ scope.row.blockMember.nickname }}
           </template>
         </el-table-column>
         <el-table-column label="头像" prop="avatar">
           <template v-slot="scope">
-            {{ scope.row.fan.avatar }}
+            <el-image v-if="scope.row.blockMember.avatar" :src="scope.row.blockMember.avatar" class="small-img circle-img" />
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="180">
+        <el-table-column label="状态" prop="status">
           <template v-slot="scope">
-            <div v-if="scope.row.fan.status == 0">封禁</div>
-            <div v-else-if="scope.row.fan.status == 1">正常</div>
+            <div v-if="scope.row.blockMember.status == 0">封禁</div>
+            <div v-else-if="scope.row.blockMember.status == 1">正常</div>
           </template>
         </el-table-column>
-        <el-table-column label="性别" prop="gender" width="100">
+        <el-table-column label="性别" prop="gender">
           <template v-slot="scope">
-            {{ scope.row.fan.gender }}
+            <el-tag style="margin-right: 10px">
+              {{ getEmulistLabelById(scope.row.blockMember.gender, userSexMap) }}
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="地址" prop="loginTime" width="100">
+        <el-table-column label="生日" prop="birthday">
           <template v-slot="scope">
-            {{ scope.row.fan.loginTime }}
+            {{ scope.row.blockMember.birthday }}
           </template>
         </el-table-column>
-        <el-table-column label="等级" prop="level" width="100">
+        <el-table-column label="等级" prop="level">
           <template v-slot="scope">
-            {{ scope.row.fan.level }}
-          </template>
-        </el-table-column>
-        <el-table-column label="时间" prop="loginTime" width="100">
-          <template v-slot="scope">
-            {{ scope.row.fan.loginTime }}
+            {{ scope.row.blockMember.level }}
           </template>
         </el-table-column>
       </el-table>
@@ -526,12 +523,15 @@ export default {
       userBalanceParams: {
         current: 1,
         size: 10
-      }
+      },
+      userSexMap: []
     };
   },
-  created() {
+  async created() {
     this.show = true;
     this.getList();
+    const userSexMap = await this.getDictionaryByKey('sys_user_sex');
+    this.userSexMap = userSexMap;
   },
   computed: {
     userId: {
diff --git a/src/views/ums/memberCart/index.vue b/src/views/ums/memberCart/index.vue
index 8f9aa8c..2d3c299 100644
--- a/src/views/ums/memberCart/index.vue
+++ b/src/views/ums/memberCart/index.vue
@@ -17,11 +17,15 @@
       <!--      <el-table-column type="selection" width="55"  />-->
       <el-table-column label="用户信息" prop="phoneHidden">
         <template v-slot="scope">
-          <p>{{ scope.row.phoneHidden }}</p>
-          <p>{{ scope.row.nickname }}</p>
+          <p>{{ scope.row.member.phoneHidden }}</p>
+          <p>{{ scope.row.member.nickname }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户备注" prop="mark">
+        <template v-slot="scope">
+          <p>{{ scope.row.member.mark }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="用户备注" prop="mark" />
       <el-table-column label="商品名称" prop="productName" />
       <el-table-column label="商品规格" prop="spData">
         <template v-slot="scope">
@@ -183,7 +187,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm');
-      // this.handleQuery();
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {