From af5359cc983eca681e1d31c1a18fae9c25d6615a Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Tue, 17 Oct 2023 23:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=97=A0=E6=B3=95=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bx/implatform/entity/User.java | 5 +++++ .../java/com/bx/implatform/vo/LoginVO.java | 1 + .../java/com/bx/implatform/vo/UserVO.java | 4 +++- im-platform/src/main/resources/db/db.sql | 3 ++- im-uniapp/App.vue | 19 +++++++++++++++++++ im-uniapp/pages.json | 3 +-- im-uniapp/pages/group/group-edit.vue | 2 +- im-uniapp/pages/group/group-info.vue | 2 +- im-uniapp/pages/group/group-invite.vue | 2 +- im-uniapp/pages/group/group-member.vue | 2 +- im-uniapp/pages/group/group.vue | 2 +- im-uniapp/store/chatStore.js | 2 +- 12 files changed, 37 insertions(+), 10 deletions(-) diff --git a/im-platform/src/main/java/com/bx/implatform/entity/User.java b/im-platform/src/main/java/com/bx/implatform/entity/User.java index 1fa5ddd..ab6ff48 100644 --- a/im-platform/src/main/java/com/bx/implatform/entity/User.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/User.java @@ -62,6 +62,11 @@ public class User extends Model { @TableField("head_image_thumb") private String headImageThumb; + /** + * 用户类型 1:普通用户 2:审核专用账户 + */ + @TableField("type") + private Integer type; /** * 个性签名 diff --git a/im-platform/src/main/java/com/bx/implatform/vo/LoginVO.java b/im-platform/src/main/java/com/bx/implatform/vo/LoginVO.java index 500bb43..1b765bc 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/LoginVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/LoginVO.java @@ -19,4 +19,5 @@ public class LoginVO { @ApiModelProperty(value = "refreshToken过期时间(秒)") private Integer refreshTokenExpiresIn; + } diff --git a/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java b/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java index a4a384b..13a5360 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java @@ -30,6 +30,9 @@ public class UserVO { @ApiModelProperty(value = "性别") private Integer sex; + @ApiModelProperty(value = "用户类型 1:普通用户 2:审核账户") + private Integer type; + @Length(max = 1024,message = "个性签名不能大于1024个字符") @ApiModelProperty(value = "个性签名") private String signature; @@ -40,7 +43,6 @@ public class UserVO { @ApiModelProperty(value = "头像缩略图") private String headImageThumb; - @ApiModelProperty(value = "是否在线") private Boolean online; diff --git a/im-platform/src/main/resources/db/db.sql b/im-platform/src/main/resources/db/db.sql index ba33925..9cca837 100644 --- a/im-platform/src/main/resources/db/db.sql +++ b/im-platform/src/main/resources/db/db.sql @@ -6,7 +6,8 @@ create table `im_user`( `head_image` varchar(255) default '' comment '用户头像', `head_image_thumb` varchar(255) default '' comment '用户头像缩略图', `password` varchar(255) not null comment '密码(明文)', - `sex` tinyint(1) default 0 comment '性别 0:男 1::女', + `sex` tinyint(1) default 0 comment '性别 0:男 1:女', + `type` smallint default 1 comment '用户类型 1:普通用户 2:审核账户', `signature` varchar(1024) default '' comment '个性签名', `last_login_time` datetime DEFAULT null comment '最后登录时间', `created_time` datetime DEFAULT CURRENT_TIMESTAMP comment '创建时间', diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index 4463d59..29800d8 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -14,6 +14,8 @@ init() { // 加载数据 store.dispatch("load").then(() => { + // 审核 + this.initAudit(); // 初始化websocket this.initWebSocket(); }).catch((e) => { @@ -140,9 +142,26 @@ // this.audioTip = uni.createInnerAudioContext(); // this.audioTip.src = "/static/audio/tip.wav"; // this.audioTip.play(); + }, + initAudit() { + console.log("initAudit") + if(store.state.userStore.userInfo.type == 1){ + // 显示群组功能 + uni.setTabBarItem({ + index: 2, + text: "群聊" + }) + }else{ + // 隐藏群组功能 + uni.setTabBarItem({ + index: 2, + text: "资讯" + }) + } } }, onLaunch() { + // 登录状态校验 if (uni.getStorageSync("loginInfo")) { // 初始化 diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json index 6dfb1e5..56107bd 100644 --- a/im-uniapp/pages.json +++ b/im-uniapp/pages.json @@ -18,7 +18,6 @@ }, { "path": "pages/group/group", "style": { - "navigationBarTitleText": "群聊列表", "enablePullDownRefresh": false } @@ -75,7 +74,7 @@ "pagePath": "pages/group/group", "iconPath": "static/tarbar/group.png", "selectedIconPath": "static/tarbar/group_active.png", - "text": "群聊" + "text": "资讯" }, { "pagePath": "pages/mine/mine", diff --git a/im-uniapp/pages/group/group-edit.vue b/im-uniapp/pages/group/group-edit.vue index 3339d58..1d0ae50 100644 --- a/im-uniapp/pages/group/group-edit.vue +++ b/im-uniapp/pages/group/group-edit.vue @@ -1,5 +1,5 @@