From 1ee5ae2fd9d3cf366779b99fc7c1d8a4aabdb7fc Mon Sep 17 00:00:00 2001
From: "zheng.zhang" <zheng.zhang@yieldchain.com>
Date: Tue, 23 Dec 2025 20:19:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=8F=E7=A7=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C=E5=92=8C=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/ExchangeTrade/SpreadSetting.cshtml  | 111 ++++++++++++++++--
 .../Scripts/app/trade/exchange/tradeList.js   |   2 +-
 2 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/YLErpWeb/Views/ExchangeTrade/SpreadSetting.cshtml b/YLErpWeb/Views/ExchangeTrade/SpreadSetting.cshtml
index 62c3c761..b53ea700 100644
--- a/YLErpWeb/Views/ExchangeTrade/SpreadSetting.cshtml
+++ b/YLErpWeb/Views/ExchangeTrade/SpreadSetting.cshtml
@@ -11,6 +11,17 @@
         .offset-form-group .form-control { width: 120px; }
         .help-block { margin-top: 5px; color: #999; }
         .form-footer { text-align: center; }
+        .popover {
+            min-width: 200px;
+        }
+        .popover-body {
+            padding: 15px;
+        }
+        .popover-body .btn {
+            margin: 0 5px;
+            padding: 0.25rem 0.75rem;
+            font-size: 0.875rem;
+        }
     </style>
 }
 
@@ -18,10 +29,67 @@
 @section JS{
     <script>
         $(function() {
-            // 保存按钮点击事件
-            $("#btnSave").click(function() {
-                var bid = $("#bid").val();
-                var ofr = $("#ofr").val();
+            var $bid = $("#bid");
+            var $ofr = $("#ofr");
+            var $popover;
+            
+            // 初始化popover
+            $('[data-toggle="popover"]').popover({
+                trigger: 'manual',
+                container: 'body',
+                sanitize: false, // 禁用HTML净化
+                html: true // 允许HTML内容
+            }).on('click', function(e) {
+                // 阻止默认行为
+                e.preventDefault();
+                e.stopPropagation();
+                
+                // 如果已经有popover显示，则不再重复显示
+                if ($(this).attr('aria-describedby')) {
+                    return;
+                }
+                
+                // 显示popover
+                $popover = $(this).popover('show');
+                
+                // 点击确认按钮
+                $(document).one('click', '#confirmSave', function(e) {
+                    e.stopPropagation();
+                    // 这里执行保存逻辑
+                    saveSettings();
+                    // 隐藏popover
+                    $popover.popover('hide');
+                });
+
+                // 点击取消按钮
+                $(document).one('click', '#cancelSave', function(e) {
+                    e.stopPropagation();
+                    $popover.popover('hide');
+                });
+            });
+            
+            // 阻止popover内部的点击事件冒泡
+            $(document).on('click', '.popover', function(e) {
+                e.stopPropagation();
+            });
+
+            // 点击页面其他区域关闭popover
+            $(document).on('click', function(e) {
+                !$(e.target).closest('.popover').length && $popover?.popover('hide');
+            });
+
+            // 关闭按钮点击事件
+            $("#btnClose").click(function() {
+                layer.closeMe();
+            });
+
+             // 保存设置
+            function saveSettings() {
+                var bid = $bid.val();
+                var ofr = $ofr.val();
+                
+                if (!validInput($bid, bid)) return;
+                if (!validInput($ofr, ofr)) return;
                 
                 // 保存到后台
                 $.ajax({
@@ -38,14 +106,18 @@
                         layer.closeMe();
                     }
                 });
-               
-            });
-            
-            // 关闭按钮点击事件
-            $("#btnClose").click(function() {
-                layer.closeMe();
-            });
+            }
         });
+
+        function validInput($input, value) {
+            var $formGroup = $input.closest('.form-group');
+            $formGroup.find('.text-danger').remove();
+            if (!!`${value}`.trim() && !/^-?\d+$/.test(`${Number(value)}`)) {
+              $formGroup.append('<div class="text-danger">只允许输入整数</div>');  
+              return false
+            }
+            return true
+        }
     </script>
 }
 
@@ -76,12 +148,25 @@
         </div>
 
         <div class="form-group" style="margin-top: 20px;">
-            <div class="help-block" style="color: #666;">保存后10分钟后生效</div>
+            <div class="help-block text-danger">保存后10分钟后生效</div>
         </div>
         
         <!-- 按钮区域 -->
         <div class="form-footer">
-            <button id="btnSave" type="button" class="btn btn-primary" style="margin-right: 10px;">保存</button>
+            <button 
+                id="btnSave"
+                type="button"
+                class="btn btn-primary" 
+                style="margin-right: 10px;" 
+                data-toggle="popover"
+                data-html="true"
+                data-placement="top"
+                data-content='<div class="text-center">
+                    <p>请注意，此偏移数值即将于10分钟后生效，要继续吗？</p>
+                    <button id="confirmSave" class="btn btn-sm btn-primary">继续</button>
+                    <button id="cancelSave" class="btn btn-sm btn-default">取消</button>
+                </div>'
+            >保存</button>
             <button id="btnClose" type="button" class="btn btn-default">关闭</button> 
         </div>
     </div>
diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/exchange/tradeList.js b/YLErpWeb/wwwroot/Scripts/app/trade/exchange/tradeList.js
index a76bbef1..d02f0b96 100644
--- a/YLErpWeb/wwwroot/Scripts/app/trade/exchange/tradeList.js
+++ b/YLErpWeb/wwwroot/Scripts/app/trade/exchange/tradeList.js
@@ -317,6 +317,6 @@ function batchTradeAdjustView() {
 // 偏移设置
 function spreadSetting() {
   main.open("偏移设置", "/ExchangeTrade/SpreadSetting", {
-    area: ["450px", "310px"],
+    area: ["450px", "360px"],
   });
 }