From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/product.wxml | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 719ec03..d4f8c42 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,14 +1,17 @@
-<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="{{ info.users && info.users.id }}" />
+ <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 data-url="{{ item }}" bindtap="priviewBanner" 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>
@@ -18,16 +21,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="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>
<!-- 瀵屾枃鏈� -->
@@ -37,19 +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 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="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>
@@ -59,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