commit

@@ -36,8 +36,10 @@ class Y100Model extends global.yoho.BaseModel {
         if (tag) {
             sql += ' and AAY.tag like :tag';
             params.tag = `%${tag}%`;
+            sql += ' ORDER BY AA.good_count DESC';
+        } else {
+            sql += ' and AAY.top = 1';
         }
-        sql += ' ORDER BY AA.good_count DESC';
         sql += ' LIMIT :start, :page';
         
 

@@ -21,11 +21,11 @@ router.get('/queryByCodeName', article.queryByCodeName);
 router.get('/queryById', article.queryById);
 router.get('/queryByUserId', article.queryByUserId);
 
-router.get('/y100/list', y100.y100List);
-router.get('/y100/randomlist', y100.y100RandomList);
-router.get('/y100/detail', y100.y100Detail);
-router.get('/y100/deviceScan', y100.y100DeviceScan);
-router.get('/y100/devicePost', y100.y100DevicePost);
-router.get('/y100/deviceCheck', y100.checkDeviceStatus);
+router.get('/y100/list', y100.y100List); // y100图列表
+router.get('/y100/detail', y100.y100Detail); // y100图详情
+router.get('/y100/randomlist', y100.y100RandomList); // y100结果页随机列表
+router.get('/y100/deviceScan', y100.y100DeviceScan); // y100扫描大屏接口-大屏
+router.get('/y100/devicePost', y100.y100DevicePost); // y100完成游戏接口-大屏
+router.get('/y100/deviceCheck', y100.checkDeviceStatus);  // y100大屏检查状态接口-大屏
 
 module.exports = router;

@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS act_article_y100 (
     `act_id` int(8) NOT NULL DEFAULT 0,
     `article_id` int(8) NOT NULL DEFAULT 0,
     `img_url` varchar(200) DEFAULT '',
+    `top` TINYINT DEFAULT 0,
     `tag` varchar(200) DEFAULT '',
     `name` varchar(200) DEFAULT '',
     `career` varchar(200) DEFAULT '',

-/*
-    true
-    @author: qiuj <jun.qiu@yoho.cn>
-    @date: 2018-03-14 17:32:57
-*/
-#注意：GO;分割执行块
-
-#y100活动给user表新增用户上传图片字段
-ALTER TABLE user ADD `user_image` VARCHAR(200) DEFAULT '';
-GO;
-#y100活动给user表新增用户自我描述字段
-ALTER TABLE user ADD `user_desc` VARCHAR(200) DEFAULT '';
-GO;

 module.exports = ['_migration', '20170913102356', '20170927092926',
     '20171025145423', '20171102104558', '20171115144710', '20180131104311',
-    '20180314145616', '20180314173257'];
+    '20180314145616'];