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

components/kline/kline.vue

@@ -185,6 +185,8 @@
 	.tab {
 		display: flex;
 		background: #000000;
+		position: absolute;
+		width:100%;
 	.item {
 		height: 64rpx;
 		line-height: 64rpx;

components/kline/tradingView/chartConfig.js

@@ -36,9 +36,11 @@ var chartConfig = {
 	//禁用功能 
 	disabled_features: [ // 需要屏蔽掉的 参考 https://tradingview.gitee.io/featuresets/
 		"widget_logo", //LOGO
-		//"header_resolutions",
+		"header_resolutions",
 		"left_toolbar",
-		//"header_screenshot",
+		"header_screenshot",
+		"header_chart_type",
+		"header_settings",
 		"header_fullscreen_button",
 		"header_undo_redo",
 		"header_indicators",

pages/markets/kLine.vue

@@ -470,6 +470,7 @@
 
 
 		.tab {
+			
 			display: flex;
 			background: #000000;