sbd-npm 1.5.4 → 1.5.6

package/constant.js

@@ -160,11 +160,11 @@ const MenuList = [
 		'icon': 'retweet',
 		'menu': [
 			{'key': 'portfolio_recommend', 'name': '关注', 'url': '/0x2da99e58e28de94b670c4200657ac7e26dd8dceb'},
+			{'key': 'portfolio_gao', 'name': '高大侠', 'url': '/0x44fe5ef98b6802a9e7a893a1dcc231031ef8683d'},
 			{'key': 'portfolio_chen', 'name': '陈营长极品投资', 'url': '/0x3f8cbeeeb38138a626e935017a4cc25f47ce3dbe'},
 			{'key': 'portfolio_stratagem', 'name': '上兵伐谋zgz', 'url': '/0x622a4a04d7a04e3b28c85a36500371ba28edea83'},
 			{'key': 'portfolio_zeng', 'name': '老曾阿牛', 'url': '/0x2cf53b473b916e1d8b9998de00bb782171bb2630'},
 			{'key': 'portfolio_dao', 'name': '专注成长的股事笔记', 'url': '/0xf9d3664538c43bf7f886674abe7af9710aab82ec'},
-			{'key': 'portfolio_vegetable', 'name': 'Veget', 'url': '/0x671dd9dcfca7dbc220c8164c92a74d2c561c6464'},
 			{'key': 'portfolio_tianjin', 'name': '天津股侠', 'url': '/0xb8428e42237a7485a787e2ab1b5ae0f057258f18'},
 			{'key': 'portfolio_junk', 'name': 'HK破烂王', 'url': '/0xfa43c30e5399feb566fb9a8181c175b0af0dff7f'},
 			{'key': 'portfolio_star50', 'name': '科创50', 'url': '/0x378b2601d83c467f81f1d4e323c8bfbc72f6cc0d'},

package/package.json

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

package/util.js

@@ -146,8 +146,7 @@ const Util = {
             }
         }
 
-        let document_html = document.documentElement.innerHTML;
-        let version_match = document_html.match(/\/sbd-npm@(\d+\.\d+\.\d+)\//);
+        let version_match = document.documentElement.innerHTML.match(/\/sbd-npm@(\d+\.\d+\.\d+)\//);
         if (version_match) {
             Util.version = version_match[1];
         }
@@ -223,17 +222,16 @@ const Util = {
      * @returns {string}
      */
     get_url: function (key) {
-        let url = location.pathname;
         if (typeof MenuList != "undefined") {
-            MenuList.forEach(function (menu) {
-                menu["menu"].forEach(function (m) {
+            for (const menu of MenuList) {
+                for (const m of menu["menu"]) {
                     if (m["key"] === key) {
-                        url = m["url"];
+                        return m["url"];
                     }
-                });
-            });
+                }
+            }
         }
-        return url;
+        return location.pathname;
     },
 
     /**
@@ -323,7 +321,11 @@ const Util = {
             },
             error: function (jqXHR, textStatus, errorThrown) {
                 Util.hide_tips();
-                if (!errorThrown) {
+                if (errorThrown) {
+                    if (jqXHR.status) {
+                        errorThrown += '(HTTP ' + jqXHR.status + ')';
+                    }
+                } else {
                     if ((textStatus === 'error' && jqXHR.status === 0) || !navigator.onLine) {
                         errorThrown = "网络异常";
                     } else if (textStatus === 'timeout') {
@@ -331,13 +333,12 @@ const Util = {
                     } else if (textStatus === 'abort') {
                         errorThrown = "请求被中止";
                     } else if (jqXHR.status) {
-                        errorThrown = '请求失败（HTTP ' + jqXHR.status + '）';
+                        errorThrown = '请求失败(HTTP ' + jqXHR.status + ')';
                     } else {
                         errorThrown = "未知错误";
                     }
                 }
-                let msg = "[" + textStatus + "] " + errorThrown;
-                Util.show_tips(msg, 0, "alert-danger");
+                Util.show_tips(`[${textStatus.toUpperCase()}] ${errorThrown}`, 0, "alert-danger");
             }
             //timeout: 5000
         })
@@ -2611,8 +2612,7 @@ const Util = {
         let result = "";
         if (time > 1000) {
             let second = Math.round(time / 1000);
-            let minute = 0;
-            let hour = 0;
+            let minute = 0, hour = 0;
             if (second > 60) {
                 minute = Math.round(second / 60);
                 second = Math.round(second % 60);