Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1

src/components/MultSpread/index.less

@@ -1,6 +1,7 @@
 @import "~@less/variables.less";
 .container{
   .tag;
+  cursor: unset;
 }
 .cont{
   .no-tag;

src/components/Multiple/index.less

@@ -1,6 +1,7 @@
 @import "~@less/mixin.less";
 .container{
   display: inline-block;
+  cursor: pointer;
 }
 /* .selected{
     .select-li;

src/components/PushItems/TipsMsg/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import style from './index.less';
 import $ from 'jquery';
+import { imageUrlPrefix } from '@utils/config.js';
 
 class TipsMsg extends Component {
     constructor(props) {
@@ -46,7 +47,7 @@ class TipsMsg extends Component {
                         />
                         <div
                           dangerouslySetInnerHTML={{
-                            __html: item.content
+                            __html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)
                           }}
                         />
                         {item.isReason === 1 && (

src/components/PushItems/TipsMsg/index.less

@@ -116,4 +116,7 @@
         border-bottom:none;
       }
     }
+    img {
+      display: none;
+    }
   }

src/utils/tools.js

@@ -871,7 +871,7 @@ function parseChartData(indexData){
     return [];
   }
   indexData.indexData.map((it)=>{
-    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
+    temp=indexData.indexConfigData.find((i)=>{return it.uniqueId==i.uniqueId});
     arr=obj[temp.groupType]||[];
     nameArr=nameObj[temp.groupType]||[];
     obj[temp.groupType]=[...arr,it];