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/realpic.wxml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index 277ecb0..4739291 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,7 +1,9 @@
 <view class="container">
+  <!-- 鍚嶇墖 -->
+  <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
   <view class="main_title">{{ info.title }}</view>
   <view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
-  <image class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
+  <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 class="list">
     <view class="item">
@@ -10,10 +12,13 @@
     </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.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+        <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>

--
Gitblit v1.9.3