sbd-npm 1.1.76 → 1.1.79

package/menu.js

@@ -74,6 +74,7 @@ const MenuList = [
 			{'key': 'macro_shibor', 'name': 'Shibor 拆放利率', 'url': '/41eaa74e3c5a9102b3f0b736090872e4'},
 			{'key': 'macro_pmi', 'name': '制造业采购经理指数(PMI)', 'url': '/6669696b194ae77d596371139e6b53a7'},
 			{'key': 'macro_new_investor', 'name': '新增投资者', 'url': '/2268c61c6d62cdc8c1c7143aa524e2f1'},
+			{'key': 'macro_gold', 'name': '黄金ETF(GLD)', 'url': '/584b9ceb0c85571831f7211903147d47'},
 		]
 	},
 	{
@@ -191,6 +192,7 @@ const MenuList = [
 			{'key': 'snowball_trend', 'name': '自选趋势', 'url': '/08c40d908dd87e29a607b6945309edf0'},
 			{'key': 'snowball_user', 'name': '用户列表', 'url': '/97339b8453883dd27e6087ae7db6f62a'},
 			{'key': 'snowball_tweet', 'name': '推文', 'url': '/9a9aef7fced3f15ff7647de75d70798c'},
+			{'key': 'snowball_red_packet', 'name': '红包数据', 'url': '/23d88182f12431fe67f658b725cbaf1d'},
 			{'key': 'snowball_tool', 'name': '搜索工具', 'url': '/ac88ee85f27e11aa06f2b8f46b03a0eb'},
 		]
 	},

package/package.json

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

package/util.js

@@ -238,7 +238,7 @@ const Util = {
         html.push("<td>", (item["pe_ttm"] ? item["pe_ttm"] : item["pe"]), "</td>");
         html.push("<td>", (item["market_capital"] ? (Util.to_float(item["market_capital"], 2) + "亿") : "--"), "</td>");
         html.push("<td>", Util.industry_url(item["code"], item["industry"]), "</td>");
-        html.push("<td>", Util.map_url(item["province_city"] ? item["province_city"] : item["area"]), "</td>");
+        html.push("<td>", Util.map_url((item["province_city"] && item["province_city"] !== "None") ? item["province_city"] : item["area"]), "</td>");
         let price = item["stock_price"] ? item["stock_price"] : item["price"];
         let pre_price = item["pre_price"] ? item["pre_price"] : (item["previous_price"] ? item["previous_price"] : 0)
         if (pre_price > 0) {
@@ -925,16 +925,16 @@ const Util = {
                 let public_date = j["public_date"] > 0 ? Util.seconds_to_format(j["public_date"], "%Y-%m-%d") : "--";
                 let issue_date = j["issue_date"] > 0 ? Util.seconds_to_format(j["issue_date"], "%Y-%m-%d") : "--";
                 _html.push("<tr title='最后更新时间: ", Util.seconds_to_format(j["update_time"], "%Y-%m-%d"), "' class='info'><th colspan='12' text-align='center'>基金概况</th></tr>");
-                _html.push("<tr><td colspan='3'>基金代码</td><td colspan='3'>", Util.pack_html_link('https://fund.jrj.com.cn/archives,' + j["fund_code"] + '.shtml', j["fund_code"]), "</td><td colspan='2'>基金名</td><td colspan='4'>", Util.pack_html_link('https://fund.jrj.com.cn/archives,' + j["fund_code"] + ',jjgk.shtml', j["fund_name"]), "</td></tr>");
+                _html.push("<tr><td colspan='3'>基金代码</td><td colspan='3'>", Util.pack_html_link('https://fund.eastmoney.com/' + j["fund_code"] + '.html', j["fund_code"]), "</td><td colspan='2'>基金名</td><td colspan='4'>", Util.pack_html_link('https://fundf10.eastmoney.com/jbgk_' + j["fund_code"] + '.html', j["fund_name"]), "</td></tr>");
                 _html.push("<tr><td colspan='3'>基金类型</td><td colspan='3'>", j["fund_type"], "</td><td colspan='2'>投资类型</td><td colspan='4'>", j["invest_type"], "</td></tr>");
                 _html.push("<tr><td colspan='3'>单位净值</td><td colspan='3'>", net, "</td><td colspan='2'>资产规模</td><td colspan='4'>", assets, "</td></tr>");
                 _html.push("<tr><td colspan='3'>成立日期</td><td colspan='3'>", public_date, "</td><td colspan='2'>发行日期</td><td colspan='4'>", issue_date, "</td></tr>");
-                _html.push("<tr><td colspan='3'>基金管理人</td><td colspan='3'>", j["administrator"], "</td><td colspan='2'>基金经理</td><td colspan='4'>", j["managers"], "</td></tr>");
+                _html.push("<tr><td colspan='3'>基金管理公司</td><td colspan='3'>", j["administrator"], "</td><td colspan='2'>基金经理</td><td colspan='4'>", j["managers"], "</td></tr>");
                 _html.push("<tr><td colspan='4'>基金托管人</td><td colspan='8'>", j["custodian"], "</td></tr>");
                 _html.push("<tr><td colspan='4'>经办律师事务所</td><td colspan='8'>", j["lawyer"], "</td></tr>");
                 _html.push("<tr><td colspan='4'>会计师事务所</td><td colspan='8'>", j["accounting"], "</td></tr>");
                 _html.push("<tr><td colspan='4'>注册地址</td><td colspan='8'>", Util.map_url(j["location"], j["location"]), "</td></tr>");
-                let fund_stock_url = "https://fund.jrj.com.cn/archives," + j["fund_code"] + ".shtml";
+                let fund_stock_url = "https://fund.eastmoney.com/" + j["fund_code"] + ".html";
                 if (j["type"] === 2) {
                     fund_stock_url = "http://fund.eastmoney.com/f10/ccmx_" + j["fund_code"] + ".html";
                 }

package/.npmignore

@@ -1 +0,0 @@
-sbd-npm.md