From b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/index/index.js | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index a4a5087..3828fd4 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -4,7 +4,7 @@
getZSZXCatalogs,
getCustomizedNewsList,
getHomeBanner,
- getHomeBannerDetail,
+ actionDo,
getZhongTaiVideoPage,
getZhongTaiProductNewsPage
} from '../../api/index'
@@ -59,14 +59,14 @@
},
changePath(e) {
let index = e.currentTarget.dataset.type
+ let that = this
switch (index) {
case '0':
wx.navigateTo({
url: '/pages/webView/index',
success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: this.data.testUrl })
- // saveBehavior({ type: 1 })
+ res.eventChannel.emit('acceptDataFromOpenerPage', { link: that.data.testUrl })
}
})
break;
@@ -120,7 +120,7 @@
// 璧勮
getZhongTaiProductNewsPage({
catalogCode: 'product_info',
- pageSize: 5, pageNum: 1
+ pageSize: 6, pageNum: 1
}).then(res => {
if(res.data){
this.setData({ consultList: res.data.records })
@@ -193,7 +193,26 @@
},
bannerClick(e) {
const { id } = e.currentTarget.dataset
- getHomeBannerDetail({id})
+ const item = e.currentTarget.dataset.item
+ console.log('item', item);
+ actionDo({actionType: 'view',id: item.id})
+ if(item.openType == 'video'){
+ wx.previewMedia({
+ sources: [{ url: item.openContent, type: 'video' }]
+ })
+ }
+ if(item.openType == 'link'){
+ wx.navigateTo({
+ url: '/pages/webView/index?link=' + item.openContent,
+ })
+ }
+ if(item.openType == 'page'){
+ getApp().globalData.catalogCode=item.openContent
+ wx.switchTab({
+ url: '/pages/discover/discover'
+ })
+ }
+ // getHomeBannerDetail({id})
},
seriveClick(e) {
const { id, title } = e.currentTarget.dataset
--
Gitblit v1.9.3