Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 wechat_jiaxuan/pages/detailDis/product.wxml

@@ -1,4 +1,4 @@
<view class="container">
<view class="container" style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
  <!-- 名片 -->
  <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
  <!-- banner轮播 -->
@@ -21,11 +21,11 @@
  <!-- video -->
  <view wx:if="{{ info.video }}" class="video">
    <view class="title">产品视频</view>
    <view class="img_wrap">
    <view bindtap="playVideo" class="img_wrap">
      <image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
      <view  class="play">
      <view class="play">
        <view>播放</view>
        <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
        <image src="../../static/icon/ic_play.png" class="icon"></image>
      </view>
    </view>
  </view>
@@ -49,22 +49,22 @@
  <view class="spaceList">
    <view class="item" wx:for="{{ info.spaceList }}">
      <!-- <view class="name">{{ item.spaceName }}</view> -->
      <image data-url="{{ item.spaceImg }}" bindtap="priviewSpace" src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
      <!-- <mp-html content="{{item.spaceContent}}"></mp-html> -->
      <!-- <image data-url="{{ item.spaceImg }}" bindtap="priviewSpace" src="{{ item.spaceImg }}" mode="widthFix" class="img"></image> -->
      <mp-html content="{{item.spaceContent}}"></mp-html>
    </view>
  </view>
  <!-- footer -->
  <view wx:if="{{ origin && origin == 'b' }}">
    <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">分享</button>
    <button hover-class="none" open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">分享</button>
  </view>
  <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
    <view class="btns">
      <button class="item btn">
        <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
        <image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
      <button hover-class="none" data-code="{{ isCollection ? 'collect_cancel' : 'collect' }}" bindtap="handleAction" class="item btn">
        <image wx:if="{{ isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
        <image wx:else class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
        <view class="name">收藏</view>
      </button>
      <button open-type="share" class="item btn" bindtap="handleShare">
      <button hover-class="none" open-type="share" class="item btn" bindtap="handleShare">
        <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
        <view class="name">分享</view>
      </button>
@@ -74,20 +74,5 @@
      </view>
    </view>
  </view>
  <!--  -->
  <van-popup position="bottom" show="{{ showShare }}" bind:close="onClose">
    <view class="share_modal">
      <view class="btns">
        <button open-type="share" class="item" bindtap="handleShare">
          <image src="../../static/icon/wechat.png"></image>
          <view>发送好友</view>
        </button>
        <button class="item" bindtap="handleDown">
          <image src="../../static/icon/download.png"></image>
          <view>下载海报</view>
        </button>
      </view>
      <view bindtap="onClose" class="cancel">取消</view>
    </view>
  </van-popup>

</view>