sbd-npm 1.3.10 → 1.3.12

package/package.json

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

package/stock_basics.js

@@ -910,7 +910,8 @@ let Stock = {
                     let _html = [];
                     _html.push('<select id="public_fund_date">');
                     j["data"].forEach(function (item) {
-                        _html.push('<option value="', item["date"], '">', item["date"], '</option>');
+                        let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
+                        _html.push('<option value="', date_format, '">', date_format, '(', item["num"], ')</option>');
                     });
                     _html.push('</select>');
                     $("#public_fund_date_zone").html(_html.join(""));
@@ -1121,9 +1122,10 @@ 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"], 3));
-                rqye_data.push(Util.to_float(item["rqye"] / 10000, 2));
+                rqye_data.push(Util.to_float(item["rqye"], 2));
                 price_data.push(item["price"]);
             });
+            $("#margin_title").html(Util.pack_html_link(j["url"], "[" + Stock.name + "]融资余额"));
             let margin_summary = "";
             if (j["latest"].length > 0) {
                 if (j["latest"].length === 1) {
@@ -1141,7 +1143,7 @@ let Stock = {
                     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, 3) + ' 最低: ' + Util.to_unit(rzye_low, 3);
+            margin_summary = 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"], 3) + '(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") + ')';
             }
@@ -1149,7 +1151,7 @@ let Stock = {
                 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);
+            Stock["rzye_chart"] = Util.multi_axis_line(Stock["rzye_chart"], "rzye_line_canvas", date_data, '融资余额(单位:亿)', rzye_data, '股价', price_data);
             let flow_data = [], color_data = [];
             date_data = [];
             j["flow_data"].forEach(function (item) {

package/util.js

@@ -632,13 +632,22 @@ const Util = {
         return prefix === "6";
     },
 
+    /**
+     * 是否A股股票
+     * @param code
+     * @returns {boolean}
+     */
+    is_cn: function (code) {
+        return /^\d{6}$/.test(code);
+    },
+
     /**
      * 是否港股
      * @param code
      * @returns {boolean}
      */
     is_hk: function (code) {
-        return code.length === 5;
+        return /^\d{5}$/.test(code);
     },
 
     /**