Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/concept/historicalTimeline/historicalTimeline.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js

pages/concept/historicalTimeline/historicalTimeline.vue

@@ -404,6 +404,7 @@
 				conceptReport(param).then(res=>{
 					for (let item of res.data.results) {
 						item.content = item.content.replace(/'/g, '"')
+						// console.log(item.content)
 					}
 					this.reportList = res.data.results
 				}).catch(error=>{
@@ -651,6 +652,9 @@ page
 				}
 				.title 
 				{
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
 					font-size: 26rpx;
 					font-weight: bold;
 					color: #070707;