w-front-end / select_good · Commits

Commit fec7152ebed877cb90744e85ab515ade4aa48698

Authored by zhiyangdu
1 parent a6206620

积分商城优化

Inline Side-by-side
Showing 6 changed files with 32 additions and 12 deletions
src/components/columnListBox/columnListBox.vue
  View file @fec7152
... ... @@ -13,6 +13,7 @@
13 13 <goods-item-7 v-if="com == '7'" @jump="jump" @primary="primary"
14 14 :item="item"
15 15 :goodType="goodType"
  16 + :company="company"
16 17 >
17 18 </goods-item-7>
18 19 </div>
... ... @@ -28,6 +29,7 @@
28 29 <goods-item-7 v-if="com == '7'" @jump="jump" @primary="primary"
29 30 :item="item"
30 31 :goodType="goodType"
  32 + :company="company"
31 33 >
32 34 </goods-item-7>
33 35 </div>
... ... @@ -47,7 +49,7 @@
47 49  
48 50 };
49 51 },
50   - props: ["lists", "com", "goodType"],
  52 + props: ["lists", "com", "goodType", "company"],
51 53 components: {
52 54 goodsItem7
53 55 },
... ...
src/components/goodsItem_7/goodsItem_7.less
  View file @fec7152
... ... @@ -30,7 +30,7 @@
30 30 width: 100%;
31 31 height: 58px;
32 32 // border-radius: 26px;
33   - background: rgba(0, 0, 0, 0.5);
  33 + background: rgba(0, 0, 0, 0.4);
34 34 display: flex;
35 35 align-items: center;
36 36 justify-content: center;
... ...
src/components/goodsItem_7/goodsItem_7.vue
  View file @fec7152
... ... @@ -3,9 +3,9 @@
3 3 <div class="item" :class="'g-' + goodType">
4 4 <div class="img-box">
5 5 <img v-lazy="item.simg + SIGN.MIDDLE" class="img" />
6   -
  6 +
7 7 <!-- 补货中按钮 -->
8   - <div v-if="item.stock && item.stock == 0" class="goods_active">
  8 + <div v-if="item && item.stock && item.stock == 0" class="goods_active">
9 9 已兑完，补货中
10 10 </div>
11 11  
... ... @@ -24,8 +24,8 @@
24 24 {{item.num}}<span>积分 + {{item.price}}元</span>
25 25 </div>
26 26 <!-- 积分 -->
27   - <div v-else class="grade-box">
28   - {{item.num}}<span>积分</span>
  27 + <div v-else-if="company == 1 || company == 2" class="grade-box">
  28 + {{item.num}}<span v-if="company==1">积分</span><span v-else>健康值</span>
29 29 </div>
30 30 <!-- 价格 -->
31 31 <div v-else class="price-box">
... ... @@ -50,7 +50,7 @@ export default {
50 50  
51 51 }
52 52 },
53   - props: ["item","goodType"],
  53 + props: ["item","goodType", "company"],
54 54 computed: {
55 55  
56 56 /**
... ...
src/pages/healthMall/healthMall.less
  View file @fec7152
... ... @@ -166,6 +166,19 @@
166 166 background: #999999;
167 167 margin: 0 16px;
168 168 }
  169 + .more{
  170 + display: flex;
  171 + flex: 1;
  172 + justify-content: flex-end;
  173 + align-items: center;
  174 + font-size: 24px;
  175 + color: #999999;
  176 + img{
  177 + display: block;
  178 + width: 22px;
  179 + height: 22px;
  180 + }
  181 + }
169 182 }
170 183 // 为你推荐
171 184 .list-box {
... ...
src/pages/healthMall/healthMall.vue
  View file @fec7152
... ... @@ -70,11 +70,13 @@
70 70 <!-- 分割线 -->
71 71 <div class="line"> </div>
72 72 <div class="item">热门商品 精品推荐</div>
  73 + <div @click="toMore(1)" class="more">更多<img src="static/img/icon_more_arrow_right.png"alt=""/></div>
73 74 </div>
74 75 <!-- 实物商品裂变 -->
75   - <!-- 商品样式 7 列表 goodType=1为健康商城实物商品-->
  76 + <!-- 商品样式 7 列表 goodType=1为健康商城实物商品 company=1单位为积分2为健康值-->
76 77 <column-list-box class="column-list-box" v-if="phyicalGoods && phyicalGoods.list && phyicalGoods.list.length" @jump="toDetail"
77 78 :lists="phyicalGoods"
  79 + company="2"
78 80 com="7">
79 81 </column-list-box>
80 82 </div>
... ... @@ -87,10 +89,12 @@
87 89 <!-- 分割线 -->
88 90 <div class="line"> </div>
89 91 <div class="item">虚拟商品 精品推荐</div>
  92 + <div @click="toMore(2)" class="more">更多<img src="static/img/icon_more_arrow_right.png"alt=""/></div>
90 93 </div>
91 94 <!-- 商品样式 7 列表 -->
92 95 <column-list-box class="column-list-box" v-if="virtualGoods && virtualGoods.list && virtualGoods.list.length" @jump="toDetail"
93 96 :lists="virtualGoods"
  97 + company="2"
94 98 com="7">
95 99 </column-list-box>
96 100 </div>
... ... @@ -102,10 +106,12 @@
102 106 <!-- 分割线 -->
103 107 <div class="line"> </div>
104 108 <div class="item">满减红包 精品推荐</div>
  109 + <div @click="toMore(3)" class="more">更多<img src="static/img/icon_more_arrow_right.png"alt=""/></div>
105 110 </div>
106 111 <!-- 商品样式 7 列表 -->
107 112 <column-list-box class="column-list-box" v-if="redEnvelopeFull && redEnvelopeFull.list && redEnvelopeFull.list.length" @jump="toDetail"
108 113 :lists="redEnvelopeFull"
  114 + company="2"
109 115 com="7">
110 116 </column-list-box>
111 117 </div>
... ...
src/pages/pointsMall/pointsMall.vue
  View file @fec7152
... ... @@ -52,7 +52,6 @@
52 52 <!-- 分割线 -->
53 53 <div class="line"> </div>
54 54 <div class="item">满减红包 精品推荐</div>
55   - <div @click="toMore(1)" class="more">更多<img src="static/img/icon_more_arrow_right.png"alt=""/></div>
56 55 </div>
57 56 <!-- 为你推荐商品列表 -->
58 57 <div class="list-box">
... ... @@ -77,7 +76,7 @@
77 76 <!-- 商品样式 7 列表 goodType=1为积分商城实物商品-->
78 77 <column-list-box class="column-list-box" v-if="phyicalGoods && phyicalGoods.list && phyicalGoods.list.length" @jump="toDetail"
79 78 :lists="phyicalGoods"
80   - com="7" goodType="1">
  79 + com="7" goodType="1" company="1">
81 80 </column-list-box>
82 81 </div>
83 82  
... ... @@ -94,7 +93,7 @@
94 93 <!-- 商品样式 7 列表 -->
95 94 <column-list-box class="column-list-box" v-if="virtualGoods && virtualGoods.list && virtualGoods.list.length" @jump="toDetail"
96 95 :lists="virtualGoods"
97   - com="7">
  96 + com="7" company="1">
98 97 </column-list-box>
99 98 </div>
100 99  
... ... @@ -110,7 +109,7 @@
110 109 <!-- 商品样式 7 列表 -->
111 110 <column-list-box class="column-list-box" v-if="redEnvelopeFull && redEnvelopeFull.list && redEnvelopeFull.list.length" @jump="toDetail"
112 111 :lists="redEnvelopeFull"
113   - com="7">
  112 + com="7" company="1">
114 113 </column-list-box>
115 114 </div>
116 115 </div>
... ...