sbd-npm 1.3.4 → 1.3.6

package/constant.js

@@ -180,6 +180,7 @@ const MenuList = [
 			{'key': 'hk_hsm100', 'name': '恒生中国100指数', 'url': '/0x759fcb84a0a322125df6748dffad66d7b2b44c2d'},
 			{'key': 'hk_biotechnology', 'name': '生物科技', 'url': '/0xa131be85db2beb939e93207d0966c3710c7b761a'},
 			{'key': 'hk_sell_short', 'name': '沽空排行', 'url': '/0x4ecddc987891875a42d206620cd97ca382613485'},
+			{'key': 'hk_stock_exchange', 'name': '港股通持股排行', 'url': '/0x7549960a2de98a41a1b78e63202003a175b93dbb'},
 		]
 	},
 	{

package/package.json

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

package/stock_basics.js

@@ -951,7 +951,7 @@ let Stock = {
             Stock["pfc_stock_chart"] = Util.multi_axis_line(Stock["pfc_stock_chart"], "pfc_stock_line_canvas", date_data, '总持股数(万股)', stock_num_data, '股价', price_data);
             Stock["pfc_fund_chart"] = Util.multi_axis_line(Stock["pfc_fund_chart"], "pfc_fund_line_canvas", date_data, '持仓家数', fund_num_data, '股价', price_data);
             if (j["cur_stock_num"] && j["cur_stock_num"] > 0 && j["pre_stock_num"] && j["pre_stock_num"] > 0) {
-                $("#pfc_stock_tips").html("(当前持股数: <b class='text-info'>" + Util.to_unit(j["cur_stock_num"] * 10000, 3) + "</b>, 环比: " + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"]) + ")");
+                $("#pfc_stock_tips").html("(当前持股数: <b class='text-info'>" + Util.to_unit(j["cur_stock_num"] * 10000, 4) + "</b>, 环比: " + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"]) + ")");
             }
             if (j["cur_fund_num"] && j["cur_fund_num"] > 0 && j["pre_fund_num"] && j["pre_fund_num"] > 0) {
                 $("#pfc_fund_tips").html("(当前基金数: <b class='text-info'>" + Util.to_unit(j["cur_fund_num"]) + "</b>, 环比: " + Util.year_price_rate(j["cur_fund_num"], j["pre_fund_num"]) + ")");
@@ -1094,11 +1094,8 @@ let Stock = {
     },
 
     fetch_margin: function () {
+        let is_summary = Stock["rzye_chart"] ? 0 : 1;
         Stock["rzye_chart"] = Util.show_chart_loading(Stock["rzye_chart"], "rzye_line_canvas");
-        let is_summary = 0;
-        if (!Stock.rzye_chart) {
-            is_summary = 1;
-        }
         let payload = {
             action: "margin",
             is_summary: is_summary,
@@ -1115,39 +1112,38 @@ let Stock = {
                 }
                 rzye_high = Math.max(rzye_high, item["rzye"]);
                 date_data.push(Util.seconds_to_format(item["date"], "%Y-%m-%d"));
-                rzye_data.push(Util.to_hundred_million(item["rzye"]));
+                rzye_data.push(Util.to_hundred_million(item["rzye"], 3));
                 rqye_data.push(Util.to_float(item["rqye"] / 10000, 2));
                 price_data.push(item["price"]);
             });
             let margin_summary = "";
-            if (!Stock.rzye_chart && j["latest"].length > 0) {
+            if (is_summary === 1 && 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"]);
+                    margin_summary = " 最新(" + Util.seconds_to_format(j["latest"][0]["date"], "%Y-%m-%d") + "): " + Util.to_unit(j["latest"][0]["rzye"], 3);
                 } else if (j["latest"].length === 2) {
                     let d1 = j["latest"][0];
                     let d2 = j["latest"][1];
                     let difference = d1["rzye"] - d2["rzye"];
                     let dist_tips = "";
                     if (difference > 0) {
-                        dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["rzye"])) + "' style='color: #a94442;'>+" + Util.strip_html(Util.to_unit(difference)) + "</b>)";
+                        dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["rzye"], 3)) + "' style='color: #a94442;'>+" + Util.strip_html(Util.to_unit(difference, 3)) + "</b>)";
                     } else if (difference < 0) {
-                        dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["rzye"])) + "' style='color: #3c763d;'>" + Util.strip_html(Util.to_unit(difference)) + "</b>)";
+                        dist_tips = "(<b title='" + Util.strip_html(Util.to_unit(d2["rzye"], 3)) + "' style='color: #3c763d;'>" + Util.strip_html(Util.to_unit(difference, 3)) + "</b>)";
                     }
-                    margin_summary = "最新(" + Util.seconds_to_format(d1["date"], "%Y-%m-%d") + "): " + Util.to_unit(d1["rzye"]) + dist_tips;
+                    margin_summary = " 最新(" + Util.seconds_to_format(d1["date"], "%Y-%m-%d") + "): " + Util.to_unit(d1["rzye"], 3) + dist_tips;
                 }
             }
-            margin_summary = '[' + Util.pack_html_link(j["url"], Stock.name) + ']融资余额(单位:亿)' + margin_summary + ' 最高: ' + Util.to_unit(rzye_high) + ' 最低: ' + Util.to_unit(rzye_low);
+            margin_summary = Util.pack_html_link(j["url"], "[" + Stock.name + "融资余额(单位:亿)]") + margin_summary + ' 最高: ' + Util.to_unit(rzye_high, 3) + ' 最低: ' + Util.to_unit(rzye_low, 3);
             if (j["high"] && j["high"]["date"] && j["high"]["date"] > 0) {
-                margin_summary += ' 历史最高: ' + Util.to_unit(j["high"]["rzye"]) + '(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") + ')';
+                margin_summary += ' 历史最高: ' + Util.to_unit(j["high"]["rzye"], 3) + '(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") + ')';
             }
             if (j["low"] && j["low"]["date"] && j["low"]["date"] > 0) {
-                margin_summary += ' 历史最低: ' + Util.to_unit(j["low"]["rzye"]) + '(' + Util.seconds_to_format(j["low"]["date"], "%Y-%m-%d") + ')';
+                margin_summary += ' 历史最低: ' + Util.to_unit(j["low"]["rzye"], 3) + '(' + Util.seconds_to_format(j["low"]["date"], "%Y-%m-%d") + ')';
             }
             $("#margin_summary").html(margin_summary);
             Stock["rzye_chart"] = Util.multi_axis_line(Stock["rzye_chart"], "rzye_line_canvas", date_data, '融资余额', rzye_data, '股价', price_data);
-            let flow_data = [];
+            let flow_data = [], color_data = [];
             date_data = [];
-            let color_data = [];
             j["flow_data"].forEach(function (item) {
                 if (item["value"] !== 0) {
                     date_data.push(item["date"]);
@@ -1188,7 +1184,7 @@ let Stock = {
                     let circulation_stock = $("#circulation_stock").attr("data-val");
                     let latest_html = "";
                     if (j["latest"].length === 1) {
-                        let holding_num = Util.to_hundred_million(j["latest"][0]["volume"]);
+                        let holding_num = Util.to_hundred_million(j["latest"][0]["volume"], 3);
                         let holding_rate = Math.round((holding_num / circulation_stock) * 10000) / 100;
                         latest_html = "最新(" + Util.seconds_to_format(j["latest"][0]["date"], "%Y-%m-%d") + "): " + holding_num + "亿股, 占 <b>" + holding_rate + "%</b> 流通股, ";
                     } else if (j["latest"].length === 2) {

package/util.js

@@ -27,6 +27,7 @@ const Util = {
     interval_timer: null,
     stock_timer_id: 0,
     is_init: 0,
+    is_load: 0,
     // 1年的天数
     one_year_day: 365,
     // 一天的秒数
@@ -470,22 +471,19 @@ const Util = {
      * 港股股票的基础HTML
      * @param html
      * @param item
-     * @param exchange_rate
      * @returns {*}
      */
-    stock_hk_html: function (html, item, exchange_rate) {
-        let market_capital_hkd = Util.to_float(item["market_capital"], 2);
-        let market_capital_cny = Util.to_float((item["market_capital"] * exchange_rate) / 100, 2);
+    stock_hk_html: function (html, item) {
         html.push("<td>", Util.snowball_url(item["code"]), "</td>");
         html.push("<td>", Util.stock_url(item["code"], item["name"]), "</td>");
         html.push("<td class='hk_industry'>", item["industry"], "</td>");
         html.push("<td>", Util.map_url(item["province_city"]), "</td>");
         html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
         html.push("<td>", Util.to_float(item["total_shares"], 2), "亿</td>");
-        html.push("<td>", market_capital_hkd, "亿(", market_capital_cny, "亿)</td>");
-        html.push("<td>", item["chairman"], "</td>");
+        html.push("<td>", Util.to_float(item["market_capital"], 3), "亿</td>");
         html.push("<td class='price_", item["code"], "'>", item["price"], "</td>");
         html.push("<td>", Util.year_price_rate(item["price"], item["year_price"]), "</td>");
+        html.push("<td>", Util.year_price_rate(item["price"], item["d5_price"]), "</td>");
         html.push("<td>", Util.digit_compare_trend(item["high_52week"], item["price"]), "</td>");
         html.push("<td>", Util.digit_compare_trend(item["low_52week"], item["price"]), "</td>");
         return html;