Commit 9d5fea74ea263c4e1b0ae30a2d469dbd9bbc3033

Authored by taiyuan
2 parents 185b5102 659c0190

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

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