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

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



See merge request !1690

@@ -29,7 +29,7 @@
     {{/isEqualOr}}
 
     {{#isEqualOr status 5}}
-        <div class="counter-num" > 人数不足 活动结束 </div>
+        <div class="counter-num" > 等待开奖中 </div>
     {{/isEqualOr}}
 
 </div>

@@ -21,7 +21,7 @@
             {{/ifcond}}
 
             {{#ifcond status '===' 5}}
-                <div class="btn">人数不足 活动结束</div>
+                <div class="btn">等待开奖中</div>
             {{/ifcond}}
 
             {{#isEqualOr status 1 2 6}}

-
-
 <div class="product-status">
-{{#isEqualOr status 0}}
-    <div class="btn cancel" >活动结束</div>
-{{/isEqualOr}}
-
-{{#isEqualOr status 1}}
-    <div class="btn cancel" >即将开始</div>
-{{/isEqualOr}}
+    {{#isEqualOr status 0}}
+        <div class="btn cancel">活动结束</div>
+    {{/isEqualOr}}
 
-{{#isEqualOr status 2}}
-    <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
-{{/isEqualOr}}
+    {{#isEqualOr status 1}}
+        <div class="btn cancel">即将开始</div>
+    {{/isEqualOr}}
 
-{{#isEqualOr status 3 4}}
-    <div class="btn cancel">活动结束</div>
-{{/isEqualOr}}
+    {{#isEqualOr status 2}}
+        <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
+    {{/isEqualOr}}
+    {{#isEqualOr status 3}}
+        <div class="btn cancel">等待开奖中</div>
+    {{/isEqualOr}}
+    {{#isEqualOr status 4}}
+        <div class="btn cancel">活动结束</div>
+    {{/isEqualOr}}
 
-{{#isEqualOr status 5}}
-    <div class="btn cancel">人数不足 活动结束</div>
-{{/isEqualOr}}
+    {{#isEqualOr status 5}}
+        <div class="btn cancel">等待开奖中</div>
+    {{/isEqualOr}}
 </div>

@@ -31,7 +31,7 @@ const domains = {
     liveApi: 'http://testapi.live.yohops.com:9999/',
     singleApi: 'http://api-test3.dev.yohocorp.com/',
     ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/',
-    yoLuck: 'http://limit-yoho-activity-platform.test3.ingress.dev.yohocorp.com',
+    yoLuck: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com',
 
     imSocket: 'wss://imsocket.yohobuy.com:443',
     imCs: 'https://imhttp.yohobuy.com/api',

@@ -21,7 +21,7 @@
             {{/ifcond}}
 
             {{#ifcond status '===' 5}}
-                <div class="btn">人数不足 活动结束</div>
+                <div class="btn">等待开奖中</div>
             {{/ifcond}}
 
             {{#is-equal-or status 1 2 6}}

-
-
 <div class="product-status">
-{{#is-equal-or status 0}}
-    <div class="btn cancel" >活动结束</div>
-{{/is-equal-or}}
+    {{#is-equal-or status 0}}
+        <div class="btn cancel">活动结束</div>
+    {{/is-equal-or}}
+
+    {{#is-equal-or status 1}}
+        <div class="btn cancel">即将开始</div>
+    {{/is-equal-or}}
 
-{{#is-equal-or status 1}}
-    <div class="btn cancel" >即将开始</div>
-{{/is-equal-or}}
+    {{#is-equal-or status 2}}
+        <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
+    {{/is-equal-or}}
 
-{{#is-equal-or status 2}}
-    <a class="btn ok js-join" data-id="{{id}}">参加抽奖</a>
-{{/is-equal-or}}
+    {{#is-equal-or status 3}}
+        <div class="btn cancel">等待开奖中</div>
+    {{/is-equal-or}}
 
-{{#is-equal-or status 3 4}}
-    <div class="btn cancel">活动结束</div>
-{{/is-equal-or}}
+    {{#is-equal-or status 4}}
+        <div class="btn cancel">活动结束</div>
+    {{/is-equal-or}}
 
-{{#is-equal-or status 5}}
-    <div class="btn cancel">人数不足 活动结束</div>
-{{/is-equal-or}}
+    {{#is-equal-or status 5}}
+        <div class="btn cancel">等待开奖中</div>
+    {{/is-equal-or}}
 </div>