From 41bd8b2b50dc308ea3a5784efccd856c073b3f37 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 21 八月 2024 15:04:55 +0800
Subject: [PATCH] ll

---
 wechat_jiaxuan/pages/detailDis/product.wxml |   84 +++++++++++++++++++----------------------
 1 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 94280fd..d4f8c42 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,20 +1,17 @@
-<view>
-  <view class="user" wx:if="{{ false }}">
-    <view class="avatar"></view>
-    <view class="content">
-      <view class="name">涓佹鏋�</view>
-      <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
-    </view>
-    <view class="btn">鑱旂郴TA</view>
-  </view>
+<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杞挱 -->
-  <swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
-    <block wx:for="{{ info.bannerImgList }}">
-      <swiper-item>
-        <image bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
-      </swiper-item>
-    </block>
-  </swiper>
+  <view class="swiper_wrap">
+    <swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
+      <block wx:for="{{ info.bannerImgList }}">
+        <swiper-item>
+          <image data-url="{{ item }}" bindtap="priviewBanner" bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
+  </view>
   <view class="main_content">
     <view class="title">{{ info.title }}</view>
     <view class="desc" wx:if="{{ info.subtitle }}">{{ info.subtitle }}</view>
@@ -24,38 +21,50 @@
   <!-- 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 bindtap="playVideo" class="play">鎾斁</view>
+      <view class="play">
+        <view>鎾斁</view>
+        <image 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>
   <!-- 瀵屾枃鏈� -->
   <view>
-    <!-- <mp-html content="{{info.content}}"></mp-html> -->
+    <mp-html content="{{info.content}}"></mp-html>
   </view>
   <view class="spaceList">
     <view class="item" wx:for="{{ info.spaceList }}">
       <!-- <view class="name">{{ item.spaceName }}</view> -->
-      <image 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 class="footer" style="padding-bottom: {{bottomLift}}px;">
+  <view wx:if="{{ origin && origin == 'b' }}">
+    <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="like_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
-        <image wx:else data-code="like" 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>
@@ -65,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>
\ No newline at end of file

--
Gitblit v1.9.3