Merge branch 'develop' of git.yoho.cn:mobile/yoho-miniapp-mkt into develop

@@ -13,7 +13,7 @@
               <view class="overflow-hidden-block-start">
                 <image mode="widthFix" wx:if="{{item.path}}" src="{{helper.imgView(item.path, 100, 100)}}"></image>
               </view>
-              <my-login bindloginSuccessCallback="clockAreaTap"></my-login>
+              <my-login ></my-login>
               <button wx:if="{{hasLocationSetting}}" class="form-sub" formType="submit" type="default" hover-class="none"></button>
               <button wx:else class="form-sub" type='default' hover-class='none' bindtap='openMsg'></button>
             </view>
@@ -65,7 +65,7 @@
           <view class="clock-result-p2" wx:if="{{userPrize.type !== 4}}">奖品已经放入您的账户</view>
 
         </view>
-        <navigator url="/pages/home/index" open-type="switchTab" hover-class="none" class="clock-result-go" wx:if="{{userPrize.type === 2}}">去看看</navigator>
+        <navigator url="/pages/home/index" open-type="switchTab" hover-class="none" class="clock-result-go" wx:if="{{userPrize.type !== 4}}">去看看</navigator>
       </view>
     </view>
   </block>