fe / yohobuywap-node · Commits

Go to a project

Authored by 杨延青
Commit d537b9ea6d1948c430c354317eeec96646210331 2 parents 40a55c11 4eb03196

Merge branch 'hotfix/fix-yoluck-status' into 'release/6.8.6' 

修改yoluck活动结束未开奖时的状态文字



See merge request !1690
Inline Side-by-side
Showing 6 changed files with 41 additions and 39 deletions
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 {{/isEqualOr}} 29 {{/isEqualOr}}
30 30
31 {{#isEqualOr status 5}} 31 {{#isEqualOr status 5}}
32 - <div class="counter-num" > 人数不足 活动结束 </div> 32 + <div class="counter-num" > 等待开奖中 </div>
33 {{/isEqualOr}} 33 {{/isEqualOr}}
34 34
35 </div> 35 </div>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/ifcond}} 21 {{/ifcond}}
22 22
23 {{#ifcond status '===' 5}} 23 {{#ifcond status '===' 5}}
24 - <div class="btn">人数不足 活动结束</div> 24 + <div class="btn">等待开奖中</div>
25 {{/ifcond}} 25 {{/ifcond}}
26 26
27 {{#isEqualOr status 1 2 6}} 27 {{#isEqualOr status 1 2 6}}
1 -  
2 -  
3 <div class="product-status"> 1 <div class="product-status">
4 -{{#isEqualOr status 0}}  
5 - <div class="btn cancel" >活动结束</div>  
6 -{{/isEqualOr}}  
7 -  
8 -{{#isEqualOr status 1}}  
9 - <div class="btn cancel" >即将开始</div>  
10 -{{/isEqualOr}} 2 + {{#isEqualOr status 0}}
  3 + <div class="btn cancel">活动结束</div>
  4 + {{/isEqualOr}}
11 5
12 -{{#isEqualOr status 2}}  
13 - <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>  
14 -{{/isEqualOr}} 6 + {{#isEqualOr status 1}}
  7 + <div class="btn cancel">即将开始</div>
  8 + {{/isEqualOr}}
15 9
16 -{{#isEqualOr status 3 4}}  
17 - <div class="btn cancel">活动结束</div>  
18 -{{/isEqualOr}} 10 + {{#isEqualOr status 2}}
  11 + <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
  12 + {{/isEqualOr}}
  13 + {{#isEqualOr status 3}}
  14 + <div class="btn cancel">等待开奖中</div>
  15 + {{/isEqualOr}}
  16 + {{#isEqualOr status 4}}
  17 + <div class="btn cancel">活动结束</div>
  18 + {{/isEqualOr}}
19 19
20 -{{#isEqualOr status 5}}  
21 - <div class="btn cancel">人数不足 活动结束</div>  
22 -{{/isEqualOr}} 20 + {{#isEqualOr status 5}}
  21 + <div class="btn cancel">等待开奖中</div>
  22 + {{/isEqualOr}}
23 </div> 23 </div>
@@ -31,7 +31,7 @@ const domains = { @@ -31,7 +31,7 @@ const domains = {
31 liveApi: 'http://testapi.live.yohops.com:9999/', 31 liveApi: 'http://testapi.live.yohops.com:9999/',
32 singleApi: 'http://api-test3.dev.yohocorp.com/', 32 singleApi: 'http://api-test3.dev.yohocorp.com/',
33 ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/', 33 ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/',
34 - yoLuck: 'http://limit-yoho-activity-platform.test3.ingress.dev.yohocorp.com', 34 + yoLuck: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com',
35 35
36 imSocket: 'wss://imsocket.yohobuy.com:443', 36 imSocket: 'wss://imsocket.yohobuy.com:443',
37 imCs: 'https://imhttp.yohobuy.com/api', 37 imCs: 'https://imhttp.yohobuy.com/api',
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/ifcond}} 21 {{/ifcond}}
22 22
23 {{#ifcond status '===' 5}} 23 {{#ifcond status '===' 5}}
24 - <div class="btn">人数不足 活动结束</div> 24 + <div class="btn">等待开奖中</div>
25 {{/ifcond}} 25 {{/ifcond}}
26 26
27 {{#is-equal-or status 1 2 6}} 27 {{#is-equal-or status 1 2 6}}
1 -  
2 -  
3 <div class="product-status"> 1 <div class="product-status">
4 -{{#is-equal-or status 0}}  
5 - <div class="btn cancel" >活动结束</div>  
6 -{{/is-equal-or}} 2 + {{#is-equal-or status 0}}
  3 + <div class="btn cancel">活动结束</div>
  4 + {{/is-equal-or}}
  5 +
  6 + {{#is-equal-or status 1}}
  7 + <div class="btn cancel">即将开始</div>
  8 + {{/is-equal-or}}
7 9
8 -{{#is-equal-or status 1}}  
9 - <div class="btn cancel" >即将开始</div>  
10 -{{/is-equal-or}} 10 + {{#is-equal-or status 2}}
  11 + <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
  12 + {{/is-equal-or}}
11 13
12 -{{#is-equal-or status 2}}  
13 - <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>  
14 -{{/is-equal-or}} 14 + {{#is-equal-or status 3}}
  15 + <div class="btn cancel">等待开奖中</div>
  16 + {{/is-equal-or}}
15 17
16 -{{#is-equal-or status 3 4}}  
17 - <div class="btn cancel">活动结束</div>  
18 -{{/is-equal-or}} 18 + {{#is-equal-or status 4}}
  19 + <div class="btn cancel">活动结束</div>
  20 + {{/is-equal-or}}
19 21
20 -{{#is-equal-or status 5}}  
21 - <div class="btn cancel">人数不足 活动结束</div>  
22 -{{/is-equal-or}} 22 + {{#is-equal-or status 5}}
  23 + <div class="btn cancel">等待开奖中</div>
  24 + {{/is-equal-or}}
23 </div> 25 </div>