sbd-npm 1.2.41 → 1.2.44

package/constant.js

@@ -40,6 +40,7 @@ const MenuList = [
 			{'key': 'trend_money_inflow', 'name': '资金流入历史最高', 'url': '/dc1303ba221de0c4fb85cd3cb513c547'},
 			{'key': 'trend_month', 'name': '月线趋势', 'url': '/218cd8e3c5ea55629cac28ee0e543233'},
 			{'key': 'trend_boll', 'name': '布林线', 'url': '/0c9b231a72e40475d6f985fd67bdb718'},
+			{'key': 'trend_bull_trend', 'name': '多头趋势', 'url': '/11c801537253fbfc175fadf8f645721d'},
 			{'key': 'trend_ma20_60', 'name': '20、60日均线交叉', 'url': '/4bf72713d83469ad6ec1d9fc3be8886f'},
 			{'key': 'trend_macd_down', 'name': 'MACD下行', 'url': '/ff97a31b4ffbabe71315e75c4fd62047'},
 			{'key': 'trend_doji', 'name': '十字星', 'url': '/718eac2cccaef1c7968f2d121b5f3070'},
@@ -136,11 +137,11 @@ const MenuList = [
 			{'key': 'concept_recommend', 'name': '关注', 'url': '/27ca098faad33a8e4d109efe0112fd16'},
 			{'key': 'concept_bellwether', 'name': '龙头股', 'url': '/2995afdea420471e00c536182e711bef'},
 			{'key': 'concept_market_situation', 'name': '市值风云', 'url': '/02fdaf4d66cdecb092bcd65f569aa493'},
+			{'key': 'concept_wen', 'name': '崇文不尚武', 'url': '/b6fd64a2c54250b8ac039123e74e9b7e'},
+			{'key': 'concept_dao', 'name': '成长股事(大道)', 'url': '/7b7ea877f6793752e2b981d82da81e1b'},
 			{'key': 'concept_down_top', 'name': '15-21年的超跌股', 'url': '/ae3bbf97a358392cfaa0ceb35cb3fb57'},
 			{'key': 'concept_cloud', 'name': '心似白云常自在', 'url': '/1d883188398a3a8c743748c5eb81fe7b'},
-			{'key': 'concept_wen', 'name': '崇文不尚武', 'url': '/b6fd64a2c54250b8ac039123e74e9b7e'},
 			{'key': 'concept_niu', 'name': '老曾阿牛', 'url': '/0f4a2714971424024c1ddd8651c26569'},
-			{'key': 'concept_dao', 'name': '成长股事(大道)', 'url': '/7b7ea877f6793752e2b981d82da81e1b'},
 			{'key': 'concept_qian', 'name': '唐史主任司马迁', 'url': '/8b3e40fe74b4870244bc51125da7675a'},
 			{'key': 'concept_dan', 'name': '但斌', 'url': '/3ac0a5857b1d9a111497c0e817e647a1'},
 			{'key': 'concept_auto_intelligent', 'name': '智能电动车', 'url': '/cd7be404357809849d267f24fceebcd2'},

package/package.json

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

package/stock_basics.js

@@ -495,16 +495,12 @@ let Stock = {
             payload["date"] = date;
         }
         Util.post("/stock/" + Stock["code"], payload, function (j) {
-            let main_html = [];
-            let circulation_html = [];
-            let main_volume = 0;
-            let pre_main_volume = 0;
-            let circulation_volume = 0;
-            let pre_circulation_volume = 0;
+            let main_html = [], circulation_html = [];
+            let main_volume = 0, pre_main_volume = 0, circulation_volume = 0, pre_circulation_volume = 0;
             j["data"].forEach(function (item) {
                 let change = item["change"];
                 if (change === "None") {
-                    change = "新增";
+                    change = "<b class='text-danger'>新增</b>";
                 } else if (parseInt(change) === 0) {
                     change = "不变";
                 } else if (parseFloat(change) > 0) {

package/util.js

@@ -251,7 +251,25 @@ const Util = {
      */
     stock_basics_html: function (html, item) {
         let symbol = Util.is_alpha(item["code"]) ? item["code"].toUpperCase() : item["code"];
-        let name = item["cname"] ? item["cname"] : (item["name"] ? item["name"].substr(0, 10) : symbol);
+        let name = symbol;
+        if (item["cname"]) {
+            if (Util.is_us(item["code"])) {
+                name = item["cname"].replace("公司", "");
+            } else {
+                name = item["cname"];
+            }
+        } else if (item["name"]) {
+            name = item["name"];
+            if (Util.is_us(item["code"])) {
+                if (name.indexOf(' ') !== -1) {
+                    let name_arr = name.split(' ');
+                    name = name_arr[0] ? name_arr[0] : name;
+                } else {
+                    name = name.replace("公司", "");
+                }
+            }
+            name = name.substr(0, 10);
+        }
         html.push("<td>", Util.snowball_url(symbol), "</td>");
         html.push("<td>", Util.stock_url(item["code"], name), "</td>");
         html.push("<td>", Util.to_float((item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), 2), "</td>");
@@ -2712,7 +2730,10 @@ const Util = {
         } else if (digit >= 10000 || digit <= -10000) {
             return "<span title='" + digit + "'>" + Util.to_float(digit / 10000, fraction) + "万</span>";
         }
-        return Util.to_float(digit, fraction);
+        if (Util.is_float(digit)) {
+            return Util.to_float(digit, fraction);
+        }
+        return digit;
     },
 
     /**
@@ -2740,6 +2761,24 @@ const Util = {
         return 0;
     },
 
+    /**
+     * 是否浮点数
+     * @param n
+     * @returns {boolean}
+     */
+    is_float: function (n) {
+        return Number(n) === n && n % 1 !== 0;
+    },
+
+    /**
+     * 是否整数
+     * @param n
+     * @returns {boolean}
+     */
+    is_int: function (n) {
+        return Number(n) === n && n % 1 === 0;
+    },
+
     /**
      * 触发事件的对象的引用
      * https://developer.mozilla.org/zh-CN/docs/Web/API/Event/target