Commit 2675f5c171193c1c0520d3b355160202a69e6ee5
Merge branch 'dev' into 'test'
积分购切换的时候的优化，普通购买的时候 See merge request !1164
Showing
1 changed file
with
11 additions
and
3 deletions
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -1320,9 +1320,17 @@ | @@ -1320,9 +1320,17 @@ | ||
| 1320 | <view class="xc-goods-attribute"> | 1320 | <view class="xc-goods-attribute"> |
| 1321 | <view hidden="{{ismend==1}}" class="spec-name">商品规格</view> | 1321 | <view hidden="{{ismend==1}}" class="spec-name">商品规格</view> |
| 1322 | <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> | 1322 | <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> |
| 1323 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | ||
| 1324 | - {{item.gg}} | ||
| 1325 | - </view> | 1323 | + |
| 1324 | + <block wx:if="{{sku_g_pt}}"> | ||
| 1325 | + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g"> | ||
| 1326 | + {{item.gg}} | ||
| 1327 | + </view> | ||
| 1328 | + </block> | ||
| 1329 | + <block wx:else> | ||
| 1330 | + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | ||
| 1331 | + {{item.gg}} | ||
| 1332 | + </view> | ||
| 1333 | + </block> | ||
| 1326 | </view> | 1334 | </view> |
| 1327 | </view> | 1335 | </view> |
| 1328 | <view class="b_num"> | 1336 | <view class="b_num"> |