|
|
@@ -36,24 +36,6 @@
|
|
|
<text class="tips">{{ good.content }}</text>
|
|
|
<view class="price_and_action">
|
|
|
<text class="price">￥{{ good.price }}</text>
|
|
|
- <view class="btn-group" v-if="good.use_property">
|
|
|
- <button type="primary" class="btn property_btn" hover-class="none"
|
|
|
- size="mini" @tap="showGoodDetailModal(item, good)">
|
|
|
- 选规格
|
|
|
- </button>
|
|
|
- <view class="dot" v-show="goodCartNum(good.id)">{{ goodCartNum(good.id) }}</view>
|
|
|
- </view>
|
|
|
- <view class="btn-group" v-else>
|
|
|
- <button type="default" v-show="goodCartNum(good.id)" plain class="btn reduce_btn"
|
|
|
- size="mini" hover-class="none" @tap="handleReduceFromCart(item, good)">
|
|
|
- <view class="iconfont iconsami-select"></view>
|
|
|
- </button>
|
|
|
- <view class="number" v-show="goodCartNum(good.id)">{{ goodCartNum(good.id) }}</view>
|
|
|
- <button type="primary" class="btn add_btn" size="min" hover-class="none"
|
|
|
- @tap="handleAddToCart(item, good, 1)">
|
|
|
- <view class="iconfont iconadd-select"></view>
|
|
|
- </button>
|
|
|
- </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -6814,8 +6796,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
|
- //this.init()
|
|
|
- this.goods_height = 'height:800px';
|
|
|
+ //this.init()
|
|
|
+ var self = this;
|
|
|
+ uni.getSystemInfo({
|
|
|
+ success: function (res) {
|
|
|
+ self.goods_height = 'height:' + res.windowHeight + 'px';
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
computed: {
|
|
|
goodCartNum() { //计算单个饮品添加到购物车的数量
|
dever