Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/boniuApi

boniu/src/StocksApiList.jsx

@@ -260,119 +260,125 @@ const stockApiList = [
         {
           key: "7",
           name: "order",
-          desc: "列表正序/倒序",
-        },
-
-        {
-          key: "9",
-          name: "code",
-          desc: "股票代码",
-        },
-        {
-          key: "10",
-          name: "name",
-          desc: "股票名称",
-        },
-        {
-          key: "11",
-          name: "fq_price",
-          desc: "是否复权",
-        },
-        {
-          key: "12",
-          name: "date",
-          desc: "交易日期",
-        },
-        {
-          key: "13",
-          name: "open_price",
-          desc: "开盘价",
-        },
-        {
-          key: "14",
-          name: "close_price",
-          desc: "收盘价",
-        },
-        {
-          key: "15",
-          name: "highest_price",
-          desc: "最高价",
-        },
-        {
-          key: "16",
-          name: "lowest_price",
-          desc: "最低价",
-        },
-        {
-          key: "17",
-          name: "amount",
-          desc: "成交量",
-        },
-        {
-          key: "18",
-          name: "value",
-          desc: "成交金额",
-        },
-        {
-          key: "19",
-          name: "increase_sign",
-          desc: "涨跌停标志",
-        },
-        {
-          key: "20",
-          name: "up_price",
-          desc: "涨停价",
-        },
-        {
-          key: "21",
-          name: "down_price",
-          desc: "跌停价",
-        },
-        {
-          key: "22",
-          name: "increase_ratio",
-          desc: "涨跌幅",
-        },
-        {
-          key: "23",
-          name: "increase_price",
-          desc: "涨跌额",
-        },
-        {
-          key: "24",
-          name: "if_st",
-          desc: "是否ST",
-        },
-        {
-          key: "25",
-          name: "m5",
-          desc: "5日线",
-        },
-        {
-          key: "26",
-          name: "m10",
-          desc: "10日线",
-        },
-        {
-          key: "27",
-          name: "m20",
-          desc: "20日线",
-        },
-        {
-          key: "28",
-          name: "m30",
-          desc: "30日线",
-        },
-        {
-          key: "29",
-          name: "m60",
-          desc: "60日线",
-        },
-        {
-          key: "30",
-          name: "m233",
-          desc: "233线",
-        },
+          desc: "列表正序/倒序"
+        },
+        {
+          key: '8',
+          name: 'list',
+          desc: '',
+          children: [
+            {
+              key: "9",
+              name: "code",
+              desc: "股票代码",
+            },
+            {
+              key: "10",
+              name: "name",
+              desc: "股票名称",
+            },
+            {
+              key: "11",
+              name: "fq_price",
+              desc: "是否复权",
+            },
+            {
+              key: "12",
+              name: "date",
+              desc: "交易日期",
+            },
+            {
+              key: "13",
+              name: "open_price",
+              desc: "开盘价",
+            },
+            {
+              key: "14",
+              name: "close_price",
+              desc: "收盘价",
+            },
+            {
+              key: "15",
+              name: "highest_price",
+              desc: "最高价",
+            },
+            {
+              key: "16",
+              name: "lowest_price",
+              desc: "最低价",
+            },
+            {
+              key: "17",
+              name: "amount",
+              desc: "成交量",
+            },
+            {
+              key: "18",
+              name: "value",
+              desc: "成交金额",
+            },
+            {
+              key: "19",
+              name: "increase_sign",
+              desc: "涨跌停标志",
+            },
+            {
+              key: "20",
+              name: "up_price",
+              desc: "涨停价",
+            },
+            {
+              key: "21",
+              name: "down_price",
+              desc: "跌停价",
+            },
+            {
+              key: "22",
+              name: "increase_ratio",
+              desc: "涨跌幅",
+            },
+            {
+              key: "23",
+              name: "increase_price",
+              desc: "涨跌额",
+            },
+            {
+              key: "24",
+              name: "if_st",
+              desc: "是否ST",
+            },
+            {
+              key: "25",
+              name: "m5",
+              desc: "5日线",
+            },
+            {
+              key: "26",
+              name: "m10",
+              desc: "10日线",
+            },
+            {
+              key: "27",
+              name: "m20",
+              desc: "20日线",
+            },
+            {
+              key: "28",
+              name: "m30",
+              desc: "30日线",
+            },
+            {
+              key: "29",
+              name: "m60",
+              desc: "60日线",
+            },
+            {
+              key: "30",
+              name: "m233",
+              desc: "233线",
+            }
+          ]
+        }
       ],
       errorResult: [
         {
@@ -444,115 +450,122 @@ const stockApiList = [
           desc: "列表正序/倒序",
         },
         {
-          key: "9",
-          name: "code",
-          desc: "股票代码",
-        },
-        {
-          key: "10",
-          name: "name",
-          desc: "股票名称",
-        },
-        {
-          key: "4",
-          name: "fq_price",
-          desc: "是否复权",
-        },
-        {
-          key: "12",
-          name: "date",
-          desc: "交易日期",
-        },
-        {
-          key: "13",
-          name: "open_price",
-          desc: "开盘价",
-        },
-        {
-          key: "14",
-          name: "close_price",
-          desc: "收盘价",
-        },
-        {
-          key: "15",
-          name: "highest_price",
-          desc: "最高价",
-        },
-        {
-          key: "16",
-          name: "lowest_price",
-          desc: "最低价",
-        },
-        {
-          key: "17",
-          name: "amount",
-          desc: "成交量",
-        },
-        {
-          key: "18",
-          name: "value",
-          desc: "成交金额",
-        },
-        {
-          key: "19",
-          name: "increase_sign",
-          desc: "涨跌停标志",
-        },
-        {
-          key: "20",
-          name: "up_price",
-          desc: "涨停价",
-        },
-        {
-          key: "21",
-          name: "down_price",
-          desc: "跌停价",
-        },
-        {
-          key: "22",
-          name: "increase_ratio",
-          desc: "涨跌幅",
-        },
-        {
-          key: "23",
-          name: "increase_price",
-          desc: "涨跌额",
-        },
-        {
-          key: "24",
-          name: "if_st",
-          desc: "是否ST",
-        },
-        {
-          key: "25",
-          name: "m5",
-          desc: "5日线",
-        },
-        {
-          key: "26",
-          name: "m10",
-          desc: "10日线",
-        },
-        {
-          key: "27",
-          name: "m20",
-          desc: "20日线",
-        },
-        {
-          key: "28",
-          name: "m30",
-          desc: "30日线",
-        },
-        {
-          key: "29",
-          name: "m60",
-          desc: "60日线",
-        },
-        {
-          key: "30",
-          name: "m233",
-          desc: "233线",
-        },
+          key: '8',
+          name: 'list',
+          desc: '',
+          children: [
+            {
+              key: "9",
+              name: "code",
+              desc: "股票代码",
+            },
+            {
+              key: "10",
+              name: "name",
+              desc: "股票名称",
+            },
+            {
+              key: "4",
+              name: "fq_price",
+              desc: "是否复权",
+            },
+            {
+              key: "12",
+              name: "date",
+              desc: "交易日期",
+            },
+            {
+              key: "13",
+              name: "open_price",
+              desc: "开盘价",
+            },
+            {
+              key: "14",
+              name: "close_price",
+              desc: "收盘价",
+            },
+            {
+              key: "15",
+              name: "highest_price",
+              desc: "最高价",
+            },
+            {
+              key: "16",
+              name: "lowest_price",
+              desc: "最低价",
+            },
+            {
+              key: "17",
+              name: "amount",
+              desc: "成交量",
+            },
+            {
+              key: "18",
+              name: "value",
+              desc: "成交金额",
+            },
+            {
+              key: "19",
+              name: "increase_sign",
+              desc: "涨跌停标志",
+            },
+            {
+              key: "20",
+              name: "up_price",
+              desc: "涨停价",
+            },
+            {
+              key: "21",
+              name: "down_price",
+              desc: "跌停价",
+            },
+            {
+              key: "22",
+              name: "increase_ratio",
+              desc: "涨跌幅",
+            },
+            {
+              key: "23",
+              name: "increase_price",
+              desc: "涨跌额",
+            },
+            {
+              key: "24",
+              name: "if_st",
+              desc: "是否ST",
+            },
+            {
+              key: "25",
+              name: "m5",
+              desc: "5日线",
+            },
+            {
+              key: "26",
+              name: "m10",
+              desc: "10日线",
+            },
+            {
+              key: "27",
+              name: "m20",
+              desc: "20日线",
+            },
+            {
+              key: "28",
+              name: "m30",
+              desc: "30日线",
+            },
+            {
+              key: "29",
+              name: "m60",
+              desc: "60日线",
+            },
+            {
+              key: "30",
+              name: "m233",
+              desc: "233线",
+            }
+          ]
+        }
       ],
       errorResult: [
         {
@@ -774,20 +787,27 @@ const stockApiList = [
           desc: "总页数",
         },
         {
-          key: "9",
-          name: "code",
-          desc: "股票代码",
-        },
-        {
-          key: "10",
-          name: "name",
-          desc: "股票名称",
-        },
-        {
-          key: "11",
-          name: "sector",
-          desc: "交易板块",
-        },
+          key: '8',
+          name: 'list',
+          desc: '',
+          children: [
+            {
+              key: "9",
+              name: "code",
+              desc: "股票代码",
+            },
+            {
+              key: "10",
+              name: "name",
+              desc: "股票名称",
+            },
+            {
+              key: "11",
+              name: "sector",
+              desc: "交易板块",
+            }
+          ]
+        }
       ],
       errorResult: [
         {

boniu/src/components/Navbar/navbar.jsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Route, Switch, Link, withRouter } from "react-router-dom";
 import Overview from "../../components/Overview/overview";
 import indexBasicInfo from "../../components/indexBasicInfo/indexBasicInfo";
+import stocksInfo from '../../components/StocksInfo/stocksInfo'
 import stocksApiList from "../../StocksApiList";
 import indexApiList from "../../IndexApiList";
 import "antd/dist/antd.css";
@@ -82,7 +83,7 @@ class NavBar extends Component {
               <Switch>
                 <Route exact path="/" component={Overview} />
                 <Route path="/overview" component={Overview} />
-                <Route path="/stocks" component={indexBasicInfo} />
+                <Route path="/stocks" component={stocksInfo} />
                 <Route path="/indexApi" component={indexBasicInfo} />
               </Switch>
             </Content>

boniu/src/components/StocksInfo/stocksInfo.css

@@ -0,0 +1,14 @@
+.stocks-title {
+  margin-top: 30px;
+  display: flex;
+  align-items: center;
+}
+.stocks-title::before {
+  content: "";
+  margin-right: 10px;
+  display: block;
+  width: 6px;
+  height: 20px;
+  border-radius: 3px;
+  background-color: #00c0ff;
+}

boniu/src/components/StocksInfo/stocksInfo.jsx

@@ -0,0 +1,95 @@
+import React from "react"
+import "./stocksInfo.css"
+import { Typography, Table, Button } from "antd"
+
+const { Text, Title, Link } = Typography
+
+const StocksInfo = (props) => {
+  const outPutList = props.location.state.data.outputResult
+  const errorList = props.location.state.data.errorResult
+  const title = props.location.state.name
+
+  return (
+    <div>
+      <Title level={4}>{title}</Title>
+      <div>
+        <Title className="stocks-title" level={5}>
+          输入参数：
+        </Title>
+        <Text>
+          method=stock_info&code=股票代码&timestamp=时间戳&sign=签名值
+        </Text>
+      </div>
+      <div>
+        <Title className="stocks-title" level={5}>
+          输出结果：
+        </Title>
+        {/* 这里需要二级表格 */}
+        <Table
+          columns={columns}
+          // expandable
+          dataSource={outPutList}
+          pagination={false}
+          size="small"
+        />
+      </div>
+      <div>
+        <Title className="stocks-title" level={5}>
+          输出结果异常：
+        </Title>
+        <Table
+          columns={errColumns}
+          dataSource={errorList}
+          pagination={false}
+          size="small"
+        />
+      </div>
+
+      <div>
+        <Title className="stocks-title" level={5}>
+          测试地址：
+        </Title>
+        <Button type="primary" className="stocks-button">
+          API测试工具
+        </Button>
+      </div>
+      <div>
+        <Title className="stocks-title" level={5}>
+          SDK包：
+        </Title>
+        <Link>php程序包下载</Link>
+      </div>
+    </div>
+  )
+}
+export default StocksInfo
+
+const columns = [
+  {
+    title: "名称",
+    dataIndex: "name",
+    key: "name",
+  },
+  {
+    title: "说明",
+    dataIndex: "desc",
+    key: "desc",
+  },
+]
+const errColumns = [
+  {
+    title: "错误类型",
+    dataIndex: "type",
+    key: "type",
+  },
+  {
+    title: "message_code",
+    dataIndex: "code",
+    key: "code",
+  },
+  {
+    title: "message",
+    dataIndex: "message",
+    key: "message",
+  },
+]

boniu/src/components/indexBasicInfo/indexBasicInfo.jsx

@@ -194,20 +194,3 @@ var subListTime = [
     desc: "涨跌额"
   }
 ];
-const expandFunc = (input) => {
-  columns = [
-    {
-      title: "名称",
-      dataIndex: "name",
-      key: "name",
-      render: (text) => <span>{text}</span>
-    },
-    {
-      title: "说明",
-      dataIndex: "desc",
-      key: "desc"
-    }
-  ];
-  console.log(input);
-  return <Table columns={columns} dataSource={input} pagination={false} />;
-};