From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/detailDis/product.wxml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index 6fb6f4b..d4f8c42 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -49,8 +49,8 @@
   <view class="spaceList">
     <view class="item" wx:for="{{ info.spaceList }}">
       <!-- <view class="name">{{ item.spaceName }}</view> -->
-      <image data-url="{{ item.spaceImg }}" bindtap="priviewSpace" src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
-      <!-- <mp-html content="{{item.spaceContent}}"></mp-html> -->
+      <!-- <image data-url="{{ item.spaceImg }}" bindtap="priviewSpace" src="{{ item.spaceImg }}" mode="widthFix" class="img"></image> -->
+      <mp-html content="{{item.spaceContent}}"></mp-html>
     </view>
   </view>
   <!-- footer -->
@@ -59,8 +59,8 @@
   </view>
   <view wx:else class="footer" style="padding-bottom: {{bottomLift}}px;">
     <view class="btns">
-      <button hover-class="none" data-code="{{ info.isCollection ? 'collect_cancel' : 'collect' }}" bindtap="handleAction" class="item btn">
-        <image wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+      <button hover-class="none" data-code="{{ isCollection ? 'collect_cancel' : 'collect' }}" bindtap="handleAction" class="item btn">
+        <image wx:if="{{ isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
         <image wx:else class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
         <view class="name">鏀惰棌</view>
       </button>

--
Gitblit v1.9.3