Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/hello_taobao

dist/pages/pageshou_ye/pageshou_ye.axml

@@ -6,7 +6,7 @@
   <image class="wen_an" src={{resList['2a026ac4-0a9c-497b-9469-2da99f935821'].url}} />
   <image onTap="onPrizeBtnClick" a:if="{{myPrizeBtnVisible}}" class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />
   <image a:if="{{ruleModalBtnVisible}}" class="gui_zeicon" onTap="showRuleModal"  src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
-  <text a:if="{{ruleModalBtnVisible}}" class="can_yu_ren_shu">已有{{joinCount * 20}}人参与</text>
+  <text a:if="{{ruleModalBtnVisible}}" class="can_yu_ren_shu">已有{{joinCount}}人参与</text>
 </view>
 
 <rule-modal a:if="{{ruleModalVisible}}"  onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal>
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.js

@@ -31,16 +31,16 @@ Page({
 
   },
   gotoVipPage() {
-    let { endTime, startTime } = this.data
-    API.getVipInfo().then(res => {
+    let { endTime, startTime } = this.data;
     // 判断活动时间
       let currentTime = new Date().getTime();
     if (currentTime < startTime) {
         commonToast('活动未开始');
-      }
-      // if (currentTime > endTime) {
-      //   commonToast('活动已结束');
-      // }
+        return;
+      };
+
+    API.getVipInfo().then(res => {
+      
 
       if (!res.data.isVip) {
         commonToast('立即加入会员，即可开始盖楼')