Merge branch 'zcZhang' into zcZhang_test

JCCDex · Nov 2, 2019 · bcc048f · bcc048f
2 parents ac2ca3f + ecdb52b
commit bcc048f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/components/klineChart.vue b/src/components/klineChart.vue
@@ -154,6 +154,12 @@
               class="close-background-icon"
             ></div>
             <div style="height: 0.05rem; background-color:#2b3944; margin-top:3px"></div>
+            <div
+              @click="showMA()"
+              :class="showIndicatorMA ? 'chart-indicator-div-active' : 'chart-indicator-div'"
+            >
+              <div class="indicator-line">{{message.MA}}</div>
+            </div>
             <div
               @click="showIndicatorChart('MACD')"
               :class="this.showIndicator ==='MACD' ? 'chart-indicator-div-active' : 'chart-indicator-div'"
@@ -553,7 +559,7 @@ export default {
         this.coinType = this.klineDataObj.coinType;
       }
       this.changeCycleLanguage(this.cycle);
-      this.changeChartDataObj(this.klineDataObj, this.outspreadMA);
+      this.changeChartDataObj(this.klineDataObj, this.showIndicatorMA);
     },
     fullscreen() {
       if (this.fullscreen && getLanguage().language === "en") {
@@ -569,7 +575,11 @@ export default {
     }
   },
   methods: {
-    showMA() {},
+    showMA() {
+      this.showIndicatorMA = !this.showIndicatorMA;
+      this.changeChartDataObj(this.klineDataObj, this.showIndicatorMA);
+      this.showIndicatorOpt = false;
+    },
     clickMinCycle() {
       this.showMinCycle = !this.showMinCycle;
       if (this.showMinCycle) {
@@ -661,7 +671,7 @@ export default {
             candleData
           );
         }
-        candleData.showIndicatorMA = this.outspreadMA;
+        candleData.showIndicatorMA = this.showIndicatorMA;
         candleData.MAData = MAData;
         candleData.precision = precision;
       }
@@ -689,7 +699,6 @@ export default {
     },
     showMAData() {
       this.outspreadMA = !this.outspreadMA;
-      this.changeChartDataObj(this.klineDataObj, this.outspreadMA);
     },
     showIndicatorChart(indicator) {
       if (indicator === this.showIndicator) {
@@ -701,7 +710,7 @@ export default {
       }
       this.showIndicatorOpt = false;
       this.resize();
-      this.changeChartDataObj(this.klineDataObj, this.outspreadMA);
+      this.changeChartDataObj(this.klineDataObj, this.showIndicatorMA);
     },
     // 获取当前鼠标所在点的数据
     getTipDataIndex(index) {

diff --git a/src/css/common.css b/src/css/common.css
@@ -305,7 +305,7 @@
 
 .indicatorOpt {
     color: #ffffff;
-    height: 195px;
+    height: 230px;
     background-color: #1e262c;
     font-size: 14px;
     font-family: "Microsoft YaHei";