From 86fc8bbb09df7bbeb50fa714ff8bb4aea85ffef5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 15:57:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/detailDis/product.wxml | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index d4294e6..becec78 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,14 +1,17 @@
<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杞挱 -->
- <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}}/{{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>
@@ -20,7 +23,10 @@
<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">
@@ -37,12 +43,15 @@
<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>
+ <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 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>
--
Gitblit v1.9.3