From a9686c7d45a779858d9dc3a6a2f738b7e818b972 Mon Sep 17 00:00:00 2001
From: msh-agent <agent@msh.local>
Date: Sun, 3 May 2026 03:53:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(user-tag):=20=E5=90=8E=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=20+=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E4=B8=8B=E6=96=B9?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后台 msh_single_admin user/list/index.vue：
- 在「分组」「推荐人」之间新增「用户标签」列，用 el-tag 渲染（多标签 ',' 切分）
- 加入默认显示项 checkedCities / columnData

后端 UserCenterResponse + UserServiceImpl：
- UserCenterResponse 新增 tagName 字段
- getUserCenter 在已注入的 userTagService 基础上回填标签名（已存在 getGroupNameInId）

小程序 pages/user/index.vue：
- 用户名 + VIP 行下方新增 .user-tags 容器，按 ',' 切分多标签
- 半透明白底胶囊，与顶部渐变橙色背景协调

附带修复：
- pages/tool/calculator-history.vue formatTime 兼容 ISO/数组/数字/旧字符串四种来源
- 解决「NaN-NaN-NaN NaN:NaN」问题（ISO 字符串里的 'T' 被替换 / 后变非法日期）

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../common/response/UserCenterResponse.java   |  3 +++
 .../service/service/impl/UserServiceImpl.java |  4 +++
 .../src/views/user/list/index.vue             | 18 +++++++++++--
 .../pages/tool/calculator-history.vue         | 25 +++++++++++++------
 msh_single_uniapp/pages/user/index.vue        | 25 +++++++++++++++++++
 5 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java b/msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java
index 3d9ece1..76ab61e 100644
--- a/msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java
+++ b/msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/response/UserCenterResponse.java
@@ -85,4 +85,7 @@ public class UserCenterResponse implements Serializable {
 
     @ApiModelProperty(value = "用户收藏数量")
     private Integer collectCount;
+
+    @ApiModelProperty(value = "用户标签名（逗号分隔，多标签）")
+    private String tagName;
 }
diff --git a/msh_crmeb_22/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java b/msh_crmeb_22/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
index 1187140..7f288bb 100644
--- a/msh_crmeb_22/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
+++ b/msh_crmeb_22/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
@@ -564,6 +564,10 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
                 userCenterResponse.setVipName(systemUserLevel.getName());
             }
         }
+        // 用户标签：在会员等级下方展示
+        if (StrUtil.isNotBlank(currentUser.getTagId())) {
+            userCenterResponse.setTagName(userTagService.getGroupNameInId(currentUser.getTagId()));
+        }
         // 充值开关
         String rechargeSwitch = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_RECHARGE_SWITCH);
         if (StrUtil.isNotBlank(rechargeSwitch)) {
diff --git a/msh_single_admin/src/views/user/list/index.vue b/msh_single_admin/src/views/user/list/index.vue
index 117a6cd..8ef5552 100755
--- a/msh_single_admin/src/views/user/list/index.vue
+++ b/msh_single_admin/src/views/user/list/index.vue
@@ -209,6 +209,20 @@
           </template>
         </el-table-column>
         <el-table-column prop="groupName" label="分组" min-width="100" v-if="checkedCities.includes('分组')" />
+        <el-table-column label="用户标签" min-width="160" v-if="checkedCities.includes('用户标签')">
+          <template slot-scope="scope">
+            <template v-if="scope.row.tagName">
+              <el-tag
+                v-for="(tag, idx) in String(scope.row.tagName).split(',').filter(Boolean)"
+                :key="idx"
+                size="mini"
+                effect="plain"
+                style="margin-right: 4px; margin-bottom: 2px;"
+              >{{ tag }}</el-tag>
+            </template>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="spreadNickname" label="推荐人" min-width="130" v-if="checkedCities.includes('推荐人')" />
         <el-table-column label="手机号" min-width="100" v-if="checkedCities.includes('手机号')">
           <template slot-scope="scope">
@@ -500,8 +514,8 @@ export default {
       idKey: 'uid',
       card_select_show: false,
       checkAll: false,
-      checkedCities: ['ID', '头像', '姓名', '用户等级', '分组', '推荐人', '手机号', '余额', '积分'],
-      columnData: ['ID', '头像', '姓名', '用户等级', '分组', '推荐人', '手机号', '余额', '积分'],
+      checkedCities: ['ID', '头像', '姓名', '用户等级', '分组', '用户标签', '推荐人', '手机号', '余额', '积分'],
+      columnData: ['ID', '头像', '姓名', '用户等级', '分组', '用户标签', '推荐人', '手机号', '余额', '积分'],
       isIndeterminate: true,
     };
   },
diff --git a/msh_single_uniapp/pages/tool/calculator-history.vue b/msh_single_uniapp/pages/tool/calculator-history.vue
index d3912c6..09716d6 100644
--- a/msh_single_uniapp/pages/tool/calculator-history.vue
+++ b/msh_single_uniapp/pages/tool/calculator-history.vue
@@ -105,14 +105,25 @@ export default {
 			uni.navigateTo({ url: '/pages/tool/calculator' })
 		},
 		formatTime(s) {
-			if (!s) return ''
-			try {
-				const d = new Date(typeof s === 'string' ? s.replace(/-/g, '/') : s)
-				const pad = (n) => (n < 10 ? '0' + n : '' + n)
-				return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate()) + ' ' + pad(d.getHours()) + ':' + pad(d.getMinutes())
-			} catch (e) {
-				return String(s)
+			if (s == null || s === '') return ''
+			// 兼容 4 种来源：
+			// ① 数字时间戳；② Java LocalDateTime 序列化为数组 [y,m,d,h,m,s,nano]；
+			// ③ ISO 字符串 "2026-05-03T01:21:18"（含 T，旧版 replace 后变 "2026/05/03T01:21:18" 解析为 Invalid Date → NaN）；
+			// ④ 旧式 "2026-05-03 01:21:18"（iOS 需把 - 替换成 /）
+			let d
+			if (typeof s === 'number') {
+				d = new Date(s)
+			} else if (Array.isArray(s) && s.length >= 3) {
+				d = new Date(s[0], (s[1] || 1) - 1, s[2] || 1, s[3] || 0, s[4] || 0, s[5] || 0)
+			} else if (typeof s === 'string') {
+				d = /T/.test(s) ? new Date(s) : new Date(s.replace(/-/g, '/'))
+			} else {
+				d = new Date(s)
 			}
+			if (!d || isNaN(d.getTime())) return String(s)
+			const pad = (n) => (n < 10 ? '0' + n : '' + n)
+			return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate())
+				+ ' ' + pad(d.getHours()) + ':' + pad(d.getMinutes())
 		},
 		formatBmi(b) {
 			if (b == null) return '—'
diff --git a/msh_single_uniapp/pages/user/index.vue b/msh_single_uniapp/pages/user/index.vue
index 6f3a5c7..226b493 100644
--- a/msh_single_uniapp/pages/user/index.vue
+++ b/msh_single_uniapp/pages/user/index.vue
@@ -21,6 +21,14 @@
 												</view>
 										</view>
 									</view>
+									<!-- 用户标签：在会员等级下方展示 -->
+									<view class="user-tags" v-if="userInfo && uid && userInfo.tagName">
+										<text
+											class="user-tag"
+											v-for="(tag, idx) in String(userInfo.tagName).split(',').filter(Boolean)"
+											:key="idx"
+										>{{ tag }}</text>
+									</view>
 									<view class="num" v-if="userInfo && userInfo.phone && uid">
 										<view class="num-txt">{{userInfo.phone}}</view>
 										<view class="icon">
@@ -598,6 +606,23 @@
 								}
 							}
 						}
+						/* 用户标签（test-0415 后续：会员等级下方展示） */
+						.user-tags {
+							display: flex;
+							flex-wrap: wrap;
+							gap: 8rpx;
+							margin-top: 8rpx;
+
+							.user-tag {
+								padding: 2rpx 16rpx;
+								font-size: 20rpx;
+								color: #ffffff;
+								background: rgba(255, 255, 255, 0.18);
+								border: 1rpx solid rgba(255, 255, 255, 0.3);
+								border-radius: 18px;
+								line-height: 1.6;
+							}
+						}
 						.app_set{
 							position: absolute;
 							font-size: 36rpx;