sbd-npm 1.5.46 → 1.5.48

package/constant.js

@@ -166,7 +166,7 @@ const MenuList = [
 			{'key': 'portfolio_uestc', 'name': '独钓寒江雪', 'url': '/0x7cbaee9df4ea09cc2ad0d001f4b948109b75f39f'},
 			{'key': 'portfolio_ning', 'name': '宁湖', 'url': '/0x69717049aefea13348d702755a4ed38a2f0e40ad'},
 			{'key': 'portfolio_two', 'name': '两瓢(彭波)', 'url': '/0x376350389c657c5153d59959b6351935c9357651'},
-			{'key': 'portfolio_li', 'name': '力氏周期', 'url': '/0xe639df667bcb74829d1db04e48c0d6c10ea5a1f9'},
+			{'key': 'portfolio_benjamin', 'name': 'Benjamin华', 'url': '/0x1cc3f28dd896b3c7aa72d8d3f24e96adc41ab39c'},
 			{'key': 'portfolio_chen', 'name': '陈营长极品投资', 'url': '/0x3f8cbeeeb38138a626e935017a4cc25f47ce3dbe'},
 			{'key': 'portfolio_zeng', 'name': '老曾阿牛', 'url': '/0x2cf53b473b916e1d8b9998de00bb782171bb2630'},
 			{'key': 'portfolio_hk_mutual', 'name': '港股通新票', 'url': '/0xa496fad09b737531211cb588399cd5c9cac2f8b5'},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.5.46",
+    "version": "1.5.48",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/snowball_tweet.js

@@ -128,7 +128,7 @@ $(function () {
                                 });
                             });
                             ttsm_object.on('hidden.bs.modal', function () {
-                                $("#today_tweet_statistics_modal_body").html("");
+//                                $("#today_tweet_statistics_modal_body").html("");
                                 Util.hide_tips();
                             });
                         }

package/status.js

@@ -196,14 +196,20 @@ $(function () {
                 let html = [], ip_num = 0;
                 j.data.forEach(function (item) {
                     ip_num++;
+                    let is_trigger_block_ip = 0;
                     if (item.type === 1) {
                         html.push("<tr class='success'>");
                     } else if (item.type === 2) {
                         html.push("<tr class='danger'>");
                     } else {
+                        is_trigger_block_ip = 1;
                         html.push("<tr>");
                     }
-                    html.push("<td><a href='#' class='block_ip'>", ip_num, "</a></td>");
+                    if (is_trigger_block_ip === 1) {
+                        html.push("<td><a href='#' class='block_ip'>", ip_num, "</a></td>");
+                    } else {
+                        html.push("<td>", ip_num, "</td>");
+                    }
                     html.push("<td>", Util.pack_html_link(Status.ip_url(item.ip), item.ip), "</td>");
                     html.push("<td>", Status.map_url(Status.convert_ip_address(item)), "</td>");
                     html.push("<td>", item.times, "</td>");
@@ -665,11 +671,11 @@ $(function () {
                             } else {
                                 Status.task_status = 0;
                                 if (j.code === 2) {
-                                    let do_content = j.do_content ? ("(" + j.do_content + ")") : "";
-                                    $("#task_tips").html("<b class='text-danger'>已添加新任务" + do_content + "在处理中！</b>");
+                                    $("#task_tips").html("<b class='text-danger'>已添加新任务" + (j.do_content ? ("(" + j.do_content + ")") : "") + "在处理中！</b>");
                                 } else if (j.code === 3) {
-                                    let doing_content = j.doing_content ? ("(" + j.doing_content + ")") : "";
-                                    $("#task_tips").html("<b class='text-danger'>有任务" + doing_content + "在执行中！</b>");
+                                    $("#task_tips").html("<b class='text-danger'>有任务" + (j.doing_content ? ("(" + j.doing_content + ")") : "") + "在执行中！</b>");
+                                } else if (j.code === 4) {
+                                    $("#task_tips").html("<b class='text-danger'>任务 `" + (j.done_content ? j.done_content : "") + "` 已经执行过！</b>");
                                 } else {
                                     $("#task_tips").html("<b class='text-danger'>参数异常！</b>");
                                 }