TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

rename

Browse Source
This commit is contained in:
Jason.Chen
2022-01-20 16:15:24 +08:00
parent 93a20f2d3d
commit 088327eaff
14 changed files with 348 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
components/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
pages/.DS_Store vendored Normal file
View File

Binary file not shown.

8
pages/im/friends/index.vue
View File

@@ -1,13 +1,13 @@
<template> <template>
<div> <view>
<view class="list"> <view class="list">
<view class="list__item" @click="toPending"> <view class="list__item" @click="toPending">
<u-avatar size="35" icon="plus-people-fill" fontSize="26" randomBgColor></u-avatar> <u-avatar size="35" icon="plus-people-fill" fontSize="26" bg-color="#f0ad4e"></u-avatar>
<text class="list__item__user-name">新的朋友</text> <text class="list__item__user-name">新的朋友</text>
</view> </view>
<u-line></u-line> <u-line></u-line>
<view class="list__item" @click="toGroup"> <view class="list__item" @click="toGroup">
<u-avatar size="35" icon="account-fill" fontSize="26" randomBgColor></u-avatar> <u-avatar size="35" icon="account-fill" fontSize="26" bg-color="#4cd964"></u-avatar>
<text class="list__item__user-name">我的群聊</text> <text class="list__item__user-name">我的群聊</text>
</view> </view>
<u-line></u-line> <u-line></u-line>
@@ -36,7 +36,7 @@
<text class="list__footer">共305位好友</text> <text class="list__footer">共305位好友</text>
</view> </view>
</u-index-list> </u-index-list>
</div> </view>
</template> </template>
<script> <script>

4
pages/im/friends/info.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div> <view>
好友资料， 好友资料，
<u-button @click="toPrivate">发送消息</u-button> <u-button @click="toPrivate">发送消息</u-button>
</div> </view>
</template> </template>
<script> <script>

50
pages/im/index.vue
View File

@@ -3,11 +3,7 @@
<view v-if="$store.state.token != ''"> <view v-if="$store.state.token != ''">
<block v-if="conversations.length < 1"> <block v-if="conversations.length < 1">
<view class="vertical null-list"> <view class="vertical null-list">
<u-empty <u-empty icon="http://cdn.uviewui.com/uview/empty/message.png" textColor="#999" text="暂无好友消息">
icon="http://cdn.uviewui.com/uview/empty/message.png"
textColor="#999"
text="暂无好友消息"
>
<template> <template>
<view class="null-list-btn">开启聊天</view> <view class="null-list-btn">开启聊天</view>
</template> </template>
@@ -18,20 +14,13 @@
<view v-for="(item, index) in conversations" :key="index" class="mssage-box" @click="toDetail(item)"> <view v-for="(item, index) in conversations" :key="index" class="mssage-box" @click="toDetail(item)">
<view class="mssage-action"> <view class="mssage-action">
<block v-if="!friend(item.targetId).portraitUrl"> <block v-if="!friend(item.targetId).portraitUrl">
<u-avatar <u-avatar clsss="mssage-action-cover" size="44"
clsss="mssage-action-cover"
size="44"
:text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'" :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'"
font-size="14" font-size="14" randomBgColor></u-avatar>
randomBgColor
></u-avatar>
</block> </block>
<block v-else> <block v-else>
<u-avatar <u-avatar clsss="mssage-action-cover" :src="friend(item.targetId).portraitUrl" size="44">
clsss="mssage-action-cover" </u-avatar>
:src="friend(item.targetId).portraitUrl"
size="44"
></u-avatar>
</block> </block>
<view class="mssage-action-content"> <view class="mssage-action-content">
<view class="mssage-header"> <view class="mssage-header">
@@ -46,11 +35,7 @@
</view> </view>
<!-- 未登录 --> <!-- 未登录 -->
<view v-else class="vertical null-list"> <view v-else class="vertical null-list">
<u-empty <u-empty icon="http://cdn.uviewui.com/uview/empty/permission.png" textColor="#999" text="登录后开启聊天吧~">
icon="http://cdn.uviewui.com/uview/empty/permission.png"
textColor="#999"
text="登录后开启聊天吧~"
>
<template> <template>
<view class="null-list-btn" @click="toLogin">去登录</view> <view class="null-list-btn" @click="toLogin">去登录</view>
</template> </template>
@@ -63,7 +48,9 @@
import * as RongIMLib from '@rongcloud/imlib-uni' import * as RongIMLib from '@rongcloud/imlib-uni'
import im from '@/utils/im/index.js' import im from '@/utils/im/index.js'
import userAuth from '@/public/userAuth' import userAuth from '@/public/userAuth'
import { getImToken } from '@/apis/interfaces/im.js' import {
getImToken
} from '@/apis/interfaces/im.js'
export default { export default {
data() { data() {
@@ -84,7 +71,6 @@
if (this.$store.state.token !== '') { if (this.$store.state.token !== '') {
if (this.isImToken === '') { if (this.isImToken === '') {
getImToken().then(res => { getImToken().then(res => {
im.syncFriends()
im.connect(res.token, res.userInfo) im.connect(res.token, res.userInfo)
this.isImToken = res.token this.isImToken = res.token
this.getConversationList() this.getConversationList()
@@ -105,7 +91,9 @@
}) })
} }
if (e.index == 1) { if (e.index == 1) {
this.$Router.push({name: 'imFriends'}) this.$Router.push({
name: 'imFriends'
})
} }
}, },
watch: { watch: {
@@ -140,7 +128,8 @@
// 进入聊天的详情页面，清理未读消息数量 // 进入聊天的详情页面，清理未读消息数量
toDetail(item) { toDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item.conversationType url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item
.conversationType
}) })
} }
} }
@@ -151,9 +140,11 @@
.content { .content {
background-color: $window-color; background-color: $window-color;
min-height: 100vh; min-height: 100vh;
.null-list { .null-list {
height: 100vh; height: 100vh;
text-align: center; text-align: center;
&-btn { &-btn {
margin-top: $margin * 2; margin-top: $margin * 2;
line-height: 70rpx; line-height: 70rpx;
@@ -165,11 +156,14 @@
box-sizing: border-box; box-sizing: border-box;
} }
} }
.mssage-box { .mssage-box {
background: white; background: white;
.mssage-action { .mssage-action {
position: relative; position: relative;
padding: 20rpx $padding; padding: 20rpx $padding;
&::after { &::after {
position: absolute; position: absolute;
left: $padding + 108; left: $padding + 108;
@@ -179,6 +173,7 @@
height: 1rpx; height: 1rpx;
background: $border-color; background: $border-color;
} }
&-content { &-content {
position: absolute; position: absolute;
top: 20rpx; top: 20rpx;
@@ -188,21 +183,25 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
.mssage-header { .mssage-header {
display: flex; display: flex;
font-size: $title-size; font-size: $title-size;
line-height: 40rpx; line-height: 40rpx;
justify-content: space-between; justify-content: space-between;
.header-name { .header-name {
flex: 1; flex: 1;
@extend .nowrap; @extend .nowrap;
} }
.header-time { .header-time {
padding-left: $padding; padding-left: $padding;
font-size: $title-size-sm - 2; font-size: $title-size-sm - 2;
color: $text-gray; color: $text-gray;
} }
} }
.mssage-msg { .mssage-msg {
font-size: $title-size-sm - 2; font-size: $title-size-sm - 2;
color: $text-gray; color: $text-gray;
@@ -210,6 +209,7 @@
} }
} }
} }
&-item:last-child { &-item:last-child {
.mssage-action::after { .mssage-action::after {
display: none; display: none;

52
pages/im/private/index.vue
View File

@@ -1,6 +1,7 @@
<template> <template>
<view class="chat-content"> <view class="chat-content">
<scroll-view class="chat-scrool" :scroll-y="true" :scroll-into-view="scrollIntoID" :scroll-with-animation="false"> <scroll-view class="chat-scrool" :scroll-y="true" :scroll-into-view="scrollIntoID"
:scroll-with-animation="false">
<!-- 聊天窗口 --> <!-- 聊天窗口 -->
<view class="chat-item" v-for="(item,index) in messages" :key="index" :id="'chatId_'+index"> <view class="chat-item" v-for="(item,index) in messages" :key="index" :id="'chatId_'+index">
<view class="chat-item-time"> <view class="chat-item-time">
@@ -11,20 +12,20 @@
<view class="chat-msg-text">{{ item.content.content }}</view> <view class="chat-msg-text">{{ item.content.content }}</view>
<!-- 预留一些图片，语音表情包等位置 --> <!-- 预留一些图片，语音表情包等位置 -->
</view> </view>
<view class="chat-status" :class="{'hide': item.sentStatus == 50}" v-if="item.messageDirection == 1">{{ item.sentStatus == 50 ? '已读': '未读'}}</view> <view class="chat-status" :class="{'hide': item.sentStatus == 50}"
v-if="item.messageDirection == 1">{{ item.sentStatus == 50 ? '已读': '未读'}}</view>
<view class="chat-avatar"> <view class="chat-avatar">
<!-- <u-avatar :src="userInfo.portraitUrl" @click="showFriend"></u-avatar> --> <!-- <u-avatar :src="userInfo.portraitUrl" @click="showFriend"></u-avatar> -->
<u-avatar <u-avatar v-if="item.messageDirection == 2" :src="friend(targetId).portraitUrl"></u-avatar>
text="无" <u-avatar v-else :src="$store.getters.sender.portraitUrl"/>
fontSize="14"
bg-color="rgba(0,0,0,.2)"
></u-avatar>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="chat-footer"> <view class="chat-footer">
<input class="chat-input" type="text" v-model="inputTxt" confirm-type="发送" @confirm="send" cursor-spacing="10"/> <input class="chat-input" type="text" v-model="inputTxt" confirm-type="发送" @confirm="send"
cursor-spacing="10" />
<button class="chat-push" size="mini" @click="send">发送</button> <button class="chat-push" size="mini" @click="send">发送</button>
</view> </view>
</view> </view>
@@ -87,6 +88,11 @@
computed: { computed: {
showSendButton() { showSendButton() {
return this.inputTxt.length > 0 return this.inputTxt.length > 0
},
friend() {
return function(targetId) {
return this.$store.getters.userInfo(targetId)
}
} }
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@@ -147,14 +153,14 @@
}) })
}, },
showFriend() { showFriend() {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/im/friends/info?targetId=' + this.targetId // url: '/pages/im/friends/info?targetId=' + this.targetId
}) // })
}, },
showMine() { showMine() {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/im/friends/mine' // url: '/pages/im/friends/mine'
}) // })
}, },
scrollBottom() { scrollBottom() {
this.$nextTick(function() { this.$nextTick(function() {
@@ -183,14 +189,17 @@
.chat-content { .chat-content {
height: 100vh; height: 100vh;
background: $window-color; background: $window-color;
.chat-scrool { .chat-scrool {
height: calc(100vh - 140rpx); height: calc(100vh - 140rpx);
box-sizing: border-box; box-sizing: border-box;
padding-bottom: $padding; padding-bottom: $padding;
.chat-item { .chat-item {
.chat-item-time { .chat-item-time {
text-align: center; text-align: center;
padding: $padding/2 $padding; padding: $padding/2 $padding;
text { text {
background: rgba($color: #000000, $alpha: .2); background: rgba($color: #000000, $alpha: .2);
color: white; color: white;
@@ -201,13 +210,16 @@
border-radius: $radius-lg; border-radius: $radius-lg;
} }
} }
.chat-item-article { .chat-item-article {
position: relative; position: relative;
padding: 10rpx ($padding + 110) 0; padding: 10rpx ($padding + 110) 0;
overflow: hidden; overflow: hidden;
min-height: 40px; min-height: 40px;
.chat-msg { .chat-msg {
overflow: hidden; overflow: hidden;
.chat-msg-text { .chat-msg-text {
display: inline-block; display: inline-block;
padding: ($padding - 10) $padding; padding: ($padding - 10) $padding;
@@ -216,22 +228,27 @@
font-size: $title-size-lg; font-size: $title-size-lg;
} }
} }
.chat-status { .chat-status {
color: $text-gray; color: $text-gray;
font-size: $title-size-sm; font-size: $title-size-sm;
text-align: right; text-align: right;
&.hide { &.hide {
color: $text-gray-m; color: $text-gray-m;
} }
} }
.chat-avatar { .chat-avatar {
position: absolute; position: absolute;
top: 0; top: 0;
} }
&.left { &.left {
.chat-avatar { .chat-avatar {
left: $margin; left: $margin;
} }
.chat-msg { .chat-msg {
.chat-msg-text { .chat-msg-text {
background-color: white; background-color: white;
@@ -239,12 +256,15 @@
} }
} }
} }
&.right { &.right {
.chat-avatar { .chat-avatar {
right: $margin; right: $margin;
} }
.chat-msg { .chat-msg {
text-align: right; text-align: right;
.chat-msg-text { .chat-msg-text {
border-radius: $radius*2 0 $radius*2 $radius*2; border-radius: $radius*2 0 $radius*2 $radius*2;
background: $main-color; background: $main-color;
@@ -255,6 +275,7 @@
} }
} }
} }
.chat-footer { .chat-footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@@ -265,6 +286,7 @@
background: white; background: white;
box-sizing: border-box; box-sizing: border-box;
z-index: 99; z-index: 99;
.chat-input { .chat-input {
background: $window-color; background: $window-color;
height: 80rpx; height: 80rpx;
@@ -273,6 +295,7 @@
padding: 0 $padding; padding: 0 $padding;
box-sizing: border-box; box-sizing: border-box;
} }
.chat-push[size='mini'] { .chat-push[size='mini'] {
position: absolute; position: absolute;
right: $margin; right: $margin;
@@ -287,6 +310,7 @@
border-radius: $radius-lg; border-radius: $radius-lg;
font-size: $title-size-m; font-size: $title-size-m;
font-weight: bold; font-weight: bold;
&::after { &::after {
display: none; display: none;
} }

8
pages/im/private/setting.vue
View File

@@ -1,11 +1,11 @@
<template> <template>
<div> <view>
会话设置 {{ targetId}} 会话设置 {{ targetId}}
<div @click="setStatus">免打扰开关 {{status}}</div> <view @click="setStatus">免打扰开关 {{status}}</view>
<div @click="setTop">置顶会话 {{isTop}}</div> <view @click="setTop">置顶会话 {{isTop}}</view>
<u-button @click="toIndex">会首页</u-button> <u-button @click="toIndex">会首页</u-button>
</div> </view>
</template> </template>
<script> <script>

BIN
static/.DS_Store vendored Normal file
View File

Binary file not shown.

2
store/modules/im.js
View File

@@ -17,7 +17,7 @@ export default {
if (state.friends[targetId]) { if (state.friends[targetId]) {
return state.friends[targetId] return state.friends[targetId]
} else { } else {
console.log('没找到', targetId); console.log('没找到,， 死循环了，得处理 todo', targetId);
im.syncUserInfo(targetId) im.syncUserInfo(targetId)
return { return {
name: '', name: '',

BIN
uni_modules/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
utils/.DS_Store vendored Normal file
View File

Binary file not shown.

44
utils/im/api.js
View File

@@ -1,44 +0,0 @@
const api_url = 'http://api.zh.shangkelian.cn/api/im'
/**
* 获取币种余额
*/
export const getToken = (uid) => {
return new Promise((resolve, reject) => {
uni.request({
method: 'GET',
url: api_url + '/token/' + uid,
success: (res) => {
if (res.statusCode === 200) {
resolve(res.data.data)
} else {
reject(res.message)
}
}
})
})
}
/**
* 获取好友列表
*/
export const getFriends = () => {
return new Promise((resolve, reject) => {
uni.request({
method: 'GET',
url: api_url + '/friends',
success: (res) => {
if (res.statusCode === 200) {
resolve(res.data.data)
} else {
reject(res.message)
}
}
})
})
}
export default {
getToken,
getFriends
}

44
utils/im/sqlite.js
View File

@@ -1,44 +0,0 @@
const openSqlite = (callback) => {
plus.sqlite.openDatabase({
name: 'friends',
path: '_doc/friends.db',
success: (res) => {
callback(res)
},
fail: (err) => {
callback(err)
}
})
}
const executeSQL = (callback) => {
plus.sqlite.selectSql({
name: 'friends',
sql: sql,
success: (res) => {
callback(res)
},
fail: (err) => {
callback(err)
}
})
}
const closeSqlite = (callback) => {
plus.sqlite.closeDatabase({
name: 'friends',
path: '_doc/friends.db',
success: (res) => {
callback(res)
},
fail: (err) => {
callback(err)
}
})
}
export {
openSqlite,
executeSQL,
closeSqlite
}