Merge pull request #100 from StellarCN/v2.0.0

fixed before v2.1.0 release
StellarCN · Jun 5, 2018 · 567e6a7 · 567e6a7
2 parents e08a943 + 9e6fcc6
commit 567e6a7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/components/FullK.vue b/src/components/FullK.vue
@@ -13,7 +13,7 @@
                 <i class="material-icons  k-icon">keyboard_arrow_left</i>
             </v-btn>
           </div>
-          <div :class="'flex3 textcenter ' + ( (titleData.change >=0 ^ redUpGreenDown ) ? 'down':'up') ">
+          <div :class="'flex3 textcenter ' + ( (titleData.change >=0 ^ redUpGreenDown ) ? 'up':'down') ">
               <div class="price textcenter">
                   <span class="price">{{titleData.price}}</span>
                   <span class="code">{{counter.code}}</span>

diff --git a/src/components/K.vue b/src/components/K.vue
@@ -15,7 +15,7 @@
                 <i class="material-icons  k-icon">keyboard_arrow_left</i>
             </v-btn>
           </div>
-          <div :class="'flex3 textcenter ' + ( (titleData.change >=0 ^ redUpGreenDown) ? 'down':'up') ">
+          <div :class="'flex3 textcenter ' + ( (titleData.change >=0 ^ redUpGreenDown) ? 'up':'down') ">
               <div class="price textcenter">
                   <span class="price">{{titleData.price}}</span>
                   <!-- <span class="code">{{counter.code}}</span> -->

diff --git a/src/components/KLine.vue b/src/components/KLine.vue
@@ -3,19 +3,19 @@
  * @Author: mazhaoyong@gmail.com 
  * @Date: 2018-01-26 15:59:49 
  * @Last Modified by: mazhaoyong@gmail.com
- * @Last Modified time: 2018-06-04 22:16:33
+ * @Last Modified time: 2018-06-05 16:54:52
  * @License MIT 
  */
 
 <template>
   <div class="line flex-row" v-if="lineData!=null || !loading">
       <div class="flex1">
-        <div :class="' price textright ' + ((titleData.change >=0 ^ redUpGreenDown)? 'down':'up') ">
+        <div :class="' price textright ' + ((titleData.change >=0 ^ redUpGreenDown)? 'up':'down') ">
             {{titleData.price >= 0 ? (titleData.price>=0.000001 ? Number(titleData.price): titleData.price):''}}</div>
       </div>
       <div class="flex1">
         <div class="rate">
-            <div v-if="titleData.rate!==null && typeof titleData.rate!=='undefined'" :class="'rate-btn textcenter ' + (( titleData.change >=0 ^ redUpGreenDown)? 'down':'up')">
+            <div v-if="titleData.rate!==null && typeof titleData.rate!=='undefined'" :class="'rate-btn textcenter ' + (( titleData.change >=0 ^ redUpGreenDown)? 'up':'down')">
                 <span v-if="titleData.rate>0">+</span>{{titleData.rate}}%    
             </div>    
         </div>

diff --git a/src/locales/index.js b/src/locales/index.js
@@ -29,8 +29,7 @@ export const ZH_TW = {
 export const LANGUAGES = [
   EN,
   ZH_CN,
-  ZH_HK,
-  ZH_TW
+  ZH_HK
 ]
 
 export const MOMENT_LANGUAGES = {

diff --git a/src/pages/trade/TradeCenter.vue b/src/pages/trade/TradeCenter.vue
@@ -130,7 +130,7 @@ import { getDefaultTradePairs } from '@/api/gateways'
 
 const TAG_ALL = 'All', TAG_XCN = 'XCN', TAG_XLM = 'XLM', TAG_BTC = 'BTC', TAG_ETH = 'ETH', TAG_CUSTOM = '_CUSTOM', TAG_XFF = 'XFF'
 
-const TAGS = [TAG_XCN, TAG_BTC, TAG_XLM, TAG_ETH, TAG_XFF, TAG_CUSTOM]
+const TAGS = [TAG_XCN, TAG_BTC, TAG_XLM, TAG_CUSTOM]
 
 export default {
   data(){
@@ -280,7 +280,7 @@ export default {
     //   this.filterTag = TAG_CUSTOM
     //   this.tagIndex = TAGS.indexOf(TAG_CUSTOM).toString()
     // }
-    this.allTagsLabel = [TAG_XCN, TAG_BTC, TAG_XLM, TAG_ETH, TAG_XFF, this.$t('custom')]
+    this.allTagsLabel = [TAG_XCN, TAG_BTC, TAG_XLM, this.$t('custom')]
   },
   mounted(){
     // if(!this.islogin){