w-front-end / select_good · Commits

Commit d48f831f5bec9d6733af23a2409b20f450a724aa

Authored by 王强
1 parent 6b196e54

折扣专区接口对接完成~

Inline Side-by-side
Showing 2 changed files with 42 additions and 45 deletions
src/pages/discountList/discountList.vue
  View file @d48f831
... ... @@ -23,17 +23,25 @@
23 23 </div>
24 24  
25 25 <!-- 倒计时 -->
26   - <div class="count-down-box" v-if="datas">
27   - <div class="text" v-if="datas.discount_time && datas.discount_time > 0">
  26 + <div class="count-down-box" v-if="datas && datas.discount_time && datas.discount_time > 0">
  27 + <div class="text">
28 28 距离活动结束仅剩
29 29 </div>
30   - <div class="text" v-else>
  30 +
  31 + <!-- 倒计时组件 -->
  32 + <count-down-com slot="extend"
  33 + :time="parseInt(datas.discount_time) * 1000"
  34 + sty="5">
  35 + </count-down-com>
  36 + </div>
  37 + <div class="count-down-box" v-if="datas && (!datas.discount_time || datas.discount_time <= 0)">
  38 + <div class="text">
31 39 活动已结束
32 40 </div>
33 41  
34 42 <!-- 倒计时组件 -->
35   - <count-down-com slot="extend" v-if="datas.discount_time && datas.discount_time > 0"
36   - :time="datas.discount_time"
  43 + <count-down-com slot="extend"
  44 + :time="-1"
37 45 sty="5">
38 46 </count-down-com>
39 47 </div>
... ...
src/pages/optimization2/optimization2.vue
  View file @d48f831
... ... @@ -18,7 +18,7 @@
18 18 <div class="main-box">
19 19  
20 20 <!-- 折扣专区 -->
21   - <div class="section shop-list" v-if="false">
  21 + <div class="section shop-list" v-if="discountTime && discountTime > 0">
22 22  
23 23 <!-- 标题 -->
24 24 <text-bg-title-com @more="toDiscountList"
... ... @@ -29,7 +29,7 @@
29 29  
30 30 <!-- 倒计时组件 -->
31 31 <count-down-com slot="extend"
32   - :time="new Date().getTime() + 10000000 - new Date().getTime()"
  32 + :time="discountTime * 1000"
33 33 sty="4">
34 34 </count-down-com>
35 35 </text-bg-title-com>
... ... @@ -44,7 +44,7 @@
44 44  
45 45 <!-- 折扣角标 -->
46 46 <div class="discount-flag" slot="flag">
47   - 5折
  47 + {{getDiscount(item.price, item.prices)}}折
48 48 </div>
49 49 </goods-item-2>
50 50 </div>
... ... @@ -168,6 +168,7 @@
168 168 title: "", // 标题
169 169 backs: null, // 后退按钮组
170 170 navs: null, // 导航
  171 + discountTime: null, // 倒计时时间
171 172 discountLists: null, // 折扣专区数据
172 173 quality: null, // 品质优选
173 174 salesOptions: null, // 热销排行选项
... ... @@ -178,6 +179,21 @@
178 179 likeNum: 0 // 猜你喜欢二维数组当前显示的下标
179 180 }
180 181 },
  182 + computed: {
  183 +
  184 + /**
  185 + * 计算折扣
  186 + */
  187 + getDiscount() {
  188 + return (price, prices) => {
  189 +
  190 + // 售价/原价
  191 + let x = (price * 100) / (prices * 100);
  192 +
  193 + return (Math.floor(x * 100) / 100) * 10;
  194 + }
  195 + }
  196 + },
181 197 components: {
182 198 callAppBox,
183 199 backBox,
... ... @@ -219,43 +235,6 @@
219 235 // 优选页面接口
220 236 this.index();
221 237  
222   -
223   -
224   -
225   - // 临时，初始化折扣专区数据
226   - this.$set(this, 'discountLists', [
227   - {
228   - ads: "广告语",
229   - id: "9519164",
230   - price: "5.01",
231   - prices: "6.00",
232   - shop_type: "1",
233   - simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
234   - title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
235   - },
236   - {
237   - ads: "广告语",
238   - id: "9519164",
239   - price: "5.01",
240   - prices: "6.00",
241   - shop_type: "1",
242   - simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
243   - title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
244   - },
245   - {
246   - ads: "广告语",
247   - id: "9519164",
248   - price: "5.01",
249   - prices: "6.00",
250   - shop_type: "1",
251   - simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
252   - title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
253   - }
254   - ]);
255   -
256   -
257   -
258   -
259 238 // 设置锚点定位数据
260 239 this.$set(this, 'navs', [
261 240 {
... ... @@ -333,6 +312,16 @@
333 312  
334 313 /* 获取优选库“优选”数据 开始 */
335 314  
  315 + // 设置折扣专区数据
  316 + if (datas.discount_time > 0 && datas.discount && datas.discount.length) {
  317 +
  318 + // 设置倒计时时间
  319 + this.$set(this, 'discountTime', datas.discount_time);
  320 +
  321 + // 设置折扣专区数据
  322 + this.$set(this, 'discountLists', datas.discount);
  323 + }
  324 +
336 325 // 判断品质优选是否有数据
337 326 if (datas.quality && datas.quality.length) {
338 327  
... ...