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

liukangdong

2024-07-30 d8f7a89939612abb5ec243f0d817932a32ef35a7

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

 wechat_jiaxuan/pages/design/design.less

@@ -1,4 +1,5 @@
.banner {
  top: -115rpx;
  width: 100%;
  position: relative;
}

 wechat_jiaxuan/pages/design/design.wxss

@@ -1,4 +1,5 @@
.banner {
  top: -115rpx;
  width: 100%;
  position: relative;
}

 wechat_jiaxuan/pages/productVideo/index.js

@@ -1,4 +1,4 @@
import { getZhongTaiVideoPage, getCataLogTagList } from '../../api/index'
import { getZhongTaiVideoPage, actionDo, getCataLogTagList } from '../../api/index'
Page({

  /**
@@ -51,13 +51,23 @@
  },
  itemClick(e) {
 
    const { videourl } = e.currentTarget.dataset 
    const { videourl ,id} = e.currentTarget.dataset 
    actionDo({
      actionType: 'view',
      id: id
    })
    var dataList = this.data.dataList;
    dataList.forEach(item =>{
       if(item.id == id){
         item.viewCount = (item.viewCount||0) +1 
        }
    })
    this.setData({dataList:dataList})
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );
    }
    // this.startPlayVideo(videourl)

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

 wechat_jiaxuan/pages/productVideo/index.wxml

@@ -17,7 +17,7 @@
    <view wx:for="{{ dataList }}" class="item">
      <view class="img_wrap">
        <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
        <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
        <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}"  data-id="{{ item.id }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
      </view>

      <view class="title">{{ item.title }}</view>

 wechat_staff/components/detailFooter/index.js

@@ -31,10 +31,10 @@
  methods: {
    handleShare() {
      let map = [
        '/pages/detailDis/product',
        '/pages/detailDis/case',
        '/pages/detailDis/realpic',
        '/pages/consult/detail',
        '/pages/detailDis/product',//产品详情
        '/pages/detailDis/case',//案例详情
        '/pages/detailDis/realpic',//实景详情
        '/pages/consult/detail',//资讯详情
      ]
      const { info,  path} = this.data
      wx.navigateToMiniProgram({

 wechat_staff/pages/productVideo/index.js

@@ -1,4 +1,4 @@
import { getZhongTaiVideoPage, getCataLogTagList ,refreshEnjoy} from '../../api/index'
import { getZhongTaiVideoPage,  actionDo, getCataLogTagList ,refreshEnjoy} from '../../api/index'
Page({

  /**
@@ -46,7 +46,18 @@
    })
  },
  itemClick(e) {
    const { videourl } = e.currentTarget.dataset
    const { videourl, id } = e.currentTarget.dataset
    actionDo({
      actionType: 'view',
      id: id
    })
    var dataList = this.data.dataList;
    dataList.forEach(item =>{
       if(item.id == id){
         item.viewCount = (item.viewCount||0) +1 
        }
    })
    this.setData({dataList:dataList})
    let videoPlay = this.selectComponent('.videoPlay'); 
    if(videoPlay){ 
      videoPlay.startPlayVideo(videourl,this );

 wechat_staff/pages/productVideo/index.wxml

@@ -18,7 +18,7 @@
    <view wx:for="{{ dataList }}" class="item">
      <view class="img_wrap">
        <image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
        <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
        <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
      </view>

      <view class="title">{{ item.title }}</view>