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/discover/discover.wxml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 8e00219..9aa518a 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -1,2 +1,25 @@
-<!--pages/discover/discover.wxml-->
-<text>pages/discover/discover.wxml</text>
+<view class="container">
+ <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: 100vh">
+ <disProduct menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'product_intro' }}" />
+ <disCase menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'whole_case' }}" />
+ <disRealpic menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'real_case' }}" />
+ </view>
+</view>
\ No newline at end of file
--
Gitblit v1.9.3