From 816d84a76c1a2f16f88dba70664397961f55caa1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/pages/discover/discover.js |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/wechat_staff/pages/discover/discover.js b/wechat_staff/pages/discover/discover.js
index 9e16cde..64a68ad 100644
--- a/wechat_staff/pages/discover/discover.js
+++ b/wechat_staff/pages/discover/discover.js
@@ -1,4 +1,6 @@
-// pages/discover/discover.js
+import { getCataLogTagList, getCatalogList } from '../../api/index'
+const { HYEventBus } = require('hy-event-store')
+const eventBus = new HYEventBus()
 Page({
 
   /**
@@ -6,32 +8,33 @@
    */
   data: {
     menuButtonInfo: {},
-    activeTabs: '0'
-  },
+    catalogCode: "product_intro",
+    activeCate: '',
 
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
-   */
+    height: 0,
+    top: 0,
+  },
   onLoad(options) {
     let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
     this.setData({menuButtonInfo})
-    console.log('WindowInfo', menuButtonInfo);
-  },  
+  }, 
+  onShow() {
+    let discoverKey = wx.getStorageSync('discoverKey') || ''
+    if(discoverKey){
+      this.setData({ catalogCode: discoverKey })
+      setTimeout(() => {
+        wx.setStorageSync('discoverKey', '')
+      }, 500)
+    }
+  },
   tabsClick(e) {
-    const activeTabs = e.currentTarget.dataset.tab
-    this.setData({activeTabs})
+    const catalogCode = e.currentTarget.dataset.code
+    this.setData({catalogCode})
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
   onReady() {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
-   */
-  onShow() {
 
   },
 

--
Gitblit v1.9.3