Skip to content

杨俊 / spread_im

Go to a project
Toggle navigation
Toggle navigation pinning
Commit f5e26bd2 f5e26bd2699f549f04e49a1564a95f3b9d3deab9 by 杨俊
Options

Merge branch 'bug' into develop

2 parents 61429879 3f96dbd2
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
4 <el-popover placement="top" width="400" trigger="click"> 4 <el-popover placement="top" width="400" trigger="click">
5 <div class="emojis"> 5 <div class="emojis">
6 <div v-for="item in emojiName" class="emoji" :key="item" @click="chooseEmoji(item)"> 6 <div v-for="item in emojiName" class="emoji" :key="item" @click="chooseEmoji(item)">
7 <img :src="emojiUrl + emojiMap[item]" style="width:30px;height:30px"/> 7 <img :src="emojiUrl + emojiMap[item]" style="width:30px;height:30px" alt=""/>
8 </div> 8 </div>
9 </div> 9 </div>
10 <i class="iconfont icon-smile" slot="reference" title="发表情"></i> 10 <i class="iconfont icon-smile" slot="reference" title="发表情"></i>
11 </el-popover> 11 </el-popover>
12 <i class="iconfont icon-tupian" title="发图片" @click="handleSendImageClick"></i> 12 <i class="iconfont icon-tupian" title="发图片" @click="handleSendImageClick"></i>
13 <i class="el-icon-camera" title="发视频" @click="handleSendVideoClick"></i> 13 <i class="el-icon-camera" title="发视频" @click="handleSendVideoClick"></i>
14 <i class="iconfont icon-wenjian" title="发文件" @click="handleSendFileClick"></i> 14 <!-- <i class="iconfont icon-wenjian" title="发文件" @click="handleSendFileClick"></i>-->
15 <!-- <i class="iconfont icon-zidingyi" title="发自定义消息" @click="sendCustomDialogVisible = true"></i>--> 15 <!-- <i class="iconfont icon-zidingyi" title="发自定义消息" @click="sendCustomDialogVisible = true"></i>-->
16 <!-- <el-dropdown>--> 16 <!-- <el-dropdown>-->
17 <!-- <span class="el-dropdown-link">--> 17 <!-- <span class="el-dropdown-link">-->
......