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_staff/components/disRealpic/index.js | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 034a81c..000c3d7 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -74,10 +74,10 @@
const item = e.currentTarget.dataset.item
console.log('item', item);
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:item.openContent} );
}
})
},
@@ -107,7 +107,11 @@
}
if(item.openType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('data',{link:item.openContent} );
+ }
})
}
if(item.openType == 'page'){
@@ -139,15 +143,13 @@
cateList[activeIndex].paramIndex = -1
cateList[activeIndex].paramName = ''
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
this.setData({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
item.paramIndex = -1
- item.paramName = ''
+ item.paramName = item.paramName || ''
})
this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
},
@@ -157,7 +159,7 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
changeShowParams(e){
--
Gitblit v1.9.3