sbd-npm 1.3.79 → 1.3.81

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.3.79",
+    "version": "1.3.81",
     "description": "Stock Big Data",
     "main": "index.js",
     "scripts": {

package/stock_basics.js

@@ -1044,10 +1044,7 @@ let Stock = {
      */
     fetch_margin: function () {
         Stock["rzye_chart"] = Util.show_chart_loading(Stock["rzye_chart"], "rzye_line_canvas");
-        let margin_url = "http://www.szse.cn/disclosure/margin/margin/index.html";
-        if (Util.is_sh(Stock["code"])) {
-            margin_url = "http://www.sse.com.cn/market/othersdata/margin/detail/";
-        }
+        let margin_url = "https://data.10jqka.com.cn/market/rzrqgg/code/" + Stock["code"];
         $("#margin_panel_title").html(Util.pack_html_link(margin_url, "[" + Stock.name + "]融资余额"));
         let payload = {
             action: "margin",
@@ -1142,12 +1139,14 @@ let Stock = {
                 "caption": "none",
                 "head_cols": [
                     {"name": "日期", "class": "info", "table_sort": 1},
-                    {"name": "融资余额", "table_sort": 1},
-                    {"name": "融资余额增值", "table_sort": 1, "title": "当天融资余额跟前一天融资余额的差值"},
+                    {"name": "融资余额", "table_sort": 1, "title": "本日融资余额 ＝ 前日融资余额 ＋ 本日融资买入额 － 本日融资偿还额"},
                     {"name": "融资买入额", "table_sort": 1},
-                    {"name": "融资偿还额", "table_sort": 1},
-                    {"name": "融券余额", "table_sort": 1},
-                    {"name": "融券余量", "table_sort": 1},
+                    {"name": "融资偿还额", "table_sort": 1, "title": "本日融资偿还额 ＝ 本日直接还款额 ＋ 本日卖券还款额 ＋ 本日融资强制平仓额 ＋ 本日融资正权益调整 － 本日融资负权益调整"},
+                    {"name": "融资净买入", "table_sort": 1, "title": "本日融资买入额 － 本日融资偿还额"},
+                    {"name": "融券余额", "table_sort": 1, "title": "本日融资融券余额 ＝ 本日融资余额 ＋ 本日融券余量金额"},
+                    {"name": "融券余量", "table_sort": 1, "title": "本日融券余量 = 前日融券余量 + 本日融券卖出数量 - 本日融券偿还量"},
+                    {"name": "收盘价", "table_sort": 1},
+                    {"name": "涨跌", "table_sort": 1},
                 ]
             });
             Util.post("/stock/" + Stock["code"], {action: "margin_detail"}, function (j) {
@@ -1156,6 +1155,8 @@ let Stock = {
                     _html.push("<tr>");
                     _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
                     _html.push("<td title='", item["rzye"], "' data-val='", item["rzye"], "'>", Util.to_unit(item["rzye"], 3), "</td>");
+                    _html.push("<td title='", item["rzmre"], "' data-val='", item["rzmre"], "'>", Util.to_unit(item["rzmre"], 3), "</td>");
+                    _html.push("<td title='", item["rzche"], "' data-val='", item["rzche"], "'>", Util.to_unit(item["rzche"], 3), "</td>");
                     let net_rzye = "--", gap_rzye = 0;
                     if (j["data"][index + 1] && j["data"][index + 1]["rzye"]) {
                         gap_rzye = item["rzye"] - j["data"][index + 1]["rzye"];
@@ -1166,22 +1167,24 @@ let Stock = {
                         }
                     }
                     _html.push("<td title='", gap_rzye, "' data-val='", gap_rzye, "'>", net_rzye, "</td>");
-                    _html.push("<td title='", item["rzmre"], "' data-val='", item["rzmre"], "'>", Util.to_unit(item["rzmre"], 3), "</td>");
-                    _html.push("<td title='", item["rzche"], "' data-val='", item["rzche"], "'>", Util.to_unit(item["rzche"], 3), "</td>");
                     _html.push("<td title='", item["rqye"], "' data-val='", item["rqye"], "'>", (item["rqye"] > 0 ? Util.to_unit(item["rqye"], 3) : "--"), "</td>");
                     _html.push("<td title='", item["rqyl"], "' data-val='", item["rqyl"], "'>", Util.to_unit(item["rqyl"], 3), "</td>");
+                    let text_color = Util.text_color(item["p_change"]);
+                    _html.push("<td><b class='", text_color, "'>", item["close"], "</b></td>");
+                    item["p_change"] = item["p_change"] > 0 ? ("+" + Util.to_float(item["p_change"], 2)) : Util.to_float(item["p_change"], 2);
+                    _html.push("<td><b class='", text_color, "'>", item["p_change"], "%</b></td>");
                     _html.push("</tr>");
                 });
                 Util.render_table_html("margin_modal_body_body", _html);
                 if (j["data"].length > 1) {
-                    let margin_modal_summary = " (当前最新的融资余额<b class='text-info'>(" + Util.to_unit(j["data"][0]["rzye"]) + ")</b>";
+                    let margin_modal_summary = " [当前最新(" + Util.seconds_to_format(j["data"][0]["date"], "%Y-%m-%d") + ")的融资余额: <b class='text-info'>" + Util.to_unit(j["data"][0]["rzye"]) + "</b>";
                     let gap_rzye = j["data"][0]["rzye"] - j["data"][1]["rzye"];
                     if (gap_rzye > 0) {
-                        margin_modal_summary += "相对于前一天持股增加 <b class='text-danger'>+" + Util.to_unit(gap_rzye) + "</b>";
+                        margin_modal_summary += "，相对于前一天余额增加 <b class='text-danger'>+" + Util.to_unit(gap_rzye) + "</b>";
                     } else if (gap_rzye < 0) {
-                        margin_modal_summary += "相对于前一天持股减少 <b class='text-success'>" + Util.to_unit(gap_rzye) + "</b>";
+                        margin_modal_summary += "，相对于前一天余额减少 <b class='text-success'>" + Util.to_unit(gap_rzye) + "</b>";
                     }
-                    margin_modal_summary += ")";
+                    margin_modal_summary += "]";
                     $("#margin_modal_summary").html(margin_modal_summary);
                 }
                 Util.hide_tips();
@@ -1287,14 +1290,14 @@ let Stock = {
                     _html.push("</tr>");
                 });
                 if (j["data"].length > 1) {
-                    let hkex_holding_modal_summary = " (当前最新的持股比例<b class='text-info'>(" + j["data"][0]["ratio"] + "%)</b>";
+                    let hkex_holding_modal_summary = " [当前最新(" + Util.seconds_to_format(j["data"][0]["date"], "%Y-%m-%d") + ")的持股比例: <b class='text-info'>" + j["data"][0]["ratio"] + "%</b>";
                     let gap_volume = j["data"][0]["volume"] - j["data"][1]["volume"];
                     if (gap_volume > 0) {
-                        hkex_holding_modal_summary += "相对于前一天持股增加 <b class='text-danger'>+" + Util.to_ten_thousand(gap_volume) + "万股</b>";
+                        hkex_holding_modal_summary += "，相对于前一天持股增加 <b class='text-danger'>+" + Util.to_ten_thousand(gap_volume) + "万股</b>";
                     } else if (gap_volume < 0) {
-                        hkex_holding_modal_summary += "相对于前一天持股减少 <b class='text-success'>" + Util.to_ten_thousand(gap_volume) + "万股</b>";
+                        hkex_holding_modal_summary += "，相对于前一天持股减少 <b class='text-success'>" + Util.to_ten_thousand(gap_volume) + "万股</b>";
                     }
-                    hkex_holding_modal_summary += ")";
+                    hkex_holding_modal_summary += "]";
                     $("#hkex_holding_modal_summary").html(hkex_holding_modal_summary);
                 }
                 Util.render_table_html("hkex_holding_modal_body_body", _html);