Authored by 郭成尧

merge

1 const co = require('bluebird').coroutine; 1 const co = require('bluebird').coroutine;
2 const GradeModel = require('../models/grade-model'); 2 const GradeModel = require('../models/grade-model');
  3 +const headerModel = require('../../../doraemon/models/header'); // 头部model
3 4
4 class Grade { 5 class Grade {
5 /** 6 /**
@@ -37,6 +38,19 @@ class Grade { @@ -37,6 +38,19 @@ class Grade {
37 }); 38 });
38 })().catch(next); 39 })().catch(next);
39 } 40 }
  41 +
  42 + droit(req, res) {
  43 + res.render('grade/droit', {
  44 + module: 'activity',
  45 + page: 'grade-droit',
  46 + pageHeader: headerModel.setNav({
  47 + navTitle: '会员权益说明',
  48 + }),
  49 + width750: true,
  50 + title: '会员权益说明',
  51 + localCss: true
  52 + });
  53 + }
40 } 54 }
41 55
42 module.exports = new Grade(); 56 module.exports = new Grade();
@@ -317,5 +317,6 @@ router.get('/coupon-list/receiveAll', couponList.receiveAll); // 全场优惠券 @@ -317,5 +317,6 @@ router.get('/coupon-list/receiveAll', couponList.receiveAll); // 全场优惠券
317 router.get('/grade/detail', auth, grade.page); // 成长值明细页面 317 router.get('/grade/detail', auth, grade.page); // 成长值明细页面
318 router.get('/grade/graph', auth, grade.graph); // 成长值明细图表数据 318 router.get('/grade/graph', auth, grade.graph); // 成长值明细图表数据
319 router.get('/grade/monthDetail', auth, grade.monthDetail); // 成长值明细图表数据 319 router.get('/grade/monthDetail', auth, grade.monthDetail); // 成长值明细图表数据
  320 +router.get('/grade/droit', auth, grade.droit); // 权益说明
320 321
321 module.exports = router; 322 module.exports = router;
  1 +<div class="grade-droit-page">
  2 + <div class="droit-nav">
  3 + <div class="droit-nav-item">
  4 + <div class="droit-nav-icon"></div>
  5 + <span class="name">运费卷</span>
  6 + </div>
  7 + <div class="droit-nav-item">
  8 + <div class="droit-nav-icon"></div>
  9 + <span class="name">运费卷</span>
  10 + </div>
  11 + <div class="droit-nav-item">
  12 + <div class="droit-nav-icon"></div>
  13 + <span class="name">运费卷</span>
  14 + </div>
  15 + <div class="droit-nav-item">
  16 + <div class="droit-nav-icon"></div>
  17 + <span class="name">运费卷</span>
  18 + </div>
  19 + <div class="droit-nav-item">
  20 + <div class="droit-nav-icon"></div>
  21 + <span class="name">运费卷</span>
  22 + </div>
  23 + <div class="droit-nav-item">
  24 + <div class="droit-nav-icon"></div>
  25 + <span class="name">运费卷</span>
  26 + </div>
  27 + <div class="droit-nav-item">
  28 + <div class="droit-nav-icon"></div>
  29 + <span class="name">运费卷</span>
  30 + </div>
  31 + <div class="droit-nav-item">
  32 + <div class="droit-nav-icon"></div>
  33 + <span class="name">运费卷</span>
  34 + </div>
  35 + <div class="droit-nav-item">
  36 + <div class="droit-nav-icon"></div>
  37 + <span class="name">运费卷</span>
  38 + </div>
  39 + <div class="droit-nav-item">
  40 + <div class="droit-nav-icon"></div>
  41 + <span class="name">运费卷</span>
  42 + </div>
  43 + <div class="droit-nav-item">
  44 + <div class="droit-nav-icon"></div>
  45 + <span class="name">运费卷</span>
  46 + </div>
  47 + <div class="droit-nav-item">
  48 + <div class="droit-nav-icon"></div>
  49 + <span class="name">运费卷</span>
  50 + </div>
  51 + </div>
  52 +</div>
  1 +import 'activity/grade-droit.page.css';
  2 +
  3 +import Page from 'yoho-page';
  4 +
  5 +class GradeDroitPage extends Page {
  6 + constructor() {
  7 + super();
  8 + }
  9 +}
  10 +
  11 +export default new GradeDroitPage();
  1 +.grade-droit-page {
  2 + width: 750px;
  3 +
  4 + .droit-nav {
  5 + width: inherit;
  6 + overflow-x: auto;
  7 + white-space: nowrap;
  8 +
  9 + .droit-nav-item {
  10 + text-align: center;
  11 + padding: 14px 0;
  12 + margin: 0 20px;
  13 + display: inline-block;
  14 +
  15 + .droit-nav-icon {
  16 + width: 100px;
  17 + height: 100px;
  18 + border-radius: 50%;
  19 + background-image: url("/activity/grade/iconYF@2x.png");
  20 + background-repeat: no-repeat;
  21 + background-size: contain;
  22 + }
  23 +
  24 + .name {
  25 + height: 34px;
  26 + font-size: 24px;
  27 + color: #a69073;
  28 + }
  29 + }
  30 + }
  31 +}