From d384c3c9d87ba40b208705e543c90bfea12754ac Mon Sep 17 00:00:00 2001
From: liuyongli <1598631486@qq.com>
Date: Fri, 8 Jul 2022 09:37:56 +0800
Subject: [PATCH] no message
---
app.js | 2 +
components/indexCom/atlasChild/index.wxml | 6 +--
components/indexCom/atlasChild/index.wxss | 2 +-
components/indexCom/barometerChild/index.wxss | 2 +-
components/indexCom/dataChild/index.js | 18 ++++----
components/indexCom/dataChild/index.wxml | 2 +-
components/indexCom/mediaChild/index.wxml | 2 +-
components/indexCom/mediaChild/index.wxss | 4 +-
components/indexCom/soundChild/index.wxml | 4 +-
components/indexCom/soundChild/index.wxss | 4 +-
pages/index/Rankdetail/Rankdetail.js | 12 +++---
pages/index/Rankdetail/Rankdetail.wxml | 41 +++++--------------
pages/index/index.js | 2 +
utils/config.js | 4 ++
14 files changed, 48 insertions(+), 57 deletions(-)
create mode 100644 utils/config.js
diff --git a/app.js b/app.js
index 14d1d8b..393c6fd 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,8 @@
//app.js
+import {url} from "./utils/config"
App({
globalData: {
+ url,
}
})
\ No newline at end of file
diff --git a/components/indexCom/atlasChild/index.wxml b/components/indexCom/atlasChild/index.wxml
index 8484ccc..ffe9797 100644
--- a/components/indexCom/atlasChild/index.wxml
+++ b/components/indexCom/atlasChild/index.wxml
@@ -3,16 +3,16 @@
热门词云
-
+
正面词云
-
+
负面词云
-
+
\ No newline at end of file
diff --git a/components/indexCom/atlasChild/index.wxss b/components/indexCom/atlasChild/index.wxss
index f169b2e..177f169 100644
--- a/components/indexCom/atlasChild/index.wxss
+++ b/components/indexCom/atlasChild/index.wxss
@@ -1,6 +1,6 @@
/* 品牌传播声量 */
.brand{
- width: 686rpx;
+ width: 680rpx;
height: 484rpx;
background-color: #fff;
margin: 32rpx;
diff --git a/components/indexCom/barometerChild/index.wxss b/components/indexCom/barometerChild/index.wxss
index 451180a..f49139d 100644
--- a/components/indexCom/barometerChild/index.wxss
+++ b/components/indexCom/barometerChild/index.wxss
@@ -1,6 +1,6 @@
/* 正负调性 */
.brand{
- width: 100%;
+ width:680rpx;
height: 484rpx;
background-color: #fff;
margin: 32rpx;
diff --git a/components/indexCom/dataChild/index.js b/components/indexCom/dataChild/index.js
index ddfa0f0..c75910b 100644
--- a/components/indexCom/dataChild/index.js
+++ b/components/indexCom/dataChild/index.js
@@ -1,45 +1,47 @@
+import {url} from '../../../utils/config'
Component({
data: {
+ url: getApp().globalData.url,
active:0,
timelist: ['二十四小时', '最近七天', '最近三十天', '自定义'],
totallist:[
{
- url:'/images/ruku.png',
+ url:'/ruku.png',
text:'入库数据',
num:'198,897,987'
},
{
- url:'/images/weibo.png',
+ url:'/weibo.png',
text:'微博数据',
num:'198,897,987'
},
{
- url:'/images/shipin.png',
+ url:'/shipin.png',
text:'短视频数据',
num:'198,897,987'
},
{
- url:'/images/weixin.png',
+ url:'/weixin.png',
text:'微信数据',
num:'198,897,987'
},
{
- url:'/images/app.png',
+ url:'/app.png',
text:'APP数据',
num:'198,897,987'
},
{
- url:'/images/luntan.png',
+ url:'/luntan.png',
text:'论坛数据',
num:'198,897,987'
},
{
- url:'/images/xinwen.png',
+ url:'/xinwen.png',
text:'新闻数据',
num:'198,897,987'
},
{
- url:'/images/qita.png',
+ url:'/qita.png',
text:'其他数据',
num:'198,897,987'
},
diff --git a/components/indexCom/dataChild/index.wxml b/components/indexCom/dataChild/index.wxml
index b528902..024d42f 100644
--- a/components/indexCom/dataChild/index.wxml
+++ b/components/indexCom/dataChild/index.wxml
@@ -30,7 +30,7 @@
-
+
{{item.text}}
diff --git a/components/indexCom/mediaChild/index.wxml b/components/indexCom/mediaChild/index.wxml
index 01003e7..cfa6730 100644
--- a/components/indexCom/mediaChild/index.wxml
+++ b/components/indexCom/mediaChild/index.wxml
@@ -1,4 +1,4 @@
-
+
diff --git a/components/indexCom/mediaChild/index.wxss b/components/indexCom/mediaChild/index.wxss
index 0b1c9fe..9ff3272 100644
--- a/components/indexCom/mediaChild/index.wxss
+++ b/components/indexCom/mediaChild/index.wxss
@@ -12,12 +12,12 @@
padding: 32rpx;
}
.ranking{
- width: 686rpx;
+ width: 654rpx;
display: flex;
padding: 0 32rpx;
}
.rank{
- width: 686rpx;
+ width: 654rpx;
height: 104rpx;
line-height: 104rpx;
display: flex;
diff --git a/components/indexCom/soundChild/index.wxml b/components/indexCom/soundChild/index.wxml
index 0f0a1f2..8dcbf8e 100644
--- a/components/indexCom/soundChild/index.wxml
+++ b/components/indexCom/soundChild/index.wxml
@@ -4,13 +4,13 @@
品牌传播声量
-
+
车型传播声量
-
+
diff --git a/components/indexCom/soundChild/index.wxss b/components/indexCom/soundChild/index.wxss
index 0f6a6e0..fdecb24 100644
--- a/components/indexCom/soundChild/index.wxss
+++ b/components/indexCom/soundChild/index.wxss
@@ -1,8 +1,8 @@
/* 品牌传播声量 */
.brand{
- width: 100%;
+ width: 680rpx;
height: 484rpx;
- background-color: #fff;
+ background-color: rgb(255, 255, 255);
margin: 32rpx;
border-radius: 4rpx;
}
diff --git a/pages/index/Rankdetail/Rankdetail.js b/pages/index/Rankdetail/Rankdetail.js
index 7ed057b..1c87837 100644
--- a/pages/index/Rankdetail/Rankdetail.js
+++ b/pages/index/Rankdetail/Rankdetail.js
@@ -4,7 +4,6 @@
* 页面的初始数据
*/
data: {
-
sortOpt: [
{
text: '列表展示',
@@ -201,11 +200,12 @@
},
//图表位置
grid: {
- left: 20,
- right: 20,
- bottom: 15,
- top: 40,
- containLabel: true
+ left: 400,
+ right: 200,
+ bottom: 10,
+ top: 200,
+ containLabel: true,
+ height:'auto'
},
yAxis: [
{
diff --git a/pages/index/Rankdetail/Rankdetail.wxml b/pages/index/Rankdetail/Rankdetail.wxml
index c7b8fef..14c70e5 100644
--- a/pages/index/Rankdetail/Rankdetail.wxml
+++ b/pages/index/Rankdetail/Rankdetail.wxml
@@ -71,42 +71,23 @@
{{item.volume}}
-<<<<<<< HEAD
-
-
-
-
-
- 销量趋势
-
-
-=======
+
销量趋势
-
-
-
- 销量趋势
-
-
-
-
->>>>>>> 87a74f85d9d55ccf735ddf74357499a809621a51
-
-
-
+
+
-
-
- 销量趋势
- 宏光MINIEV销量趋势
-
-
-
+
+
+ 销量趋势
+ 宏光MINIEV销量趋势
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index d1d4ced..7811b12 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,9 +1,11 @@
// index.js
// 获取应用实例
const app = getApp()
+import {url} from '../../utils/config'
Page({
data: {
+ url: getApp().globalData.url,
active: 0,
navData: [{
text: '数据',
diff --git a/utils/config.js b/utils/config.js
new file mode 100644
index 0000000..af66e8d
--- /dev/null
+++ b/utils/config.js
@@ -0,0 +1,4 @@
+const url ='https://cdn.sws010.com/wxapp/images'
+module.exports={
+ url
+}
\ No newline at end of file