Merge branch 'master' of http://git.weirui0755.com/liang/samehome

components/kline/kline.vue

@@ -141,6 +141,7 @@
 				chartConfig.interval = index_activeCycle
 				// 给chartConfig添加展示产品
 				chartConfig.symbol = this.symbol
+				chartConfig.resolutions=[1];
 				//设置图表宽高
 				chartConfig.width = this.chartWidth
 				chartConfig.height = this.chartHeight

components/kline/tradingView/chartConfig.js

@@ -10,6 +10,7 @@ var chartConfig = {
 	supported_resolutions: ['1', '5', '15', '30', '60', '1D', '1W', '1M'],
 	supports_marks: true,
 	supports_timescale_marks: true,
+	resolutions:['1', '5', '15', '30', '60', '1D', '1W', '1M'],
 	// debug: true,
 	width: 0, //宽度
 	height: 0, //高度

static/charting_library/datafeed-api.d.ts

@@ -50,7 +50,7 @@ export interface DOMLevel {
 }
 export interface DatafeedConfiguration {
 	exchanges?: Exchange[];
-	supported_resolutions?: ResolutionString[];
+	supported_resolutions?: ResolutionString[1];
 	units?: Record<string, Unit[]>;
 	currency_codes?: string[];
 	supports_marks?: boolean;