This commit is contained in:
zengBin 2024-10-09 17:24:18 +08:00
parent 0e33b23f52
commit 391558c1e3
5 changed files with 21 additions and 16 deletions

View File

@ -1044,10 +1044,8 @@ wepy.page({
} }
} }
vm.throttle = true vm.throttle = true
wx.hideLoading()
}).catch(() => { }).catch(() => {
vm.throttle = true vm.throttle = true
wx.hideLoading()
}) })
} }
}, },
@ -1156,7 +1154,7 @@ wepy.page({
vm.loginShow = true vm.loginShow = true
return return
} }
if (!vm.userData.is_rank) { if (!vm.userData.rank_id) {
vm.modalName = 'purchase' vm.modalName = 'purchase'
return return
} }

View File

@ -559,7 +559,7 @@ page {
</style> </style>
<template> <template>
<view class="ui-chitchat"> <view class="ui-chitchat">
<image class="m_tips_icon" src="https://image.fulllinkai.com/202305/05/2172ea48286be34e3a4e80a8c2a4571a.png" mode="aspectFit" @tap="reportShow = true"></image> <image v-show="!hiddenHtml" class="m_tips_icon" src="https://image.fulllinkai.com/202305/05/2172ea48286be34e3a4e80a8c2a4571a.png" mode="aspectFit" @tap="reportShow = true"></image>
<scroll-view class="ui-scroll-view" style="height: {{windowHeight - bottomBoxH}}rpx;" :scroll-y="scrollY" upper-threshold="50" bindscrolltoupper="getHistoryMsg" scroll-into-view="{{toView}}" enable-flex="{{true}}"> <scroll-view class="ui-scroll-view" style="height: {{windowHeight - bottomBoxH}}rpx;" :scroll-y="scrollY" upper-threshold="50" bindscrolltoupper="getHistoryMsg" scroll-into-view="{{toView}}" enable-flex="{{true}}">
<view class="ui-top-placeholder"></view> <view class="ui-top-placeholder"></view>
<block v-show="loading"> <block v-show="loading">
@ -615,7 +615,7 @@ page {
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="ui-bottom-input-box"> <view class="ui-bottom-input-box" v-show="!hiddenHtml">
<!--输入文本加表情预览信息--> <!--输入文本加表情预览信息-->
<view class="replyView f-fcc animation-slide-bottom" v-if="msg.length > 17 && showReplyView" style="bottom: {{inputBoxH}}px;"> <view class="replyView f-fcc animation-slide-bottom" v-if="msg.length > 17 && showReplyView" style="bottom: {{inputBoxH}}px;">
<view class="replyContent main-content-box" bindlongpress="copy" data-text="{{msg}}"> <view class="replyContent main-content-box" bindlongpress="copy" data-text="{{msg}}">
@ -742,6 +742,7 @@ wepy.page({
videoIndex: -1, videoIndex: -1,
videoContext: null, videoContext: null,
videoState: null, videoState: null,
hiddenHtml: null,
playAudioIndex: -1, playAudioIndex: -1,
audioTime: null, audioTime: null,
@ -774,10 +775,10 @@ wepy.page({
} }
let msg = vm.msg let msg = vm.msg
if (/\[[^\]]+\]/.test(vm.msg)) { if (/\[[^\]]+\]/.test(vm.msg)) {
vm.msg = vm.transitionMsg(vm.msg) msg = vm.transitionMsg(vm.msg)
} }
vm.msgList.push({ vm.msgList.push({
text: vm.msg, text: msg,
attach: '', attach: '',
id: `id_${timeData}`, id: `id_${timeData}`,
isSelf: true, isSelf: true,
@ -1433,6 +1434,7 @@ wepy.page({
playVideo(index) { playVideo(index) {
let vm = this let vm = this
vm.videoState = true vm.videoState = true
vm.hiddenHtml = true
vm.videoIndex = index vm.videoIndex = index
vm.videoContext = wx.createVideoContext('chatVideo-' + index, vm) vm.videoContext = wx.createVideoContext('chatVideo-' + index, vm)
vm.videoContext.requestFullScreen({direction: 0}) vm.videoContext.requestFullScreen({direction: 0})
@ -1446,11 +1448,13 @@ wepy.page({
let vm = this let vm = this
let fullScreen = e.$wx.detail.fullScreen let fullScreen = e.$wx.detail.fullScreen
vm.videoState = true vm.videoState = true
vm.hiddenHtml = true
if (!fullScreen) { if (!fullScreen) {
vm.toView = `${row}` vm.toView = `${row}`
vm.videoContext.stop() vm.videoContext.stop()
vm.videoContext = null vm.videoContext = null
vm.videoIndex = -1 vm.videoIndex = -1
vm.hiddenHtml = false
setTimeout(() => { setTimeout(() => {
vm.videoState = false vm.videoState = false
}, 500) }, 500)

View File

@ -445,7 +445,7 @@ wepy.page({
data.data.forEach((item) => { data.data.forEach((item) => {
item.nickname = `${item.nickname.substring(0, 1)}***` item.nickname = `${item.nickname.substring(0, 1)}***`
}) })
if (vm.list.length === 0 || vm.page === 1) { if (vm.fansList.length === 0 || vm.fans_page === 1) {
vm.fansList = data.data vm.fansList = data.data
} else { } else {
data.data.map(function (item) { data.data.map(function (item) {
@ -563,8 +563,11 @@ wepy.page({
}, },
onShow() { onShow() {
}, },
created() { onLoad(e) {
let vm = this let vm = this
if (e && e.index) {
vm.tabBarIndex = e.index
}
vm.getList() vm.getList()
vm.getFansList() vm.getFansList()
vm.userInfo = wx.getStorageSync('userInfo') vm.userInfo = wx.getStorageSync('userInfo')

View File

@ -240,7 +240,6 @@ wepy.page({
index: null, // 滑动删除聊天消息下标 index: null, // 滑动删除聊天消息下标
groupSessionsCount: [], // 群聊消息未读数 groupSessionsCount: [], // 群聊消息未读数
teamAtList: [], // 群聊@ teamAtList: [], // 群聊@
cachePage: 0, // 记录跳转前的页数
page: 1, page: 1,
no_more: false, no_more: false,
list: [] // 消息列表数据 list: [] // 消息列表数据
@ -288,7 +287,6 @@ wepy.page({
} }
} }
} }
vm.cachePage = vm.page
setTimeout(() => { setTimeout(() => {
vm.loading = true vm.loading = true
}, 500) }, 500)
@ -468,16 +466,15 @@ wepy.page({
onPullDownRefresh() { onPullDownRefresh() {
let vm = this let vm = this
vm.page = 1 vm.page = 1
vm.cachePage = 0
vm.no_more = false vm.no_more = false
vm.getList() vm.getList()
}, },
onShow() { onShow() {
let vm = this let vm = this
vm.page = 1
vm.no_more = false
vm.getNewCount() vm.getNewCount()
if (vm.cachePage != vm.page) {
vm.getList() vm.getList()
}
}, },
onLoad() {} onLoad() {}
}) })

View File

@ -145,7 +145,10 @@ const IM = (account, token) => {
}) })
} }
setTimeout(() => { setTimeout(() => {
console.log(currentPage, '7777777')
if (currentPage.route == 'pages/tabBar/news') {
currentPage.onShow() currentPage.onShow()
}
wx.vibrateLong({ wx.vibrateLong({
success: () => { success: () => {
console.log('来消息了,震动~~') console.log('来消息了,震动~~')