Quellcode durchsuchen

Merge branch 'master' of http://git.liuniu946.com/lhl/nzhbsr

hwq vor 3 Jahren
Ursprung
Commit
8bf3033ecf

+ 1 - 1
hybrid/html/js/kline.js

@@ -139,7 +139,7 @@ var app = new Vue({
 						// that.txData.lastPrice = data.data[0][]
 					}
 					// 
-					if (item.arg.channel == ("tickers") && item.arg.data) {
+					if (item.arg.channel == ("tickers") &&item.data[0]) {
 						const data = item.data[0]
 						that.txData.lastPrice = +data.last
 						that.txData.high = +data.high24h

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


Datei-Diff unterdrückt, da er zu groß ist
+ 3 - 3
unpackage/dist/dev/app-plus/app-service.js


Datei-Diff unterdrückt, da er zu groß ist
+ 84 - 83
unpackage/dist/dev/app-plus/app-view.js


+ 7 - 7
unpackage/dist/dev/app-plus/hybrid/html/js/kline.js

@@ -9,23 +9,23 @@ var app = new Vue({
 		volMA10: '',
 		current: "15m",
 		tabs: [{
-				'label': '1分',
+				'label': '1分',
 				'value': "1m"
 			},
 			{
-				'label': '15分',
+				'label': '15分',
 				'value': "15m"
 			},
 			{
-				'label': '30分',
+				'label': '30分',
 				'value': "30m"
 			},
 			{
-				'label': '1小',
+				'label': '1小',
 				'value': "1H"
 			},
 			{
-				'label': '4小',
+				'label': '4小',
 				'value': "4H"
 			},
 			{
@@ -43,7 +43,7 @@ var app = new Vue({
 				'value': 2
 			},
 			{
-				'label': '介',
+				'label': '介',
 				'value': 3
 			},
 		],
@@ -139,7 +139,7 @@ var app = new Vue({
 						// that.txData.lastPrice = data.data[0][]
 					}
 					// 
-					if (item.arg.channel == ("tickers") && item.arg.data) {
+					if (item.arg.channel == ("tickers") &&item.data[0]) {
 						const data = item.data[0]
 						that.txData.lastPrice = +data.last
 						that.txData.high = +data.high24h

+ 18 - 22
unpackage/dist/dev/app-plus/hybrid/html/local.html

@@ -3,11 +3,7 @@
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-<<<<<<< HEAD
-		<title>K綫</title>
-=======
 		<title>交易详情</title>
->>>>>>> a5ff036717d64fdf42749babd301b878972ea37f
 		<link rel="stylesheet" type="text/css" href="css/kline.css"/>
 	</head>
 
@@ -20,7 +16,7 @@
 				</div>
 				<div class="head-item">
 					<div class="head-item-cell">
-						<span class="hic-label">跌幅</span>
+						<span class="hic-label">跌幅</span>
 						<span class="hic-value" :class="txData.upFlag==1?'price-green':'price-red'">{{txData.upRate || 0}}</span>
 					</div>
 					<div class="head-item-cell">
@@ -69,15 +65,15 @@
 				<div v-if="category==1" class="depth">
 					<div class="depth-head">
 						<div class="depth-head-left">
-							<div class="depth-head-label depth-head-left-index">買盤</div>
-							<div class="depth-head-label">量(XRD)</div>
+							<div class="depth-head-label depth-head-left-index">买盘</div>
+							<div class="depth-head-label">量(XRD)</div>
 						</div>
 						<div class="depth-head-center">
-							<div class="depth-head-label">格(USDT)</div>
+							<div class="depth-head-label">格(USDT)</div>
 						</div>
 						<div class="depth-head-right">
-							<div class="depth-head-label">量(XRD)</div>
-							<div class="depth-head-label depth-head-right-index">賣盤</div>
+							<div class="depth-head-label">量(XRD)</div>
+							<div class="depth-head-label depth-head-right-index">卖盘</div>
 						</div>
 					</div>
 					<div class="depth-main">
@@ -105,15 +101,15 @@
 				</div>
 				<div v-else-if="category==2" class="transaction">
 					<div class="transaction-head">
-						<div class="transaction-head-item tmc-time">時間</div>
+						<div class="transaction-head-item tmc-time">时间</div>
 						<div class="transaction-head-item tmc-type">方向</div>
-						<div class="transaction-head-item tmc-price">格</div>
-						<div class="transaction-head-item tmc-num">量</div>
+						<div class="transaction-head-item tmc-price">格</div>
+						<div class="transaction-head-item tmc-num">量</div>
 					</div>
 					<div class="transaction-main">
 						<div class="transaction-main-cell" v-for="(item,index) in dealHis || 10" :key="index">
 							<span class="tmc-label tmc-time">{{item.date || '--'}}</span>
-							<span class="tmc-label tmc-type" :style="{color:item.takerFlag==1?'#38ad70':'#fe5c57'}">{{item.takerFlag==1?'買入':'賣出'}}</span>
+							<span class="tmc-label tmc-type" :style="{color:item.takerFlag==1?'#38ad70':'#fe5c57'}">{{item.takerFlag==1?'买入':'卖出'}}</span>
 							<span class="tmc-label tmc-price">{{item.price || '--'}}</span>
 							<span class="tmc-label tmc-num">{{item.amount || '--'}}</span>
 						</div>
@@ -122,35 +118,35 @@
 				<div v-else="category==3" class="introduction">
 					<div class="introduction-name">{{tokenInfo.tokenName || '--'}}</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">發行時間</span>
+						<span class="introduction-cell-label">发行时间</span>
 						<span class="introduction-cell-value">{{tokenInfo.issueDate || '--'}}</span>
 					</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">發行總量</span>
+						<span class="introduction-cell-label">发行总量</span>
 						<span class="introduction-cell-value">{{tokenInfo.totalSupply || '--'}}</span>
 					</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">流通量</span>
+						<span class="introduction-cell-label">流通量</span>
 						<span class="introduction-cell-value">{{tokenInfo.nowSupply || '--'}}</span>
 					</div>
 					
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">衆籌價格</span>
+						<span class="introduction-cell-label">众筹价格</span>
 						<span class="introduction-cell-value">{{tokenInfo.price || '--'}}</span>
 					</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">白皮</span>
+						<span class="introduction-cell-label">白皮</span>
 						<span class="introduction-cell-value">{{tokenInfo.whitePaper || '--'}}</span>
 					</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">官</span>
+						<span class="introduction-cell-label">官</span>
 						<span class="introduction-cell-value">{{tokenInfo.webSite || '--'}}</span>
 					</div>
 					<div class="introduction-cell">
-						<span class="introduction-cell-label">區塊查詢</span>
+						<span class="introduction-cell-label">区块查询</span>
 						<span class="introduction-cell-value">{{tokenInfo.exploereSite || '--'}}</span>
 					</div>
-					<div class="introduction-label">介</div>
+					<div class="introduction-label">介</div>
 					<div class="introduction-value">{{tokenInfo.remark || '--'}}</div>
 				</div>
 			</div>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.