页面返回按钮显示BUG

@@ -43,7 +43,12 @@ const _msgDetail = (req, res, next) => {
             info: result,
             info: result,
         };
         };
 
 
-        res.render('message-detail', options);
+        if (result && result.isCollar && result.isCollar === true) {
+            res.redirect('/home/message');
+        } else {
+            res.render('message-detail', options);
+        }
+        
     }).catch(next);
     }).catch(next);
 };
 };
 
 

@@ -81,15 +81,24 @@ const _detail = (result, id, couponData) => {
                             ticket: []
                             ticket: []
                         };
                         };
                         final.birthType = true;
                         final.birthType = true;
-                        for (let coupon of couponData) {
-                            final.ticket.push({
-                                id: coupon.id ? coupon.id : '',
-                                couponAmount: coupon.couponAmount,
-                                couponName: coupon.couponName.split('-')[0],
-                                startTime: _formatDay(coupon.startTime),
-                                endTime: _formatDay(coupon.endTime),
-                                useLimit: coupon.useLimit
-                            });
+
+                        if (result.data.list[0].body.is_collar === 'Y') {
+
+                            final = {
+                                isCollar: true
+                            };
+
+                        } else {
+                            for (let coupon of couponData) {
+                                final.ticket.push({
+                                    id: coupon.id ? coupon.id : '',
+                                    couponAmount: coupon.couponAmount,
+                                    couponName: coupon.couponName.split('-')[0],
+                                    startTime: _formatDay(coupon.startTime),
+                                    endTime: _formatDay(coupon.endTime),
+                                    useLimit: coupon.useLimit
+                                });
+                            }
                         }
                         }
 
 
                         // 领取生日券消息
                         // 领取生日券消息

@@ -10,6 +10,7 @@ const express = require('express');
 
 
 const router = express.Router(); // eslint-disable-line
 const router = express.Router(); // eslint-disable-line
 const auth = require('../../doraemon/middleware/auth');
 const auth = require('../../doraemon/middleware/auth');
+const disableBFCache = require('../../doraemon/middleware/disable-BFCache');
 
 
 const cRoot = './controllers';
 const cRoot = './controllers';
 const installment = require(cRoot + '/installment');
 const installment = require(cRoot + '/installment');
@@ -90,7 +91,7 @@ router.get('/suggestSub', suggest.suggestSub);
 router.post('/savesuggest', suggest.saveSuggest);
 router.post('/savesuggest', suggest.saveSuggest);
 
 
 // 消息
 // 消息
-router.use('/message', auth, message.index);
+router.use('/message', auth, disableBFCache, message.index);
 router.get('/messageDetail', auth, message.index);
 router.get('/messageDetail', auth, message.index);
 router.post('/ajaxDelMes', auth, message.ajaxDelMes);
 router.post('/ajaxDelMes', auth, message.ajaxDelMes);
 router.post('/pickCoupon', auth, message.pickCoupon);
 router.post('/pickCoupon', auth, message.pickCoupon);