Merge branch 'bd-dev' of gitee.com:cabbage_qd/web-base-h5 into bd-test
This commit is contained in:
commit
2dfedbb333
|
@ -81,7 +81,11 @@
|
||||||
<view style="display: flex; flex: 1">
|
<view style="display: flex; flex: 1">
|
||||||
<view
|
<view
|
||||||
class="fly"
|
class="fly"
|
||||||
v-show="item.preSaleStatus == 3 || item.isSale == 1"
|
v-show="
|
||||||
|
item.preSaleStatus == 3 ||
|
||||||
|
item.isSale == 1 ||
|
||||||
|
(item.specialArea === 14 && !Number(item.inventory))
|
||||||
|
"
|
||||||
></view>
|
></view>
|
||||||
<view class="image-container">
|
<view class="image-container">
|
||||||
<img :src="item.cover || item.cover1" class="cover" alt="" />
|
<img :src="item.cover || item.cover1" class="cover" alt="" />
|
||||||
|
@ -178,7 +182,7 @@
|
||||||
{{ item.waresPrice | numberToCurrency }}
|
{{ item.waresPrice | numberToCurrency }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<template v-if="item.specialArea !== 14">
|
||||||
<img
|
<img
|
||||||
@click.stop="addCar(item)"
|
@click.stop="addCar(item)"
|
||||||
v-show="
|
v-show="
|
||||||
|
@ -189,17 +193,19 @@
|
||||||
src="@/static/images/cart.png"
|
src="@/static/images/cart.png"
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
<img
|
<img
|
||||||
@click.stop="addCar(item)"
|
@click.stop="addCar(item)"
|
||||||
v-show="
|
v-show="
|
||||||
item.preSaleStatus != 3 &&
|
item.preSaleStatus != 3 &&
|
||||||
item.isSale != 1 &&
|
item.isSale != 1 &&
|
||||||
specialArea == 31 &&
|
Number(item.inventory)
|
||||||
userInfo.isMakerSpace == 0
|
|
||||||
"
|
"
|
||||||
src="@/static/images/cart.png"
|
src="@/static/images/cart.png"
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
Loading…
Reference in New Issue