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

components/kline/kline.vue

@@ -20,7 +20,7 @@
 		</view>
 		<view id="kline" :windowWidth="width" :change:windowWidth="KlineJs.setWidth" :windowHeight="height"
 			:change:windowHeight="KlineJs.setHeight" :symbol="symbol"
-			:change:symbol="KlineJs.setSymbol"  :language="language" :change:language="KlineJs.changlanguage" :index_activeCycle="index_activeCycle" :change:index_activeCycle="KlineJs.changindex_activeCycle"></view>
+			:change:symbol="KlineJs.setSymbol"  :language="lang" :change:language="KlineJs.changlanguage" :index_activeCycle="index_activeCycle" :change:index_activeCycle="KlineJs.changindex_activeCycle"></view>
 	</view>
 </template>
 
@@ -132,7 +132,7 @@
 				this.initChart(index_activeCycle)
 			},
 			changlanguage(language){
-				this.language=language
+				chartConfig.locale=language
 			}
 			,
 			initChart(index_activeCycle) {

components/kline/props.js

@@ -14,7 +14,7 @@ export default {
 			type: String,
 			default: ''
 		},
-		language: {
+		lang: {
 			type: String,
 			default: ''
 		},

pages/markets/kLine.vue

@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			
-			<kline v-if="showKline" :width="chartWidth" :height="chartHeight" :symbol="symbol.symbol" :language="language"></kline>
+			<kline v-if="showKline" :width="chartWidth" :height="chartHeight" :symbol="symbol.symbol" :lang="language"></kline>
 			
 			<!-- 买卖挂牌表 -->
 			<view class="MarketTrades">