Commit 5a685934e52a3ce50222f7ed452fc84a6f6a49f2
1 parent
f6c04313
幸运大转盘跳转修改
Showing
3 changed files
with
13 additions
and
6 deletions
app.wxss
| @@ -703,9 +703,9 @@ background: #ffe3e2; | @@ -703,9 +703,9 @@ background: #ffe3e2; | ||
| 703 | /* 图标字体(ty) */ | 703 | /* 图标字体(ty) */ |
| 704 | @font-face { | 704 | @font-face { |
| 705 | font-family: 'iconfont'; /* Project id 2054717 */ | 705 | font-family: 'iconfont'; /* Project id 2054717 */ |
| 706 | - src: url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff2?t=1627287108388') format('woff2'), | ||
| 707 | - url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.woff?t=1627287108388') format('woff'), | ||
| 708 | - url('//at.alicdn.com/t/font_2054717_nzwl8grylfi.ttf?t=1627287108388') format('truetype'); | 706 | + src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'), |
| 707 | + url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'), | ||
| 708 | + url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype'); | ||
| 709 | } | 709 | } |
| 710 | 710 | ||
| 711 | .iconfont { | 711 | .iconfont { |
| @@ -716,6 +716,13 @@ background: #ffe3e2; | @@ -716,6 +716,13 @@ background: #ffe3e2; | ||
| 716 | -moz-osx-font-smoothing: grayscale; | 716 | -moz-osx-font-smoothing: grayscale; |
| 717 | } | 717 | } |
| 718 | 718 | ||
| 719 | + | ||
| 720 | +.icon-zhiwen:before { | ||
| 721 | + content: "\e6aa"; | ||
| 722 | +} | ||
| 723 | + | ||
| 724 | + | ||
| 725 | + | ||
| 719 | .icon-guan:before { | 726 | .icon-guan:before { |
| 720 | content: "\e612"; | 727 | content: "\e612"; |
| 721 | } | 728 | } |
packageB/pages/luckactivity/luckinfo/luckinfo.js
| @@ -633,7 +633,7 @@ Page({ | @@ -633,7 +633,7 @@ Page({ | ||
| 633 | 633 | ||
| 634 | 634 | ||
| 635 | 635 | ||
| 636 | - if(no_luck_urltype == 1) { | 636 | + if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) { |
| 637 | if(this.data.luckInfo.no_luck_weappurl) { | 637 | if(this.data.luckInfo.no_luck_weappurl) { |
| 638 | let num = this.data.num; | 638 | let num = this.data.num; |
| 639 | let url = this.data.luckInfo.no_luck_weappurl; | 639 | let url = this.data.luckInfo.no_luck_weappurl; |
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
| @@ -165,7 +165,7 @@ | @@ -165,7 +165,7 @@ | ||
| 165 | <view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view> | 165 | <view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view> |
| 166 | <view class="pdt10">{{luckInfo.no_luck_remark}}</view> | 166 | <view class="pdt10">{{luckInfo.no_luck_remark}}</view> |
| 167 | <view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'/miniapp/images/luckDraw/nolockimg.png')}}" class="img" mode="aspectFit"></image></view> | 167 | <view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'/miniapp/images/luckDraw/nolockimg.png')}}" class="img" mode="aspectFit"></image></view> |
| 168 | - | 168 | + <view class="pdt40 fs26 c9 t-c" wx:if="{{(luckInfo.no_luck_urltype == 1) && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view> |
| 169 | </block> | 169 | </block> |
| 170 | <block wx:else> | 170 | <block wx:else> |
| 171 | <view class="bold c-tb fs40">恭喜你获得</view> | 171 | <view class="bold c-tb fs40">恭喜你获得</view> |
| @@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
| 178 | <view class="btn btn2" bindtap="clickReceive">立即领取</view> | 178 | <view class="btn btn2" bindtap="clickReceive">立即领取</view> |
| 179 | </view> | 179 | </view> |
| 180 | 180 | ||
| 181 | - <view class="pdt40 fs26 c9 t-c" wx:if="{{luckInfo.no_luck_urltype == 1 && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view> | 181 | + |
| 182 | <!-- <view class="note">注:未领取就关闭弹窗视为主动放弃奖品。</view> --> | 182 | <!-- <view class="note">注:未领取就关闭弹窗视为主动放弃奖品。</view> --> |
| 183 | </view> | 183 | </view> |
| 184 | </view> | 184 | </view> |