mobile / yoho-miniapp-mkt · Commits

Go to a project

Authored by baoss
Commit 02a8fc021ab89a8843e4c392da1bf2e6adcb7ee6 2 parents 66ea4198 c1ad5701

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

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <view class="overflow-hidden-block-start"> 13 <view class="overflow-hidden-block-start">
14 <image mode="widthFix" wx:if="{{item.path}}" src="{{helper.imgView(item.path, 100, 100)}}"></image> 14 <image mode="widthFix" wx:if="{{item.path}}" src="{{helper.imgView(item.path, 100, 100)}}"></image>
15 </view> 15 </view>
16 - <my-login bindloginSuccessCallback="clockAreaTap"></my-login> 16 + <my-login ></my-login>
17 <button wx:if="{{hasLocationSetting}}" class="form-sub" formType="submit" type="default" hover-class="none"></button> 17 <button wx:if="{{hasLocationSetting}}" class="form-sub" formType="submit" type="default" hover-class="none"></button>
18 <button wx:else class="form-sub" type='default' hover-class='none' bindtap='openMsg'></button> 18 <button wx:else class="form-sub" type='default' hover-class='none' bindtap='openMsg'></button>
19 </view> 19 </view>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <view class="clock-result-p2" wx:if="{{userPrize.type !== 4}}">奖品已经放入您的账户</view> 65 <view class="clock-result-p2" wx:if="{{userPrize.type !== 4}}">奖品已经放入您的账户</view>
66 66
67 </view> 67 </view>
68 - <navigator url="/pages/home/index" open-type="switchTab" hover-class="none" class="clock-result-go" wx:if="{{userPrize.type === 2}}">去看看</navigator> 68 + <navigator url="/pages/home/index" open-type="switchTab" hover-class="none" class="clock-result-go" wx:if="{{userPrize.type !== 4}}">去看看</navigator>
69 </view> 69 </view>
70 </view> 70 </view>
71 </block> 71 </block>