From bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/discover/discover.wxml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 9a877da..8bfe2e7 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -1,23 +1,23 @@
<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="item {{ catalogCode == 'product_intro' ? 'active' : '' }}" data-code="product_intro" bindtap="tabsClick">
<view class="name">浜у搧</view>
<view class="border"></view>
</view>
- <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-tab="1" bindtap="tabsClick">
+ <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 {{ activeTabs == '2' ? 'active' : '' }}" data-tab="2" bindtap="tabsClick">
+ <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="{{ activeTabs == '0' }}" />
- <disCase wx:if="{{ activeTabs == '1' }}" />
- <disRealpic wx:if="{{ activeTabs == '2' }}" />
+ <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