2025.02.28 工作代码提交

This commit is contained in:
sx 2025-02-28 19:19:35 +08:00
parent ff3913769c
commit 1fb340263b
6 changed files with 365 additions and 353 deletions

View File

@ -142,8 +142,6 @@ const getReadNum = () => {
getNoReadNum()
}
defineExpose({ getReadNum })
//
onMounted(() => {
//
@ -154,15 +152,13 @@ onMounted(() => {
uni.getSystemInfo().then(rs => {
safeHeight.value = rs.safeArea + 'px'
})
//
getNoReadNum()
//
// proxy.$refs.alert.open()
})
onLoad(() => {
//
getNoReadNum()
})
//
onUnmounted(() => {
@ -240,6 +236,10 @@ function getNoReadNum() {
// #endif
}
}
defineExpose({
getReadNum
})
</script>
<template>
@ -252,9 +252,10 @@ function getNoReadNum() {
<view class="option" :class="{ active: item.page === page }" v-if="item.type == 'option'">
<text class="text">{{ item.name }}</text>
<view class="pot" v-if="item.page == 'news' && noReadNum != 0">{{ noReadNum }}</view>
</view>
<text class="pot" v-if="item.page == 'news' && noReadNum != 0">{{ noReadNum }}</text>
<view class="middle" v-else-if="item.type === 'middle'">
<image class="img" src="/static/footerMenuPlus.png" mode="aspectFit" v-if="subject == 'dark'" />
<image class="img" src="/static/footerMenuPlus1.png" mode="aspectFit"
@ -320,6 +321,7 @@ $boderSize: 2rpx;
.item {
/* #ifndef APP-NVUE */
position: relative;
display: flex;
/* #endif */
align-items: center;
@ -363,25 +365,32 @@ $boderSize: 2rpx;
.option {
position: relative;
z-index: 1;
}
//
.pot {
position: absolute;
top: -16rpx;
right: -30rpx;
height: 24rpx;
/* #ifndef APP-NVUE */
min-width: 24rpx;
display: flex;
flex-direction: column;
box-sizing: border-box;
/* #endif */
line-height: 24rpx;
border-radius: 24rpx;
/* #ifdef APP-NVUE */
line-height: 28rpx;
/* #endif */
justify-content: center;
align-items: center;
position: absolute;
top: 5rpx;
right: 5rpx;
width: 28rpx;
height: 28rpx;
border-radius: 100rpx;
background: #FF6B17;
color: #fff;
font-size: 20rpx;
padding: 4rpx;
text-align: center;
z-index: 11;
}
}
.middle {
.img {

View File

@ -130,13 +130,11 @@
userId: userinfo.value.id,
// id
childrenParentId: reply.id || 0,
}
}).then(rs => {
console.log('saveComment', rs)
if (rs.code == 200) {
proxy.$refs.comment.close()
detail.comment++
//
refreshList()
setTimeout(() => {
@ -144,7 +142,10 @@
content.value = ''
}, 500)
//
uni.$emit('updateVideo', detail)
uni.$emit('updateVideo', {
...detail,
...rs.data,
})
return
}
util.alert({

View File

@ -474,7 +474,7 @@
if (isLong.value) return
play()
isLong.value = true
videoCtx.value.playbackRate(2)
videoCtx.value.playbackRate(1.5)
}
//
@ -509,6 +509,7 @@
<view class="main f1">
<view class="videoBox f1" @touchmove.stop="" @touchstart="onTouchStart" @touchend="onTouchEnd"
@touchcancel="onTouchCancel" @longpress="longtap">
<statusBar />
<!-- 视频 增加判断防止重复加载 -->
@ -530,7 +531,7 @@
<!-- 倍速播放提示 -->
<view class="speedBox" v-if="isLong">
<view class="speed ptb5 plr10">
<text class="f22 cfff">2倍速播放中...</text>
<text class="f22 cfff">1.5倍速播放中...</text>
</view>
</view>
@ -587,7 +588,8 @@
<!-- 只有公开赞显示点赞数 -->
<view class="txt mt10">
<text class="text" v-if="item.isLike == 0 && item.likeType == 0">{{ item.likeCount }}</text>
<text class="text"
v-if="item.isLike == 0 && item.likeType == 0">{{ item.likeCount }}</text>
<text class="text" v-else-if="item.isLike == 0 && item.likeType == 1">隐私赞</text>
<text class="text" v-else>点赞</text>
</view>

View File

@ -53,7 +53,7 @@
function getDetail() {
api.shop.productDetail({
query: {
userId: userinfo.value.id,
userId: userinfo.value.id || '',
// id
productionId: proId.value
}

View File

@ -360,7 +360,7 @@ function handleDate(timestamp) {
<view class="mark pa t0 r0 cfff f22 cir" v-if="item.unreadCount">{{ item.unreadCount }}
</view>
</view>
<view class="col f1 ml20">
<view class="col oh f1 ml20">
<view class="rows">
<view class="name f1 thd c333 f32">{{ item.name }}</view>
<view class="datetime c999 f22">

View File

@ -228,8 +228,8 @@
const videoRefList = proxy.$refs[`videoRef${tabIndex.value}`]
// 暂停视频
if (videoRefList) {
// videoRefList[videoRefList.length - 2].pause()
videoRefList[current[tabIndex.value]].pause()
videoRefList[videoRefList.length - 2].pause()
// videoRefList[current[tabIndex.value]].pause()
}
})
@ -806,7 +806,7 @@
@touchend="onTouchend($event,index)" @loadmore="item.getMoreList">
<cell class="cell" :style="[{height: viewSize.height + 'px'}]" :ref="`cellRef` + index"
v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
<!-- <template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2"> -->
<template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2">
<!-- 视频 -->
<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
@ -815,7 +815,7 @@
@onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike"
@longtap="$refs.moreMenuRef.open(secItem)" @showFastCollect="handleShowFastCollect"
@showProduct="handleShowProduct" @proBuy="handleProBuy" />
<!-- </template> -->
</template>
</cell>
</list>
</view>