折扣专场问题

@@ -5,8 +5,8 @@
             {{#if discount}}
             {{#if discount}}
                 <span class="discount">{{discount}}</span>
                 <span class="discount">{{discount}}</span>
             {{/if}}
             {{/if}}
-            {{#if up}}
-                起
+            {{#if discountText}}
+                {{discountText}}
             {{/if}}
             {{/if}}
             <div class="time pull-right">
             <div class="time pull-right">
                 <span class="iconfont">&#xe60a;</span>
                 <span class="iconfont">&#xe60a;</span>

@@ -87,11 +87,23 @@ function convertTime(time) {
 }
 }
 
 
 function setPageTime() {
 function setPageTime() {
-    var i, showTime;
+    var i, text, showTime;
 
 
     for (i = 0; i < limitTime.length; i++) {
     for (i = 0; i < limitTime.length; i++) {
+        if (limitTime[i].time < 0) {
+            return;
+        }
+
         limitTime[i].time -= 1000;
         limitTime[i].time -= 1000;
         showTime = convertTime(limitTime[i].time);
         showTime = convertTime(limitTime[i].time);
+        if (showTime) {
+            text = showTime;
+            if (limitTime[i].pre) {
+                text = limitTime[i].pre + ' ' + text;
+            }
+        } else {
+            text = '活动已结束';
+        }
         $('.time-calculate').removeClass('hidden');
         $('.time-calculate').removeClass('hidden');
         $('.time-calculate').text(showTime);
         $('.time-calculate').text(showTime);
     }
     }