修改交易

src/store/modules/trend.js

@@ -10,7 +10,7 @@ export default {
 		allTrendList: [], //所有交易对+价格
 		myCollectList: [] ,//我的收藏
 		
-		currentPair: {}, //当前交易对
+		currentPair: null, //当前交易对
 	},
 	mutations: {
 		setCoin(state, data) { //币种 --资产模块

src/views/assets/coincoin_assets.vue

@@ -98,7 +98,9 @@
 								<div class="cell">0.0000</div>
 							</td>
 							<td>
-								<div class="cell">0.0000</div>
+								<div class="cell">
+									{{item.customAssetsTypes[0].assetsType == 'A_I_T_LOCK_UP' ? item.customAssetsTypes[0].amount : item.customAssetsTypes[1].assetsType == 'A_I_T_LOCK_UP' ? item.customAssetsTypes[1].amount : 0}}
+								</div>
 							</td>
 							<td class="is-right">
 								<div class="cell">

src/views/coincoin/components/trade_depth.vue

@@ -14,7 +14,8 @@
 					</ul>
 				</div>
 
-				<div class="deal-folder">
+				<div class="deal-folder" :class="{'deal-folder-open': depthListType == 3}" v-if="depthListType != 2">
+					<!-- 买单 -->
 					<div class="deal-list">
 						<ul>
 							<li><span class="red-text">9101.08</span></li>
@@ -23,28 +24,20 @@
 						</ul>
 						<span class="progress progress-1" style="width: 80%"></span>
 					</div>
-
-					<div class="deal-list">
-						<ul>
-							<li><span class="red-text">9101.08</span></li>
-							<li><span>0.0547</span></li>
-							<li><span>1.44</span></li>
-						</ul>
-						<span class="progress progress-1" style="width: 60%"></span>
-					</div>
 				</div>
 
 				<div class="deal-list-update">
 					<h3>
-						<span class="red-text">9062.14</span>
-						<i>≈64245.75 CNY</i>
+						<span class="red-text" :class="{'green-text': currentPair.changes > 0}">{{currentPair.price}}</span>
+						<i>≈ {{currentPair.price * 7 | Decimal(2)}} CNY</i>
 					</h3>
-					<a href="tradeplate.html" class="more-aa hc-color4">
+					<span class="more-aa hc-color4">
 						{{$t('更多')}}
-					</a>
+					</span>
 				</div>
 
-				<div class="deal-folder">
+				<div class="deal-folder" :class="{'deal-folder-open': depthListType == 2}" v-if="depthListType != 3">
+					<!-- 卖单 -->
 					<div class="deal-list">
 						<ul>
 							<li><span class="green-text">9101.08</span></li>
@@ -59,9 +52,12 @@
 
 		<div class="deallist-operation hc-bgColor3">
 			<div class="deal-list-range">
-				<div class="list-range-1" :class="{'active': depthListType == 1}"></div>
-				<div class="list-range-2" :class="{'active': depthListType == 2}"></div>
-				<div class="list-range-3" :class="{'active': depthListType == 3}"></div>
+				<!-- 普通 -->
+				<div class="list-range-1" :class="{'active': depthListType == 1}" @click="changeList(1)"></div>
+				<!-- 只显示买单 -->
+				<div class="list-range-2" :class="{'active': depthListType == 2}" @click="changeList(2)"></div>
+				<!-- 只显示卖单 -->
+				<div class="list-range-3" :class="{'active': depthListType == 3}" @click="changeList(3)"></div>
 			</div>
 			
 			<div class="deal-list-type">
@@ -81,6 +77,8 @@
 		name: 'tradeDepth',
 		data() {
 			return {
+				timer:'',
+				
 				depthListType: 1, //1全部 2买单 3卖单
 				depthValue: 1,
 				depthOptions: [
@@ -95,9 +93,23 @@
 			...mapState('trend', ['currentPair']),
 		},
 		methods: {
-			chooseDepth(val) {
+			getDepth() { //获取深度盘口
+				this.postAxios('/api/coin/price/getDepth', {symbolId: this.currentPair.symbolId})
+					.then(data => {
+						console.log(JSON.stringify(data))
+					})
+			},
+			
+			chooseDepth(val) { //切换深度
 				this.depthValue = val;
+			},
+			changeList(val) { //切换列表类型
+				this.depthListType = val;
 			}
+		},
+		mounted() {
+			this.getDepth();
+			
 		}
 	}
 </script>
@@ -106,4 +118,7 @@
 	.deal-folder {
 		height: 300px;
 	}
+	.deal-folder-open {
+		height: 600px;
+	}
 </style>

src/views/coincoin/components/trade_order_list.vue

@@ -128,6 +128,8 @@
 				isContent: false,
 				pageTotal: 0, //总页数
 				currentPage: 1, //默认当前页
+				
+				timer: '', //定时器
 			}
 		},
 		computed: {
@@ -147,21 +149,30 @@
 					page: pages,
 				}
 				let url = this.titleIndex == 1 ? '/api/entrust/info/page' : '/api/entrust/info/page/history';
-				this.orderList = [];
-				this.postAxios(url, params)
-					.then(data => {
-						this.pageTotal = data.data.pages;
-						
-						if (data.data.total == 0) {
-							this.isContent = true;
-						} else {
-							this.isContent = false;
-						}
-						
-						data.data.records.forEach(item => {
-							this.orderList.push(item);
+				
+				if(this.currentPair) {
+					this.postAxios(url, params)
+						.then(data => {
+							clearInterval(this.timers);
+							
+							this.pageTotal = data.data.pages;
+							this.orderList = [];
+							
+							if (data.data.total == 0) {
+								this.isContent = true;
+							} else {
+								this.isContent = false;
+							}
+							
+							data.data.records.forEach(item => {
+								this.orderList.push(item);
+							})
 						})
-					})
+				} else {
+					this.timer = setInterval(() => {
+						this.getOrderList(1);
+					}, 1000)
+				}
 			},
 			
 			tabOrder(val) { //切换标题

src/views/coincoin/components/trade_pair_list.vue

@@ -7,7 +7,6 @@
 				
 				<div class="list2-soso-box">
 					<el-input class="inp" :placeholder="$t('搜索币种')" v-model="searchKeywords" type="text" clearable autocomplete="off"></el-input>
-					
 					<i class="list2-icon-search"></i>
 				</div>
 			</div>

src/views/register/register.vue

@@ -264,6 +264,10 @@
 			}
 		},
 		created() {
+			if(this.$route.query.inviteCode) {
+				this.inviteCode = this.$route.query.inviteCode;
+			}
+			
 			this.getImageCode();
 		},
 	}

src/views/release/components/release_depth.vue

@@ -14,7 +14,8 @@
 					</ul>
 				</div>
 
-				<div class="deal-folder">
+				<div class="deal-folder" :class="{'deal-folder-open': depthListType == 3}" v-if="depthListType != 2">
+					<!-- 买单 -->
 					<div class="deal-list">
 						<ul>
 							<li><span class="red-text">9101.08</span></li>
@@ -23,28 +24,20 @@
 						</ul>
 						<span class="progress progress-1" style="width: 80%"></span>
 					</div>
-
-					<div class="deal-list">
-						<ul>
-							<li><span class="red-text">9101.08</span></li>
-							<li><span>0.0547</span></li>
-							<li><span>1.44</span></li>
-						</ul>
-						<span class="progress progress-1" style="width: 60%"></span>
-					</div>
 				</div>
 
 				<div class="deal-list-update">
 					<h3>
-						<span class="red-text">9062.14</span>
-						<i>≈64245.75 CNY</i>
+						<span class="red-text" :class="{'green-text': currentPair.changes > 0}">{{currentPair.price}}</span>
+						<i>≈ {{currentPair.price * 7 | Decimal(2)}} CNY</i>
 					</h3>
-					<a href="tradeplate.html" class="more-aa hc-color4">
+					<span class="more-aa hc-color4">
 						{{$t('更多')}}
-					</a>
+					</span>
 				</div>
 
-				<div class="deal-folder">
+				<div class="deal-folder" :class="{'deal-folder-open': depthListType == 2}" v-if="depthListType != 3">
+					<!-- 卖单 -->
 					<div class="deal-list">
 						<ul>
 							<li><span class="green-text">9101.08</span></li>
@@ -59,9 +52,12 @@
 
 		<div class="deallist-operation hc-bgColor3">
 			<div class="deal-list-range">
-				<div class="list-range-1" :class="{'active': depthListType == 1}"></div>
-				<div class="list-range-2" :class="{'active': depthListType == 2}"></div>
-				<div class="list-range-3" :class="{'active': depthListType == 3}"></div>
+				<!-- 普通 -->
+				<div class="list-range-1" :class="{'active': depthListType == 1}" @click="changeList(1)"></div>
+				<!-- 只显示买单 -->
+				<div class="list-range-2" :class="{'active': depthListType == 2}" @click="changeList(2)"></div>
+				<!-- 只显示卖单 -->
+				<div class="list-range-3" :class="{'active': depthListType == 3}" @click="changeList(3)"></div>
 			</div>
 			
 			<div class="deal-list-type">
@@ -81,6 +77,8 @@
 		name: 'tradeDepth',
 		data() {
 			return {
+				timer:'',
+				
 				depthListType: 1, //1全部 2买单 3卖单
 				depthValue: 1,
 				depthOptions: [
@@ -95,9 +93,23 @@
 			...mapState('trend', ['currentPair']),
 		},
 		methods: {
-			chooseDepth(val) {
+			getDepth() { //获取深度盘口
+				this.postAxios('/api/coin/price/getDepth', {symbolId: this.currentPair.symbolId})
+					.then(data => {
+						console.log(JSON.stringify(data))
+					})
+			},
+			
+			chooseDepth(val) { //切换深度
 				this.depthValue = val;
+			},
+			changeList(val) { //切换列表类型
+				this.depthListType = val;
 			}
+		},
+		mounted() {
+			this.getDepth();
+			
 		}
 	}
 </script>
@@ -106,4 +118,7 @@
 	.deal-folder {
 		height: 300px;
 	}
+	.deal-folder-open {
+		height: 600px;
+	}
 </style>

src/views/release/components/release_order_list.vue

@@ -111,6 +111,8 @@
 				isContent: false,
 				pageTotal: 0, //总页数
 				currentPage: 1, //默认当前页
+				
+				timer: '', //定时器
 			}
 		},
 		computed: {
@@ -131,21 +133,27 @@
 				}
 				let url = this.titleIndex == 1 ? '/api/entrust/info/page' : '/api/entrust/info/page/history';
 				
-				this.postAxios(url, params)
-					.then(data => {
-						this.pageTotal = data.data.pages;
-						this.orderList = [];
-						
-						if (data.data.total == 0) {
-							this.isContent = true;
-						} else {
-							this.isContent = false;
-						}
-						
-						data.data.records.forEach(item => {
-							this.orderList.push(item);
-						})
-					})
+				if(this.currentPair) {
+					this.postAxios(url, params)
+						.then(data => {
+							this.pageTotal = data.data.pages;
+							this.orderList = [];
+							
+							if (data.data.total == 0) {
+								this.isContent = true;
+							} else {
+								this.isContent = false;
+							}
+							
+							data.data.records.forEach(item => {
+								this.orderList.push(item);
+							})
+						})	
+				} else {
+					this.timer = setInterval(() => {
+						this.getOrderList(1);
+					}, 1000)
+				}
 			},
 			
 			tabOrder(val) { //切换标题

src/views/release/components/release_pair_list.vue

@@ -5,7 +5,7 @@
 			<div class="list2-div1">
 				<span>{{$t('市场')}}</span>
 				<div class="list2-soso-box">
-					<input placeholder="搜索币种">
+					<el-input class="inp" :placeholder="$t('搜索币种')" v-model="searchKeywords" type="text" clearable autocomplete="off"></el-input>
 					<i class="list2-icon-search"></i>
 				</div>
 			</div>
@@ -60,12 +60,12 @@
 										<span @click="choosePair(item)">{{item.dealCoin}}/{{item.convertType}}</span>
 									</div>
 								</td>
-								<td>
+								<td @click="choosePair(item)">
 									<div class="cell">
 										<span>{{item.price}}</span>
 									</div>
 								</td>
-								<td>
+								<td @click="choosePair(item)">
 									<div class="cell">
 										<div class="green-text" v-if="item.changes > 0">
 											+{{item.changes * 100 | Decimal(2)}}%<i class="icon-arrow"></i>
@@ -93,6 +93,7 @@
 		data() {
 			return {
 				caseIndex: 3, //选择主板
+				searchKeywords: '', //搜索关键字
 				toPrice: 0, //按价格排序
 				toRange: 0, //按涨跌幅度排序
 			}
@@ -115,15 +116,30 @@
 			// },
 			tradePairList() { //所有交易对
 				let list = [];
-				this.allPairList.forEach(item => {
-					if(item.caseCode == 3) {
-						item.childen.forEach(item2 => {
-							item2.prices.forEach(item3 => {
-								list.push(item3);
+				
+				if(this.searchKeywords) { //搜索
+					this.allPairList.forEach(item => {
+						if(item.caseCode == 3) {
+							item.childen.forEach(item2 => {
+								item2.prices.forEach(item3 => {
+									if (item3.dealCoin.toUpperCase().indexOf(this.searchKeywords.toUpperCase()) > -1) {
+										list.push(item3);
+									}
+								})
 							})
-						})
-					}
-				});
+						}
+					});
+				} else {
+					this.allPairList.forEach(item => {
+						if(item.caseCode == 3) {
+							item.childen.forEach(item2 => {
+								item2.prices.forEach(item3 => {
+									list.push(item3);
+								})
+							})
+						}
+					});
+				}
 				
 				//是否收藏
 				list.forEach(item => {