Merge branch 'hotfix/button-status' into 'master'

未登录状态下按钮文案优化



See merge request !11

@@ -64,11 +64,14 @@
       <view class="action-item action-list" bindtap="goList">
       <view class="action-item action-list" bindtap="goList">
         <image class="action-image" src="./images/list_icon@2x.png"></image>
         <image class="action-image" src="./images/list_icon@2x.png"></image>
       </view>
       </view>
-
+      <block wx:if="{{product.status === 1 || product.status === 2}}">
+          <block wx:if="{{product.status === 1}}">
+            <button class="action-item over" bindtap="goLogin">即将开始</button>
+          </block>
           <block wx:if="{{product.status === 2}}">
           <block wx:if="{{product.status === 2}}">
             <button class="action-item confirm" bindtap="goLogin">0元参加抽奖</button>
             <button class="action-item confirm" bindtap="goLogin">0元参加抽奖</button>
           </block>
           </block>
-
+      </block>  
       <block wx:else>
       <block wx:else>
         <view class="action-item over">活动已结束</view>
         <view class="action-item over">活动已结束</view>
       </block>
       </block>