Merge branch 'feature/newimg' into 'gray'

Feature/newimg



See merge request !1319

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

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

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

-<img src="//cdn.yoho.cn/grade/vip-upgrade.jpg?imageMogr2/quality/70" alt="">
+<a href='https://union.yoho.cn/union/app-downloads.html?openby:yohobuy={"action":"go.vipInfo"}'><img src="//cdn.yoho.cn/grade/vip-upgrade-h5.jpg?imageMogr2/quality/70"></a>

 {
   "name": "yohobuywap-node",
-  "version": "6.5.31",
+  "version": "6.5.32",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -92,6 +92,19 @@ class GradeDetailPage extends Page {
 
         this.refreshEchart(endIndex);
         this.monthDetailRender(true);
+
+        if (window._yas && window._yas.sendCustomInfo) {
+            // 埋点
+            let C_ID = window._ChannelVary[window.cookie('_Channel')];
+
+            window._yas.sendCustomInfo({
+                op: 'YB_GRADE_DETAIL_GRAPH_DATAZOOM',
+                appop: 'YB_H5_GRADE_DETAIL_GRAPH_DATAZOOM',
+                param: JSON.stringify({
+                    C_ID: C_ID
+                })
+            }, true);
+        }
     }
 
     /**

+import 'home/grade-app.page.css';

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