1.

pages/concept/concept.vue

@@ -862,12 +862,13 @@
 					params.end_date = this.endDateStr
 				}else 
 				{
-					params.day = 3
+					params.days = 3
 					if(this.selectCycleIndex==1) {
-						params.day = 7
+						params.days = 7
 					}else if(this.selectCycleIndex==2) {
-						params.day = 14
+						params.days = 14
 					}
+					params.min_stock_count = 3
 				}
 				conceptRankList(params).then(res=>{
 					if (this.selectTab==0) {

pages/concept/historicalTimeline/historicalTimeline.vue

@@ -78,7 +78,7 @@
 								<view class="type report">研报</view>
 								<view class="title flex1">{{item.report_title}}</view>
 							</view>
-							<view class="content">{{JSON.parse(item.content).content}}</view>
+							<view class="content">{{ getContent(item) }}</view>
 						</view>
 					</block>
 				</view>
@@ -90,7 +90,7 @@
 <script>
 	import { inject } from 'vue';
 	import { conceptNews, conceptReport, priceTimeline } from '@/request/api';
-	import { getChgRateStr, getRateUpOrDown } from '@/utils/util';
+	import { getChgRateStr, getRateUpOrDown, isValidJSON } from '@/utils/util';
 
 	export default {
 		data() {
@@ -135,6 +135,13 @@
 			}
 		},
 		methods: {
+			getContent(item) {
+				if (isValidJSON(item.content)) {
+					return JSON.parse(item.content).content
+				}else {
+					return item.content
+				}
+			},
 			/**
 			 * 获取当前时间前一天的数据
 			 */
@@ -322,6 +329,7 @@
 			 */
 			clickNewsOrReportItem(index)
 			{
+				console.log(this.selectNewsOrReport, index);
 				if(this.selectNewsOrReport!=index) {
 					this.selectNewsOrReport = index;
 				}
@@ -340,6 +348,7 @@
 			 * @param {Object} item
 			 */
 			clickReportItem(item) {
+				console.log(item);
 				uni.navigateTo({
 					url:'/pages/concept/reportDetails/reportDetails?info='+encodeURIComponent(JSON.stringify(item))
 				})

pages/concept/reportDetails/reportDetails.vue

@@ -9,7 +9,7 @@
 			</view>
 			<view class="content">
 				<!-- <ua-markdown :source="content" /> -->
-				<text>{{content}}</text>
+				<text>{{content ? content : reportInfo.content}}</text>
 			</view>
 		</view>
 	</view>