From e3a8d46ed7f215a7ad1d61d7e6d3a853e3922361 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 30 七月 2024 19:13:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/detailDis/product.wxml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 11a034b..c72efc3 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鍚嶇墖 -->
- <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
<!-- banner杞挱 -->
<view class="swiper_wrap">
<swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
@@ -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>
@@ -23,14 +23,23 @@
<view class="title">浜у搧瑙嗛</view>
<view class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
- <view bindtap="playVideo" class="play">鎾斁</view>
+ <view class="play">
+ <view>鎾斁</view>
+ <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
+ </view>
</view>
</view>
<view class="detail">
<view class="title">浜у搧璇︽儏</view>
- <view class="line" wx:for="{{ info.productParamList }}">
- <view class="label">{{ item.paramName }}锛�</view>
- <view class="val">{{ item.paramValue }}</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>
<!-- 瀵屾枃鏈� -->
--
Gitblit v1.9.3