Authored by ccbikai

star action 修改

@@ -26,7 +26,7 @@ const headTab = [ @@ -26,7 +26,7 @@ const headTab = [
26 } 26 }
27 ]; 27 ];
28 28
29 -const processPublicData = (req, title) => { 29 +const _processPublicData = (req, title) => {
30 // let headerData = headerModel.setNav({ 30 // let headerData = headerModel.setNav({
31 // navTitle: title, 31 // navTitle: title,
32 // navBtn: navBtn 32 // navBtn: navBtn
@@ -52,7 +52,7 @@ const processPublicData = (req, title) => { @@ -52,7 +52,7 @@ const processPublicData = (req, title) => {
52 * @param {[object]} res 52 * @param {[object]} res
53 * @return {[type]} 53 * @return {[type]}
54 */ 54 */
55 -exports.index = (req, res, next) => { 55 +let index = (req, res, next) => {
56 const pageHeadTab = _.cloneDeep(headTab); 56 const pageHeadTab = _.cloneDeep(headTab);
57 57
58 pageHeadTab[0].cur = true; 58 pageHeadTab[0].cur = true;
@@ -75,11 +75,11 @@ exports.index = (req, res, next) => { @@ -75,11 +75,11 @@ exports.index = (req, res, next) => {
75 }, 75 },
76 starAvatar: result.starAvatar.concat(result.starAvatar).concat(result.starAvatar), // 需要优化,数组重复三次 76 starAvatar: result.starAvatar.concat(result.starAvatar).concat(result.starAvatar), // 需要优化,数组重复三次
77 articles: result.articles 77 articles: result.articles
78 - }, processPublicData(req, '星潮教室'))); 78 + }, _processPublicData(req, '星潮教室')));
79 }).catch(next); 79 }).catch(next);
80 }; 80 };
81 81
82 -exports.getIndexHtml = (req, res, next) => { 82 +let getIndexHtml = (req, res, next) => {
83 starModel.getIndexData((req.query.uid || 0)).then((result) => { 83 starModel.getIndexData((req.query.uid || 0)).then((result) => {
84 res.render('star/index-html', _.assign({ 84 res.render('star/index-html', _.assign({
85 layout: false, 85 layout: false,
@@ -99,7 +99,7 @@ exports.getIndexHtml = (req, res, next) => { @@ -99,7 +99,7 @@ exports.getIndexHtml = (req, res, next) => {
99 * @param {[object]} res 99 * @param {[object]} res
100 * @return {[type]} 100 * @return {[type]}
101 */ 101 */
102 -exports.special = (req, res, next) => { 102 +let special = (req, res, next) => {
103 starModel.getSpecialData().then((result) => { 103 starModel.getSpecialData().then((result) => {
104 const pageHeadTab = _.cloneDeep(headTab); 104 const pageHeadTab = _.cloneDeep(headTab);
105 105
@@ -107,7 +107,7 @@ exports.special = (req, res, next) => { @@ -107,7 +107,7 @@ exports.special = (req, res, next) => {
107 pageHeadTab[2].url += (req.query.uid || 0); 107 pageHeadTab[2].url += (req.query.uid || 0);
108 res.render('star/special', _.assign({ 108 res.render('star/special', _.assign({
109 page: 'special' 109 page: 'special'
110 - }, processPublicData(req, '星潮教室'), { 110 + }, _processPublicData(req, '星潮教室'), {
111 resources: result, 111 resources: result,
112 headTab: pageHeadTab, 112 headTab: pageHeadTab,
113 notIndex: true 113 notIndex: true
@@ -122,7 +122,7 @@ exports.special = (req, res, next) => { @@ -122,7 +122,7 @@ exports.special = (req, res, next) => {
122 * @param {[object]} res 122 * @param {[object]} res
123 * @return {[type]} 123 * @return {[type]}
124 */ 124 */
125 -exports.collocation = (req, res) => { 125 +let collocation = (req, res) => {
126 const pageHeadTab = _.cloneDeep(headTab); 126 const pageHeadTab = _.cloneDeep(headTab);
127 127
128 pageHeadTab[2].cur = true; 128 pageHeadTab[2].cur = true;
@@ -130,7 +130,7 @@ exports.collocation = (req, res) => { @@ -130,7 +130,7 @@ exports.collocation = (req, res) => {
130 res.render('star/collocation', _.assign({ 130 res.render('star/collocation', _.assign({
131 isStarDetailPage: true, 131 isStarDetailPage: true,
132 page: 'collocation' 132 page: 'collocation'
133 - }, processPublicData(req, '星潮教室'), { 133 + }, _processPublicData(req, '星潮教室'), {
134 headTab: pageHeadTab, 134 headTab: pageHeadTab,
135 notIndex: true 135 notIndex: true
136 })); 136 }));
@@ -142,7 +142,7 @@ exports.collocation = (req, res) => { @@ -142,7 +142,7 @@ exports.collocation = (req, res) => {
142 * @param {[object]} res 142 * @param {[object]} res
143 * @return {[type]} 143 * @return {[type]}
144 */ 144 */
145 -exports.collocationList = (req, res, next) => { 145 +let collocationList = (req, res, next) => {
146 let params = req.query; 146 let params = req.query;
147 let uid = req.query.uid || 0; // 客户端访问,不能使用 cookie 147 let uid = req.query.uid || 0; // 客户端访问,不能使用 cookie
148 148
@@ -162,7 +162,7 @@ exports.collocationList = (req, res, next) => { @@ -162,7 +162,7 @@ exports.collocationList = (req, res, next) => {
162 * @param {[type]} res [description] 162 * @param {[type]} res [description]
163 * @return {[type]} 163 * @return {[type]}
164 */ 164 */
165 -exports.setFavorite = (req, res, next) => { 165 +let setFavorite = (req, res, next) => {
166 let uid = req.body.uid || 0; // 客户端访问,不能使用 cookie 166 let uid = req.body.uid || 0; // 客户端访问,不能使用 cookie
167 let urlEncode = ''; 167 let urlEncode = '';
168 let url = ''; 168 let url = '';
@@ -193,11 +193,11 @@ exports.setFavorite = (req, res, next) => { @@ -193,11 +193,11 @@ exports.setFavorite = (req, res, next) => {
193 * @param {[object]} res 193 * @param {[object]} res
194 * @return {[type]} 194 * @return {[type]}
195 */ 195 */
196 -exports.detail = (req, res) => { 196 +let detail = (req, res) => {
197 res.render('star/detail', _.assign({ 197 res.render('star/detail', _.assign({
198 isStarDetailPage: true, 198 isStarDetailPage: true,
199 page: 'detail-list' 199 page: 'detail-list'
200 - }, processPublicData(req, req.query.tag, false))); 200 + }, _processPublicData(req, req.query.tag, false)));
201 }; 201 };
202 202
203 /** 203 /**
@@ -206,7 +206,7 @@ exports.detail = (req, res) => { @@ -206,7 +206,7 @@ exports.detail = (req, res) => {
206 * @param {[object]} res 206 * @param {[object]} res
207 * @return {[type]} 207 * @return {[type]}
208 */ 208 */
209 -exports.detailList = (req, res, next) => { 209 +let detailList = (req, res, next) => {
210 let params = req.query; 210 let params = req.query;
211 211
212 starModel.getDetailData(params).then((result) => { 212 starModel.getDetailData(params).then((result) => {
@@ -218,3 +218,14 @@ exports.detailList = (req, res, next) => { @@ -218,3 +218,14 @@ exports.detailList = (req, res, next) => {
218 })); 218 }));
219 }).catch(next); 219 }).catch(next);
220 }; 220 };
  221 +
  222 +module.exports = {
  223 + index,
  224 + getIndexHtml,
  225 + special,
  226 + collocation,
  227 + collocationList,
  228 + setFavorite,
  229 + detail,
  230 + detailList
  231 +};