diff --git a/src/views/users/UserCheckAdminBaseView.vue b/src/views/users/UserCheckAdminBaseView.vue index 34295e3..ce7bcdb 100644 --- a/src/views/users/UserCheckAdminBaseView.vue +++ b/src/views/users/UserCheckAdminBaseView.vue @@ -15,6 +15,7 @@ + @@ -48,7 +49,7 @@
- @@ -60,6 +61,12 @@

+
+ +
+

+
+
@@ -196,6 +203,8 @@ export default { }, { field: 'account.uid', title: 'Uid', align: 'center', valign: 'middle' }, { field: 'users.nick', title: '用户昵称', align: 'center', valign: 'middle' }, + { field: 'account.phone', title: '手机号', align: 'center', valign: 'middle' }, + { field: 'account.email', title: '邮箱', align: 'center', valign: 'middle' }, { field: 'users.userDesc', title: '简介', align: 'center', valign: 'middle' }, { field: '', title: '是否实名认证', align: 'center', valign: 'middle', @@ -251,7 +260,38 @@ export default { return '女'; } } - }, + }, + { + field: 'users.userVipInfoVO', + title: 'vip等级', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + if (!val){ + return 0 + } else { + return val.vipLevel; + } + } + }, + { + field: 'users.userLevelVo', + title: '财富等级(经验值)', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + return val.experLevelName + '(' + val.experAmount + ')'; + } + }, + { + field: 'users.userLevelVo', + title: '魅力等级(魅力值)', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + return val.charmLevelName + '(' + val.charmAmount + ')'; + } + }, { field: 'users.defUser', title: '账号类型', @@ -261,13 +301,12 @@ export default { switch (val) { case 1: return '普通账号'; - case 2: return '官方账号'; - case 3: return '机器账号'; - + case 4: + return '工会账户'; } } }, diff --git a/src/views/users/UserCheckAdminView.vue b/src/views/users/UserCheckAdminView.vue index 77d962c..fc8e43f 100644 --- a/src/views/users/UserCheckAdminView.vue +++ b/src/views/users/UserCheckAdminView.vue @@ -14,8 +14,9 @@
@@ -41,21 +42,26 @@
地区:
平台号:
UID:
-
头像：
+
性别:
手机:
-
出生日期:
email:
+
出生日期:
签名:
自我描述:
+
+
vip等级:
+
财富等级:
+
魅力等级:
+
金币数:
-
水晶数:
+
钻石数:
@@ -63,20 +69,26 @@
粉丝数:
账号类型:
-
+ + + + + + +
+
最后更新ip:
+
ip地区:
+
+
手机型号:
+
系统:
设备号:
版本号:
@@ -116,7 +128,7 @@
- @@ -129,6 +141,13 @@ 解绑
+
+ +
+ + 解绑 +
+
@@ -141,25 +160,27 @@ class="form-control validate[required]" />
-
- -
- -
-
-
- -
- -
-
+ + + + + + + + + + + +
- + +
@@ -345,6 +366,8 @@ export default { }, { field: 'account.uid', title: 'Uid', align: 'center', valign: 'middle' }, { field: 'users.nick', title: '用户昵称', align: 'center', valign: 'middle' }, + { field: 'users.phone', title: '手机号', align: 'center', valign: 'middle' }, + { field: 'users.email', title: '邮箱', align: 'center', valign: 'middle' }, { field: 'users.userDesc', title: '简介', align: 'center', valign: 'middle' }, { field: 'users.partitionId', @@ -387,7 +410,6 @@ export default { { field: 'userPurseVo.diamonds', title: '金币数', align: 'center', valign: 'middle' }, { field: 'userPurseVo.golds', title: '钻石数', align: 'center', valign: 'middle' }, - // {field:'account.phone',title:'手机电话',align:'center',valign:'middle'}, { field: 'users.birth', title: '用户出生日期', @@ -415,8 +437,39 @@ export default { } } }, - { field: 'users.alipayAccount', title: '支付宝账号', align: 'center', valign: 'middle' }, - { field: 'users.alipayAccountName', title: '支付宝账户名', align: 'center', valign: 'middle' }, + // { field: 'users.alipayAccount', title: '支付宝账号', align: 'center', valign: 'middle' }, + // { field: 'users.alipayAccountName', title: '支付宝账户名', align: 'center', valign: 'middle' }, + { + field: 'users.userVipInfoVO', + title: 'vip等级', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + if (!val){ + return 0 + } else { + return val.vipLevel; + } + } + }, + { + field: 'users.userLevelVo', + title: '财富等级(经验值)', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + return val.experLevelName + '(' + val.experAmount + ')'; + } + }, + { + field: 'users.userLevelVo', + title: '魅力等级(魅力值)', + align: 'center', + valign: 'middle', + formatter: function (val, row, index) { + return val.charmLevelName + '(' + val.charmAmount + ')'; + } + }, { field: 'users.defUser', title: '账号类型', @@ -426,13 +479,12 @@ export default { switch (val) { case 1: return '普通账号'; - case 2: return '官方账号'; - case 3: return '机器账号'; - + case 4: + return '工会账户'; } } }, @@ -501,20 +553,26 @@ export default { } else { $('.gender span').html('女'); } - $('.avatar img').attr('src', users.avatar); $('.phone span').html(users.phone); var birthDate = users.birth ? new Date(users.birth).format('yyyy-MM-dd') : ''; $('.birth span').html(birthDate); $('.email span').html(users.email); $('.sign span').html(users.signture); - $('.userVoice span').html(users.userVoice); + //$('.userVoice span').html(users.userVoice); $('.userDesc span').html(users.userDesc); + const vipLevel = users.userVipInfoVO? users.userVipInfoVO.vipLevel: 0; + $('.vipLevel span').html(vipLevel) + + const experDesc = users.userLevelVo.experLevelName + '(' + users.userLevelVo.experAmount + ')' + $('.exper span').html(experDesc) + const charmDesc = users.userLevelVo.charmLevelName + '(' + users.userLevelVo.charmAmount + ')' + $('.charm span').html(charmDesc) $('.diamondNum span').html(purse.diamonds); - $('.crystalNum span').html(purse.crystals); + //$('.crystalNum span').html(purse.crystals); $('.goldNum span').html(purse.golds); $('.followNum span').html(users.followNum); @@ -529,23 +587,32 @@ export default { case 3: $('.defUser span').html('机器账号'); break; + case 4: + $('.defUser span').html('工会账号'); + break; } - $('.fortune span').html(users.fortune); - $('.channelType span').html(users.channel); + /*$('.fortune span').html(users.fortune); + $('.channelType span').html(users.channel);*/ - $('.alipayAccount span').html(users.alipayAccount); - $('.alipayAccountName span').html(users.alipayAccountName); + /*$('.alipayAccount span').html(users.alipayAccount); + $('.alipayAccountName span').html(users.alipayAccountName);*/ if (loginRecord) { - $('.ispType span').html(loginRecord.ispType); - $('.netType span').html(loginRecord.netType); + /*$('.ispType span').html(loginRecord.ispType); + $('.netType span').html(loginRecord.netType);*/ + $('.ip span').html(loginRecord.loginIp); + $('.ipRegion span').html(loginRecord.loginIpRegion); $('.model span').html(loginRecord.model); + $('.os span').html(loginRecord.os); $('.deviceID span').html(loginRecord.deviceId); $('.appVersion span').html(loginRecord.appVersion); } else { - $('.ispType span').html(users.ispType); - $('.netType span').html(users.netType); + /*$('.ispType span').html(users.ispType); + $('.netType span').html(users.netType);*/ + $('.ip span').html(users.loginIp); + $('.ipRegion span').html(users.loginIpRegion); $('.model span').html(users.model); + $('.os span').html(users.os); $('.deviceID span').html(users.deviceId); $('.appVersion span').html(users.appVersion); } @@ -556,6 +623,7 @@ export default { partitionDesc = partitions[0].desc; } $('.partitionId span').html(partitionDesc); + $('#detailModal').modal('show'); } else { $("#tipMsg").text("不存在用户详细信息，原因：该用户资料未补全");