From 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disRealpic/index.js | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 24d02de..c96868b 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -76,9 +76,15 @@
},
videoClick(e) {
const { videourl } = e.currentTarget.dataset
- wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
- })
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(videourl,this );
+ }
+ console.log(videourl+"-------------------------------------")
+ // wx.previewMedia({
+ // sources: [{ url: videourl, type: 'video' }]
+ // })
},
priviewFull(e){
const item = e.currentTarget.dataset.item
@@ -111,9 +117,14 @@
const item = e.currentTarget.dataset.item
console.log('item', item);
if(item.openType == 'video'){
- wx.previewMedia({
- sources: [{ url: item.openContent, type: 'video' }]
- })
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(item.openContent,this );
+ }
+ // wx.previewMedia({
+ // sources: [{ url: item.openContent, type: 'video' }]
+ // })
}
if(item.openType == 'link'){
wx.navigateTo({
@@ -137,18 +148,8 @@
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
-
- if(index === -1){
- // if(activeParam && activeParam.length > 0){
- // activeParam.forEach(item => {
- // const indexTemp = tagCodes.indexOf(item.labelValueCode)
- // if(indexTemp > -1){
- // tagCodes.splice(indexTemp, 1)
- // }
- // })
- // }
- // tagCodes.push(code)
+ const index = tagCodes.indexOf(code)
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
cateList[activeIndex].tempParamIndex = paramIndex
cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
cateList[activeIndex].tempParamCode = code
--
Gitblit v1.9.3