exchange-back.git

			@@ -127,6 +127,7 @@
			return '<span style="color:red;">跟单合约</span>'
			}
			}, minWidth: 100,align:'center'},
			{field: 'symbol', title: '币种', minWidth: 120,align:'center'},
			{field: 'tradeType', title: '交易类型',
			templet: function (d) {
			if (d.tradeType === 1) {
			@@ -135,7 +136,6 @@
			return '<span style="color:red;">限价</span>'
			}
			}, minWidth: 100,align:'center'},
			{field: 'symbol', title: '币种', minWidth: 120,align:'center'},
			{field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
			{field: 'orderType', title: '订单类型',
			templet: function (d) {
			@@ -153,6 +153,19 @@
			}, minWidth: 100,align:'center'},
			{field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
			{field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
			{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
			{field: 'rewardAmount', title: '盈亏金额',
			templet: function (d) {
			if (d.rewardAmount > 0) {
			return '<span style="color:green;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount < 0) {
			return '<span style="color:red;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount == 0 \|\| d.rewardAmount == "" \|\| d.rewardAmount == null) {
			return '<span></span>'
			}
			},minWidth: 120,align:'center',totalRow: true},
			{field: 'closingType', title: '平仓类型',
			templet: function (d) {
			if (d.closingType === 0) {
			@@ -179,18 +192,8 @@
			}, minWidth: 120,align:'center'},
			{field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},
			{field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
			{field: 'rewardAmount', title: '盈亏金额',
			templet: function (d) {
			if (d.rewardAmount > 0) {
			return '<span style="color:green;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount < 0) {
			return '<span style="color:red;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount == 0 \|\| d.rewardAmount == "" \|\| d.rewardAmount == null) {
			return '<span></span>'
			}
			},minWidth: 120,align:'center',totalRow: true},
			{field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
			{field: 'rewardRatio', title: '盈亏比例',
			templet: function (d) {
			if (d.rewardRatio > 0) {
			@@ -203,13 +206,20 @@
			return '<span></span>'
			}
			}, minWidth: 120,align:'center'},
			{field: 'accountType', title: '账号类型',
			templet: function (d) {
			if (d.accountType === 1) {
			return '<span style="color:green;">正常账号</span>'
			}else if (d.accountType === 2) {
			return '<span style="color:red;">测试账号</span>'
			}else{
			return ''
			}
			}, minWidth: 120,align:'center'},
			{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
			{field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
			{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
			{field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
			{field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
			{field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
			{field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
			{field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
			{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
			@@ -219,16 +229,6 @@
			return '<span style="color:green;">成交</span>'
			}else if (d.orderStatus === 2) {
			return '<span style="color:red;">撤单</span>'
			}else{
			return ''
			}
			}, minWidth: 120,align:'center'},
			{field: 'accountType', title: '账号类型',
			templet: function (d) {
			if (d.accountType === 1) {
			return '<span style="color:green;">正常账号</span>'
			}else if (d.accountType === 2) {
			return '<span style="color:red;">测试账号</span>'
			}else{
			return ''
			}