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

临时开启视频测试

Browse Source
This commit is contained in:
Jason.Chen
2022-02-17 17:06:41 +08:00
parent 77b0905895 ed28161bc0
commit 8d7f248d9b
5 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages.json
View File

@@ -636,7 +636,7 @@
} }
], ],
"tabBar": { "tabBar": {
"borderStyle": "black", "borderStyle": "white",
"selectedColor": "#34CE98", "selectedColor": "#34CE98",
"list": [{ "list": [{
"iconPath": "static/tabBar/tabBar_00.png", "iconPath": "static/tabBar/tabBar_00.png",

19
pages/im/components/groupUserList.vue
View File

@@ -4,16 +4,14 @@
<view :class="['user', {'active': item.targetId === currentUser.targetId}]" @longpress="showAction(item)" <view :class="['user', {'active': item.targetId === currentUser.targetId}]" @longpress="showAction(item)"
v-for="(item, index) in users" :key="index" @click="toUser(item)"> v-for="(item, index) in users" :key="index" @click="toUser(item)">
<view class="avatar"> <view class="avatar">
<u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl"></u-avatar> <u-avatar :size="avatarSize" shape="square" :src="contact(item.targetId).portraitUrl" />
<view class="admin" v-if="item.is_admin === 1">管理</view> <view class="admin" v-if="item.is_admin === 1">管理</view>
<view class="owner" v-if="item.is_admin === 2">群主</view> <view class="owner" v-if="item.is_admin === 2">群主</view>
</view> </view>
<view class="name">{{ item.name }}</view> <view class="name">{{ item.name }}</view>
</view> </view>
<view class="user" v-if="isAdmin"> <view class="user" v-if="isAdmin">
<u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bg-color="#eeeeee" <u-avatar @click="inviteUser" :size="avatarSize" shape="square" icon="plus" bgColor="#f9f9f9" color="#c7c7c7" />
color="#999999">
</u-avatar>
<view class="name">邀请好友</view> <view class="name">邀请好友</view>
</view> </view>
</view> </view>
@@ -24,8 +22,7 @@
</view> </view>
<u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction" <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
@select="handleAction" :show="actionShow"> @select="handleAction" :show="actionShow" />
</u-action-sheet>
</view> </view>
</template> </template>
@@ -282,7 +279,7 @@
background-color: $main-color; background-color: $main-color;
transform: rotate(45deg); transform: rotate(45deg);
color: #ffffff; color: #ffffff;
font-size: 12rpx; font-size: 16rpx;
width: 100rpx; width: 100rpx;
padding-top: 30rpx; padding-top: 30rpx;
text-align: center; text-align: center;
@@ -295,7 +292,7 @@
background-color: $text-price; background-color: $text-price;
transform: rotate(45deg); transform: rotate(45deg);
color: #ffffff; color: #ffffff;
font-size: 12rpx; font-size: 16rpx;
width: 100rpx; width: 100rpx;
padding-top: 30rpx; padding-top: 30rpx;
text-align: center; text-align: center;
@@ -306,14 +303,16 @@
} }
.name { .name {
color: $text-gray-m; color: 20rpx;
width: 126rpx; width: 126rpx;
padding-top: 6rpx;
text-align: center; text-align: center;
font-size: 26rpx; font-size: 22rpx !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
word-break: break-word; word-break: break-word;
color: $text-gray-m !important;
} }
} }

7
pages/im/components/messageCell.vue
View File

@@ -6,8 +6,7 @@
</view> </view>
<view class="content"> <view class="content">
<view class="header"> <view class="header">
<view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
class='qun'>[群]</text></view>
<view class="time">{{ item.sentTime|timeCustomCN }}</view> <view class="time">{{ item.sentTime|timeCustomCN }}</view>
</view> </view>
<message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType" <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
@@ -77,8 +76,10 @@
.qun { .qun {
color: $main-color; color: $main-color;
font-size: $title-size-m; font-size: $title-size-m - 4;
margin-left: 4px; margin-left: 4px;
position: relative;
top: -4rpx;
} }
} }

6
pages/im/group/chat.nvue
View File

@@ -2,9 +2,7 @@
<view class="group--chat"> <view class="group--chat">
<list class="body" :show-scrollbar="false"> <list class="body" :show-scrollbar="false">
<cell class="cell" v-for="(item, index) in messages" :key="index"> <cell class="cell" v-for="(item, index) in messages" :key="index">
<view class="cell-system" v-if="item.senderUserId === '__system__'"> <view class="cell-system" v-if="item.senderUserId === '__system__'"> <text class="text">{{ item.content.message }}</text> </view>
<text class="text">{{ item.content.message }}</text>
</view>
<view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']"> <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
<u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" /> <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" />
<view class="msg"> <view class="msg">
@@ -168,8 +166,8 @@
flex: 1; flex: 1;
.body { .body {
flex: 1;
flex: 1;
.cell { .cell {
padding: 10rpx 30rpx; padding: 10rpx 30rpx;

25
pages/im/private/chat.nvue
View File

@@ -5,13 +5,17 @@
<cell class="cell" v-for="(item, index) in messages" :key="index"> <cell class="cell" v-for="(item, index) in messages" :key="index">
<view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view> <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
<view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']"> <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
<u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)" :src="contact(item.senderUserId).portraitUrl" /> <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
:src="contact(item.senderUserId).portraitUrl" />
<view class="msg"> <view class="msg">
<show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" /> <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
<show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" /> :msg="item.content" />
<show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" /> <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
:msg="item.content" />
<show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
:msg="item.content" />
<view class="state" v-if="item.messageDirection == 1"> <view class="state" v-if="item.messageDirection == 1">
<text class="state-text">{{ item.sentStatus == 50 ? '已读': '未读'}}</text> <text :class="item.sentStatus === 50?'state-text':'state-text-active'">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
</view> </view>
</view> </view>
</view> </view>
@@ -167,6 +171,7 @@
background: $window-color; background: $window-color;
flex: 1; flex: 1;
.body { .body {
flex: 1; flex: 1;
@@ -192,7 +197,6 @@
width: 690rpx; width: 690rpx;
justify-content: flex-start; justify-content: flex-start;
&.left { &.left {
flex-direction: row; flex-direction: row;
} }
@@ -213,8 +217,13 @@
padding-top: 10rpx; padding-top: 10rpx;
.state-text { .state-text {
font-size: 24rpx; font-size: $title-size-m - 2;
color: #666; color: rgba($color: $main-color, $alpha: 0.3)
}
.state-text-active {
font-size: $title-size-m - 2;
color: #cecece;
} }
} }
} }