diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js index f3e34be..8ceacf5 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.js +++ b/pages/insight/pages/brandInsight/brandDataList/index.js @@ -3,9 +3,6 @@ Page({ data: { brandDataList: [], //form - sQuDao: [], - sQingGan: [], - sCrisis: [], iTimeType: 0, sTimeType: 34, sStartTime: '', @@ -14,15 +11,16 @@ Page({ iPageSize: 10, //api affList: [], - qgList: [], - wjList: [{key: 1,value: '低级危机'},{key: 2,value: '中级危机'},{key: 3,value: '高级危机'}], + qgList: [ + {key: 1, value: "正面", isSelect: false}, + {key: 2, value: "负面", isSelect: false}, + {key: 3, value: "中性", isSelect: false} + ], + wjList: [ + {key: 1,value: '低级危机', isSelect: false},{key: 2,value: '中级危机', isSelect: false},{key: 3,value: '高级危机', isSelect: false} + ], copyShow: false, copyData: {}, - //default select all list - allQuDao: [], - allQingGan: [], - qingGanList: [], - quDaoList: [], }, onShow() { this.setData({ @@ -34,6 +32,24 @@ Page({ this.getData(); }, onReachBottom() { + let qdList = []; + this.data.affList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qdList.push(ele.key) + } + }); + let qgList = []; + this.data.qgList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qgList.push(ele.key) + } + }); + let wjList = []; + this.data.wjList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + wjList.push(ele.key) + } + }); let pageIndex = this.data.iPageIndex + 1; this.setData({iPageIndex: pageIndex}); app.globalData.request({ @@ -42,14 +58,14 @@ Page({ sTimeType: this.data.sTimeType, sStartTime: this.data.sStartTime, sEndTime: this.data.sEndTime, - sQuDao: (this.data.sQuDao).join(',') || '', - sQingGan: (this.data.sQingGan).join(',') || '', + sQuDao: qdList.join(',') || '', + sQingGan: qgList.join(',') || '', iPageIndex: this.data.iPageIndex, iPageSize: this.data.iPageSize, sType: 'BrandData', isSourcetype: 0, //1返回渠道 0不返回 iTimeType: this.data.iTimeType, //0发布时间 1入库时间 - sCrisis: (this.data.sCrisis).join(',') || '', + sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', }).then(res => { let arr = [...this.data.brandDataList, ...res] @@ -57,20 +73,38 @@ Page({ }); }, getData() { + let qdList = []; + this.data.affList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qdList.push(ele.key) + } + }); + let qgList = []; + this.data.qgList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qgList.push(ele.key) + } + }); + let wjList = []; + this.data.wjList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + wjList.push(ele.key) + } + }); app.globalData.request({ action: 'getList', //数据列表 token: 't%2BrswgjvzGM=', sTimeType: this.data.sTimeType, sStartTime: this.data.sStartTime, sEndTime: this.data.sEndTime, - sQuDao: (this.data.sQuDao).join(',') || '', - sQingGan: (this.data.sQingGan).join(',') || '', + sQuDao: qdList.join(',') || '', + sQingGan: qgList.join(',') || '', iPageIndex: this.data.iPageIndex, iPageSize: this.data.iPageSize, sType: 'BrandData', isSourcetype: 0, //1返回渠道 0不返回 iTimeType: this.data.iTimeType, //0发布时间 1入库时间 - sCrisis: (this.data.sCrisis).join(',') || '', + sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', }).then(res => { this.setData({brandDataList: res}) @@ -81,44 +115,48 @@ Page({ action: 'getQuDao', //获取所有渠道 token: 't%2BrswgjvzGM=', }).then(res => { - let arr = [] - res.slice(1).forEach(ele => { - arr.push(ele.key.toString()) - }) - this.setData({affList: res.slice(1), quDaoList: arr}) - }); - app.globalData.request({ - action: 'getQingGan', //获取所有情感 - token: 't%2BrswgjvzGM=', - }).then(res => { - let arr = [] - res.slice(1).forEach(ele => { - arr.push(ele.key.toString()) + res.forEach(ele => { + ele.isSelect = false; }) - this.setData({qgList: res.slice(1), qingGanList: arr}) + this.setData({affList: res}) }); }, - changeSource(event) {this.setData({ sQuDao: event.detail });this.getData()}, - selectQdall(event) { - if(event.detail.length == 0) { - this.setData({sQuDao: []}) + changeSource(event) { + let that = this; + let val = event.currentTarget.dataset.value; + if(val.key == -1 && val.isSelect == false) { + that.data.affList.forEach(ele => { + ele.isSelect = true; + }) + } else if(val.key == -1 && val.isSelect == true) { + that.data.affList.forEach(ele => { + ele.isSelect = false; + }) } else { - this.setData({sQuDao: this.data.quDaoList}) + that.data.affList[0].isSelect = false; } - this.setData({ allQuDao: event.detail }); + if(val.key == -1) { + this.setData({affList: that.data.affList}); + } else { + that.data.affList[val.key].isSelect = !that.data.affList[val.key].isSelect; + this.setData({affList: that.data.affList}); + }; this.getData(); }, - changeQingGan(event) {this.setData({ sQingGan: event.detail });this.getData()}, - selectQgall(event) { - if(event.detail.length == 0) { - this.setData({sQingGan: [], sCrisis: []}) - } else { - this.setData({sQingGan: this.data.qingGanList, sCrisis: ['1','2','3']}) - } - this.setData({ allQingGan: event.detail }); + changeQingGan(event) { + let that = this; + let val = event.currentTarget.dataset.value; + that.data.qgList[val.key-1].isSelect = !that.data.qgList[val.key-1].isSelect; + this.setData({qgList: that.data.qgList}); + this.getData(); + }, + changeWeiJi(event) { + let that = this; + let val = event.currentTarget.dataset.value; + that.data.wjList[val.key-1].isSelect = !that.data.wjList[val.key-1].isSelect; + this.setData({wjList: that.data.wjList}); this.getData(); }, - changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()}, iTimeTypeChange(event) { this.setData({ iTimeType: this.data.iTimeType == 1?0:1, diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml index 215f77b..b92e01a 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.wxml +++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml @@ -3,35 +3,26 @@ - - - 全部 - - - - - {{item.value}} - - + + + {{item.value}} + {{item.value}} + + - - - - 全部 - - - - - {{item.value}} - - - - - {{item.value}} - - + + + + {{item.value}} + {{item.value}} + + + {{item.value}} + {{item.value}} + + diff --git a/pages/insight/pages/modalInsight/index.js b/pages/insight/pages/modalInsight/index.js index 7ad60b0..0823e65 100644 --- a/pages/insight/pages/modalInsight/index.js +++ b/pages/insight/pages/modalInsight/index.js @@ -30,11 +30,11 @@ Page({ sTimeType: wx.getStorageSync('sTimeType') || 34, sStartTime: wx.getStorageSync('sStartTime') || '', sEndTime: wx.getStorageSync('sEndTime') || '', - sBrand: this.data.currentBrand, + sBrand: wx.getStorageSync('sBrand') || '', sSeriesName: wx.getStorageSync('sSeriesName') || '', }).then(res => { this.setData({ - percent: (res.countPercent * 100).toFixed(2) + '%' + percent: (res.countPercent * 1) + '%' }) }); app.globalData.request({ @@ -44,7 +44,7 @@ Page({ sTimeType: wx.getStorageSync('sTimeType') || 34, sStartTime: wx.getStorageSync('sStartTime') || '', sEndTime: wx.getStorageSync('sEndTime') || '', - sBrand: this.currentBrand, + sBrand: wx.getStorageSync('sBrand') || '', sSeriesName: wx.getStorageSync('sSeriesName') || '', }).then(res => { let total = res.正面*1 + res.中性*1 + res.负面*1 @@ -74,7 +74,7 @@ Page({ sTimeType: wx.getStorageSync('sTimeType') || 34, sStartTime: wx.getStorageSync('sStartTime') || '', sEndTime: wx.getStorageSync('sEndTime') || '', - sBrand: this.data.currentBrand, + sBrand: wx.getStorageSync('sBrand') || '', sSeriesName: wx.getStorageSync('sSeriesName') || '', }).then(res => { wx.showModal({ diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js index 5056e0c..ecb0d99 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.js +++ b/pages/insight/pages/modalInsight/modalDataList/index.js @@ -3,69 +3,111 @@ Page({ data: { brandDataList: [], //form - sQuDao: [], - sQingGan: [], - sCrisis: [], iTimeType: 0, + sTimeType: 34, + sStartTime: '', + sEndTime: '', iPageIndex: 1, iPageSize: 10, //api affList: [], - qgList: [], - wjList: [{key: 1,value: '低级危机'},{key: 2,value: '中级危机'},{key: 3,value: '高级危机'}], + qgList: [ + {key: 1, value: "正面", isSelect: false}, + {key: 2, value: "负面", isSelect: false}, + {key: 3, value: "中性", isSelect: false} + ], + wjList: [ + {key: 1,value: '低级危机', isSelect: false},{key: 2,value: '中级危机', isSelect: false},{key: 3,value: '高级危机', isSelect: false} + ], copyShow: false, copyData: {}, - //default select all list - allQuDao: [], - allQingGan: [], - qingGanList: [], - quDaoList: [], }, onShow() { + this.setData({ + sTimeType: wx.getStorageSync('sTimeType') || 34, + sStartTime: wx.getStorageSync('sStartTime') || '', + sEndTime: wx.getStorageSync('sEndTime') || '', + }) this.getApi(); this.getData(); }, onReachBottom() { + let qdList = []; + this.data.affList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qdList.push(ele.key) + } + }); + let qgList = []; + this.data.qgList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qgList.push(ele.key) + } + }); + let wjList = []; + this.data.wjList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + wjList.push(ele.key) + } + }); let pageIndex = this.data.iPageIndex + 1; this.setData({iPageIndex: pageIndex}); app.globalData.request({ action: 'getList', //数据列表 token: 't%2BrswgjvzGM=', - sTimeType: wx.getStorageSync('sTimeType') || 34, - sStartTime: wx.getStorageSync('sStartTime') || '', - sEndTime: wx.getStorageSync('sEndTime') || '', - sQuDao: (this.data.sQuDao).join(',') || '', - sQingGan: (this.data.sQingGan).join(',') || '', + sTimeType: this.data.sTimeType, + sStartTime: this.data.sStartTime, + sEndTime: this.data.sEndTime, + sQuDao: qdList.join(',') || '', + sQingGan: qgList.join(',') || '', iPageIndex: this.data.iPageIndex, iPageSize: this.data.iPageSize, sType: 'BrandData', isSourcetype: 0, //1返回渠道 0不返回 iTimeType: this.data.iTimeType, //0发布时间 1入库时间 - sCrisis: (this.data.sCrisis).join(','), + sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', - sSeries: wx.getStorageSync('sSeries') || '', + sSeries: wx.getStorageSync('sSeriesName') || '', }).then(res => { let arr = [...this.data.brandDataList, ...res] this.setData({brandDataList: arr}) }); }, getData() { + let qdList = []; + this.data.affList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qdList.push(ele.key) + } + }); + let qgList = []; + this.data.qgList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + qgList.push(ele.key) + } + }); + let wjList = []; + this.data.wjList.forEach(ele => { + if(ele.isSelect && ele.key != -1) { + wjList.push(ele.key) + } + }); app.globalData.request({ action: 'getList', //数据列表 token: 't%2BrswgjvzGM=', - sTimeType: wx.getStorageSync('sTimeType') || 34, - sStartTime: wx.getStorageSync('sStartTime') || '', - sEndTime: wx.getStorageSync('sEndTime') || '', - sQuDao: (this.data.sQuDao).join(',') || '', - sQingGan: (this.data.sQingGan).join(',') || '', + sTimeType: this.data.sTimeType, + sStartTime: this.data.sStartTime, + sEndTime: this.data.sEndTime, + sQuDao: qdList.join(',') || '', + sQingGan: qgList.join(',') || '', iPageIndex: this.data.iPageIndex, iPageSize: this.data.iPageSize, sType: 'BrandData', isSourcetype: 0, //1返回渠道 0不返回 iTimeType: this.data.iTimeType, //0发布时间 1入库时间 - sCrisis: (this.data.sCrisis).join(','), + sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', - sSeries: wx.getStorageSync('sSeries') || '', + sSeries: wx.getStorageSync('sSeriesName') || '', }).then(res => { this.setData({brandDataList: res}) }); @@ -75,44 +117,48 @@ Page({ action: 'getQuDao', //获取所有渠道 token: 't%2BrswgjvzGM=', }).then(res => { - let arr = [] - res.slice(1).forEach(ele => { - arr.push(ele.key.toString()) - }) - this.setData({affList: res.slice(1), quDaoList: arr}) - }); - app.globalData.request({ - action: 'getQingGan', //获取所有情感 - token: 't%2BrswgjvzGM=', - }).then(res => { - let arr = [] - res.slice(1).forEach(ele => { - arr.push(ele.key.toString()) + res.forEach(ele => { + ele.isSelect = false; }) - this.setData({qgList: res.slice(1), qingGanList: arr}) + this.setData({affList: res}) }); }, - changeSource(event) {this.setData({ sQuDao: event.detail });this.getData()}, - selectQdall(event) { - if(event.detail.length == 0) { - this.setData({sQuDao: []}) + changeSource(event) { + let that = this; + let val = event.currentTarget.dataset.value; + if(val.key == -1 && val.isSelect == false) { + that.data.affList.forEach(ele => { + ele.isSelect = true; + }) + } else if(val.key == -1 && val.isSelect == true) { + that.data.affList.forEach(ele => { + ele.isSelect = false; + }) } else { - this.setData({sQuDao: this.data.quDaoList}) + that.data.affList[0].isSelect = false; } - this.setData({ allQuDao: event.detail }); + if(val.key == -1) { + this.setData({affList: that.data.affList}); + } else { + that.data.affList[val.key].isSelect = !that.data.affList[val.key].isSelect; + this.setData({affList: that.data.affList}); + }; this.getData(); }, - changeQingGan(event) {this.setData({ sQingGan: event.detail });this.getData()}, - selectQgall(event) { - if(event.detail.length == 0) { - this.setData({sQingGan: [], sCrisis: []}) - } else { - this.setData({sQingGan: this.data.qingGanList, sCrisis: ['1','2','3']}) - } - this.setData({ allQingGan: event.detail }); + changeQingGan(event) { + let that = this; + let val = event.currentTarget.dataset.value; + that.data.qgList[val.key-1].isSelect = !that.data.qgList[val.key-1].isSelect; + this.setData({qgList: that.data.qgList}); + this.getData(); + }, + changeWeiJi(event) { + let that = this; + let val = event.currentTarget.dataset.value; + that.data.wjList[val.key-1].isSelect = !that.data.wjList[val.key-1].isSelect; + this.setData({wjList: that.data.wjList}); this.getData(); }, - changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()}, iTimeTypeChange(event) { this.setData({ iTimeType: this.data.iTimeType == 1?0:1, diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml index 4455b07..092a95a 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.wxml +++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml @@ -3,35 +3,26 @@ - - - 全部 - - - - - {{item.value}} - - + + + {{item.value}} + {{item.value}} + + - - - 全部 - - - - - {{item.value}} - - - - - {{item.value}} - - + + + {{item.value}} + {{item.value}} + + + {{item.value}} + {{item.value}} + +