Merge branch 'feature/waiting' into 'gray'

Feature/waiting



See merge request !1310

@@ -83,3 +83,22 @@ exports.getHis = (req, res, next) => {
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);
 };
 };
+
+/**
+ * 会员升级引导页面
+ */
+exports.upgrade = (req, res) => {
+    let responseData = {
+        module: 'home',
+        page: 'grade-new',
+        pageHeader: headerModel.setNav({
+            navTitle: '会员等级'
+        }),
+        title: '会员等级',
+        width750: true,
+        localCss: true,
+        pageFooter: true
+    };
+
+    res.render('grade-new/upgrade', responseData);
+};

@@ -153,8 +153,8 @@ router.get('/getaddress.json', addressController.newGetAddress); // TODO 模拟
 
 
 router.get('/logistic', auth, orderDetailController.logistic); // 查看物流页面
 router.get('/logistic', auth, orderDetailController.logistic); // 查看物流页面
 
 
-router.get('/grade', auth, gradeNew.index); // 会员等级
-router.get('/gradeNew/content', auth, gradeNew.content); // app要提供我的等级单独tab部分页面
+router.get('/grade', auth, gradeNew.upgrade); // 会员等级
+router.get('/gradeNew/content', auth, gradeNew.upgrade); // app要提供我的等级单独tab部分页面
 router.get('/gradeNew/grow', auth, gradeNew.grow); // 成长记录
 router.get('/gradeNew/grow', auth, gradeNew.grow); // 成长记录
 router.get('/gradeNew/getHis', gradeNew.getHis); // 成长记录
 router.get('/gradeNew/getHis', gradeNew.getHis); // 成长记录
 
 

+<img src="//cdn.yoho.cn/grade/vip-upgrade.jpg?imageMogr2/quality/60" alt="">

-require('home/grade-new.page.css');
+// require('home/grade-new.page.css');
 
 
-const GradeController = require('./controller');
-
-new GradeController();
+// const GradeController = require('./controller');
 
 
+// new GradeController();