From bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/product.wxml | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 244cdce..94280fd 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -1,5 +1,5 @@
<view>
- <view class="user">
+ <view class="user" wx:if="{{ false }}">
<view class="avatar"></view>
<view class="content">
<view class="name">涓佹鏋�</view>
@@ -7,55 +7,78 @@
</view>
<view class="btn">鑱旂郴TA</view>
</view>
+ <!-- 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="main_content">
- <view class="title">鑾タ鍋囨棩-椁愬巺</view>
- <view class="desc">绠�娆ч鏍�</view>
- <view class="text">瀹跺眳椋庢牸涓嶅浛浜庡浐鏈夊舰寮忥紝鍘ㄦ埧鍔熻兘涓嶅眬闄愪簬涓�鏃ヤ笁椁愩��
- 鍏冪礌涓庢潗璐ㄧ鎾炲嚭鐨勪笉浠呮槸璁捐鎰燂紝鏇存槸涓�绉嶉矞鏄庣殑涓嶆嫎
- 涓�鏍肩殑鐜颁唬鎬佸害锛岃瀺鍚堝綋涓嬫祦琛岀編瀛︼紝鏋勮绌洪棿鐨勬棤椋庢牸
- 鍖栥��</view>
- <view class="user counselor">
- <view class="avatar_wrap">
- <image class="avatar" mode="widthFix" src="../../static/icon/home_ic_guwen@2x.png"></image>
- </view>
- <view class="content">
- <view class="name">鎮ㄧ殑涓撳睘瀹跺眳椤鹃棶</view>
- <view class="desc">鎮ㄨ韩杈圭殑鍏ㄥ眿璁捐涓撳</view>
- </view>
- <view class="btn">鍘荤湅鐪�</view>
- </view>
+ <view class="title">{{ info.title }}</view>
+ <view class="desc" wx:if="{{ info.subtitle }}">{{ info.subtitle }}</view>
+ <view class="text">{{ info.intro }}</view>
+ <authCard type="{{ member.authStatus }}" />
</view>
<!-- video -->
- <view class="video">
+ <view wx:if="{{ info.video }}" class="video">
<view class="title">浜у搧瑙嗛</view>
- <video src=""></video>
+ <view class="img_wrap">
+ <image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
+ <view bindtap="playVideo" class="play">鎾斁</view>
+ </view>
</view>
<view class="detail">
<view class="title">浜у搧璇︽儏</view>
- <view class="line">
- <view class="label">鍝佸悕锛�</view>
- <view class="val">鑾タ鍋囨棩-椁愬巺</view>
+ <view class="line" wx:for="{{ info.productParamList }}">
+ <view class="label">{{ item.paramName }}锛�</view>
+ <view class="val">{{ item.paramValue }}</view>
</view>
- <view class="line">
- <view class="label">宸ヨ壓锛�</view>
- <view class="val">鑾タ鍋囨棩-椁愬巺</view>
+ </view>
+ <!-- 瀵屾枃鏈� -->
+ <view>
+ <!-- <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> -->
</view>
</view>
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <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>
<view class="name">鏀惰棌</view>
- </view>
- <view class="item">
+ </button>
+ <button 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>
- </view>
- <view class="sub_btn">
+ </button>
+ <view class="sub_btn" bindtap="handleDesign">
<image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
<view>鍏嶈垂棰勭害涓撳睘璁捐</view>
</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