修改优惠券

@@ -3,20 +3,8 @@
 const headerModel = require('../../../doraemon/models/header'), // 头部model
 const headerModel = require('../../../doraemon/models/header'), // 头部model
     model = require('../models/coupons');
     model = require('../models/coupons');
 
 
-const index = (req, res) => {
-    res.render('coupons', {
-        module: 'home',
-        page: 'coupons',
-        pageHeader: headerModel.setNav({
-            navTitle: '优惠券'
-        }),
-        title: '优惠券',
-        pageFooter: true,
-    });
-};
-
 // 处理Ajax请求，status为使用状态
 // 处理Ajax请求，status为使用状态
-const couponData = (req, res, next) => {
+const index = (req, res, next) => {
     model.couponData({
     model.couponData({
         method: 'app.coupons.li',
         method: 'app.coupons.li',
         uid: req.user.uid,
         uid: req.user.uid,
@@ -24,12 +12,21 @@ const couponData = (req, res, next) => {
         page: req.body.page || 1,
         page: req.body.page || 1,
         limit: 10,
         limit: 10,
     }).then(result => {
     }).then(result => {
-        res.send(result);
-        res.end();
+        let options = {
+            module: 'home',
+            page: 'coupons',
+            pageHeader: headerModel.setNav({
+                navTitle: '优惠券'
+            }),
+            title: '优惠券',
+            pageFooter: true,
+            list: result,
+        };
+        req.body.page && (req.body.page !== '1' || req.body.status === '1') && (options.layout = false);
+        res.render('coupons', options);
     }).catch(next);
     }).catch(next);
 };
 };
 
 
 module.exports = {
 module.exports = {
     index,
     index,
-    couponData
-};
+};

@@ -4,26 +4,15 @@
 const api = global.yoho.API;
 const api = global.yoho.API;
 
 
 const couponData = (params) => {
 const couponData = (params) => {
-    let used = (params.status === '1') ? '<i></i>' : '',
-        html = '';
-
     return api.get('', params).then(result => {
     return api.get('', params).then(result => {
-        if (result.data && result.data.info) {
-            for (let item of result.data.info) {
-                html += `<div class="employ-main">
-                            <span>${item.money}</span>
-                            <p class="coupon-name">${item.coupon_name}</p>
-                            <p>有效期：${item.couponValidity}</p>
-                            ${used}
-                         </div>`;
+        if(result && result.data && result.data.info){
+            for(let item of result.data.info){
+                item.used = ((params.status === '1') ? true : false);
             }
             }
-            return html;
-        } else {
-            return `<div class="null">
-			            <i></i>
-			            <p>您还没有优惠券!</p>
-			            <a href="/product/new">随便逛逛</a>
-		            </div>`;
+            return result.data.info;
+        }
+        else{
+            return 0;
         }
         }
     });
     });
 };
 };

@@ -72,8 +72,7 @@ router.get('/favBrand', favorite.favfavBrand);
 router.post('/favoriteDel', favorite.favoriteDelete);
 router.post('/favoriteDel', favorite.favoriteDelete);
 
 
 // 优惠券
 // 优惠券
-router.get('/coupons', auth, coupons.index);
-router.post('/couponData', coupons.couponData);
+router.use('/coupons', coupons.index);
 
 
 // 帮助中心
 // 帮助中心
 router.get('/help', help.index);
 router.get('/help', help.index);

@@ -3,5 +3,26 @@
 		<span class="active">未使用</span>
 		<span class="active">未使用</span>
 		<span>已使用</span>
 		<span>已使用</span>
 	</div>
 	</div>
-	<div id="employ" class="coupon-list"></div>
+	<div id="employ" class="coupon-list">
+		{{#if list}}
+		{{#list}}
+		<div class="employ-main">
+			<span>{{money}}</span>
+			<p class="coupon-name">{{coupon_name}}</p>
+			<p>有效期：{{couponValidity}}</p>
+			{{#if used}}
+				<i></i>
+			{{/if}}
+		</div>
+		{{/list}}
+
+		{{else}}
+		<div class="null">
+			<i></i>
+			<p>您还没有优惠券!</p>
+			<a href="/product/new">随便逛逛</a>
+		</div>
+
+		{{/if}}
+	</div>
 </div>
 </div>

@@ -21,20 +21,27 @@ var couponAJAX = function(statu, page) {
     loading.showLoadingMask();
     loading.showLoadingMask();
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
-        url: '/home/couponData',
+        url: '/home/coupons',
         dataType: 'html',
         dataType: 'html',
         data: {
         data: {
             status: statu,
             status: statu,
             page: page
             page: page
         },
         },
         success: function(data) {
         success: function(data) {
-            if (!data) {
+            if ($(data).find('.null').html()) {
+                page === 1 && $('#employ').append($(data).find('.null'));
                 AjaxFlag = 1;
                 AjaxFlag = 1;
                 window.rePosFooter();
                 window.rePosFooter();
                 loading.hideLoadingMask();
                 loading.hideLoadingMask();
                 return;
                 return;
             }
             }
-            $('#employ').append(data);
+            if (!$(data).find('.employ-main').html()) {
+                AjaxFlag = 1;
+                window.rePosFooter();
+                loading.hideLoadingMask();
+                return;
+            }
+            $('#employ').append($(data).find('.employ-main'));
             window.rePosFooter();
             window.rePosFooter();
             loading.hideLoadingMask();
             loading.hideLoadingMask();
             AjaxFlag = 0;
             AjaxFlag = 0;
@@ -64,6 +71,7 @@ $('.employ span').each(function(index) {
         statu = index;
         statu = index;
         page = 1;
         page = 1;
         AjaxFlag = 0;
         AjaxFlag = 0;
+        status === 1 && $('#employ').empty();
         couponAJAX(statu, page);
         couponAJAX(statu, page);
         window.rePosFooter();
         window.rePosFooter();
     });
     });
@@ -72,5 +80,3 @@ $('.employ span').each(function(index) {
 $(window).scroll(function() {
 $(window).scroll(function() {
     window.requestAnimationFrame(scrollHandler);
     window.requestAnimationFrame(scrollHandler);
 });
 });
-
-couponAJAX(statu, page);