sbd-npm 1.3.80 → 1.3.82

package/constant.js

@@ -286,5 +286,6 @@ const IndexList = [
 	{'code': 'hsci', 'name': '恒生综合指数', 'is_industry': 1, 'is_key': 1},
 	{'code': 'hstech', 'name': '恒生科技指数', 'is_industry': 0, 'is_key': 1},
 	{'code': 'sp500', 'name': '标普500指数', 'is_industry': 1, 'is_key': 1},
+	{'code': 'ths_all_a', 'name': '同花顺全A指数', 'is_industry': 0, 'is_key': 0},
 	{'code': 'usdcnh', 'name': '美元离岸人民币汇率', 'is_industry': 0, 'is_key': 0},
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.3.80",
+    "version": "1.3.82",
     "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",
@@ -1058,7 +1055,9 @@ let Stock = {
         Util.post("/stock/" + Stock["code"], payload, function (j) {
             Stock["rzye_chart"].hideLoading();
             let date_data = [], rzye_data = [], rqye_data = [], price_data = [], rqye_color_data = [], rzye_low = Number.MAX_SAFE_INTEGER, rzye_high = 0, rqye_low = Number.MAX_SAFE_INTEGER, rqye_high = 0;
+            let latest_date = 0, margin_summary = "", rqye_summary = "";
             j["data"].forEach(function (item) {
+                latest_date = Math.max(latest_date, item["date"]);
                 date_data.push(Util.seconds_to_format(item["date"], "%Y-%m-%d"));
                 rzye_low = Math.min(rzye_low, item["rzye"]);
                 rzye_high = Math.max(rzye_high, item["rzye"]);
@@ -1069,7 +1068,8 @@ let Stock = {
                 price_data.push(item["price"]);
                 rqye_color_data.push("#E74C3C");
             });
-            let margin_summary = "", rqye_summary = "";
+            latest_date = Util.seconds_to_format(latest_date, "%Y-%m-%d");
+            $("#stock_margin_url").attr("href", Util.get_url("trend_margin") + "?start_date=" + latest_date + "&end_date=" + latest_date);
             if (j["latest"].length > 0) {
                 if (j["latest"].length === 1) {
                     margin_summary = " 最新融资余额(" + Util.seconds_to_format(j["latest"][0]["date"], "%Y-%m-%d") + "): " + Util.to_unit(j["latest"][0]["rzye"], 3);
@@ -1143,9 +1143,9 @@ let Stock = {
                 "head_cols": [
                     {"name": "日期", "class": "info", "table_sort": 1},
                     {"name": "融资余额", "table_sort": 1, "title": "本日融资余额 ＝ 前日融资余额 ＋ 本日融资买入额 － 本日融资偿还额"},
-                    {"name": "融资余额增值", "table_sort": 1, "title": "当天融资余额跟前一天融资余额的差值，即`本日融资买入额` － `本日融资偿还额`"},
                     {"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},
@@ -1158,6 +1158,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"];
@@ -1168,8 +1170,6 @@ 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"]);