From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/realpic.wxml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index a1e0b86..4739291 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -1,9 +1,9 @@
<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 }}" />
<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">
@@ -12,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