diff --git a/contrastPackages/brandRatio/BBS/index.wxml b/contrastPackages/brandRatio/BBS/index.wxml index 42a70ed..0af5bc0 100644 --- a/contrastPackages/brandRatio/BBS/index.wxml +++ b/contrastPackages/brandRatio/BBS/index.wxml @@ -45,7 +45,7 @@ 论坛调性对比 - + diff --git a/contrastPackages/brandRatio/index.js b/contrastPackages/brandRatio/index.js index 0bcd574..7bb08db 100644 --- a/contrastPackages/brandRatio/index.js +++ b/contrastPackages/brandRatio/index.js @@ -72,8 +72,9 @@ Page({ }, del(e) { let filter = this.data.result.filter(ele=>{ - return ele!= null + return ele!= "null" }) + console.log(filter); if(filter.length==2){ Dialog.alert({ message: '至少需要两个品牌才可以对比哦!', diff --git a/contrastPackages/brandRatio/survey/index.js b/contrastPackages/brandRatio/survey/index.js index c62309b..5dd2017 100644 --- a/contrastPackages/brandRatio/survey/index.js +++ b/contrastPackages/brandRatio/survey/index.js @@ -213,7 +213,7 @@ Component({ } //横轴,数据,纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, sBrand, []) + brandOption4: sHistogram(xMsg, data, sBrand, dColor) }) }) //品牌传播TOP媒体 diff --git a/contrastPackages/brandRatio/survey/index.wxml b/contrastPackages/brandRatio/survey/index.wxml index f497b20..183fbd0 100644 --- a/contrastPackages/brandRatio/survey/index.wxml +++ b/contrastPackages/brandRatio/survey/index.wxml @@ -55,46 +55,46 @@ {{brandTop[0].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/brandRatio/survey/index.wxss b/contrastPackages/brandRatio/survey/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/brandRatio/survey/index.wxss +++ b/contrastPackages/brandRatio/survey/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/brandRatio/thetail/index.wxml b/contrastPackages/brandRatio/thetail/index.wxml index b2bb1f1..72b6096 100644 --- a/contrastPackages/brandRatio/thetail/index.wxml +++ b/contrastPackages/brandRatio/thetail/index.wxml @@ -20,46 +20,46 @@ {{brandTop[0].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].key}} - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/brandRatio/thetail/index.wxss b/contrastPackages/brandRatio/thetail/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/brandRatio/thetail/index.wxss +++ b/contrastPackages/brandRatio/thetail/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/brandRatio/weibo/index.wxml b/contrastPackages/brandRatio/weibo/index.wxml index a4b4149..b1b6436 100644 --- a/contrastPackages/brandRatio/weibo/index.wxml +++ b/contrastPackages/brandRatio/weibo/index.wxml @@ -40,46 +40,46 @@ {{brandTop[0].Name}} - 排名 - 车型 - 传播量 + 排名 + 内容 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].Name}} - - 排名 - 车型 - 传播量 + + 排名 + 内容 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/brandRatio/weibo/index.wxss b/contrastPackages/brandRatio/weibo/index.wxss index 2bbcb19..a0d4725 100644 --- a/contrastPackages/brandRatio/weibo/index.wxss +++ b/contrastPackages/brandRatio/weibo/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/carModelsRatio/survey/index.wxml b/contrastPackages/carModelsRatio/survey/index.wxml index ef90c91..7af80a9 100644 --- a/contrastPackages/carModelsRatio/survey/index.wxml +++ b/contrastPackages/carModelsRatio/survey/index.wxml @@ -55,46 +55,46 @@ {{brandTop[0].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].key}} - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} @@ -118,9 +118,9 @@ {{item.name}} - - - + + + @@ -136,9 +136,9 @@ {{item.name}} - - - + + + diff --git a/contrastPackages/carModelsRatio/survey/index.wxss b/contrastPackages/carModelsRatio/survey/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/carModelsRatio/survey/index.wxss +++ b/contrastPackages/carModelsRatio/survey/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/carModelsRatio/thetail/index.wxml b/contrastPackages/carModelsRatio/thetail/index.wxml index b2bb1f1..72b6096 100644 --- a/contrastPackages/carModelsRatio/thetail/index.wxml +++ b/contrastPackages/carModelsRatio/thetail/index.wxml @@ -20,46 +20,46 @@ {{brandTop[0].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].key}} - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/carModelsRatio/thetail/index.wxss b/contrastPackages/carModelsRatio/thetail/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/carModelsRatio/thetail/index.wxss +++ b/contrastPackages/carModelsRatio/thetail/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/carModelsRatio/weibo/index.wxml b/contrastPackages/carModelsRatio/weibo/index.wxml index a4b4149..07efce9 100644 --- a/contrastPackages/carModelsRatio/weibo/index.wxml +++ b/contrastPackages/carModelsRatio/weibo/index.wxml @@ -40,46 +40,46 @@ {{brandTop[0].Name}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].Name}} - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/carModelsRatio/weibo/index.wxss b/contrastPackages/carModelsRatio/weibo/index.wxss index 2bbcb19..a0d4725 100644 --- a/contrastPackages/carModelsRatio/weibo/index.wxss +++ b/contrastPackages/carModelsRatio/weibo/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/eventRatio/survey/index.wxml b/contrastPackages/eventRatio/survey/index.wxml index ba035ca..1490a3a 100644 --- a/contrastPackages/eventRatio/survey/index.wxml +++ b/contrastPackages/eventRatio/survey/index.wxml @@ -89,46 +89,46 @@ 事件一 - 排名 - 媒体 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} 事件二 - - 排名 - 媒体 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/eventRatio/survey/index.wxss b/contrastPackages/eventRatio/survey/index.wxss index b5edbb3..e339489 100644 --- a/contrastPackages/eventRatio/survey/index.wxss +++ b/contrastPackages/eventRatio/survey/index.wxss @@ -44,6 +44,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/eventRatio/thetail/index.wxml b/contrastPackages/eventRatio/thetail/index.wxml index bf46d19..c89ac76 100644 --- a/contrastPackages/eventRatio/thetail/index.wxml +++ b/contrastPackages/eventRatio/thetail/index.wxml @@ -12,46 +12,46 @@ 事件一 - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} 事件二 - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/eventRatio/thetail/index.wxss b/contrastPackages/eventRatio/thetail/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/eventRatio/thetail/index.wxss +++ b/contrastPackages/eventRatio/thetail/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/themeRatio/survey/index.wxml b/contrastPackages/themeRatio/survey/index.wxml index bf42729..c7e6dab 100644 --- a/contrastPackages/themeRatio/survey/index.wxml +++ b/contrastPackages/themeRatio/survey/index.wxml @@ -55,46 +55,46 @@ {{brandTop[0].themeName}} - 排名 - 媒体 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].themeName}} - - 排名 - 媒体 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/themeRatio/survey/index.wxss b/contrastPackages/themeRatio/survey/index.wxss index 85c4d37..cf4924d 100644 --- a/contrastPackages/themeRatio/survey/index.wxss +++ b/contrastPackages/themeRatio/survey/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/themeRatio/thetail/index.wxml b/contrastPackages/themeRatio/thetail/index.wxml index e9ef82b..9732f6f 100644 --- a/contrastPackages/themeRatio/thetail/index.wxml +++ b/contrastPackages/themeRatio/thetail/index.wxml @@ -26,46 +26,46 @@ {{brandTop[0].key}} - 排名 - 车型 - 传播量 + 排名 + 媒体 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].key}} - - 排名 - 车型 - 传播量 + + 排名 + 媒体 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/themeRatio/thetail/index.wxss b/contrastPackages/themeRatio/thetail/index.wxss index 99278f6..927db49 100644 --- a/contrastPackages/themeRatio/thetail/index.wxss +++ b/contrastPackages/themeRatio/thetail/index.wxss @@ -39,6 +39,8 @@ min-height: 544rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/contrastPackages/themeRatio/weibo/index.wxml b/contrastPackages/themeRatio/weibo/index.wxml index 15e98c6..9754c7b 100644 --- a/contrastPackages/themeRatio/weibo/index.wxml +++ b/contrastPackages/themeRatio/weibo/index.wxml @@ -40,46 +40,46 @@ {{brandTop[0].themeName}} - 排名 - 车型 - 传播量 + 排名 + 内容 + 传播量 - + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} {{brandTop[1].themeName}} - - 排名 - 车型 - 传播量 + + 排名 + 内容 + 传播量 - - + + - + - + - {{"0"+(index+1)}} - {{item.key}} - {{item.value}} + {{"0"+(index+1)}} + {{item.key}} + {{item.value}} diff --git a/contrastPackages/themeRatio/weibo/index.wxss b/contrastPackages/themeRatio/weibo/index.wxss index 2bbcb19..a0d4725 100644 --- a/contrastPackages/themeRatio/weibo/index.wxss +++ b/contrastPackages/themeRatio/weibo/index.wxss @@ -38,6 +38,8 @@ margin-top: 16rpx; } .ranking{ + display: flex; + justify-content: space-between; font-size: 12px; font-weight: 400; color: #999999; diff --git a/pages/varComm/pages/brand/index.js b/pages/varComm/pages/brand/index.js index f4e8f1f..02dace0 100644 --- a/pages/varComm/pages/brand/index.js +++ b/pages/varComm/pages/brand/index.js @@ -64,6 +64,9 @@ Component({ attached() { //页面数据 // this.getOpenID() + wx.showLoading({ + title: '数据载入中....', + }) app.globalData.request({ action: 'getUserBrand', token: wx.getStorageSync('token'), @@ -86,6 +89,9 @@ Component({ mockData: arr }) }) + }, + ready(){ + wx.hideLoading() } }, }) \ No newline at end of file diff --git a/pages/varComm/pages/brand/index.wxml b/pages/varComm/pages/brand/index.wxml index 4a31aca..9dd5bdf 100644 --- a/pages/varComm/pages/brand/index.wxml +++ b/pages/varComm/pages/brand/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/varComm/pages/carModels/index.js b/pages/varComm/pages/carModels/index.js index 3817a24..18aeeb0 100644 --- a/pages/varComm/pages/carModels/index.js +++ b/pages/varComm/pages/carModels/index.js @@ -95,7 +95,9 @@ Component({ lifetimes: { attached() { //页面数据 - // this.getOpenID() + wx.showLoading({ + title: '数据载入中....', + }) app.globalData.request({ action: 'getUserBrand', token: 't%2BrswgjvzGM=', @@ -118,6 +120,9 @@ Component({ mockData: arr }) }) + }, + ready(){ + wx.hideLoading() } }, }) \ No newline at end of file