diff --git a/pages/insight/brandChild/index.js b/pages/insight/brandChild/index.js index 1d409eb..2e9e196 100644 --- a/pages/insight/brandChild/index.js +++ b/pages/insight/brandChild/index.js @@ -25,8 +25,8 @@ Component({ img: e.currentTarget.dataset.id.img } let isAdded = false; - for(let i=0;i { + if(ele.firstword == '热门') { + recommandArr.push(ele) + } + }); for (let i = 65; i <= 90; i++) { arr.push({ name: String.fromCharCode(i), @@ -84,8 +81,14 @@ Component({ } this.setData({ brandList:arr, - // recommandBrand: recommandArr, + recommandBrand: recommandArr, }); + if(wx.getStorageSync('historyBrand').length != 0) { + this.setData({history: wx.getStorageSync('historyBrand')}) + } else { //首次加载默认为推荐品牌 + this.setData({history: recommandArr}); + wx.setStorageSync('historyBrand', recommandArr); + } setTimeout(() =>{ wx.hideToast(); },500) diff --git a/pages/insight/brandChild/index.wxml b/pages/insight/brandChild/index.wxml index a8dabe5..05f36dd 100644 --- a/pages/insight/brandChild/index.wxml +++ b/pages/insight/brandChild/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/insight/modalChild/index.wxml b/pages/insight/modalChild/index.wxml index d76817b..3316af1 100644 --- a/pages/insight/modalChild/index.wxml +++ b/pages/insight/modalChild/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/insight/pages/brandInsight/TailInsight/index.js b/pages/insight/pages/brandInsight/TailInsight/index.js index e4738b7..0ebe69f 100644 --- a/pages/insight/pages/brandInsight/TailInsight/index.js +++ b/pages/insight/pages/brandInsight/TailInsight/index.js @@ -29,6 +29,8 @@ Component({ 'background: rgb(75,203,100)', 'background: rgb(75,214,213)', ], + copyShow: false, + copyData: {}, }, methods: { getData() { @@ -128,8 +130,13 @@ Component({ this.setData({wordCloudData: arr1, wShow: true}) }); }, - toEventDetail(value) { - // 外链 + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.srctitle+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) }, toTailDataList() { wx.navigateTo({ diff --git a/pages/insight/pages/brandInsight/TailInsight/index.wxml b/pages/insight/pages/brandInsight/TailInsight/index.wxml index 9a9f1e9..5ead981 100644 --- a/pages/insight/pages/brandInsight/TailInsight/index.wxml +++ b/pages/insight/pages/brandInsight/TailInsight/index.wxml @@ -63,7 +63,7 @@ 查看更多 > - + {{item._source.srctitle}} @@ -79,4 +79,16 @@ + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.srctitle}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js index c9aa061..cb94176 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.js +++ b/pages/insight/pages/brandInsight/brandDataList/index.js @@ -14,6 +14,8 @@ Page({ affList: [], qgList: [], wjList: [{key: 1,value: '低级危机'},{key: 2,value: '中级危机'},{key: 3,value: '高级危机'}], + copyShow: false, + copyData: {}, }, onShow() { this.setData({ @@ -69,5 +71,13 @@ Page({ sEndTime: result.detail.sEndTime, }); this.getData(); - } + }, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.title+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) + }, }) \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml index 752e87e..db61c61 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.wxml +++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml @@ -52,7 +52,7 @@ 负面 - + {{item._source.title}} @@ -60,4 +60,16 @@ 作者:{{item._source.user_author}} + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.title}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/tailDataList/index.js b/pages/insight/pages/brandInsight/tailDataList/index.js index 72a331b..075e140 100644 --- a/pages/insight/pages/brandInsight/tailDataList/index.js +++ b/pages/insight/pages/brandInsight/tailDataList/index.js @@ -1,7 +1,9 @@ const app = getApp(); Page({ data: { - tailDataList: [] + tailDataList: [], + copyShow: false, + copyData: {}, }, onShow() { this.getData(); @@ -26,5 +28,13 @@ Page({ }).then(res => { this.setData({tailDataList: res}) }); - } + }, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.srctitle+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) + }, }) \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/tailDataList/index.wxml b/pages/insight/pages/brandInsight/tailDataList/index.wxml index 35cd7e9..8fb118d 100644 --- a/pages/insight/pages/brandInsight/tailDataList/index.wxml +++ b/pages/insight/pages/brandInsight/tailDataList/index.wxml @@ -11,7 +11,7 @@ 负面 - + {{item._source.srctitle}} @@ -19,4 +19,16 @@ 作者:{{item._source.user_author}} + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.srctitle}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/totalReview/index.js b/pages/insight/pages/brandInsight/totalReview/index.js index b7b2d4e..4b6b86b 100644 --- a/pages/insight/pages/brandInsight/totalReview/index.js +++ b/pages/insight/pages/brandInsight/totalReview/index.js @@ -33,8 +33,6 @@ Component({ dx.push(key); dy.push(res[key]) }; - console.log(dx); - console.log(dy); this.setData({ brandOption: histogram(dx,dy,[],'#0084FF') }) diff --git a/pages/insight/pages/eventInsight/evDatalist/index.js b/pages/insight/pages/eventInsight/evDatalist/index.js index 6d07851..0d60807 100644 --- a/pages/insight/pages/eventInsight/evDatalist/index.js +++ b/pages/insight/pages/eventInsight/evDatalist/index.js @@ -17,7 +17,9 @@ Component({ qgList: [], wjList: [{key: 1,value: '低级危机'},{key: 2,value: '中级危机'},{key: 3,value: '高级危机'}], //列表 - dataList: [] + dataList: [], + copyShow: false, + copyData: {}, }, methods: { getApi() { @@ -68,6 +70,14 @@ Component({ changeQingGan(event) {this.setData({ sQingGan: event.detail });this.getData()}, changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()}, iTimeTypeByChange(event) {this.setData({iTimeType: event.detail});this.getData()}, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.title+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) + }, }, lifetimes: { attached() { diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml index 9bdfa81..57e25a0 100644 --- a/pages/insight/pages/eventInsight/evDatalist/index.wxml +++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml @@ -53,7 +53,7 @@ 负面 - + {{item._source.title}} @@ -62,4 +62,16 @@ + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.title}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/modalInsight/TailInsight/index.js b/pages/insight/pages/modalInsight/TailInsight/index.js index 4f67a44..63f6f6c 100644 --- a/pages/insight/pages/modalInsight/TailInsight/index.js +++ b/pages/insight/pages/modalInsight/TailInsight/index.js @@ -15,6 +15,8 @@ Component({ //热门词云 wordCloudActive: 0, wordCloudData: [], + copyShow: false, + copyData: {}, }, methods: { getData() { @@ -96,11 +98,12 @@ Component({ this.setData({wordCloudData: arr1}) }); }, - toEventDetail(value) { - let id = value.currentTarget.dataset.id; - wx.setStorageSync('sRele', id); - wx.navigateTo({ - url: "/pages/insight/pages/eventInsight/index" + '?id=' + id + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.srctitle+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, }) }, changeWordCloud(event) { diff --git a/pages/insight/pages/modalInsight/TailInsight/index.wxml b/pages/insight/pages/modalInsight/TailInsight/index.wxml index f5bdf22..93b10f6 100644 --- a/pages/insight/pages/modalInsight/TailInsight/index.wxml +++ b/pages/insight/pages/modalInsight/TailInsight/index.wxml @@ -62,7 +62,7 @@ 查看更多 > - + {{item._source.srctitle}} @@ -78,4 +78,16 @@ + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.srctitle}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js index bf5a9a4..079421c 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.js +++ b/pages/insight/pages/modalInsight/modalDataList/index.js @@ -11,6 +11,8 @@ Page({ affList: [], qgList: [], wjList: [{key: 1,value: '低级危机'},{key: 2,value: '中级危机'},{key: 3,value: '高级危机'}], + copyShow: false, + copyData: {}, }, onShow() { this.getApi(); @@ -62,5 +64,13 @@ Page({ sEndTime: result.detail.sEndTime, }); this.getData(); - } + }, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.title+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) + }, }) \ No newline at end of file diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml index 752e87e..db61c61 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.wxml +++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml @@ -52,7 +52,7 @@ 负面 - + {{item._source.title}} @@ -60,4 +60,16 @@ 作者:{{item._source.user_author}} + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.title}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/modalInsight/tailDataList/index.js b/pages/insight/pages/modalInsight/tailDataList/index.js index cc51c18..4a0b92f 100644 --- a/pages/insight/pages/modalInsight/tailDataList/index.js +++ b/pages/insight/pages/modalInsight/tailDataList/index.js @@ -1,7 +1,9 @@ const app = getApp(); Page({ data: { - tailDataList: [] + tailDataList: [], + copyShow: false, + copyData: {}, }, onShow() { this.getData(); @@ -21,5 +23,13 @@ Page({ }).then(res => { this.setData({tailDataList: res}) }); - } + }, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.srctitle+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author + wx.setClipboardData({ + data: str, + }) + }, }) \ No newline at end of file diff --git a/pages/insight/pages/modalInsight/tailDataList/index.wxml b/pages/insight/pages/modalInsight/tailDataList/index.wxml index 35cd7e9..8fb118d 100644 --- a/pages/insight/pages/modalInsight/tailDataList/index.wxml +++ b/pages/insight/pages/modalInsight/tailDataList/index.wxml @@ -11,7 +11,7 @@ 负面 - + {{item._source.srctitle}} @@ -19,4 +19,16 @@ 作者:{{item._source.user_author}} + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.srctitle}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file diff --git a/pages/insight/pages/themeList/index.js b/pages/insight/pages/themeList/index.js index eb77eab..ed7a3f5 100644 --- a/pages/insight/pages/themeList/index.js +++ b/pages/insight/pages/themeList/index.js @@ -39,6 +39,8 @@ Page({ reportOption: [], reportShow: false, fieldList: [], + copyShow: false, + copyData: {}, }, onLoad: function(options) { this.setData({Guid: options.Guid, sStartTime: options.StartTime, sEndTime: options.EndTime}) @@ -172,9 +174,6 @@ Page({ +'&sQuDao='+quDao+'&sQingGan='+qingGan+'&sTitle='+title+'&website='+website, }) }, - toDetail() { - // 外链 - }, openReport() { this.setData({reportShow: true}) }, @@ -211,6 +210,14 @@ Page({ fieldChange(event) { this.setData({fieldList: event.detail}) }, + toEventDetail(event) { + let cpdt = event.currentTarget.dataset.id._source + this.setData({copyShow: true, copyData: cpdt}); + let str = '发布时间:'+cpdt.sourcetime+'来源:'+cpdt.source+'标题:'+cpdt.title+'链接:'+cpdt.url+'调性:'+(cpdt.affections == 1?'正面':cpdt.affections == 2?'中性':'负面')+'作者:'+cpdt.user_author; + wx.setClipboardData({ + data: str, + }) + }, // 时间选择器 onDisplayStart() { this.setData({ show1: true }); diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml index bd346c1..e84e9b7 100644 --- a/pages/insight/pages/themeList/index.wxml +++ b/pages/insight/pages/themeList/index.wxml @@ -81,7 +81,7 @@ 负面 - + {{item._source.title}} @@ -110,4 +110,16 @@ + + + 已复制到剪贴板,快去分享吧 + 发布时间:{{copyData.sourcetime}} + + 来源:{{copyData.source}} + 标题:{{copyData.title}} + 链接:{{copyData.url}} + 调性:{{copyData.affections == 1?'正面':copyData.affections == 2?'中性':'负面'}} + 作者:{{copyData.user_author}} + + \ No newline at end of file