Merge remote-tracking branch 'origin/master'

k94314517

2024-07-29 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd

 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({
@@ -138,17 +149,7 @@
      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)
      if( cateList[activeIndex].tempParamIndex==null ||     cateList[activeIndex].tempParamIndex != paramIndex){ 
        cateList[activeIndex].tempParamIndex = paramIndex
        cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
        cateList[activeIndex].tempParamCode = code