From 10320ed7d625ea7471540cbe92865ec65c96f076 Mon Sep 17 00:00:00 2001
From: joeyoyo <549400805@qq.com>
Date: Fri, 8 Nov 2019 17:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8F=8A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=B8=82=E5=95=86=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/home/js/home.js     | 26 +++++++++++++++++++++-----
 mine/html/wallet_my.html | 16 ++++++++--------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/html/home/js/home.js b/html/home/js/home.js
index bc577b8..92154c8 100644
--- a/html/home/js/home.js
+++ b/html/home/js/home.js
@@ -271,11 +271,11 @@ function initTopMarket() {
 					ul.appendChild(li);
 					liListener(li, markets[i].currencyPair)
 				}
-				var sliderItem = document.createElement('li');
-				sliderItem.className = "gain-item-list mui-table-view-cell";
-				sliderItem.innerHTML = '<div class="gain-item-list-ranking">' + (markets.length + 1) + '</div>' +
-					'<div class="gain-item-list-name"><span class="name1">HFH/USDT</span><span class="name2">24H 0.1500</span></div><div class="gain-item-list-price"><span class="price1">0.1500</span><span class="price2">0.1500 USD</span></div><div class="gain-item-list-info">+0.00%</div>';
-				ul.appendChild(sliderItem);
+				// var sliderItem = document.createElement('li');
+				// sliderItem.className = "gain-item-list mui-table-view-cell";
+				// sliderItem.innerHTML = '<div class="gain-item-list-ranking">' + (markets.length + 1) + '</div>' +
+				// 	'<div class="gain-item-list-name"><span class="name1">HFH/USDT</span><span class="name2">24H 0.1500</span></div><div class="gain-item-list-price"><span class="price1">0.1500</span><span class="price2">0.1500 USD</span></div><div class="gain-item-list-info">+0.00%</div>';
+				// ul.appendChild(sliderItem);
 
 			} else {}
 		},
@@ -328,6 +328,9 @@ function getNews() {
 						sliderItem.className = 'mui-slider-item';
 						sliderItem.innerHTML = '<p class="mui-slider-title mui-ellipsis">' + resultData[i].title + '</p>';
 						sliderGroup.appendChild(sliderItem);
+						if(resultData[i].title) {
+							toSystemNotice(sliderItem, resultData[i].id);
+						}
 					}
 					var sliderItem = document.createElement('div');
 					sliderItem.className = 'mui-slider-item';
@@ -423,4 +426,17 @@ function webJump(obj, url) {
 			}
 		});
 	});
+}
+
+// 跳转指定公告
+function toSystemNotice(obj, id) {
+	obj.addEventListener('tap', function() {
+		mui.openWindow({
+			url: '../../../mine/html/my/system_notice_value.html',
+			id: '../../../mine/html/my/system_notice_value.html',
+			extras: {
+				_id: id
+			}
+		})
+	});
 }
\ No newline at end of file
diff --git a/mine/html/wallet_my.html b/mine/html/wallet_my.html
index 025f608..a06d75e 100644
--- a/mine/html/wallet_my.html
+++ b/mine/html/wallet_my.html
@@ -496,14 +496,14 @@
 			}
 		})
 		//取消市商申请
-		document.getElementById("cancel-M").addEventListener("tap", function() {
-			mui.confirm(dataInfo.langue.marketMsg, dataInfo.langue.marketNote, [dataInfo.langue.no, dataInfo.langue.yes],
-				function(e) {
-					if (e.index == 1) {
-						cancelMarket();
-					}
-				});
-		});
+		// document.getElementById("cancel-M").addEventListener("tap", function() {
+		// 	mui.confirm(dataInfo.langue.marketMsg, dataInfo.langue.marketNote, [dataInfo.langue.no, dataInfo.langue.yes],
+		// 		function(e) {
+		// 			if (e.index == 1) {
+		// 				cancelMarket();
+		// 			}
+		// 		});
+		// });
 		//登录
 		document.getElementById("login").addEventListener("tap", function() {
 			app.openWin("wallet_login.html", "my/wallet_login.html");