Authored by 张孝茹

成长值load

@@ -22,7 +22,7 @@ class grouthNewModel extends global.yoho.BaseModel { @@ -22,7 +22,7 @@ class grouthNewModel extends global.yoho.BaseModel {
22 if (result && result.code && result.code === 200 && result.data) { 22 if (result && result.code && result.code === 200 && result.data) {
23 let calculateData = result.data; 23 let calculateData = result.data;
24 24
25 - calculateData.expireTime = calculateData.expireTime ? 25 + calculateData.expireTime = (calculateData.expireTime && parseInt(calculateData.expireTime, 10) !== 0) ?
26 moment.unix(calculateData.expireTime).format('YYYY/MM/DD') : ''; 26 moment.unix(calculateData.expireTime).format('YYYY/MM/DD') : '';
27 27
28 return calculateData; 28 return calculateData;
1 <div class="grouth-init-page yoho-page"> 1 <div class="grouth-init-page yoho-page">
2 - <div class="anima-img">  
3 - <img src=""> 2 + <div class="anima-img" >
  3 + <div class="loading"></div>
  4 + <p class="load-text">成长值初始化...</p>
4 </div> 5 </div>
5 {{# initData}} 6 {{# initData}}
6 <div class="grouth-calculate"> 7 <div class="grouth-calculate">
@@ -39,29 +40,33 @@ @@ -39,29 +40,33 @@
39 </P> 40 </P>
40 41
41 </div> 42 </div>
  43 + {{#if expireTime}}
42 <div class="calculate-item"> 44 <div class="calculate-item">
43 <p class="introduce"> 45 <p class="introduce">
44 有效期至 46 有效期至
45 </p> 47 </p>
46 <P class="small-font">{{expireTime}}</P> 48 <P class="small-font">{{expireTime}}</P>
47 </div> 49 </div>
  50 + {{/if}}
48 {{#if levelInfo.privilege}} 51 {{#if levelInfo.privilege}}
49 - <div class="calculate-item">  
50 - <p class="introduce">  
51 - 已为您解锁如下会员权益  
52 - </p>  
53 - <div class="equities-list">  
54 - {{#levelInfo.privilege}}  
55 - <div class="list-item">  
56 - <div class="item-ico">  
57 - <img src="{{pic_big}}"> 52 + {{#if expireTime}}
  53 + <div class="calculate-item">
  54 + <p class="introduce">
  55 + 已为您解锁如下会员权益
  56 + </p>
  57 + <div class="equities-list">
  58 + {{#levelInfo.privilege}}
  59 + <div class="list-item">
  60 + <div class="item-ico">
  61 + <img src="{{pic_big}}">
  62 + </div>
  63 + <p class="text">{{title}}</p>
58 </div> 64 </div>
59 - <p class="text">{{title}}</p> 65 + {{/levelInfo.privilege}}
  66 +
60 </div> 67 </div>
61 - {{/levelInfo.privilege}}  
62 -  
63 </div> 68 </div>
64 - </div> 69 + {{/if}}
65 {{/if}} 70 {{/if}}
66 </div> 71 </div>
67 <div class="vip-btn">开启会员之旅</div> 72 <div class="vip-btn">开启会员之旅</div>
@@ -16,9 +16,9 @@ class GrouthInit extends Page { @@ -16,9 +16,9 @@ class GrouthInit extends Page {
16 16
17 init() { 17 init() {
18 setTimeout(function() { 18 setTimeout(function() {
19 - $('.anima-img').fadeOut(1000); 19 + $('.anima-img').hide(1000);
20 $('.grouth-calculate').show(); 20 $('.grouth-calculate').show();
21 - }, 2000); 21 + }, 3000);
22 22
23 this.bindEvents(); 23 this.bindEvents();
24 } 24 }
@@ -9,11 +9,29 @@ body { @@ -9,11 +9,29 @@ body {
9 9
10 .grouth-init-page { 10 .grouth-init-page {
11 min-height: 100%; 11 min-height: 100%;
12 - background-color: rgba(0, 0, 0, 0.7); 12 + background-color: rgba(0, 0, 0, 0.8);
13 13
14 .anima-img { 14 .anima-img {
15 width: 100%; 15 width: 100%;
16 height: 100%; 16 height: 100%;
  17 + padding-top: 550px;
  18 +
  19 + .loading {
  20 + width: 150px;
  21 + height: 150px;
  22 + margin-left: 300px;
  23 + background-image: resolve("activity/grade/loading.gif");
  24 + background-size: 100% 100%;
  25 + background-repeat: no-repeat;
  26 + }
  27 +
  28 + .load-text {
  29 + width: 100%;
  30 + font-size: 28px;
  31 + color: #848484;
  32 + text-align: center;
  33 + margin-top: 10px;
  34 + }
17 } 35 }
18 36
19 .grouth-calculate { 37 .grouth-calculate {