Merge branch 'test' into 'qa'

Test See merge request !965

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