From 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/pages/detailDis/product.wxml |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 23a49bb..edf23cc 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/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>
@@ -28,11 +28,17 @@
       </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>
   <!-- 瀵屾枃鏈� -->

--
Gitblit v1.9.3