From 469c80a4eff3777563354199e01ab0721b12c186 Mon Sep 17 00:00:00 2001
From: liuyongli <1598631486@qq.com>
Date: Tue, 26 Jul 2022 08:49:00 +0800
Subject: [PATCH 1/3] no message
---
pages/index/Brandsales/Brandsales.js | 6 ++--
.../Salesranking/Vehicletype/Vehicletype.js | 29 +++++--------------
2 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/pages/index/Brandsales/Brandsales.js b/pages/index/Brandsales/Brandsales.js
index 5709446..cdf6c2d 100644
--- a/pages/index/Brandsales/Brandsales.js
+++ b/pages/index/Brandsales/Brandsales.js
@@ -145,9 +145,9 @@ showPopup() {
*/
onReady: function () {
//动态设置标题
- wx.setNavigationBarTitle({
- title:this.data.query.title
- })
+ // wx.setNavigationBarTitle({
+ // title:this.data.query.title
+ // })
},
diff --git a/pages/index/Salesranking/Vehicletype/Vehicletype.js b/pages/index/Salesranking/Vehicletype/Vehicletype.js
index 8c758be..7be0754 100644
--- a/pages/index/Salesranking/Vehicletype/Vehicletype.js
+++ b/pages/index/Salesranking/Vehicletype/Vehicletype.js
@@ -281,15 +281,15 @@ Component({
icon: 'loading',
duration: 300000
})
- // console.log('picker发送选择改变，携带值为', e.detail.value)
- this.getTrend(e.detail.value)
+ console.log('picker发送选择改变，携带值为', e.detail.value)
+ this.setData({
+ date: e.detail.value,
+ })
+ this.getTrend(e.detail.value)
setTimeout(() =>{
wx.hideToast();
- },500),
- this.setData({
- date: e.detail.value,
-
- })
+ },500)
+
},
priceSel(e) {
this.setData({
@@ -354,26 +354,13 @@ Component({
})
})
},
- //页面上拉触底事件的处理函数
- onReachBottom: function () {
- console.log("上拉触底事件")
- let that = this
- if (!that.data.loadMore) {
- that.setData({
- loadMore: true, //加载中
- loadAll: false //是否加载完所有数据
- });
- //加载更多，这里做下延时加载
- // that.getTrend();
- }
- },
exit() {
this.setData({
show: false
})
},
//页面上拉触底事件的处理函数
- onReachBottom: function () {
+ onReachBottom: function () {
console.log("上拉触底事件")
let that = this
if (!that.data.loadMore) {
From 3e0593095c2df3a6a8cccec9c2e63a176191d20e Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Tue, 26 Jul 2022 16:12:46 +0800
Subject: [PATCH 2/3] cxw-010203
---
components/indexCom/atlasChild/index.js | 139 ++++++++++++----------
components/indexCom/atlasChild/index.wxml | 10 +-
components/word-cloud/index.js | 4 +-
components/word-cloud/index.wxss | 2 +-
4 files changed, 86 insertions(+), 69 deletions(-)
diff --git a/components/indexCom/atlasChild/index.js b/components/indexCom/atlasChild/index.js
index a6ebd78..8272e8b 100644
--- a/components/indexCom/atlasChild/index.js
+++ b/components/indexCom/atlasChild/index.js
@@ -2,6 +2,13 @@
const app = getApp()
Component({
data: {
+ showTu: false,
+ skey: {
+ 34: 2000,
+ 3: 20000,
+ 20: 60000,
+ 4: 20000
+ }
// words:
},
lifetimes: {
@@ -18,7 +25,6 @@ Component({
let sStartTime = e.detail.sStartTime;
let sEndTime = e.detail.sEndTime;
this.getData(sTimeType, sStartTime, sEndTime);
-
},
getData(sTimeType, sStartTime, sEndTime) {
wx.showToast({
@@ -26,87 +32,98 @@ Component({
icon: 'loading',
duration: 300000
}),
- this.getData1(sTimeType, sStartTime, sEndTime),
+ this.setData({
+ showTu: false
+ })
+ Promise.all([this.getData1(sTimeType, sStartTime, sEndTime),
this.getData2(sTimeType, sStartTime, sEndTime),
- this.getData3(sTimeType, sStartTime, sEndTime),
+ this.getData3(sTimeType, sStartTime, sEndTime)
+ ]).then(() => {
setTimeout(() => {
wx.hideToast();
}, 500)
+ this.setData({
+ showTu: true
+ })
+ })
+ // this.getData1(sTimeType, sStartTime, sEndTime),
+ // this.getData2(sTimeType, sStartTime, sEndTime),
+ // this.getData3(sTimeType, sStartTime, sEndTime),
+
},
//热门
getData1(sTimeType, sStartTime, sEndTime) {
- let obj = {
- action: 'getHotWordHome',
- sType: "Home",
- sTimeType: sTimeType,
- sStartTime: sStartTime,
- sEndTime: sEndTime
- }
- app.globalData.request(obj).then(res => {
- const data = res
- const arr1 = []
- Object.keys(data).forEach(key => {
- let o = [key, data[key]/11000]
- arr1.push(o)
- })
- const arr2 = [arr1[0]]
- console.log(arr2)
- this.setData({
- HotWords: arr1
+ return new Promise((resolve, reject) => {
+ let obj = {
+ action: 'getHotWordHome',
+ sType: "Home",
+ sTimeType: sTimeType,
+ sStartTime: sStartTime,
+ sEndTime: sEndTime
+ }
+ app.globalData.request(obj).then(res => {
+ const data = res
+ const arr1 = []
+ Object.keys(data).forEach(key => {
+ let o = [key, data[key] / this.data.skey[sTimeType]]
+ arr1.push(o)
+ })
+ this.setData({
+ HotWords: arr1
+ })
+ resolve(true)
})
})
},
// 正面
getData2(sTimeType, sStartTime, sEndTime) {
- const arr2 = []
- const limit2 = []
- let obj = {
- action: 'getPositive0528',
- sType: "Home",
- sTimeType: sTimeType,
- sStartTime: sStartTime,
- sEndTime: sEndTime
- }
- app.globalData.request(obj).then(res => {
- const obj = res
- Object.keys(obj).forEach(item => {
- let list = [item, parseInt(obj[item] / 1000)]
- arr2.push(list)
- })
- for (let index = 0; index < 30; index++) {
- limit2.push(arr2[index])
+ return new Promise((resolve, reject) => {
+ let obj = {
+ action: 'getPositive0528',
+ sType: "Home",
+ sTimeType: sTimeType,
+ sStartTime: sStartTime,
+ sEndTime: sEndTime
}
- // console.log(limit2)
- this.setData({
- PositiveWords: limit2
+ app.globalData.request(obj).then(res => {
+ const data = res
+ const arr2 = []
+ Object.keys(data).forEach(key => {
+ let list = [key, data[key] / this.data.skey[sTimeType]]
+ arr2.push(list)
+ })
+ this.setData({
+ PositiveWords: arr2
+ })
+ resolve(true)
})
})
+
},
// 负面
getData3(sTimeType, sStartTime, sEndTime) {
- const arr3 = []
- const limit3 = []
- let obj = {
- action: 'getNegative0528',
- sType: "Home",
- sTimeType: sTimeType,
- sStartTime: sStartTime,
- sEndTime: sEndTime
- }
- app.globalData.request(obj).then(res => {
- const obj = res
- Object.keys(obj).forEach(item => {
- let list = [item, parseInt(obj[item] / 1000)]
- arr3.push(list)
- })
- for (let index = 10; index < 40; index++) {
- limit3.push(arr3[index])
+ return new Promise((resolve, reject) => {
+ let obj = {
+ action: 'getNegative0528',
+ sType: "Home",
+ sTimeType: sTimeType,
+ sStartTime: sStartTime,
+ sEndTime: sEndTime
}
- // console.log(limit3)
- this.setData({
- NegativeWords: limit3
+ app.globalData.request(obj).then(res => {
+ const data = res
+ const arr3 = []
+ Object.keys(data).forEach(key => {
+ let list = [key, data[key] / this.data.skey[sTimeType]]
+ arr3.push(list)
+ })
+ this.setData({
+ NegativeWords: arr3
+ })
+ resolve(true)
})
})
+
},
},
})
\ No newline at end of file
diff --git a/components/indexCom/atlasChild/index.wxml b/components/indexCom/atlasChild/index.wxml
index c79b8bb..c5d1ffe 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/word-cloud/index.js b/components/word-cloud/index.js
index 9946b0d..cdebeb3 100644
--- a/components/word-cloud/index.js
+++ b/components/word-cloud/index.js
@@ -1,5 +1,5 @@
// components/word-cloud/index.js
-import WordCloud from './wordcloud'
+import WordCloud from './wordCloud'
const options = {
"list": [],
"gridSize": 2, // size of the grid in pixels
@@ -37,7 +37,7 @@ Component({
attached: function() {
// 在组件实例进入页面节点树时执行
const query = this.createSelectorQuery()
- query.select('#myCanvas')
+ query.select('.wc-canvas')
.fields({ node: true, size: true })
.exec((res) => {
this.data.canvas = res[0].node
diff --git a/components/word-cloud/index.wxss b/components/word-cloud/index.wxss
index 5efb4bf..034c3d8 100644
--- a/components/word-cloud/index.wxss
+++ b/components/word-cloud/index.wxss
@@ -6,7 +6,7 @@
.wc-main {
position: relative;
margin-left: -40%;
- margin-top: -15%;
+ margin-top: 0px;
}
.wc-item {
white-space: nowrap;
From 050032c178fe3bafd8dd282960cf4e1b829fca92 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Tue, 26 Jul 2022 17:05:20 +0800
Subject: [PATCH 3/3] cxw-010203
---
app.json | 2 +-
custom-tab-bar/icons/appSearch.png | Bin 4930 -> 4700 bytes
custom-tab-bar/icons/appSearchActive.png | Bin 6497 -> 0 bytes
custom-tab-bar/index.js | 2 +-
custom-tab-bar/index.wxml | 1 +
custom-tab-bar/index.wxss | 11 +++++++++--
pages/brandCrisis/index.js | 2 +-
pages/brandCrisis/index.wxml | 10 +++++-----
pages/brandCrisis/index.wxss | 5 +++--
9 files changed, 21 insertions(+), 12 deletions(-)
delete mode 100644 custom-tab-bar/icons/appSearchActive.png
diff --git a/app.json b/app.json
index 0339c99..ba4b841 100644
--- a/app.json
+++ b/app.json
@@ -52,7 +52,7 @@
{
"pagePath": "pages/brandCrisis/index",
"iconPath": "/custom-tab-bar/icons/appSearch.png",
- "selectedIconPath": "/custom-tab-bar/icons/appSearchActive.png",
+ "selectedIconPath": "",
"text": "品牌搜索"
},
{
diff --git a/custom-tab-bar/icons/appSearch.png b/custom-tab-bar/icons/appSearch.png
index 3a801c436cd82d7bfff622fe05ce8232ba7f51a6..399698281c9a40cda383f1fa1d5f020ac74ab54b 100644
GIT binary patch
delta 4614
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