update:watchlist详情展示优化v1

src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -1108,7 +1108,8 @@ public class CoinServiceImpl implements CoinService {
                 if ("open_long".equals(side)) {
                     chaRate = new BigDecimal(markPrice).divide(new BigDecimal(jsonObject.getString("triggerPrice")), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
                 } else if ("open_short".equals(side)) {
-                    chaRate = new BigDecimal(jsonObject.getString("triggerPrice")).divide(new BigDecimal(markPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+                    //chaRate = new BigDecimal(jsonObject.getString("triggerPrice")).divide(new BigDecimal(markPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+                    chaRate = new BigDecimal(markPrice).divide(new BigDecimal(jsonObject.getString("triggerPrice")), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
                 }
 
                 jsonObject.put("markPrice", markPrice);

src/main/resources/static/coin.html

@@ -22,7 +22,7 @@
         display: block;
     }
 
-    #bigpreview {
+    #watchlistpreview {
         display: none;
         position: absolute;
         z-index: 999;
@@ -30,31 +30,31 @@
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
-        background-color: rgba(0, 0, 0, 0.4);
+        background: antiquewhite;
         border: 1px solid #888;
         width: 50%;
         height: 50%;
     }
 
-    .bigpreview-content {
+    .watchlistpreview-content {
         overflow: auto;
         height: calc(100% - 40px);
     }
 
-    .bigpreview-close {
+    .watchlistpreview-top-close {
         color: #ddd;
         height: 40px;
         font-size: 28px;
         font-weight: bold;
     }
 
-    .bigpreview-close:hover, .bigpreview-close:focus {
+    /*.watchlistpreview-top-close:hover, .watchlistpreview-top-close:focus {
         color: black;
         text-decoration: none;
         cursor: pointer;
-    }
+    }*/
 
-    .bigpreview-loading {
+    .watchlistpreview-loading {
         text-align: center;
         display: none;
         position: absolute;
@@ -276,13 +276,13 @@
     </div>
 </div>
 
-<div id="bigpreview">
-    <div class="bigpreview-loading"><img src='cover/loading.gif'></div>
-    <div class="bigpreview-close">
-        <div style="float: left;">详情</div>
-        <div style="float: right;"><img src="cover/close.svg"></div>
+<div id="watchlistpreview">
+    <div class="watchlistpreview-loading"><img src='cover/loading.gif'></div>
+    <div class="watchlistpreview-top">
+        <div style="float: left;" class="watchlistpreview-top-title">详情</div>
+        <div style="float: right;" class="watchlistpreview-top-close"><img src="cover/close.svg"></div>
     </div>
-    <div class="bigpreview-content"></div>
+    <div class="watchlistpreview-content"></div>
 </div>
 </body>
 </html>

src/main/resources/static/js/my-coin.js

@@ -348,6 +348,11 @@ function mainSearch(url, nameEn, slideDiv, needCustomFlag) {
                     str += '</tr>';
                 }
 
+                if (nameEn === 'watchlist') {
+                    $(".apis-quiet-div-watchlist-detail").unbind("click");
+                    $(".watchlistpreview-top-close").unbind("click");
+                }
+
                 $('#' + slideDiv).find(".contentTD").html(str);
 
                 initContentEvent();
@@ -375,17 +380,17 @@ function initContentEvent() {
     }
 
     $(".apis-quiet-div-watchlist-detail").click(function () {
-        if ($("#bigpreview").css("display") === 'none') {
-            $("#bigpreview").css("display", "block");
-        } else if ($("#bigpreview").css("display") === 'block') {
-            $("#bigpreview").css("display", "none");
+        if ($("#watchlistpreview").css("display") === 'none') {
+            $("#watchlistpreview").css("display", "block");
+        } else if ($("#watchlistpreview").css("display") === 'block') {
+            $("#watchlistpreview").css("display", "none");
         }
 
-        $("#bigpreview").find(".bigpreview-close").click(function () {
-            if ($("#bigpreview").css("display") === 'none') {
-                $("#bigpreview").css("display", "block");
-            } else if ($("#bigpreview").css("display") === 'block') {
-                $("#bigpreview").css("display", "none");
+        $(".watchlistpreview-top-close").click(function () {
+            if ($("#watchlistpreview").css("display") === 'none') {
+                $("#watchlistpreview").css("display", "block");
+            } else if ($("#watchlistpreview").css("display") === 'block') {
+                $("#watchlistpreview").css("display", "none");
             }
             $(this).unbind("click");
         });
@@ -398,17 +403,17 @@ function initContentEvent() {
                 //请求成功时处理
                 if (data != null && $.trim(data) != "" && data.success) {
                     data = data.data;
-                    $(".bigpreview-content").html(data);
+                    $(".watchlistpreview-content").html(data);
                 } else {
                     //alert(data.message);
                 }
             },
             beforeSend: function () {
-                $(".bigpreview-content").html("");
-                $(".bigpreview-loading").css("display", "block");
+                $(".watchlistpreview-content").html("");
+                $(".watchlistpreview-loading").css("display", "block");
             },
             complete: function () {
-                $(".bigpreview-loading").css("display", "none");
+                $(".watchlistpreview-loading").css("display", "none");
             },
             error: function (data) {
                 //请求出错处理