Commit b8c64046c1fc006a5834bca0a5a494c9ed47c4b3

Authored by 后端研发-苏明海
2 parents d75dc8e5 542122e4

Merge branch 'test' into 'qa'

Test

See merge request !883
pages/goods/goodsInfo/goodsInfo.wxml
@@ -435,9 +435,6 @@ @@ -435,9 +435,6 @@
435 <view class="goods-name elli">{{data.goods_name}}</view> 435 <view class="goods-name elli">{{data.goods_name}}</view>
436 </view> 436 </view>
437 </view> 437 </view>
438 -  
439 - -- 88888 --  
440 -  
441 <view class="goods-num" wx:if="{{prom_type!=1 && prom_type!=2}}"> 438 <view class="goods-num" wx:if="{{prom_type!=1 && prom_type!=2}}">
442 <view class="sales">销量:{{data.sales_sum}}件</view> 439 <view class="sales">销量:{{data.sales_sum}}件</view>
443 <view class="stock">折扣:{{g_filters.num(data.disc)}}折</view> 440 <view class="stock">折扣:{{g_filters.num(data.disc)}}折</view>