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

同步代码

Browse Source
This commit is contained in:
张冬雪
2022-01-28 11:41:06 +08:00
parent 572066de9a
commit d4dc956f2e
4 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,9 @@
.name { .name {
flex: 1; flex: 1;
padding-left: $padding; padding-left: $padding;
font-size: $title-size; font-size: $title-size + 2;
font-size: $title-size + 2;
color: #454545 !important;
@extend .nowrap; @extend .nowrap;
} }
} }

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

@@ -2,7 +2,7 @@
<view class="content"> <view class="content">
<!-- 用户信息 --> <!-- 用户信息 -->
<view class="info-flex"> <view class="info-flex">
<u-avatar :src="userInfo.portraitUrl" shape="square" size="50" bg-color="#fff"></u-avatar> <u-avatar :src="userInfo.portraitUrl || require('@/static/user/cover.png')" shape="square" size="50" bg-color="#fff"></u-avatar>
<view class="info-text"> <view class="info-text">
<view class="nickname">{{userInfo.name}}</view> <view class="nickname">{{userInfo.name}}</view>
<view class="address" @longpress="copyAddress">地址：{{userInfo.address}}</view> <view class="address" @longpress="copyAddress">地址：{{userInfo.address}}</view>
@@ -22,11 +22,11 @@
<view class="info-btns"> <view class="info-btns">
<view class="item u-border-bottom" @click="setRemark"> <view class="item u-border-bottom" @click="setRemark">
<label>设置备注</label> <label>设置备注</label>
<u-icon name="arrow-right" color="#999" size="16"></u-icon> <u-icon name="arrow-right" color="#eee" size="16" />
</view> </view>
<view class="item u-border-bottom" @click="setRemark"> <view class="item u-border-bottom" @click="setRemark">
<label>设置标签</label> <label>设置标签</label>
<u-icon name="arrow-right" color="#999" size="16"></u-icon> <u-icon name="arrow-right" color="#eee" size="16" />
</view> </view>
<view class="item u-border-bottom"> <view class="item u-border-bottom">
<label>聊天免打扰</label> <label>聊天免打扰</label>
@@ -40,21 +40,21 @@
<view class="footer"> <view class="footer">
<view class="footer-item" @click="deleteFriend"> <view class="footer-item" @click="deleteFriend">
<view class="icon"> <view class="icon">
<u-icon class="icon-u" name="close-circle-fill" color="#fff" size="26"></u-icon> <u-icon class="icon-u" name="close-circle-fill" color="#fff" size="30" />
</view> </view>
<view class="text">删除好友</view> <view class="text">删除好友</view>
</view> </view>
<view class="footer-item" @click="toPrivate"> <view class="footer-item" @click="toPrivate">
<view class="icon"> <view class="icon ">
<u-icon class="icon-u" name="chat-fill" color="#fff" size="26"></u-icon> <u-icon class="icon-u" name="chat-fill" color="#fff" size="30" />
</view> </view>
<view class="text">发送消息</view> <view class="text">发送消息</view>
</view> </view>
<view class="footer-item" @click="callShow = true"> <view class="footer-item" @click="callShow = true">
<view class="icon"> <view class="icon">
<u-icon class="icon-u" name="camera-fill" color="#fff" size="26"></u-icon> <u-icon class="icon-u" name="camera-fill" color="#fff" size="30" />
</view> </view>
<view class="text">视频通话</view> <view class="text">音/视频通话</view>
</view> </view>
</view> </view>
</block> </block>
@@ -62,7 +62,7 @@
<view class="footer"> <view class="footer">
<view class="footer-item" @click="toBeFriend"> <view class="footer-item" @click="toBeFriend">
<view class="icon"> <view class="icon">
<u-icon class="icon-u" name="plus-people-fill" color="#fff" size="26"></u-icon> <u-icon class="icon-u" name="plus-people-fill" color="#fff" size="30" />
</view> </view>
<view class="text">申请好友</view> <view class="text">申请好友</view>
</view> </view>
@@ -282,7 +282,7 @@
.nickname { .nickname {
line-height: 30px; line-height: 30px;
font-size: $title-size + 6; font-size: $title-size + 6;
color: $text-color; color: #454545;
text-align: left; text-align: left;
} }
@@ -309,26 +309,36 @@
.footer-item { .footer-item {
margin: 0 $margin/2; margin: 0 $margin/2;
text-align: center; text-align: center;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
box-sizing: border-box;
.icon { .icon {
background: $main-color; background: $main-color;
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
line-height: 88rpx; // line-height: 88rpx;
display: inline-block; // display: inline-block;
border-radius: 50%; border-radius: 50%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
box-sizing: border-box;
.icon-u { .icon-u {
margin-top: calc((88rpx/2) - 13px); // margin-top: calc((88rpx/2) - 13px);
margin-left: calc((88rpx/2) - 13px); // margin-left: calc((88rpx/2) - 13px);
} }
} }
.text { .text {
color: $main-color; color: $main-color;
font-size: $title-size-m; font-size: $title-size-m - 2;
text-align: center; text-align: center;
padding-top: 10rpx; padding-top: 16rpx;
} }
} }
} }
@@ -339,12 +349,14 @@
background: white; background: white;
margin: $margin; margin: $margin;
border-radius: $radius; border-radius: $radius;
.u-border-bottom{
border-bottom: solid 1rpx #f9f9f9 !important;
}
.item { .item {
line-height: 100rpx; line-height: 100rpx;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 $padding; padding:10rpx $padding;
justify-content: space-between; justify-content: space-between;
font-size: $title-size-lg; font-size: $title-size-lg;

43
pages/im/index.vue
View File

@@ -29,17 +29,17 @@
</view> </view>
</block> </block>
<block v-else> <block v-else>
<u-alert type="warning" v-if="connection != 0" description="网络似乎断开了" :show-icon="true"></u-alert> <u-alert type="warning" v-if="connection != 0" description="网络似乎断开了" :show-icon="true" />
<view v-for="(item, index) in conversations" :key="index" <view v-for="(item, index) in conversations" :key="index"
:class="['message', 'u-border-bottom', { 'is-top': item.isTop }]" @tap="toDetail(item)" :class="['message', { 'is-top': item.isTop }]" @tap="toDetail(item)"
@longpress="onLongPress" :data-item="item"> @longpress="onLongPress" :data-item="item">
<view class="avatar"> <view class="avatar">
<u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]" <u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]"
:value="item.unreadMessageCount" /> :value="item.unreadMessageCount" />
<u-avatar size="44" v-if="!friend(item.targetId).portraitUrl" shape="square" <u-avatar size="46" v-if="!friend(item.targetId).portraitUrl" shape="square"
: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="16" randomBgColor></u-avatar> font-size="16" randomBgColor />
<u-avatar v-else :src="friend(item.targetId).portraitUrl" shape="square" size="44"></u-avatar> <u-avatar v-else :src="friend(item.targetId).portraitUrl" shape="square" size="46" />
</view> </view>
<view class="content"> <view class="content">
<view class="header"> <view class="header">
@@ -248,7 +248,7 @@
// header // header
.custom-header { .custom-header {
@extend .ios-top; @extend .ios-top;
background: $window-color; background: #fff;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@@ -296,7 +296,7 @@
.contents { .contents {
background-color: $window-color; background-color: $window-color;
min-height: 100vh; min-height: 100vh;
padding-top: 90rpx; padding-top: 90rpx + 20rpx;
box-sizing: border-box; box-sizing: border-box;
.null-list { .null-list {
@@ -317,14 +317,14 @@
.message { .message {
background: white; background: white;
padding: 20rpx 30rpx; padding: 30rpx 30rpx 0 30rpx;
position: relative; position: relative;
display: flex; display: flex;
&.u-border-bottom {}
&.is-top { &.is-top {
background: $window-color; background: $window-color;
// background-color: rgba($color: $main-color, $alpha: 0.02);
} }
.avatar { .avatar {
@@ -336,28 +336,38 @@
} }
.content { .content {
padding-left: 30rpx; margin-left: 30rpx;
width: calc(100% - 44px); width: calc(100% - 46px);
box-sizing: border-box; box-sizing: border-box;
border-bottom: solid 1rpx #eee;
position: relative;
.header { .header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.name { .name {
font-size: $title-size + 4; font-size: $title-size + 2;
color: #454545;
color: #454545;
} }
.time { .time {
font-size: $title-size-sm; font-size: $title-size-sm;
color: $text-gray; color: $text-gray-m;
position: absolute;
right: 0;
} }
} }
.preview { .preview {
word-break: break-all; word-break: break-all;
color: $text-gray; color: $text-gray-m;
font-size: $title-size-sm; font-size: $title-size-sm + 2;
padding-top: $padding - 20;
padding-bottom: $padding;
padding-bottom: $padding;
width: 500rpx;
@extend .nowrap; @extend .nowrap;
} }
} }
@@ -413,4 +423,7 @@
} }
} }
} }
.u-border-bottom{
border-bottom: solid 1rpx #f9f9f9 !important;
}
</style> </style>

3
pages/im/private/call.nvue
View File

@@ -10,7 +10,8 @@
<view class="status" v-if="!connected || mediaType == 0"> <view class="status" v-if="!connected || mediaType == 0">
<view class="call-user"> <view class="call-user">
<u-avatar :src="userInfo.portraitUrl" shape="square" size="96" bg-color="#fff"></u-avatar> <u-avatar v-if="userInfo.portraitUrl" :src="userInfo.portraitUrl" shape="square" size="96" bgColor="#fff" />
<u-avatar size="80" v-if="!userInfo.portraitUrl" shape="square" :text="userInfo.name ? userInfo.name.substring(0,1) : '未'" font-size="44" randomBgColor />
<view><text class="nickname">{{userInfo.name}}</text></view> <view><text class="nickname">{{userInfo.name}}</text></view>
<view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view> <view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view>
<view v-if="connected"><text class="mediaType">已接通</text></view> <view v-if="connected"><text class="mediaType">已接通</text></view>