倒计时

src/locales/zh.json

@@ -1,118 +1,123 @@
 {
+  "cancel": "取消",
+  "login": "登录",
+  "title": {
+    "balanceRecord": "交易明细",
+    "distribution": "收益中心",
+    "myTeam": "我的团队"
+  },
+  "common": {
     "cancel": "取消",
-    "login": "登录",
-    "title": {
-        "balanceRecord": "交易明细",
-        "distribution": "收益中心",
-        "myTeam": "我的团队"
+    "confirm": "确定",
+    "more": "更多",
+    "pullRefresh": "下拉刷新",
+    "loadFinish": "加载完成",
+    "home": "首页",
+    "mine": "我的",
+    "eula": "平台协议"
+  },
+  "order": {
+    "id": "订单编号",
+    "createdAt": "下单时间",
+    "my": "我的订单",
+    "detail": "订单详情",
+    "payMethod": "支付方式",
+    "status": {
+      "ALL": "全部",
+      "NOT_PAID": "待付款",
+      "CANCELED": "已取消",
+      "NOT_CONFIRMED": "待卖家确认收款",
+      "CONFIRMED": "待委托",
+      "SELLING": "委托中",
+      "SOLD_NOT_PAID": "待买家付款",
+      "SOLD_NOT_CONFIRMED": "待确认收款",
+      "SOLD": "已售出",
+      "NOT_SHIPPED": "待发货",
+      "SHIPPED": "已发货",
+      "RECEIVED": "已收货"
     },
-    "common": {
-        "cancel": "取消",
-        "confirm": "确定",
-        "more": "更多",
-        "pullRefresh": "下拉刷新",
-        "loadFinish": "加载完成",
-        "home": "首页",
-        "mine": "我的",
-        "eula": "平台协议"
+    "statusDesc": {
+      "NOT_PAID": "请尽快支付，超时未支付订单将自动取消",
+      "CANCELED": "订单已取消，如有疑问请联系客服",
+      "NOT_CONFIRMED": "待卖家确认收款",
+      "CONFIRMED": "待委托，委托后将在24小时内上架",
+      "SELLING": "委托中，如有疑问请联系客服",
+      "SOLD_NOT_PAID": "待买家付款",
+      "SOLD_NOT_CONFIRMED": "待确认收款",
+      "SOLD": "已售出，如有疑问请联系客服",
+      "NOT_SHIPPED": "待发货",
+      "SHIPPED": "已发货",
+      "RECEIVED": "已收货"
     },
-    "order": {
-        "id": "订单编号",
-        "createdAt": "下单时间",
-        "my": "我的订单",
-        "detail": "订单详情",
-        "payMethod": "支付方式",
-        "status": {
-            "ALL": "全部",
-            "NOT_PAID": "待付款",
-            "CANCELED": "已取消",
-            "NOT_CONFIRMED": "待卖家确认收款",
-            "CONFIRMED": "待委托",
-            "SELLING": "委托中",
-            "SOLD_NOT_PAID": "待买家付款",
-            "SOLD_NOT_CONFIRMED": "待确认收款",
-            "SOLD": "已售出",
-            "NOT_SHIPPED": "待发货",
-            "SHIPPED": "已发货",
-            "RECEIVED": "已收货"
-        },
-        "statusDesc": {
-            "NOT_PAID": "请尽快支付，超时未支付订单将自动取消",
-            "CANCELED": "订单已取消，如有疑问请联系客服",
-            "NOT_CONFIRMED": "待卖家确认收款",
-            "CONFIRMED": "待委托，委托后将在24小时内上架",
-            "SELLING": "委托中，如有疑问请联系客服",
-            "SOLD_NOT_PAID": "待买家付款",
-            "SOLD_NOT_CONFIRMED": "待确认收款",
-            "SOLD": "已售出，如有疑问请联系客服",
-            "NOT_SHIPPED": "待发货",
-            "SHIPPED": "已发货",
-            "RECEIVED": "已收货"
-        },
-        "payMethodName": {
-            "balance": "余额支付"
-        },
-        "payNow": "立即支付",
-        "totalPayment": "实际支付",
-        "total": "合计",
-        "payInfo": "支付信息",
-        "buyNow": "立即购买",
-        "walletPay": "钱包支付",
-        "processing": "处理中",
-        "createSuccess": "订单创建成功"
+    "payMethodName": {
+      "balance": "余额支付"
     },
-    "balance": {
-        "symbol": "¥",
-        "unit": "元",
-        "balance": "账户余额",
-        "chooseAmount": "选择金额",
-        "inputCustomAmount": "请输入自定义金额",
-        "withdraw": "提现",
-        "recharge": "充值",
-        "totalWithdraw": "累计提现",
-        "record": {
-            "pay": "支付",
-            "receipt": "收款",
-            "recharge": "充值",
-            "withdraw": "提现",
-            "commission": "佣金"
-        },
-        "withdrawModalTitle": "申请提现",
-        "confirmWithdraw": "确认提现",
-        "withdrawAmount": "提现金额",
-        "availableWidthdrawAmount": "可提现金额",
-        "withdrawInputTip": "请输入提现金额",
-        "withdrawAmountError": "请输入正确的提现金额",
-        "withdrawing": "提现中",
-        "withdrawSuccess": "提现成功",
-        "withdrawFeeTip0": "注: 购买总流水的1/3手续费是",
-        "withdrawFeeTip1": "，超出部分手续费",
-        "withdrawFee": "提现手续费",
-        "realReceipt": "实际到账"
+    "payNow": "立即支付",
+    "totalPayment": "实际支付",
+    "total": "合计",
+    "payInfo": "支付信息",
+    "buyNow": "立即购买",
+    "walletPay": "钱包支付",
+    "processing": "处理中",
+    "createSuccess": "订单创建成功"
+  },
+  "balance": {
+    "symbol": "¥",
+    "unit": "元",
+    "balance": "账户余额",
+    "chooseAmount": "选择金额",
+    "inputCustomAmount": "请输入自定义金额",
+    "withdraw": "提现",
+    "recharge": "充值",
+    "totalWithdraw": "累计提现",
+    "record": {
+      "pay": "支付",
+      "receipt": "收款",
+      "recharge": "充值",
+      "withdraw": "提现",
+      "commission": "佣金"
     },
-    "user": {
-        "wallet": "我的钱包",
-        "profile": "编辑资料",
-        "notLogin": "用户未登录，是否立即登录？"
-    },
-    "product": {
-        "detail": "商品详情",
-        "dailyEarning": "日化收益"
-    },
-    "delegate": {
-        "title": "委托代卖"
-    },
-    "distribution": {
-        "qrCode": "我的推广码",
-        "myInvitor": "我的推荐人",
-        "myProfit": "我的收益",
-        "profitDetails": "收益明细",
-        "teamNum": "团队人数",
-        "viewDetail": "查看明细",
-        "viewTeam": "查看团队",
-        "commission": "佣金",
-        "totalProfit": "总收益",
-        "orderNum": "订单数",
-        "joinTeamAt": "加入团队时间"
-    }
+    "withdrawModalTitle": "申请提现",
+    "confirmWithdraw": "确认提现",
+    "withdrawAmount": "提现金额",
+    "availableWidthdrawAmount": "可提现金额",
+    "withdrawInputTip": "请输入提现金额",
+    "withdrawAmountError": "请输入正确的提现金额",
+    "withdrawing": "提现中",
+    "withdrawSuccess": "提现成功",
+    "withdrawFeeTip0": "注: 购买总流水的1/3手续费是",
+    "withdrawFeeTip1": "，超出部分手续费",
+    "withdrawFee": "提现手续费",
+    "realReceipt": "实际到账"
+  },
+  "user": {
+    "wallet": "我的钱包",
+    "profile": "编辑资料",
+    "notLogin": "用户未登录，是否立即登录？"
+  },
+  "product": {
+    "detail": "商品详情",
+    "dailyEarning": "日化收益"
+  },
+  "delegate": {
+    "title": "委托代卖"
+  },
+  "distribution": {
+    "qrCode": "我的推广码",
+    "myInvitor": "我的推荐人",
+    "myProfit": "我的收益",
+    "profitDetails": "收益明细",
+    "teamNum": "团队人数",
+    "viewDetail": "查看明细",
+    "viewTeam": "查看团队",
+    "commission": "佣金",
+    "totalProfit": "总收益",
+    "orderNum": "订单数",
+    "joinTeamAt": "加入团队时间"
+  },
+  "home":{
+    "all":"全部",
+    "hot":"火爆抢购中",
+    "start":"后开抢"
+  }
 }

src/views/HomePage.vue

@@ -63,7 +63,7 @@
 
             <template v-for="(item, index) in saleBatchs" :key="index">
                 <div class="level">
-                    <van-cell :title="item.name" value="全部" @click="goList(item)" :border="false" is-link>
+                    <van-cell :title="item.name" :value="$t('home.all')" @click="goList(item)" :border="false" is-link>
                         <template #right-icon>
                             <img src="../assets/icon_inter.png" alt="" class="right-icon" />
                         </template>
@@ -84,11 +84,14 @@
 
                         <div class="status hot" v-if="getStatus(item) === '抢购中'">
                             <img src="../assets/info_icon_qianggouzhong.png" alt="" />
-                            <span>火爆抢购中…</span>
+                            <span>{{ $t('home.hot') }}…</span>
                         </div>
                         <div class="status" v-else-if="getStatus(item)">
                             <img src="../assets/info_icon_shijian.png" alt="" />
-                            <span><van-count-down :time="getStatus(item)" format="HH时mm分" /> 后开抢</span>
+                            <span
+                                ><van-count-down :time="getStatus(item)" format="HH时mm分" />
+                                {{ $t('home.start') }}</span
+                            >
                         </div>
                     </div>
                     <div class="second" v-else>
@@ -229,6 +232,8 @@ const getStatus = info => {
             !info.empty
         ) {
             return '抢购中'
+        } else if (isBefore(new Date(), new Date(date1 + ' ' + info.saleStart))) {
+            return getTime(new Date(date1 + ' ' + info.saleStart), 1) - getTime(new Date())
         } else {
             console.log(addDays(new Date(date1 + ' ' + info.saleStart), 1))
             return getTime(addDays(new Date(date1 + ' ' + info.saleStart), 1)) - getTime(new Date())

src/views/ProductListPage.vue

@@ -84,6 +84,8 @@ const status = computed(() => {
             !empty.value
         ) {
             return '抢购中'
+        } else if (isBefore(new Date(), new Date(date1 + ' ' + batchInfo.value.saleStart))) {
+            return getTime(new Date(date1 + ' ' + batchInfo.value.saleStart), 1) - getTime(new Date())
         } else {
             return getTime(addDays(new Date(date1 + ' ' + batchInfo.value.saleStart), 1)) - getTime(new Date())
         }