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

merge

Browse Source
This commit is contained in:
Jason.Chen
2022-02-08 14:24:23 +08:00
parent 784483cc47 c722c70624
commit 03fdc9b9d0
12 changed files with 125 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
pages/.DS_Store vendored
View File

Binary file not shown.

13
pages/im/components/sentText.nvue
View File

@@ -1,6 +1,15 @@
<template>
<view class="sent--text">
<input class="input" type="text" @focus="focus" @blur="blur" v-model="inputTxt" confirm-type="send" @confirm="sent" cursor-spacing="10" />
<input
class="input"
type="text"
@focus="focus"
@blur="blur"
v-model="inputTxt"
confirm-type="send"
@confirm="sent"
cursor-spacing="10"
/>
<!-- <button class="button" size="mini" :disabled="disabled" @click="sent">发送</button> -->
</view>
</template>
@@ -71,7 +80,7 @@
.input {
background: #F3F6FB;
height: 70rpx;
width: 460rpx;
width: 500rpx;
border-radius: 10rpx;
margin-right: 15rpx;
padding: 0 20rpx;

2
pages/im/components/sentVoice.nvue
View File

@@ -102,7 +102,7 @@
line-height: 70rpx;
justify-content: center;
align-items: center;
width: 460rpx;
width: 500rpx;
border-radius: 10rpx;
margin-right: 15rpx;

14
pages/im/index.vue
View File

@@ -7,11 +7,11 @@
<view class="tabs">
<view class="item show">
私聊
<u-badge absolute max="99" shape="horn" :offset="[-7, -7]" :value="5" />
<u-badge absolute max="99" shape="horn" :offset="[-7, -7]" :value="privateUnread" />
</view>
<view class="item" @click="onNav('', {})">
群聊
<u-badge absolute max="99" shape="horn" :offset="[-7, -7]" :value="10" />
<u-badge absolute max="99" shape="horn" :offset="[-7, -7]" :value="groupUnread" />
</view>
</view>
@@ -95,6 +95,8 @@
/* 弹窗定位样式 */
popStyle: "",
pickedItem: {},
privateUnread: 0,
groupUnread: 0,
hasNewFriends: true
}
},
@@ -120,6 +122,12 @@
uni.$on('onReceiveMessage', (msg) => {
console.log('收到消息，刷新列表');
this.getConversationList()
// todo ，不知道这个获取未读数量的，有没有办法能获取私聊的，还有群组的
// RongIMLib.getTotalUnreadCount(({
// count
// }) => {
// this.privateUnread = count
// })
})
this.isShown = true
},
@@ -203,7 +211,6 @@
const timestamp = 0
RongIMLib.getConversationList([RongIMLib.ConversationType.PRIVATE], count, timestamp, (res) => {
if (res.code === 0) {
console.log(res.conversations);
this.conversations = res.conversations
}
})
@@ -273,6 +280,7 @@
line-height: 60rpx;
.tabs {
.item {
position: relative;
margin-left: $margin;

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

@@ -36,13 +36,12 @@
@success="getMessageList" />
<sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId"
@success="getMessageList" />
<view class="msg-type" @click="showPopups = !showPopups">
<view class="msg-type msg-popups" @click="scrollBottom('msgPopups')">
<image class="icon" src="@/static/icon/popups-icon.png"></image>
</view>
</view>
<!-- 弹出层 -->
<sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId"
@success="() => {showPopups = false, getMessageList()}"></sent-popups>
<sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId" @success="() => {showPopups = false, getMessageList()}"></sent-popups>
</view>
</template>
@@ -148,10 +147,14 @@
})
},
// 滚动到底部
scrollBottom() {
scrollBottom(type) {
if(type === 'msgPopups'){
this.showPopups = !this.showPopups
}
setTimeout(() => {
let el = this.$refs.chatBottom
ChatList.scrollToElement(el, {
ChatList.scrollToElement(el, {
offset: 0,
animated: false
})
}, 50)
@@ -165,19 +168,14 @@
.chat {
background: $window-color;
flex: 1;
.body {
flex: 1;
.cell {
.body {
flex: 1;
.cell {
padding: 10rpx 30rpx;
.time {
justify-content: center;
align-items: center;
padding-bottom: 20rpx;
padding-bottom: 20rpx;
.text {
background: #fff;
font-size: 24rpx;
@@ -238,12 +236,10 @@
padding: 20rpx 30rpx;
display: flex;
justify-content: space-between;
flex-direction: row;
flex-direction: row;
.msg-type {
width: 70rpx;
height: 70rpx;
.icon {
margin: 5rpx;
width: 60rpx;

29
pages/index/index.vue
View File

@@ -4,7 +4,15 @@
<view class="status-main">
<view class="helloe">欢迎使用ZH-HEALTH健康</view>
<view class="btns">
<view class="btns-item" @click="onBtn('signIndex')"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
<!-- 打卡图标gif -->
<!-- <view class="btns-item" @click="$Router.push({name: 'signIndex'})"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view> -->
<view class="btns-clock" @click="$Router.push({name: 'signIndex'})">
<image src="@/static/icon/clock_icon.png" mode="widthFix"></image>
<view class="btns-clock-text">
打卡
</view>
</view>
<view class="btns-item show" @click="onBtn('noticeIndex')"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>
</view>
</view>
@@ -101,12 +109,29 @@
align-items: center;
.helloe {
line-height: 100rpx;
font-size: $title-size + 10;
font-size: $title-size + 4;
font-weight: bold;
}
.btns {
margin-left: $margin;
display: flex;
.btns-clock {
color: #885100;
height: 50rpx;
font-size: $title-size-sm - 2;
border-radius: 40rpx;
display: flex;
background-image: linear-gradient(to right, #fce938, #ffce36);
image {
width: 48rpx;
display: inline-block;
}
.btns-clock-text {
line-height: 50rpx;
font-weight: 600;
padding: 0 20rpx 0 8rpx;
}
}
.btns-item {
position: relative;
text-align: right;

44
pages/sign/index.vue
View File

@@ -9,7 +9,7 @@
<view class="number">
<text>{{ dateData.total }}</text>天
</view>
本月签到
本月打卡
</view>
</view>
<view class="label">
@@ -18,7 +18,7 @@
<view class="number">
<text>{{ dateData.continue }}</text>天
</view>
累计签到
累计打卡
</view>
</view>
</view>
@@ -50,25 +50,28 @@
六
</view>
</view>
<view class="day" v-for="(item, index) in dateArr">
<view class="day-label" v-for="(items, index) in item">
<view class="label-block" :class="{active : items.isSign}" v-if="!items.isHidden">{{ items.isSign ? '签' : items.date }}</view>
<view class="day" v-for="(item, index) in dateArr" :key="index">
<view class="day-label" v-for="(items, index) in item" :key="index">
<view class="label-block" :class="{active : items.isSign}" v-if="!items.isHidden">
<uni-icons v-if="items.isSign" class="search-icon" custom-prefix="iconfont" type="icon-dui" color="#ffffff" size="18"></uni-icons>
<block v-else>{{ items.date }}</block>
</view>
</view>
</view>
</view>
<view class="signBtn">
<view class="btn" @click="signClick" :class="{active : dateData.isSign}">
{{ dateData.isSign ? '当日已签' : '立即签到'}}
{{ dateData.isSign ? '今日已打卡' : '今日打卡'}}
</view>
</view>
</view>
<view class="tipsText">
ZH大健康用户签到
ZH大健康用户打卡
</view>
</view>
</view>
</template>
</view>
</template>
<script>
import { date, sign } from '@/apis/interfaces/sign'
export default {
@@ -112,9 +115,9 @@
})
}
}
}
</script>
}
</script>
<style lang="scss" scoped>
page {
background: $window-color;
@@ -174,7 +177,9 @@
}
}
.signDate {
padding: $padding;
padding: $padding;
border-radius: $radius-m;
background-color: white;
.date {
text-align: center;
font-size: $title-size + 6;
@@ -209,6 +214,12 @@
height: 56rpx;
line-height: 56rpx;
text-align: center;
position: relative;
.label-icon {
position: absolute;
left: 10rpx;
top: 0;
}
&.active {
background-color: $main-color;
color: white;
@@ -232,7 +243,8 @@
color: $text-gray;
}
}
}
}
}
.tipsText {
text-align: center;
@@ -241,4 +253,4 @@
color: $text-gray-m;
}
}
color: $text-gray-m;
</style>