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/case.wxml |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index 7aa7378..0c0840f 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -1,4 +1,6 @@
 <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>
   <view class="fullview_wrap">
@@ -9,23 +11,26 @@
     <image class="banner" src="{{ info.coverImage }}" mode="widthFix"></image>
   </view>
   <view class="h1">甯冪疆鍥�</view>
-  <image class="img" src="{{ info.layoutUlr }}"  mode="widthFix"></image>
+  <image bindtap="priviewLayout" class="img" src="{{ info.layoutUlr }}"  mode="widthFix"></image>
   <view class="analysis">
     <view class="h2">妗堜緥瑙f瀽</view>
     <view class="text">{{ info.caseInfo }}</view>
   </view>
   <view class="list">
-    <view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
+    <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
       <view class="h1">{{ item.spaceName }}</view>
-      <image class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
+      <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb"  wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
       <view class="content">{{ item.spaceDesc }}</view>
     </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