Commit 24728227d8fab97e36a6d67978777da0113df7a6
1 parent
c9691201
bug修复
Showing
3 changed files
with
10 additions
and
5 deletions
src/components/goodsItem_7/goodsItem_7.vue
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | </div> | 10 | </div> |
| 11 | 11 | ||
| 12 | <!-- goodType=1为积分商城定义实物商品展示tip积分+现金形式 --> | 12 | <!-- goodType=1为积分商城定义实物商品展示tip积分+现金形式 --> |
| 13 | - <div v-if="goodType == 1" class="goods_tip"> | 13 | + <div v-if="goodType == 1 && item && item.price && parseInt(item.price)>0" class="goods_tip"> |
| 14 | 积分+现金 | 14 | 积分+现金 |
| 15 | </div> | 15 | </div> |
| 16 | 16 |
src/pages/goodDetails/goodDetails.vue
| @@ -44,12 +44,12 @@ | @@ -44,12 +44,12 @@ | ||
| 44 | </div> | 44 | </div> |
| 45 | <!-- 积分 --> | 45 | <!-- 积分 --> |
| 46 | <div class="title-t"> | 46 | <div class="title-t"> |
| 47 | - <div class="goods_tip"> | 47 | + <div v-show="parseInt(goodsInfo.price)>0" class="goods_tip"> |
| 48 | 积分+现金 | 48 | 积分+现金 |
| 49 | </div> | 49 | </div> |
| 50 | <div> | 50 | <div> |
| 51 | <!-- <span v-if="goodsInfo && goodsInfo.price" class="price">¥{{goodsInfo.price}}</span> --> | 51 | <!-- <span v-if="goodsInfo && goodsInfo.price" class="price">¥{{goodsInfo.price}}</span> --> |
| 52 | - <span v-if="goodsInfo && goodsInfo.num" class="integral">{{goodsInfo.num}}积分+{{goodsInfo.price}}元</span> | 52 | + <span v-if="goodsInfo && goodsInfo.num" class="integral">{{goodsInfo.num}}积分<span v-show="parseInt(goodsInfo.price)>0"> +{{goodsInfo.price}}元</span></span> |
| 53 | <!-- <span class="integral-in">积分</span> --> | 53 | <!-- <span class="integral-in">积分</span> --> |
| 54 | </div> | 54 | </div> |
| 55 | </div> | 55 | </div> |
src/pages/morePoints/morePoints.vue
| @@ -28,8 +28,13 @@ | @@ -28,8 +28,13 @@ | ||
| 28 | </column-list-box> | 28 | </column-list-box> |
| 29 | </div> | 29 | </div> |
| 30 | <!-- 没有更多了 --> | 30 | <!-- 没有更多了 --> |
| 31 | - <div v-if="isNoMore" class="no_more"> | ||
| 32 | - — 没有更多了 — | 31 | + <!-- 暂无记录展示 --> |
| 32 | + <div v-show="list.length == 0 && isCall" class="no_gift_tip"> | ||
| 33 | + <img src="static/img/no_gift_tip.png" alt=""/> | ||
| 34 | + <div class="text">暂无兑换记录</div> | ||
| 35 | + </div> | ||
| 36 | + <div v-show="list.length>0 && isMore ==0" class="is_more"> | ||
| 37 | + 没有更多了 | ||
| 33 | </div> | 38 | </div> |
| 34 | </div> | 39 | </div> |
| 35 | </template> | 40 | </template> |