Browse Source

引入阿里图标库,优化部分字体图标

master
xie.bx 3 years ago
parent
commit
b3feb26e55
  1. 2
      im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java
  2. 2
      im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java
  3. 5
      im-ui/.env.development
  4. 43
      im-ui/src/assets/iconfont/iconfont.css
  5. BIN
      im-ui/src/assets/iconfont/iconfont.ttf
  6. BIN
      im-ui/src/assets/iconfont/iconfont.woff
  7. BIN
      im-ui/src/assets/iconfont/iconfont.woff2
  8. 2
      im-ui/src/components/chat/ChatBox.vue
  9. 1
      im-ui/src/main.js
  10. 2
      im-ui/src/view/Home.vue
  11. 5
      im-ui/src/view/Login.vue

2
im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java

@ -22,7 +22,7 @@ public class GroupMessageVO {
@ApiModelProperty(value = "发送内容") @ApiModelProperty(value = "发送内容")
private String content; private String content;
@NotNull(message="发送内容不可为空") @NotNull(message="消息类型不可为空")
@ApiModelProperty(value = "消息类型") @ApiModelProperty(value = "消息类型")
private Integer type; private Integer type;
} }

2
im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java

@ -24,7 +24,7 @@ public class PrivateMessageVO {
@ApiModelProperty(value = "发送内容") @ApiModelProperty(value = "发送内容")
private String content; private String content;
@NotNull(message="发送内容不可为空") @NotNull(message="消息类型不可为空")
@ApiModelProperty(value = "消息类型") @ApiModelProperty(value = "消息类型")
private Integer type; private Integer type;

5
im-ui/.env.development

@ -1,7 +1,8 @@
ENV = 'development' ENV = 'development'
# app名称
VUE_APP_NAME = "盒子IM"
// 接口请求地址 // 接口请求地址
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
# ws地址
VUE_APP_WS_URL = 'ws://localhost:8878/im' VUE_APP_WS_URL = 'ws://localhost:8878/im'

43
im-ui/src/assets/iconfont/iconfont.css

@ -0,0 +1,43 @@
@font-face {
font-family: "iconfont"; /* Project id 3776657 */
src: url('iconfont.woff2?t=1668665799410') format('woff2'),
url('iconfont.woff?t=1668665799410') format('woff'),
url('iconfont.ttf?t=1668665799410') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-biaoqing:before {
content: "\e60c";
}
.icon-youyinpin:before {
content: "\e649";
}
.icon-audio:before {
content: "\e800";
}
.icon-group_fill:before {
content: "\e7f4";
}
.icon-yinpin:before {
content: "\e68a";
}
.icon-emoji:before {
content: "\e6f6";
}
.icon-voiceprint:before {
content: "\e953";
}

BIN
im-ui/src/assets/iconfont/iconfont.ttf

Binary file not shown.

BIN
im-ui/src/assets/iconfont/iconfont.woff

Binary file not shown.

BIN
im-ui/src/assets/iconfont/iconfont.woff2

Binary file not shown.

2
im-ui/src/components/chat/ChatBox.vue

@ -21,7 +21,7 @@
</el-main> </el-main>
<el-footer height="200px" class="im-chat-footer"> <el-footer height="200px" class="im-chat-footer">
<div class="chat-tool-bar"> <div class="chat-tool-bar">
<div title="表情" class="el-icon-eleme" ref="emotion" @click="switchEmotionBox()"> <div title="表情" class="icon iconfont icon-biaoqing" ref="emotion" @click="switchEmotionBox()">
</div> </div>
<div title="发送图片"> <div title="发送图片">
<file-upload :action="imageAction" :maxSize="5*1024*1024" <file-upload :action="imageAction" :maxSize="5*1024*1024"

1
im-ui/src/main.js

@ -3,6 +3,7 @@ import App from './App'
import router from './router' import router from './router'
import ElementUI from 'element-ui'; import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/index.css';
import './assets/iconfont/iconfont.css';
import httpRequest from './api/httpRequest'; import httpRequest from './api/httpRequest';
import * as socketApi from './api/wssocket'; import * as socketApi from './api/wssocket';
import emotion from './api/emotion.js'; import emotion from './api/emotion.js';

2
im-ui/src/view/Home.vue

@ -20,7 +20,7 @@
</el-menu-item> </el-menu-item>
<el-menu-item title="群聊"> <el-menu-item title="群聊">
<router-link v-bind:to="'/home/group'"> <router-link v-bind:to="'/home/group'">
<span class="el-icon-s-check"></span> <span class="icon iconfont icon-group_fill"></span>
</router-link> </router-link>
</el-menu-item> </el-menu-item>

5
im-ui/src/view/Login.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="login-view"> <div class="login-view" >
<el-form :model="loginForm" status-icon :rules="rules" ref="loginForm" label-width="60px" class="web-ruleForm"> <el-form :model="loginForm" status-icon :rules="rules" ref="loginForm" label-width="60px" class="web-ruleForm" @keyup.enter.native="submitForm('loginForm')">
<div class="login-brand">欢迎登陆</div> <div class="login-brand">欢迎登陆</div>
<el-form-item label="用户名" prop="username"> <el-form-item label="用户名" prop="username">
<el-input type="username" v-model="loginForm.username" autocomplete="off"></el-input> <el-input type="username" v-model="loginForm.username" autocomplete="off"></el-input>
@ -16,7 +16,6 @@
<div class="register"> <div class="register">
<router-link to="/register">没有账号,前往注册</router-link> <router-link to="/register">没有账号,前往注册</router-link>
</div> </div>
</el-form> </el-form>
</div> </div>

Loading…
Cancel
Save