修复无法获取文章的bug

apis/Article/Admin/GetArticleList.js

@@ -62,6 +62,7 @@ class GetArticleList extends API {
                 a.title,
                 a.cover,
                 a.describe,
+                a.type,
                 a.time,
                 a.views,
                 a.state,
@@ -77,7 +78,6 @@ class GetArticleList extends API {
                 AND a.state = ?
             ORDER BY 
                 a.id DESC
-            LIMIT ? OFFSET ?;
         `
 
         // 查询文章总数，方便返回总页数
@@ -89,7 +89,7 @@ class GetArticleList extends API {
 
         try {
             // 获取文章列表
-            let articles = await db.query(sql, [type, state, pagesize, offset])
+            let articles = await db.query(sql, [type, state])
 
             // 获取总记录数
             let countResult = await db.query(countSql, [type])

apis/Article/GetArticle.js

@@ -28,7 +28,10 @@ class GetArticle extends API {
                 SELECT 
                     a.id,
                     a.title,
+                    a.cover,
+                    a.\`describe\`,
                     a.content,
+                    a.type,
                     a.views,
                     a.time,
                     u.username AS author

apis/Article/GetArticleList.js

@@ -20,10 +20,6 @@ class GetArticleList extends API {
             })
         }
 
-        // 转换参数类型
-        pagesize = parseInt(pagesize, 10)
-        current = parseInt(current, 10)
-
         // 校验分页参数
         if (isNaN(pagesize) || pagesize <= 0) {
             return res.json({
@@ -40,14 +36,19 @@ class GetArticleList extends API {
         }
 
         // 计算分页的 offset
-        const offset = (current - 1) * pagesize
+        let offset = (current - 1) * pagesize
+
+        pagesize = parseInt(pagesize, 10)
+        offset = parseInt(offset, 10)
 
         let sql = `
             SELECT 
                 a.id,
                 a.title,
-                a.describe,
+                a.\`describe\`,
                 a.cover,
+                a.type,
+                a.views,
                 a.time,
                 u.username AS author
             FROM 
@@ -61,7 +62,6 @@ class GetArticleList extends API {
                 AND a.type = ?
             ORDER BY 
                 a.id DESC
-            LIMIT ? OFFSET ?;
         `
 
         // 查询文章总数，方便返回总页数
@@ -74,7 +74,7 @@ class GetArticleList extends API {
 
         try {
             // 获取文章列表
-            let articles = await db.query(sql, [type, pagesize, offset])
+            let articles = await db.query(sql, [type])
 
             // 获取总记录数
             let countResult = await db.query(countSql, [type])

apis/Data/IndexData.js

@@ -35,25 +35,55 @@ class IndexData extends API {
 
         try {
             let r = await db.query(sql, [uuid])
-            if (!r) {
+            if (!r)
                 return res.json({
                     ...BaseStdResponse.DATABASE_ERR
                 })
-            }
-
+            
             let { accounts, rules } = r[0]
 
+            sql = `
+            SELECT 
+                a.id,
+                a.title,
+                a.\`describe\`,
+                a.views,
+                a.type,
+                a.time,
+                u.username AS author
+            FROM 
+                article a
+            LEFT JOIN 
+                users u 
+            ON 
+                a.author = u.uuid
+            WHERE 
+                a.state = 1 
+                AND a.type = 'news'
+            ORDER BY 
+                a.id DESC
+            LIMIT 9
+        `
+
+            r = await db.query(sql)
+            if(!r)
+                return res.json({
+                    ...BaseStdResponse.DATABASE_ERR
+                })
+
             res.json({
                 ...BaseStdResponse.OK,
                 data: {
                     accounts,
-                    rules
+                    rules,
+                    article: r
                 }
             })
 
         } catch (err) {
             return res.json({
-                ...BaseStdResponse.ERR
+                ...BaseStdResponse.ERR,
+                msg: `获取数据失败！${err.message || ''}`
             })
         }
     }

apis/IC/Order/OrderHistory.js

@@ -0,0 +1,50 @@
+const API = require("../../../lib/API");
+const AccessControl = require("../../../lib/AccessControl");
+const db = require('../../../plugin/DataBase/db')
+const { BaseStdResponse } = require("../../../BaseStdResponse");
+
+class OrderHistory extends API {
+    constructor() {
+        super();
+
+        this.setPath('/IC/OrderHistory')
+        this.setMethod('GET')
+    }
+
+    async onRequest(req, res) {
+        let { uuid, session } = req.query
+
+        if ([uuid, session].some(value => value === '' || value === null || value === undefined))
+            return res.json({
+                ...BaseStdResponse.MISSING_PARAMETER
+            })
+
+        // 检查 session
+        if (!await AccessControl.checkSession(uuid, session))
+            return res.status(401).json({
+                ...BaseStdResponse.ACCESS_DENIED
+            })
+
+
+        try {
+            let sql = 'SELECT * FROM ic_record WHERE create_user = ?'
+            let rows = await db.query(sql, [uuid])
+            if(!rows)
+                return res.json({
+                    ...BaseStdResponse.DATABASE_ERR
+                })
+
+            res.json({
+                ...BaseStdResponse.OK,
+                data: rows
+            })
+        } catch (error) {
+            res.json({
+                ...BaseStdResponse.ERR,
+                msg: error.message || '获取信息失败！请稍后再试'
+            })
+        }
+    }
+}
+
+module.exports.OrderHistory = OrderHistory