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

liukangdong

2024-07-29 fc8133ed1d1d6a389fb0fe637a3d48a6558e2879

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

 wechat_jiaxuan/pages/index/index.js

@@ -215,12 +215,16 @@
    const {
      videourl
    } = e.currentTarget.dataset
    wx.previewMedia({
      sources: [{
        url: videourl,
        type: 'video'
      }]
    })
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );
    }
    // wx.previewMedia({
    //   sources: [{
    //     url: videourl,
    //     type: 'video'
    //   }]
    // })
  },
  goserHeight: function (e) {
    const serviceHeight = e.detail.height
@@ -245,14 +249,27 @@
    })
  },
  consultClick(e) {
    const id = e.currentTarget.dataset.id
    const item = e.currentTarget.dataset.id
    actionDo({
      actionType: 'view',
      id: id
      id: item.id
    })
    if(item.contentType == 'link'){
    wx.navigateTo({
      url: '/pages/consult/detail?id=' + id
        url: '/pages/webView/index',
        success: function(res) {
          // 通过eventChannel向被打开页面传送数据
          res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.content, title: item.title })
        }
    })
    }else{
      wx.navigateTo({
        url: '/pages/consult/detail?id='+item.id,
      })
    }
    // wx.navigateTo({
    //   url: '/pages/consult/detail?id=' + id
    // })
  },
  bannerClick(e) {
    const {

 wechat_jiaxuan/pages/index/index.json

@@ -2,6 +2,7 @@
  "usingComponents": {
    "van-nav-bar": "@vant/weapp/nav-bar/index",
    "authCard": "/components/authCard/authCard",
    "videoPlay": "/components/videoPlay/index",
    "van-popup": "@vant/weapp/popup/index"
  },
  "navigationStyle": "custom",

 wechat_jiaxuan/pages/index/index.wxml

@@ -107,7 +107,7 @@
    </view>
    <swiper class="consult_swiper consult_wrap" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight + 100 }}rpx" duration="{{ bannerSwiperOption.duration }}">
    <block wx:for="{{ consultList }}" wx:key="index">
      <swiper-item data-id="{{ item.id }}" bindtap="consultClick">
      <swiper-item data-id="{{ item }}" bindtap="consultClick">
        <image bindload="consultbindload"  mode="aspectFill" src="{{ item.coverImage }}"></image>
        <view class="scroll_text">{{ item.title }}</view>
      </swiper-item>
@@ -139,5 +139,5 @@
  </view>
  <!-- active -->
  <image class="active_baoming" data-type="2" bindtap="changePath" src="../../static/icon/ic_float_baoming@2x.png" mode="widthFix"></image>

<videoPlay class="videoPlay"/>
</view>

 wechat_jiaxuan/pages/productVideo/index.js

@@ -50,8 +50,13 @@
    })
  },
  itemClick(e) {
 
    const { videourl } = e.currentTarget.dataset 
    this.startPlayVideo(videourl)
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );
    }
    // this.startPlayVideo(videourl)

    // wx.previewMedia({
    //   sources: [{ url: videourl, type: 'video' }]

 wechat_jiaxuan/pages/productVideo/index.json

@@ -1,7 +1,8 @@
{
  "usingComponents": {
    "van-overlay": "@vant/weapp/overlay/index" ,
    "van-popup": "@vant/weapp/popup/index"
    "van-popup": "@vant/weapp/popup/index",
    "videoPlay": "../../components/videoPlay/index"
  },
  "navigationBarTitleText": "产品视频"
}

 wechat_jiaxuan/pages/productVideo/index.wxml

@@ -33,10 +33,10 @@
      <image class="default_empty" src="../../static/images/default_empty.png"></image>
    </view>
  </view>  
    <view wx:if="{{ isShow }}" bind:tap="onClose" class="video_content">   
  <!-- <view wx:if="{{ isShow }}" bind:tap="onClose" class="video_content">   
      <view  class="video">
      <video    id="myVideo" src="{{curVideoSrc}}"  autoplay   show-fullscreen-btn show-play-btn ></video>
      </view> 
  </view >

  </view > -->
  <videoPlay class='videoPlay' /> 
</view>

 wechat_staff/pages/index/index.js

@@ -130,12 +130,16 @@
    const {
      videourl
    } = e.currentTarget.dataset
    wx.previewMedia({
      sources: [{
        url: videourl,
        type: 'video'
      }]
    })
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );
    }
    // wx.previewMedia({
    //   sources: [{
    //     url: videourl,
    //     type: 'video'
    //   }]
    // })
  },
  seriveClick(e) {
    const {

 wechat_staff/pages/index/index.json

@@ -1,5 +1,6 @@
{
  "usingComponents": {
    "videoPlay": "/components/videoPlay/index",
    "buoyClient": "../../components/buoyClient/index"
  },
  "navigationStyle": "custom"

 wechat_staff/pages/index/index.wxml

@@ -122,4 +122,5 @@
  <view class="logo_wrap">
    <image src="../../static/home_logo@2x.png" class="logo" mode="widthFix"></image>
  </view>
  <videoPlay class="videoPlay"/>
</view>

 wechat_staff/pages/productVideo/index.js

@@ -47,9 +47,13 @@
  },
  itemClick(e) {
    const { videourl } = e.currentTarget.dataset
    wx.previewMedia({
      sources: [{ url: videourl, type: 'video' }]
    })
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );
    }
    // wx.previewMedia({
    //   sources: [{ url: videourl, type: 'video' }]
    // })
  },
  cateClick(e) {
    const { code } = e.target.dataset

 wechat_staff/pages/productVideo/index.json

@@ -1,6 +1,7 @@
{
  "navigationBarTitleText": "产品视频",
  "usingComponents": { 
    "videoPlay": "/components/videoPlay/index",
    "buoyClient": "../../components/buoyClient/index"
  }
}

 wechat_staff/pages/productVideo/index.wxml

@@ -31,4 +31,6 @@
      </view>
    </view>
  </view>
  
  <videoPlay class='videoPlay' /> 
</view>