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_staff/pages/discover/discover.wxml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/wechat_staff/pages/discover/discover.wxml b/wechat_staff/pages/discover/discover.wxml
index 9a877da..7f87f4b 100644
--- a/wechat_staff/pages/discover/discover.wxml
+++ b/wechat_staff/pages/discover/discover.wxml
@@ -1,23 +1,26 @@
<view class="container">
- <view style="height: {{ menuButtonInfo.top }}px;"></view>
- <view class="main_tab">
- <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-tab="0" bindtap="tabsClick">
- <view class="name">浜у搧</view>
- <view class="border"></view>
- </view>
- <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-tab="1" bindtap="tabsClick">
- <view class="name">妗堜緥</view>
- <view class="border"></view>
- </view>
- <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-tab="2" bindtap="tabsClick">
- <view class="name">瀹炴櫙</view>
- <view class="border"></view>
+ <buoyClient class="buoyClient"/>
+ <view class="home_tab">
+ <view style="height: {{ menuButtonInfo.top - 6 }}px;"></view>
+ <view class="main_tab" style="height: {{ menuButtonInfo.height + 12 }}px;">
+ <view class="item {{ catalogCode == 'product_intro' ? 'active' : '' }}" data-code="product_intro" bindtap="tabsClick">
+ <view class="name">浜у搧</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ catalogCode == 'whole_case' ? 'active' : '' }}" data-code="whole_case" bindtap="tabsClick">
+ <view class="name">妗堜緥</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ catalogCode == 'real_case' ? 'active' : '' }}" data-code="real_case" bindtap="tabsClick">
+ <view class="name">瀹炴櫙</view>
+ <view class="border"></view>
+ </view>
</view>
</view>
<!-- -->
- <view class="main_content" style="height: calc( 100vh - {{menuButtonInfo.top}}px - 88rpx )">
- <disProduct wx:if="{{ activeTabs == '0' }}" />
- <disCase wx:if="{{ activeTabs == '1' }}" />
- <disRealpic wx:if="{{ activeTabs == '2' }}" />
+ <view class="main_content" style="height: 100vh">
+ <disProduct class="disProduct" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'product_intro' }}" />
+ <disCase class="disCase" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'whole_case' }}" />
+ <disRealpic class="disRealpic" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'real_case' }}" />
</view>
</view>
\ No newline at end of file
--
Gitblit v1.9.3