Merge branch 'feature/growthdetail' into release/6.5.3

@@ -65,7 +65,7 @@ class Grade {
         res.render('grade/detail', {
             module: 'activity',
             page: 'grade-detail',
-            bgcolor: '#2b2b2b',
+            bgcolor: '#444444',
             width750: true,
             localCss: true,
             title: '成长值'

 'use strict';
 const moment = require('moment');
-const _ = require('lodash');
 
 class grouthNewModel extends global.yoho.BaseModel {
     constructor(ctx) {
@@ -22,21 +21,20 @@ class grouthNewModel extends global.yoho.BaseModel {
         return this.get(option).then((result => {
             if (result && result.code && result.code === 200 && result.data) {
                 let calculateData = result.data;
-                let privilegeList = [];
 
                 calculateData.expireTime = (calculateData.expireTime && parseInt(calculateData.expireTime, 10) !== 0) ?
                     moment.unix(calculateData.expireTime).format('YYYY/MM/DD') : '';
 
-                if (_.get(calculateData, 'levelInfo.privilege', '')) {
-                    _.forEach(calculateData.levelInfo.privilege, val => {
+                // if (_.get(calculateData, 'levelInfo.privilege', '')) {
+                //     _.forEach(calculateData.levelInfo.privilege, val => {
 
-                        if (val.light === 'Y') {
-                            privilegeList.push(val);
-                        }
-                    });
-                }
+                //         if (val.light === 'Y') {
+                //             privilegeList.push(val);
+                //         }
+                //     });
+                // }
 
-                calculateData.privilegeList = privilegeList;
+                // calculateData.privilegeList = privilegeList;
 
                 return calculateData;
             }

@@ -54,7 +54,7 @@
                     已为您解锁如下会员权益
                 </p>
                 <div class="equities-list">
-                    {{#privilegeList}}
+                    {{#levelInfo.privilege}}
                     <div class="list-item">
                         <div class="item-ico">
                             <img src="{{pic_big}}">
@@ -62,7 +62,7 @@
                         <p class="text">{{title}}</p>
                         <p class="discount">{{#if discount}}-{{discount}}-{{/if}}</p>
                     </div>
-                    {{/privilegeList}}
+                    {{/levelInfo.privilege}}
                 </div>
             </div>
             {{/if}}

@@ -74,6 +74,9 @@ class GradeDetailPage extends Page {
         });
     }
 
+    /**
+     * 月度数据初始化
+     */
     monthDetailInit(event) {
         let tapData = event.data;
 

@@ -8,9 +8,9 @@ export default (graphData) => {
             x2: 0,
             y2: 1,
             colorStops: [{
-                offset: 0, color: '#2b2b2b'
+                offset: 0, color: '#444444'
             }, {
-                offset: 1, color: '#444141'
+                offset: 1, color: '#2b2b2b'
             }],
             globalCoord: false
         },

+@keyframes loading {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    25% {
+        transform: rotate(90deg);
+    }
+
+    50% {
+        transform: rotate(180deg);
+    }
+
+    75% {
+        transform: rotate(270deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
 .grade-detail-page {
     .grade-graph {
         width: 100%;
@@ -7,13 +29,14 @@
     }
 
     .loading-mask {
+        margin-top: 104px;
         width: 100%;
-        height: 500px;
+        height: 502px;
         position: fixed;
         top: 0;
         left: 0;
         z-index: 2;
-        background-color: #2b2b2b;
+        background-color: #444;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -22,8 +45,10 @@
         .loading-logo {
             width: 80px;
             height: 80px;
-            background: resolve("activity/grade/loading.gif");
+            background: resolve("activity/grade/loading2.png");
             background-size: 100%;
+            animation: loading 1.5s infinite;
+            animation-timing-function: linear;
         }
 
         .loading-text {

@@ -9,7 +9,7 @@ body {
 
 .grouth-init-page {
     height: 100%;
-    background-color: rgba(0, 0, 0, 0.8);
+    background-color: #1b1b1b;
 
     .anima-img {
         width: 100%;
@@ -54,6 +54,9 @@ body {
             border: 4px solid #fff;
             margin: 0 auto;
             overflow: hidden;
+            background-image: resolve("activity/grouth-new/user.png");
+            background-size: cover;
+            background-repeat: no-repeat;
         }
 
         .nick-name {
@@ -156,15 +159,15 @@ body {
 
             .list-item {
                 color: #fff;
-                margin-right: 66px;
+                margin-right: 30px;
                 margin-top: 44px;
                 display: inline-block;
                 height: 100%;
                 vertical-align: top;
 
                 .item-ico {
-                    width: 60px;
-                    height: 60px;
+                    width: 100px;
+                    height: 100px;
                     margin: 0 auto;
                     margin-bottom: 30px;
                 }