Commit 9c1314d5a7dcccd82fcde6db6d92ed98f16eefee
Merge branch 'dev' into 'test'
Dev See merge request !964
Showing
3 changed files
with
7 additions
and
4 deletions
app.wxss
| ... | ... | @@ -743,9 +743,9 @@ background: #ffe3e2; |
| 743 | 743 | /* 图标字体(ty) */ |
| 744 | 744 | @font-face { |
| 745 | 745 | font-family: 'iconfont'; /* Project id 2054717 */ |
| 746 | - src: url('//at.alicdn.com/t/font_2054717_f0dh5dgis1.woff2?t=1645174692674') format('woff2'), | |
| 747 | - url('//at.alicdn.com/t/font_2054717_f0dh5dgis1.woff?t=1645174692674') format('woff'), | |
| 748 | - url('//at.alicdn.com/t/font_2054717_f0dh5dgis1.ttf?t=1645174692674') format('truetype'); | |
| 746 | + src: url('//at.alicdn.com/t/font_2054717_lrw1n4v54a9.woff2?t=1645426251412') format('woff2'), | |
| 747 | + url('//at.alicdn.com/t/font_2054717_lrw1n4v54a9.woff?t=1645426251412') format('woff'), | |
| 748 | + url('//at.alicdn.com/t/font_2054717_lrw1n4v54a9.ttf?t=1645426251412') format('truetype'); | |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | .icon-suoxiao:before { | ... | ... |
packageB/pages/zuhegou/index/index.wxml
| 1 | 1 | <wxs module="filters" src="../../../../utils/filter.wxs"></wxs> |
| 2 | 2 | <view wx:if="{{act}}" class="container"> |
| 3 | 3 | <view class="flex jc_sb"> |
| 4 | - <view class="white">以下商品{{act.zhprice}}元任选{{act.zhbuyqty}}件</view> | |
| 4 | + <view class="white">以下商品{{act.zhprice}}元选择{{act.zhbuyqty}}件</view> | |
| 5 | 5 | <view class="rule-container" bindtap="showRule">规则详情 |
| 6 | 6 | <text class="iconfont icon-arrow_right"></text> |
| 7 | 7 | </view> | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -1815,6 +1815,9 @@ Page({ |
| 1815 | 1815 | } |
| 1816 | 1816 | } |
| 1817 | 1817 | |
| 1818 | + //如果是普通购买的情况下 | |
| 1819 | + if(th.data.openSpecModal_flash_normal) th.data.is_normal=1; | |
| 1820 | + | |
| 1818 | 1821 | //--判断商品是否超出活动限购-- |
| 1819 | 1822 | if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && !th.data.is_normal) { |
| 1820 | 1823 | if (t + th.data.prom_buy_num > th.data.prom_buy_limit) { | ... | ... |