Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-07-29 26fb0b3e76f52212a2cef49a0bc0b94e7425880c

 wechat_staff/components/disRealpic/index.js

@@ -74,10 +74,10 @@
      const item = e.currentTarget.dataset.item
      console.log('item', item);
      wx.navigateTo({
        url: '/pages/webView/index?link=' + item.openContent,
        url: '/pages/webView/index',
        success: function(res) {
          // 通过eventChannel向被打开页面传送数据
          res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
          // 通过eventChannel向被打开页面传送数据 
          res.eventChannel.emit('data',{link:item.openContent} );
        }
      })
    },
@@ -107,7 +107,11 @@
      }
      if(item.openType == 'link'){
        wx.navigateTo({
          url: '/pages/webView/index?link=' + item.openContent,
          url: '/pages/webView/index',
          success: function(res) {
            // 通过eventChannel向被打开页面传送数据 
            res.eventChannel.emit('data',{link:item.openContent} );
          }
        })
      }
      if(item.openType == 'page'){
@@ -139,15 +143,13 @@
        cateList[activeIndex].paramIndex = -1
        cateList[activeIndex].paramName = ''
      }
      this.setData({ pageNum: 1,dataList: [],total: 0})
      this.setData({ tagCodes, cateList })
      console.log('tagCodes', tagCodes);
    },
    cancelParam() {
      const { cateList } = this.data
      cateList.forEach(item => {
        item.paramIndex = -1
        item.paramName = ''
        item.paramName = item.paramName || ''
      })
      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
    },
@@ -157,7 +159,7 @@
    },
    subParam() {
      this.setData({ activeParam: [] })
      this.setData({ pageNum: 1,dataList: [],total: 0})
      this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
      this.getList()
    },
    changeShowParams(e){