Commit 1eb552c33811768c464090d52566afc6637be8c7

Authored by zhiyangdu
1 parent 66f9bc45

积分商城实物商品新增积分+现金的tip标签

src/components/columnListBox/columnListBox.vue
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="item-box" v-if="!(index % 2)" v-for="(item, index) in lists.list || lists" :key="index"> 10 <div class="item-box" v-if="!(index % 2)" v-for="(item, index) in lists.list || lists" :key="index">
11 11
12 <!-- 商品组件 --> 12 <!-- 商品组件 -->
13 - <goods-item-7 v-if="com == '7'" @jump="jump" @primary="primary" 13 + <goods-item-7 v-if="com == '7'" :goodType="goodType" @jump="jump" @primary="primary"
14 :item="item"> 14 :item="item">
15 </goods-item-7> 15 </goods-item-7>
16 </div> 16 </div>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <div class="item-box" v-if="index % 2" v-for="(item, index) in lists.list || lists" :key="index"> 23 <div class="item-box" v-if="index % 2" v-for="(item, index) in lists.list || lists" :key="index">
24 24
25 <!-- 商品组件 --> 25 <!-- 商品组件 -->
26 - <goods-item-7 v-if="com == '7'" @jump="jump" @primary="primary" 26 + <goods-item-7 v-if="com == '7'" :goodType="goodType" @jump="jump" @primary="primary"
27 :item="item"> 27 :item="item">
28 </goods-item-7> 28 </goods-item-7>
29 </div> 29 </div>
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 43
44 }; 44 };
45 }, 45 },
46 - props: ["lists", "com"], 46 + props: ["lists", "com", "goodType"],
47 components: { 47 components: {
48 goodsItem7 48 goodsItem7
49 }, 49 },
src/components/goodsItem_7/goodsItem_7.less
@@ -41,6 +41,20 @@ @@ -41,6 +41,20 @@
41 left: 0; 41 left: 0;
42 bottom: 0; 42 bottom: 0;
43 } 43 }
  44 + // 积分 + 现金标示
  45 + .goods_tip{
  46 + position: absolute;
  47 + left: 14px;
  48 + top: 14px;
  49 + padding: 3px 8px;
  50 + background: linear-gradient(90deg, #F9EE7A 0%, #FAD844 100%);
  51 + border-radius: 7px;
  52 + height: 30px;
  53 + font-size: 22px;
  54 + font-weight: 400;
  55 + color: #945A08;
  56 + line-height: 30px;
  57 + }
44 } 58 }
45 .content-box { 59 .content-box {
46 margin: 0 auto; 60 margin: 0 auto;
src/components/goodsItem_7/goodsItem_7.vue
@@ -3,11 +3,13 @@ @@ -3,11 +3,13 @@
3 <div class="item"> 3 <div class="item">
4 <div class="img-box"> 4 <div class="img-box">
5 <img v-lazy="item.simg + SIGN.MIDDLE" class="img" /> 5 <img v-lazy="item.simg + SIGN.MIDDLE" class="img" />
6 -  
7 - <!-- 补货中按钮 -->  
8 - <div v-if="item.stock == 0" class="goods_active">  
9 - 已售罄  
10 - </div> 6 + <!-- 补货中按钮 -->
  7 + <div v-if="item.stock && item.stock == 0" class="goods_active">
  8 + 已售罄
  9 + </div>
  10 + <div v-if="goodType == 1" class="goods_tip">
  11 + 积分+现金
  12 + </div>
11 </div> 13 </div>
12 <div class="content-box"> 14 <div class="content-box">
13 <div class="title">{{item.title}}</div> 15 <div class="title">{{item.title}}</div>
@@ -43,7 +45,7 @@ export default { @@ -43,7 +45,7 @@ export default {
43 45
44 } 46 }
45 }, 47 },
46 - props: ["item"], 48 + props: ["item","goodType"],
47 computed: { 49 computed: {
48 50
49 /** 51 /**
src/pages/pointsMall/pointsMall.vue
@@ -72,10 +72,10 @@ @@ -72,10 +72,10 @@
72 <div class="item">热门商品 精品推荐</div> 72 <div class="item">热门商品 精品推荐</div>
73 </div> 73 </div>
74 <!-- 实物商品裂变 --> 74 <!-- 实物商品裂变 -->
75 - <!-- 商品样式 7 列表 --> 75 + <!-- 商品样式 7 列表 goodType=1为积分商城实物商品-->
76 <column-list-box class="column-list-box" v-if="phyicalGoods && phyicalGoods.list && phyicalGoods.list.length" @jump="toDetail" 76 <column-list-box class="column-list-box" v-if="phyicalGoods && phyicalGoods.list && phyicalGoods.list.length" @jump="toDetail"
77 :lists="phyicalGoods" 77 :lists="phyicalGoods"
78 - com="7"> 78 + com="7" goodType="1">
79 </column-list-box> 79 </column-list-box>
80 </div> 80 </div>
81 81