Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 wechat_staff/pages/detailDis/product.wxml

@@ -10,7 +10,7 @@
        </swiper-item>
      </block>
    </swiper>
    <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
    <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
  </view>
  <view class="main_content">
    <view class="title">{{ info.title }}</view>
@@ -20,19 +20,25 @@
  <!-- 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="aspectFill"></image>
      <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>
  <view class="detail">
    <view class="title" bind:tap="goTestPage">产品详情</view>
    <view class="line" wx:for="{{ info.productParamList }}">
      <view class="label">{{ item.paramName }}：</view>
      <view class="val">{{ item.paramValue }}</view>
   <view class="detail">
    <view class="title">产品详情</view>
    <block wx:for="{{ info.productParamList }}">
      <view wx:if="{{ index < 5 || isFold }}" class="line" >
        <view class="label">{{ item.paramName }}：</view>
        <view class="val">{{ item.paramValue }}</view>
      </view>
    </block>
    <view wx:if="{{ info.productParamList.length > 5 }}" class="fold" bindtap="changeFold">
      <text>{{ isFold ? '收起' : '展开' }}</text>
      <van-icon class="icon" name="{{ isFold ? 'arrow-up' : 'arrow-down' }}" />
    </view>
  </view>
  <!-- 富文本 -->
@@ -40,10 +46,10 @@
    <mp-html content="{{info.content}}"></mp-html>
  </view>
  <view class="spaceList">
    <view data-url="{{ item.spaceImg }}" bindtap="priviewSpace" class="item" wx:for="{{ info.spaceList }}">
    <view data-url="{{ item.spaceImg }}" bindtap="priviewSpace" class="item" wx:for="{{ spaceList }}">
      <!-- <view class="name">{{ item.spaceName }}</view> -->
      <image src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
      <!-- <mp-html content="{{item.spaceContent}}"></mp-html> -->
      <!-- <image src="{{ item.spaceImg }}" mode="widthFix" class="img"></image> -->
      <mp-html content="{{item.spaceContent}}"></mp-html>
    </view>
  </view>
</view>