From 16f5d5467cf4d8826e6747d08dcd2d70cebf76f6 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Wed, 28 Sep 2022 10:08:04 +0800
Subject: [PATCH] zx

---
 .../pages/brandInsight/brandDataList/index.js        |  3 +++
 .../pages/brandInsight/brandDataList/index.wxml      |  1 +
 .../insight/pages/brandInsight/tailDataList/index.js |  5 ++++-
 .../pages/brandInsight/tailDataList/index.wxml       |  1 +
 pages/insight/pages/eventInsight/evDatalist/index.js |  3 +++
 .../insight/pages/eventInsight/evDatalist/index.wxml |  1 +
 .../pages/modalInsight/EventInsight/index.wxml       |  2 +-
 .../pages/modalInsight/TutorInsight/index.wxml       |  1 -
 .../pages/modalInsight/TutorInsight/index.wxss       |  1 +
 .../pages/modalInsight/modalDataList/index.js        |  3 +++
 .../pages/modalInsight/modalDataList/index.wxml      |  1 +
 .../insight/pages/modalInsight/tailDataList/index.js |  5 ++++-
 .../pages/modalInsight/tailDataList/index.wxml       |  1 +
 pages/insight/pages/themeList/index.js               | 12 ++++++++++--
 pages/insight/pages/themeList/index.wxml             |  3 ++-
 15 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js
index 8ceacf5..a511328 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.js
+++ b/pages/insight/pages/brandInsight/brandDataList/index.js
@@ -21,6 +21,7 @@ Page({
         ],
         copyShow: false,
         copyData: {},
+        total: 0,
     },
     onShow() {
         this.setData({
@@ -106,6 +107,8 @@ Page({
             iTimeType: this.data.iTimeType, //0发布时间 1入库时间
             sCrisis: wjList.join(',') || '',
             sBrand: wx.getStorageSync('sBrand') || '',
+        },(res) => {
+            this.setData({total: res.totalNum})
         }).then(res => {
             this.setData({brandDataList: res})
         });
diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml
index b92e01a..18f52eb 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxml
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml
@@ -43,6 +43,7 @@
             </van-dropdown-item>
         </van-dropdown-menu>
     </view>
+    <view style="color: #333333;font-size: 12px;margin-top: 20rpx">共{{total}}条信息数据</view>
     <view class="tdl-item" style="margin-top: 16rpx;" wx:for="{{brandDataList}}"  wx:key="index">
         <view class="top-time">
             <view class="top-time-item">{{item._source.sourcetime}}</view>
diff --git a/pages/insight/pages/brandInsight/tailDataList/index.js b/pages/insight/pages/brandInsight/tailDataList/index.js
index 57a634f..b001a16 100644
--- a/pages/insight/pages/brandInsight/tailDataList/index.js
+++ b/pages/insight/pages/brandInsight/tailDataList/index.js
@@ -5,7 +5,8 @@ Page({
         copyShow: false,
         copyData: {},
         iPageIndex: 1,
-        iPageSize: 25
+        iPageSize: 25,
+        total: 0,
     },
     onShow() {
         this.getData();
@@ -51,6 +52,8 @@ Page({
             sCrisis: '',
             iPageIndex: this.data.iPageIndex,
             iPageSize: this.data.iPageSize
+        },(res) => {
+            this.setData({total: res.totalNum})
         }).then(res => {
             this.setData({tailDataList: res})
         });
diff --git a/pages/insight/pages/brandInsight/tailDataList/index.wxml b/pages/insight/pages/brandInsight/tailDataList/index.wxml
index 8fb118d..74e3748 100644
--- a/pages/insight/pages/brandInsight/tailDataList/index.wxml
+++ b/pages/insight/pages/brandInsight/tailDataList/index.wxml
@@ -1,4 +1,5 @@
 <view class="tdl-content">
+    <view style="color: #333333;font-size: 12px">共{{total}}条信息数据</view>
     <view class="tdl-item" wx:for="{{tailDataList}}"  wx:key="index">
         <view class="top-time">
             <view class="top-time-item">{{item._source.sourcetime}}</view>
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.js b/pages/insight/pages/eventInsight/evDatalist/index.js
index e7368c1..11946c7 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.js
+++ b/pages/insight/pages/eventInsight/evDatalist/index.js
@@ -25,6 +25,7 @@ Component({
         dataList: [],
         copyShow: false,
         copyData: {},
+        total: 0
     },
     methods: {
         getApi() {
@@ -72,6 +73,8 @@ Component({
                 iTimeType: this.data.iTimeType, //0发布时间 1入库时间
                 sCrisis: wjList.join(',') || '',
                 sRele: wx.getStorageSync('sRele') || '',
+            },(res) => {
+                this.setData({total: res.totalNum})
             }).then(res => {
                 this.setData({dataList: res})
             });
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml
index 9f6262b..cbb61be 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.wxml
+++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml
@@ -44,6 +44,7 @@
         </van-dropdown-menu>
     </view>
     <view class="tdl-content">
+        <view style="color: #333333;font-size: 12px">共{{total}}条信息数据</view>
         <view class="tdl-item" wx:for="{{dataList}}"  wx:key="index">
             <view class="top-time">
                 <view class="top-time-item">{{item._source.sourcetime}}</view>
diff --git a/pages/insight/pages/modalInsight/EventInsight/index.wxml b/pages/insight/pages/modalInsight/EventInsight/index.wxml
index 644308b..5b309cd 100644
--- a/pages/insight/pages/modalInsight/EventInsight/index.wxml
+++ b/pages/insight/pages/modalInsight/EventInsight/index.wxml
@@ -18,7 +18,7 @@
     </view>
     <view class="ei-item">
         <view class="ei-chart-title">热点事件渠道分布</view>
-        <view class="ei-chart-item" style="height: 480rpx;width: 100%;">
+        <view class="ei-chart-item" style="height: 480rpx;width: 95%;">
             <c-echars showChart="{{showChart}}" canvasId="thed-canvas" chartId="thed" chartOption="{{topHotEventData}}" height="100%"></c-echars>
         </view>
     </view>
diff --git a/pages/insight/pages/modalInsight/TutorInsight/index.wxml b/pages/insight/pages/modalInsight/TutorInsight/index.wxml
index 243e9f7..bb177f8 100644
--- a/pages/insight/pages/modalInsight/TutorInsight/index.wxml
+++ b/pages/insight/pages/modalInsight/TutorInsight/index.wxml
@@ -111,7 +111,6 @@
         <view class="tu-chart-item" style="margin-top: 32rpx;height: auto;">
             <view class="kol-content">
                 <view class="kol-item" wx:for="{{topicUser}}" wx:key="index" wx:if="{{index < 3}}">
-                    <!-- <image style="width: 64rpx;height: 64rpx;margin-top: 20rpx;" src="{{item._source.profileimgurl}}" /> -->
                     <view class="kol-user-name">{{item.name}}</view>
                     <view style="display: flex;justify-content: space-between;padding: 24rpx 24rpx 0rpx 24rpx">
                         <view class="kol-value">影响力</view>
diff --git a/pages/insight/pages/modalInsight/TutorInsight/index.wxss b/pages/insight/pages/modalInsight/TutorInsight/index.wxss
index 441bfd6..91438ed 100644
--- a/pages/insight/pages/modalInsight/TutorInsight/index.wxss
+++ b/pages/insight/pages/modalInsight/TutorInsight/index.wxss
@@ -110,6 +110,7 @@
     font-size: 12px;
     font-weight: 400;
     color: #333333;
+    margin-top: 25%;
     /* line-height: 12px; */
 }
 .kol-value {
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js
index ecb0d99..b63f69a 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.js
+++ b/pages/insight/pages/modalInsight/modalDataList/index.js
@@ -21,6 +21,7 @@ Page({
         ],
         copyShow: false,
         copyData: {},
+        total: 0
     },
     onShow() {
         this.setData({
@@ -108,6 +109,8 @@ Page({
             sCrisis: wjList.join(',') || '',
             sBrand: wx.getStorageSync('sBrand') || '',
             sSeries: wx.getStorageSync('sSeriesName') || '',
+        },(res) => {
+            this.setData({total: res.totalNum})
         }).then(res => {
             this.setData({brandDataList: res})
         });
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml
index 092a95a..8206dd9 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.wxml
+++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml
@@ -43,6 +43,7 @@
             </van-dropdown-item>
         </van-dropdown-menu>
     </view>
+    <view style="color: #333333;font-size: 12px;margin-top: 20rpx">共{{total}}条信息数据</view>
     <view class="tdl-item" style="margin-top: 16rpx;" wx:for="{{brandDataList}}"  wx:key="index">
         <view class="top-time">
             <view class="top-time-item">{{item._source.sourcetime}}</view>
diff --git a/pages/insight/pages/modalInsight/tailDataList/index.js b/pages/insight/pages/modalInsight/tailDataList/index.js
index 91f9b60..ba95a4f 100644
--- a/pages/insight/pages/modalInsight/tailDataList/index.js
+++ b/pages/insight/pages/modalInsight/tailDataList/index.js
@@ -5,7 +5,8 @@ Page({
         copyShow: false,
         copyData: {},
         iPageIndex: 1,
-        iPageSize: 25
+        iPageSize: 25,
+        total: 0
     },
     onShow() {
         this.getData();
@@ -41,6 +42,8 @@ Page({
             sSeriesName: wx.getStorageSync('sSeriesName') || '',
             iPageIndex: this.data.iPageIndex,
             iPageSize: this.data.iPageSize
+        },(res) => {
+            this.setData({total: res.totalNum})
         }).then(res => {
             this.setData({tailDataList: res})
         });
diff --git a/pages/insight/pages/modalInsight/tailDataList/index.wxml b/pages/insight/pages/modalInsight/tailDataList/index.wxml
index ac0ffd2..1e7fde3 100644
--- a/pages/insight/pages/modalInsight/tailDataList/index.wxml
+++ b/pages/insight/pages/modalInsight/tailDataList/index.wxml
@@ -1,4 +1,5 @@
 <view class="tdl-content">
+    <view style="color: #333333;font-size: 12px">共{{total}}条信息数据</view>
     <view class="tdl-item" wx:for="{{tailDataList}}"  wx:key="index">
         <view class="top-time">
             <view class="top-time-item">{{item._source.sourcetime}}</view>
diff --git a/pages/insight/pages/themeList/index.js b/pages/insight/pages/themeList/index.js
index 9f636e5..8c9615d 100644
--- a/pages/insight/pages/themeList/index.js
+++ b/pages/insight/pages/themeList/index.js
@@ -108,7 +108,11 @@ Page({
             iGroupBy: this.data.iGroupBy, //0不去重 1相似度去重
             listType: this.data.listType, //0默认 1影响力倒序
         }).then(res => {
-            let arr = [...this.data.dataList, ...res]
+            let data = res
+            data.forEach(ele => {
+                ele._source.title = ele._source.title.replace(/<em>/g,'<em style="color: red">');
+            })
+            let arr = [...this.data.dataList, ...data]
             this.setData({
                 dataList: arr
             });
@@ -203,8 +207,12 @@ Page({
                 total: res.totalNum
             })
         }).then(res => {
+            let data = res
+            data.forEach(ele => {
+                ele._source.title = ele._source.title.replace(/<em>/g,'<em style="color: red">');
+            })
             this.setData({
-                dataList: res
+                dataList: data
             })
         });
     },
diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml
index 604ea40..3fd69df 100644
--- a/pages/insight/pages/themeList/index.wxml
+++ b/pages/insight/pages/themeList/index.wxml
@@ -76,6 +76,7 @@
         </van-dropdown-menu>
     </view>
     <view class="tdl-content">
+        <view style="color: #333333;font-size: 12px;margin-bottom: 20rpx;">共{{total}}条信息数据</view>
         <van-checkbox-group value="{{ result }}" bind:change="onChange">
             <view class="tdl-item" wx:for="{{dataList}}" wx:key="index" name="{{item}}">
                 <view class="top-time">
@@ -93,7 +94,7 @@
                     </view>
                 </view>
                 <view class="middle-title" data-id='{{item}}' bindtap="toEventDetail" style="margin-top: 16rpx;">
-                    {{item._source.title}}
+                    <rich-text nodes="{{item._source.title}}"></rich-text>
                 </view>
                 <view class="bottom-source">
                     <view>来源：{{item._source.source}}</view>