Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -905,6 +905,10 @@
     },
     "delivery": {
         "title": "Delivery pickup",
+        "title1": "Full-payment Pickup",
+        "title2": "Deposit Pickup",
+        "title3": "Deposit Delivery",
+        "title4": "Returns & Exchanges",
         "online": {
             "title": "Select settlement order",
             "title2": "Historical selected settlement orders",

public/locales/th-TH.json

@@ -480,6 +480,9 @@
     },
     "order": {
         "title": "คำสั่งซื้อของฉัน",
+        "title1": "ประวัติคำสั่งซื้อ",
+        "title2": "คำสั่งซื้อแบบชำระเต็มจำนวน",
+        "title3": "คำสั่งซื้อแบบชำระล่วงหน้า",
         "plTotal": "กำไรและขาดทุน:",
         "feeTotal": "ค่า:",
         "qtyTotal": "จำนวน:",
@@ -905,6 +908,10 @@
     },
     "delivery": {
         "title": "การส่งมอบและการรับสินค้า",
+        "title1": "รับสินค้าด้วยการชำระเต็มจำนวน",
+        "title2": "รับสินค้าด้วยการชำระล่วงหน้า",
+        "title3": "การส่งมอบสินค้าหลังชำระล่วงหน้า",
+        "title4": "การคืนและเปลี่ยนสินค้า",
         "online": {
             "title": "เลือกใบส่งมอบ",
             "title2": "ประวัติการเลือกใบส่งมอบ",

public/locales/zh-CN.json

@@ -480,6 +480,9 @@
     },
     "order": {
         "title": "我的订单",
+        "title1": "历史订单",
+        "title2": "全款订单",
+        "title3": "预付款订单",
         "plTotal": "盈亏：",
         "feeTotal": "手续费：",
         "qtyTotal": "数量：",
@@ -905,6 +908,10 @@
     },
     "delivery": {
         "title": "交货提货",
+        "title1": "全款提货",
+        "title2": "预付款提货",
+        "title3": "预付款交货",
+        "title4": "退换货",
         "online": {
             "title": "点选交收单",
             "title2": "历史点选交收单",

public/locales/zh-TW.json

@@ -480,6 +480,9 @@
     },
     "order": {
         "title": "我的訂單",
+        "title1": "歷史訂單",
+        "title2": "全款訂單",
+        "title3": "預付款訂單",
         "plTotal": "盈虧：",
         "feeTotal": "手續費：",
         "qtyTotal": "數量：",
@@ -905,6 +908,10 @@
     },
     "delivery": {
         "title": "交貨提貨",
+        "title1": "全款提貨",
+        "title2": "預付款提貨",
+        "title3": "預付款交貨",
+        "title4": "退換貨",
         "online": {
             "title": "點選交收單",
             "title2": "歷史點選交收單",

src/stores/modules/goodscollection.ts

@@ -35,7 +35,7 @@ export const useGoodsCollectionStore = defineStore(() => {
         try {
             state.loading = true
             const res = await getTCEGoodsCollections()
-            state.goodsCollections = res.data.filter((e) => e.collectionstatus === 1)
+            state.goodsCollections = res.data.filter((e) => e.collectionstatus === 1 && e.configs.length != 0)
         } finally {
             state.loading = false
         }