折扣专区接口对接完成~

王强
1 parent 6b196e54
Showing 2 changed files with 42 additions and 45 deletions
src/pages/discountList/discountList.vue
src/pages/optimization2/optimization2.vue
@@ -23,17 +23,25 @@
             </div>
             <!-- 倒计时 -->
-            <div class="count-down-box" v-if="datas">
-                <div class="text" v-if="datas.discount_time && datas.discount_time > 0">
+            <div class="count-down-box" v-if="datas && datas.discount_time && datas.discount_time > 0">
+                <div class="text">
                     距离活动结束仅剩
                 </div>
-                <div class="text" v-else>
+
+                <!-- 倒计时组件 -->
+                <count-down-com slot="extend"
+                    :time="parseInt(datas.discount_time) * 1000"
+                    sty="5">
+                </count-down-com>
+            </div>
+            <div class="count-down-box" v-if="datas && (!datas.discount_time || datas.discount_time <= 0)">
+                <div class="text">
                     活动已结束
                 </div>
                 <!-- 倒计时组件 -->
-                <count-down-com slot="extend" v-if="datas.discount_time && datas.discount_time > 0"
-                    :time="datas.discount_time"
+                <count-down-com slot="extend"
+                    :time="-1"
                     sty="5">
                 </count-down-com>
             </div>
@@ -18,7 +18,7 @@
         <div class="main-box">
             <!-- 折扣专区 -->
-            <div class="section shop-list" v-if="false">
+            <div class="section shop-list" v-if="discountTime && discountTime > 0">
                 <!-- 标题 -->
                 <text-bg-title-com @more="toDiscountList"
@@ -29,7 +29,7 @@
                     <!-- 倒计时组件 -->
                     <count-down-com slot="extend"
-                        :time="new Date().getTime() + 10000000 - new Date().getTime()"
+                        :time="discountTime * 1000"
                         sty="4">
                     </count-down-com>
                 </text-bg-title-com>
@@ -44,7 +44,7 @@
                         <!-- 折扣角标 -->
                         <div class="discount-flag" slot="flag">
-                            5折
+                            {{getDiscount(item.price, item.prices)}}折
                         </div>
                     </goods-item-2>
                 </div>
@@ -168,6 +168,7 @@
                 title: "",              // 标题
                 backs: null,            // 后退按钮组
                 navs: null,             // 导航
+                discountTime: null,     // 倒计时时间
                 discountLists: null,    // 折扣专区数据
                 quality: null,          // 品质优选
                 salesOptions: null,     // 热销排行选项
@@ -178,6 +179,21 @@
                 likeNum: 0              // 猜你喜欢二维数组当前显示的下标
             }
         },
+        computed: {
+
+            /**
+             * 计算折扣
+             */
+            getDiscount() {
+                return (price, prices) => {
+
+                    // 售价/原价
+                    let x = (price * 100) / (prices * 100);
+
+                    return (Math.floor(x * 100) / 100) * 10;
+                }
+            }
+        },
         components: {
             callAppBox,
             backBox,
@@ -219,43 +235,6 @@
             // 优选页面接口
             this.index();
-
-
-
-            // 临时，初始化折扣专区数据
-            this.$set(this, 'discountLists', [
-                {
-                    ads: "广告语",
-                    id: "9519164",
-                    price: "5.01",
-                    prices: "6.00",
-                    shop_type: "1",
-                    simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
-                    title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
-                },
-                {
-                    ads: "广告语",
-                    id: "9519164",
-                    price: "5.01",
-                    prices: "6.00",
-                    shop_type: "1",
-                    simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
-                    title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
-                },
-                {
-                    ads: "广告语",
-                    id: "9519164",
-                    price: "5.01",
-                    prices: "6.00",
-                    shop_type: "1",
-                    simg: "http://wjjseller.cnlive.com/uploads/05ac5ee31c3bb363d95072559d205bd8.png",
-                    title: "L'OCCITANE/欧舒丹 芍药花香润手霜 30ML 30ml"
-                }
-            ]);
-
-
-
-
             // 设置锚点定位数据
             this.$set(this, 'navs', [
                 {
@@ -333,6 +312,16 @@
                     /* 获取优选库“优选”数据 开始 */
+                    // 设置折扣专区数据
+                    if (datas.discount_time > 0 && datas.discount && datas.discount.length) {
+
+                        // 设置倒计时时间
+                        this.$set(this, 'discountTime', datas.discount_time);
+
+                        // 设置折扣专区数据
+                        this.$set(this, 'discountLists', datas.discount);
+                    }
+
                     // 判断品质优选是否有数据
                     if (datas.quality && datas.quality.length) {