sbd-npm 1.3.55 → 1.3.57

package/package.json

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

package/status.js

@@ -415,8 +415,10 @@ $(function () {
                 if (md5) {
                     Util.show_loading();
                     $("#md5").prop('disabled', true);
+                    $("#md5_encrypt").attr("disabled", true);
                     Util.post("/action", {action: "md5", md5: md5}, function (md5_result) {
                         $("#md5").prop('disabled', false);
+                        $("#md5_encrypt").attr("disabled", false);
                         $("#md5_result").html("<b class='text-success'>" + md5_result + "</b>");
                         Util.hide_tips();
                     }, "text");
@@ -578,8 +580,13 @@ $(function () {
     ip_obj.on('show.bs.modal', function (e) {
         $("#ip_daily_search").click(function() {
             Util.show_loading();
-            let data = {active_div: "ip_daily_search", ip: $("#search_ip").val(), location: $("#search_location").val(), referer: $("#search_referer").val()};
-            Util.post(location.pathname, data, function (j) {
+            let payload = {
+                active_div: "ip_daily_search",
+                ip: $("#search_ip").val(),
+                location: $("#search_location").val(),
+                referer: $("#search_referer").val()
+            };
+            Util.post(location.pathname, payload, function (j) {
                 Status.render_ip_daily(j["ip_daily_data"]);
                 Util.hide_tips();
             });
@@ -591,7 +598,6 @@ $(function () {
         $("#search_ip").val("");
         $("#search_location").val("");
         $("#search_referer").val("");
-        Util.hide_tips();
     });
 
     let request_arguments = Util.request_arguments();

package/stock_basics.js

@@ -86,9 +86,6 @@ let Stock = {
                 Stock.fetch_report_organization();
                 break;
             case "public_fund":
-                $("#is_fund_ten").click(function () {
-                    Stock.fetch_public_fund();
-                });
                 Stock.fetch_public_fund();
                 break;
             case "public_fund_change":
@@ -934,7 +931,7 @@ let Stock = {
                 {"name": "资产规模", "table_sort": 1},
                 {"name": "基金类型"},
                 {"name": "投资类型"},
-                {"name": "基金管理公司"},
+                {"name": "基金公司"},
                 {"name": "成立日期", "table_sort": 1},
                 {"name": "持有量", "table_sort": 1, "class": "info"},
                 {"name": "持仓市值", "table_sort": 1},
@@ -943,8 +940,7 @@ let Stock = {
         });
         let payload = {
             action: "public_fund",
-            public_fund_date: $("#public_fund_date").val(),
-            is_fund_ten: $("#is_fund_ten").prop("checked") ? 1 : 0
+            public_fund_date: $("#public_fund_date").val()
         };
         Util.post("/stock/" + Stock["code"], payload, function (j) {
             let _html = [], total_public_fund = 0, total_stock_num = 0, total_market_capital = 0;
@@ -977,8 +973,16 @@ let Stock = {
                 _html.push("</tr>");
             });
             Util.render_table_html("public_fund_table_body", _html);
-            total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
-            $("#public_fund_tips").html('共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值');
+            let public_fund_tips = "";
+            if (j["statistics"] && j["statistics"]["cur_fund_num"]) {
+                let sf = j["statistics"];
+                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + sf["cur_fund_num"] + '</span>');
+                public_fund_tips = '共 ' + total_public_fund + ' 家(' + Util.year_price_rate(sf["cur_fund_num"], sf["pre_fund_num"], 1) + ')， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股(' + Util.year_price_rate(sf["cur_stock_num"], sf["pre_stock_num"], 1) + ')，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
+            } else {
+                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
+                public_fund_tips = '共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
+            }
+            $("#public_fund_tips").html(public_fund_tips);
             if (j["date"] && j["date"] > 0) {
                 $("#public_fund_title").find("a").each(function() {
                     let t_text = $(this).text();

package/util.js

@@ -1012,7 +1012,11 @@ const Util = {
         code_list = code_list.length > 0 ? code_list.join("-") : "all";
         Util.post("/action", {action: "classify_num", code_list: code_list}, function (j) {
             if (j["data"]) {
+                let classify_val = $("#" + classify_id).val();
                 Util.render_classify_html(classify_id, j["data"], callback_func);
+                if (classify_val && classify_val !== "0") {
+                    $("#" + classify_id).val(classify_val);
+                }
             }
         });
     },