From d2212709606b4e2af14d6a874f5f827767d7411c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 13:46:27 +0800
Subject: [PATCH] ''

---
 wechat_jiaxuan/pages/index/index.js |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 701604f..e66444b 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -8,8 +8,11 @@
   getZhongTaiVideoPage,
   getZhongTaiProductNewsPage
 } from '../../api/index'
-const { HYEventBus } = require('hy-event-store')
+const {
+  HYEventBus
+} = require('hy-event-store')
 const eventBus = new HYEventBus()
+const app = getApp()
 Page({
 
   /**
@@ -46,6 +49,11 @@
     HOME_CLASS_B2: '',
     HOME_CLASS_C: '',
   },
+  onLoadLogin(options){
+    // 宸茬粡鐧诲綍锛屽彲浠ヨ蛋渚濊禆token鐨勯�昏緫浜�
+    console.log('棣栭〉鐨刼nLoadLogin',options,`{"token":"${app.globalData.token}"}`);
+    this.initData()
+  },
   onShow() {
     let that = this
     const member = wx.getStorageSync('member')
@@ -68,9 +76,6 @@
   onLoad(options) {
     const member = wx.getStorageSync('member')
     this.initDictData()
-    setTimeout(() => {
-      this.initData()
-    }, 1200)
   },
   changePath(e) {
     let index = e.currentTarget.dataset.type
@@ -93,7 +98,6 @@
           url: '/pages/calculator/index'
         })
         break;
-
       case '2':
         wx.navigateTo({
           url: '/pages/design/design'
@@ -256,7 +260,7 @@
     } = e.currentTarget.dataset
     const item = e.currentTarget.dataset.item
     console.log('item', item);
-    if(item.openType){
+    if (item.openType) {
       actionDo({
         actionType: 'view',
         id: item.id
@@ -272,7 +276,12 @@
     }
     if (item.openType == 'link') {
       wx.navigateTo({
-        url: '/pages/webView/index?link=' + item.openContent,
+        url: '/pages/webView/index',
+        success: function (res) {
+          res.eventChannel.emit('acceptDataFromOpenerPage', {
+            link: item.openContent || item.content
+          });
+        }
       })
     }
     if (item.openType == 'page') {

--
Gitblit v1.9.3