From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/index/index.js | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 68b0262..a871c96 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -8,6 +8,10 @@
getZhongTaiVideoPage,
getZhongTaiProductNewsPage
} from '../../api/index'
+const {
+ HYEventBus
+} = require('hy-event-store')
+const eventBus = new HYEventBus()
Page({
/**
@@ -45,6 +49,7 @@
HOME_CLASS_C: '',
},
onShow() {
+ let that = this
const member = wx.getStorageSync('member')
if (member && (member.authStatus == '1' || member.authStatus == '2')) {
getMemberInfo().then(res => {
@@ -57,17 +62,17 @@
member
})
}
+ eventBus.on("reloadHome", () => {
+ console.log('reloadHome');
+ this.onLoad()
+ })
},
onLoad(options) {
const member = wx.getStorageSync('member')
this.initDictData()
- if (member && member.token) {
+ setTimeout(() => {
this.initData()
- } else {
- setTimeout(() => {
- this.initData()
- }, 1200)
- }
+ }, 1200)
},
changePath(e) {
let index = e.currentTarget.dataset.type
@@ -90,7 +95,6 @@
url: '/pages/calculator/index'
})
break;
-
case '2':
wx.navigateTo({
url: '/pages/design/design'
@@ -253,7 +257,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
@@ -269,7 +273,12 @@
}
if (item.openType == 'link') {
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
+ success: function (res) {
+ res.eventChannel.emit('data', {
+ link: item.content
+ });
+ }
})
}
if (item.openType == 'page') {
--
Gitblit v1.9.3