From 0358677c06e86f05c992f406c9714a32b30a235d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 18 七月 2024 18:42:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/discover/discover.wxml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 8e00219..8bfe2e7 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -1,2 +1,23 @@
-<!--pages/discover/discover.wxml-->
-<text>pages/discover/discover.wxml</text>
+<view class="container">
+ <view style="height: {{ menuButtonInfo.top }}px;"></view>
+ <view class="main_tab">
+ <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 class="main_content" style="height: calc( 100vh - {{menuButtonInfo.top}}px - 88rpx )">
+ <disProduct wx:if="{{ catalogCode == 'product_intro' }}" />
+ <disCase wx:if="{{ catalogCode == 'whole_case' }}" />
+ <disRealpic wx:if="{{ catalogCode == 'real_case' }}" />
+ </view>
+</view>
\ No newline at end of file
--
Gitblit v1.9.3