From 52787adceb282c1914589c7ceb252bdb03e2df36 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 11:26:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/detailDis/realpic.wxml | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 952bec0..ee3a652 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,36 +1,30 @@
-<view class="container">
- <view class="main_title">绠�娆ч鏍�70m虏涓ゅ眳瀹�</view>
- <view class="time">鍙戝竷鏃堕棿锛�2021-08-21 10:0</view>
- <view class="list">
- <view class="item">
- <image src="" mode="widthFix" />
- <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+<view>
+ <!-- 鍚嶇墖 -->
+ <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
+ <view class="container" style="padding-top: {{ origin != 'b' && info.users && info.users.id ? '148' : '0' }}rpx;">
+ <view class="main_title">{{ info.title }}</view>
+ <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
+ <image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
+ <view class="desc">{{ info.contentText || '' }}</view>
+ <view wx:if="{{ origin && origin == 'b' }}">
+ <button open-type="share" style="bottom: {{bottomLift + 6}}px;" class="share_btn">鍒嗕韩</button>
</view>
- <view class="item">
- <image src="" mode="widthFix" />
- <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
- </view>
- <view class="item">
- <image src="" mode="widthFix" />
- <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
- </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>
- <view class="name">鏀惰棌</view>
- </view>
- <view class="item" bindtap="openShare">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <view class="name">鍒嗕韩</view>
- </view>
- <view class="sub_btn">
- <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
- <view>鍏嶈垂棰勭害涓撳睘璁捐</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>
+ <view class="name">鏀惰棌</view>
+ </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>
+ </button>
+ <view class="sub_btn" bindtap="handleDesign">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
</view>
</view>
</view>
-
</view>
\ No newline at end of file
--
Gitblit v1.9.3