Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce

 wechat_jiaxuan/components/disRealpic/index.js

@@ -112,6 +112,10 @@
      if(item.openType == 'link'){
        wx.navigateTo({
          url: '/pages/webView/index?link=' + item.openContent,
          success: function(res) {
            // 通过eventChannel向被打开页面传送数据
            res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent})
          }
        })
      }
      if(item.openType == 'page'){