From 4addd6a42ced7cf7b4205b3121ca91ff570babae Mon Sep 17 00:00:00 2001 From: jones2000 Date: Fri, 20 Mar 2020 19:21:38 +0800 Subject: [PATCH] =?UTF-8?q?hq=5Fh5=5Fdemo=5Fblack=20=20=E9=BB=91=E8=89=B2?= =?UTF-8?q?=E9=A3=8E=E6=A0=BCdemo=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/horizontalHq/components/horizontalHq.vue | 6 ++++-- .../src/pages/stockHq/components/iconTabList.vue | 4 ++-- .../src/pages/stockHq/components/showhide.vue | 2 +- .../src/pages/stockHq/components/stockHq.vue | 10 ++++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/vue.demo/hq_h5_demo_black/src/pages/horizontalHq/components/horizontalHq.vue b/vue.demo/hq_h5_demo_black/src/pages/horizontalHq/components/horizontalHq.vue index b41df6c..9b055f7 100644 --- a/vue.demo/hq_h5_demo_black/src/pages/horizontalHq/components/horizontalHq.vue +++ b/vue.demo/hq_h5_demo_black/src/pages/horizontalHq/components/horizontalHq.vue @@ -279,9 +279,9 @@ {Name:"日线",Value:0}, {Name:"周线",Value:1}, {Name:"月线",Value:2}, - {Name:"年线",Value:3}, + // {Name:"年线",Value:3}, // {Name:"1分钟",Value:4}, - // {Name:"5分钟",Value:5}, + {Name:"5分钟",Value:5}, // {Name:"15分钟",Value:6}, // {Name:"30分钟",Value:7}, // {Name:"60分钟",Value:8} @@ -455,6 +455,7 @@ this.Minute.Option.Symbol=this.Symbol; let chart=JSCommon.JSChart.Init(this.$refs.minute); var blackStyle = JSCommon.HQChartStyle.GetStyleConfig(JSCommon.STYLE_TYPE_ID.BLACK_ID); + blackStyle.FrameTitleBGColor = "#1a1c30"; JSCommon.JSChart.SetStyle(blackStyle); this.$refs.minute.style.backgroundColor='#1a1c30'; chart.SetOption(this.Minute.Option); @@ -477,6 +478,7 @@ Amount:{Text:''}, }; var data = data.Draw; + if(data == null) return; if(data.Time >= 1000){ objNew.Time = data.Time.toString().substring(0,2)+":"+data.Time.toString().substring(2,4); }else{ diff --git a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/iconTabList.vue b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/iconTabList.vue index 989f699..30924db 100644 --- a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/iconTabList.vue +++ b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/iconTabList.vue @@ -60,9 +60,9 @@ {Name:"日线",Value:0}, {Name:"周线",Value:1}, {Name:"月线",Value:2}, - {Name:"年线",Value:3}, + // {Name:"年线",Value:3}, // {Name:"1分钟",Value:4}, - // {Name:"5分钟",Value:5}, + {Name:"5分钟",Value:5}, // {Name:"15分钟",Value:6}, // {Name:"30分钟",Value:7}, // {Name:"60分钟",Value:8} diff --git a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/showhide.vue b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/showhide.vue index 661ef9d..5777669 100644 --- a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/showhide.vue +++ b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/showhide.vue @@ -162,7 +162,7 @@ // background: rgba(0,0,0,0.4); .exchangeInfoT {padding: 1em;box-sizing:border-box;width: 100%; border-collapse: collapse; border: none;background-color: #1a1c30;} .exchangeInfoT tr {height: 1.6rem; line-height: 2rem;} - .exchangeInfoT tr>td { font-size: 1.3rem;} + .exchangeInfoT tr>td { font-size: 1.1rem;} .exchangeInfoT tr>td:nth-of-type(1) { width: 12%;} .exchangeInfoT tr>td:nth-of-type(2) { width: 22%; padding-right: 4%; text-align: right;} .exchangeInfoT tr>td:nth-of-type(3) { width: 36%; padding-right: 4%; text-align: right; } diff --git a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/stockHq.vue b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/stockHq.vue index f997b82..61ec0df 100644 --- a/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/stockHq.vue +++ b/vue.demo/hq_h5_demo_black/src/pages/stockHq/components/stockHq.vue @@ -373,7 +373,7 @@ methods:{ OnSize(){ var width = window.innerWidth; - var chartHeight = window.innerHeight - $(".headTitle").outerHeight(true) - $(".exchangeData").outerHeight(true) - $(".tabList").outerHeight(true) - 40; + var chartHeight = window.innerHeight - $(".headTitle").outerHeight(true) - $(".exchangeData").outerHeight(true) - $(".tabList").outerHeight(true) - 50; if(this.IsFiveminute){ $('#minuteChart').width(width); @@ -492,6 +492,7 @@ this.Minute.Option.Symbol=this.Symbol; let chart=JSCommon.JSChart.Init(this.$refs.minute); var blackStyle = JSCommon.HQChartStyle.GetStyleConfig(JSCommon.STYLE_TYPE_ID.BLACK_ID); + blackStyle.FrameTitleBGColor = "#1a1c30"; JSCommon.JSChart.SetStyle(blackStyle); this.$refs.minute.style.backgroundColor='#1a1c30'; chart.SetOption(this.Minute.Option); @@ -512,6 +513,7 @@ Amount:{Text:''}, }; var data = data.Draw; + if(data == null) return; if(data.Time >= 1000){ objNew.Time = data.Time.toString().substring(0,2)+":"+data.Time.toString().substring(2,4); }else{ @@ -886,7 +888,7 @@ ul,ol {list-style: none;} } .PriceNull { - color: inherit; + color: #ffffff!important; } // BackNull @@ -907,7 +909,7 @@ ul,ol {list-style: none;} height: 3.4rem; line-height: 3.4rem; color: #ffffff; - font-size: 1.3rem; + font-size: 1.1rem; } .tooltip-span{ margin-right: 5px; @@ -1003,7 +1005,7 @@ ul,ol {list-style: none;} #minuteFive .tableOne { margin-bottom: 12px; padding-top: 13px;} #minuteFive .tableTwo {padding-top: 10px; border-top: 1px solid #ececec;} #minuteFive td,#minute td {font: 1.2rem "Microsoft YaHei"; line-height: 27px;} -#minute td { line-height: 29px;} +#minute td { line-height: 29px;font-size: 1rem;} .phoneRight { border: 1px solid #ececec; float: right; margin-right: 0.7%; width: 12.5%; height: 335px; margin-top: 20px; background-color: #f4f4f4;} .phoneRight li {line-height: 37px; font-size: 0.786rem; text-align: center;} .phoneRight li.active {color: #217cd9;} -- GitLab