feat: uk网站改版初稿.

assets/json/api2.json

@@ -358,4 +358,4 @@
             ]
         }
     ]
-}
+}

assets/json/api3.json

@@ -2,199 +2,150 @@
     "message": "OK",
     "status": 1,
     "data": {
-        "product_name": "Double-end Belton Flash Drive",
-        "product_code": "PCU608",
+        "product_name": "Harper Flash Drive",
+        "product_code": "PCU612",
         "category": "Classic USBs",
-        "price_notes": "Price is ex-GST,ex freight. Price included for an android connector, for IOS connector, additional cost would be applied, please contact us. An android connector can choose 2.0 or 3.0, IOS  connector just can choose 3.0.",
-        "colors_notes": "Red,Blue,Black,White,Green",
-        "supplier_colours": [
-            "Black",
-            "White",
-            "Red",
-            "Blue",
-            "Green"
-        ],
-        "discontinued": "No",
-        "hero_image": "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_2.jpg",
-        "secondary_images": [
-            "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_2.jpg",
-            "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_3.jpg",
-            "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_5.jpg",
-            "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_6.jpg",
-            "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/PCU608_7.jpg"
-        ],
-        "description": "Make data upload and data transfer easy and stylish! USB flash drives are one of the most in demand and useful promotional items nowadays. Made from metal and plastic material, and available in different colours. With screen print, engraving or full colour print options showcase your branding. It features two connectors on this USB Flash Drive.",
-        "line_artwork": "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/line_artwork/PCU608.pdf",
-        "product_size": "67 x 19 x 1.1mm",
+        "price_notes": "",
+        "colors_notes": null,
+        "supplier_colours": [],
+        "discontinued": "NO",
+        "clothing_sizes": "",
+        "clothing_size_chart": "",
+        "product_attributes": [],
+        "hero_image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/bca5c694c26b2da7d8c7121f05845ae3d549f43a.jpg",
+        "description": "1<br/>2",
+        "line_artwork": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/line_artwork/PCU612.pdf",
+        "product_size": "60 x 17 x 8 m5",
         "product_material": "Metal/Plastic",
-        "product_dimensions": "G/N Weight: 15kgs\n<br/>Meas: 38x28x30cm\n<br/>Packing: 1000pcs/ctn",
+        "product_dimensions": "G/N Weight: 12.5kgs\n<br/>Meas: 38x28x30cm\n<br/>Packing: 1000pcs/ctn",
         "print_position": "Front,Back",
-        "print_size_area": "25x12mm",
+        "print_size_area": "A: 35 x 12 mm<br/>B: 38 x 12 mm",
         "additional_info": "USB pricing is updated every two weeks, at the start and middle of the month, according to market prices. Our website will always have our latest up to date pricing, so please confirm pricing on our website before placing an order.<br/>please note that for metal USB print, if the product is likely to come into contact with other metal objects, there is a risk that the print will be scratched off. So in this situation we would recommend using engraving, as a more durable alternative.<br/><br/>Lead time is from confirmation of artwork approval. Lead time refers to dispatch, final delivery time will depend on location and type of courier used.<br/><br/><br/>Upon request, we can provide certification documents for the factories that we source our products from. If you have a certain requirement, please mention at the time of quoting, so we can ensure to source from the appropriate factory before commencing the order. If we are required to switch a factory that we source from, to meet a certain requirement, there may be variations in price applicable.",
-        "create_time": "2020-06-15 09:37:10",
+        "colors_text": "Black, Blue, Deep red, Silver",
+        "standard_status": 2,
+        "secondary_images": [
+            {
+                "colour": "Black",
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/f78dd1833c9238b803a37a0f4eb39b7f37404069.jpg"
+            },
+            {
+                "colour": "Blue",
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/114c43ff30c95e75e2ab704aa22d1928734e642b.jpg"
+            },
+            {
+                "colour": "Deep red",
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/5e1c43c39b4b455d1ed3333d8ee42ed6db4e0a22.jpg"
+            },
+            {
+                "colour": "Silver",
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/2a3bbcde6cc3be8e7680ada2aa05affc632803fb.jpg"
+            },
+            {
+                "colour": null,
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/f7bc568de196e1ec70c555269d8fa85113a6a7f2.jpg"
+            },
+            {
+                "colour": null,
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/9bead777bdbc99c07438757d8453f38bec285772.jpg"
+            },
+            {
+                "colour": null,
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/8758f50144379db8bb9826cf1e32ba78bc441932.jpg"
+            },
+            {
+                "colour": null,
+                "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/image/20240527/f4be3a9b26f69de2ea388b8050f6a402df740236.jpg"
+            }
+        ],
+        "create_time": "15-06-2020 09:37:10",
         "carton": {
             "qty": "1000",
             "x": "38",
             "y": "28",
             "z": "30",
-            "weight": "15"
+            "weight": "12.5"
         },
         "price": {
-            "2 week": {
+            "24Hours": {
                 "price": [
                     {
-                        "model": "2wk 512MB",
-                        "website_qty_1": 50,
-                        "website_price_1": "4.45",
-                        "website_qty_2": 100,
-                        "website_price_2": "3.56",
-                        "website_qty_3": 250,
-                        "website_price_3": "2.95",
-                        "website_qty_4": 500,
-                        "website_price_4": "2.88",
-                        "website_qty_5": 1000,
-                        "website_price_5": "2.79",
-                        "website_qty_6": 2500,
-                        "website_price_6": "2.69",
-                        "website_qty_7": 5000,
-                        "website_price_7": "POA",
-                        "website_qty_8": 10000,
-                        "website_price_8": "POA"
-                    },
-                    {
-                        "model": "2wk 1GB",
-                        "website_qty_1": 50,
-                        "website_price_1": "4.73",
-                        "website_qty_2": 100,
-                        "website_price_2": "3.82",
-                        "website_qty_3": 250,
-                        "website_price_3": "3.18",
-                        "website_qty_4": 500,
-                        "website_price_4": "3.11",
-                        "website_qty_5": 1000,
-                        "website_price_5": "3.02",
-                        "website_qty_6": 2500,
-                        "website_price_6": "2.92",
-                        "website_qty_7": 5000,
-                        "website_price_7": "POA",
-                        "website_qty_8": 10000,
-                        "website_price_8": "POA"
-                    },
-                    {
-                        "model": "2wk 2GB",
-                        "website_qty_1": 50,
-                        "website_price_1": "4.76",
-                        "website_qty_2": 100,
-                        "website_price_2": "3.84",
-                        "website_qty_3": 250,
-                        "website_price_3": "3.21",
-                        "website_qty_4": 500,
-                        "website_price_4": "3.14",
-                        "website_qty_5": 1000,
-                        "website_price_5": "3.04",
-                        "website_qty_6": 2500,
-                        "website_price_6": "2.94",
-                        "website_qty_7": 5000,
-                        "website_price_7": "POA",
-                        "website_qty_8": 10000,
-                        "website_price_8": "POA"
-                    },
-                    {
-                        "model": "2wk 4GB",
+                        "model": "512GB",
                         "website_qty_1": 50,
-                        "website_price_1": "4.84",
+                        "website_price_1": "3.21",
                         "website_qty_2": 100,
-                        "website_price_2": "3.91",
+                        "website_price_2": "3.20",
                         "website_qty_3": 250,
-                        "website_price_3": "3.27",
+                        "website_price_3": "3.29",
                         "website_qty_4": 500,
-                        "website_price_4": "3.20",
+                        "website_price_4": "3.29",
                         "website_qty_5": 1000,
-                        "website_price_5": "3.10",
+                        "website_price_5": "3.29",
                         "website_qty_6": 2500,
-                        "website_price_6": "3.00",
+                        "website_price_6": "3.29",
                         "website_qty_7": 5000,
-                        "website_price_7": "POA",
+                        "website_price_7": "3.29",
                         "website_qty_8": 10000,
-                        "website_price_8": "POA"
+                        "website_price_8": "3.29"
                     },
                     {
-                        "model": "2wk 8GB",
+                        "model": "1GB",
                         "website_qty_1": 50,
-                        "website_price_1": "5.09",
+                        "website_price_1": "3.29",
                         "website_qty_2": 100,
-                        "website_price_2": "4.14",
+                        "website_price_2": "3.29",
                         "website_qty_3": 250,
-                        "website_price_3": "3.48",
+                        "website_price_3": "3.29",
                         "website_qty_4": 500,
-                        "website_price_4": "3.40",
+                        "website_price_4": "3.29",
                         "website_qty_5": 1000,
-                        "website_price_5": "3.31",
+                        "website_price_5": "3.29",
                         "website_qty_6": 2500,
-                        "website_price_6": "3.21",
+                        "website_price_6": "3.29",
                         "website_qty_7": 5000,
-                        "website_price_7": "POA",
+                        "website_price_7": "3.29",
                         "website_qty_8": 10000,
-                        "website_price_8": "POA"
+                        "website_price_8": "3.29"
                     },
                     {
-                        "model": "2wk 16GB",
+                        "model": "2GB",
                         "website_qty_1": 50,
-                        "website_price_1": "5.60",
+                        "website_price_1": "3.29",
                         "website_qty_2": 100,
-                        "website_price_2": "4.61",
+                        "website_price_2": "3.29",
                         "website_qty_3": 250,
-                        "website_price_3": "3.91",
+                        "website_price_3": "3.29",
                         "website_qty_4": 500,
-                        "website_price_4": "3.83",
+                        "website_price_4": "3.29",
                         "website_qty_5": 1000,
-                        "website_price_5": "3.73",
+                        "website_price_5": "3.29",
                         "website_qty_6": 2500,
-                        "website_price_6": "3.63",
+                        "website_price_6": "3.29",
                         "website_qty_7": 5000,
-                        "website_price_7": "POA",
+                        "website_price_7": "3.29",
                         "website_qty_8": 10000,
-                        "website_price_8": "POA"
-                    },
-                    {
-                        "model": "2wk 32GB",
-                        "website_qty_1": 50,
-                        "website_price_1": "5.76",
-                        "website_qty_2": 100,
-                        "website_price_2": "4.76",
-                        "website_qty_3": 250,
-                        "website_price_3": "4.05",
-                        "website_qty_4": 500,
-                        "website_price_4": "3.97",
-                        "website_qty_5": 1000,
-                        "website_price_5": "3.87",
-                        "website_qty_6": 2500,
-                        "website_price_6": "3.76",
-                        "website_qty_7": 5000,
-                        "website_price_7": "POA",
-                        "website_qty_8": 10000,
-                        "website_price_8": "POA"
+                        "website_price_8": "3.29"
                     }
                 ],
                 "decoration": [
                     {
                         "decorationList": [
                             {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
+                                "decoration_code": "DPPU23",
+                                "decoration_type": "UV Print",
+                                "price_decoration_description": "1 design",
+                                "website_setup": "35",
                                 "website_qty_1": 50,
-                                "website_price_1": "0.76",
+                                "website_price_1": "-",
                                 "website_qty_2": 100,
-                                "website_price_2": "0.38",
+                                "website_price_2": "-",
                                 "website_qty_3": 250,
-                                "website_price_3": "0.36",
+                                "website_price_3": "0.35",
                                 "website_qty_4": 500,
-                                "website_price_4": "0.34",
+                                "website_price_4": "0.35",
                                 "website_qty_5": 1000,
-                                "website_price_5": "0.32",
+                                "website_price_5": "0.35",
                                 "website_qty_6": 2500,
-                                "website_price_6": "0.30",
+                                "website_price_6": "POA",
                                 "website_qty_7": 5000,
                                 "website_price_7": "POA",
                                 "website_qty_8": 10000,
@@ -205,42 +156,22 @@
                     {
                         "decorationList": [
                             {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.76",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.38",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.36",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.34",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.32",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.30",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            },
-                            {
-                                "decoration_code": "DPPS15",
+                                "decoration_code": "DSSP45",
                                 "decoration_type": "Screen Print",
-                                "website_setup": "",
+                                "price_decoration_description": "1 colour / 1 position Print / 4 panels",
+                                "website_setup": "35",
                                 "website_qty_1": 50,
-                                "website_price_1": "0.20",
+                                "website_price_1": "0.00",
                                 "website_qty_2": 100,
-                                "website_price_2": "0.15",
+                                "website_price_2": "4.20",
                                 "website_qty_3": 250,
-                                "website_price_3": "0.10",
+                                "website_price_3": "4.20",
                                 "website_qty_4": 500,
-                                "website_price_4": "0.07",
+                                "website_price_4": "4.20",
                                 "website_qty_5": 1000,
-                                "website_price_5": "0.05",
+                                "website_price_5": "4.20",
                                 "website_qty_6": 2500,
-                                "website_price_6": "0.04",
+                                "website_price_6": "4.20",
                                 "website_qty_7": 5000,
                                 "website_price_7": "POA",
                                 "website_qty_8": 10000,
@@ -251,201 +182,68 @@
                     {
                         "decorationList": [
                             {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.76",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.38",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.36",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.34",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.32",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.30",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            },
-                            {
-                                "decoration_code": "DPPS15",
-                                "decoration_type": "Screen Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.20",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.15",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.10",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.07",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.05",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.04",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            },
-                            {
-                                "decoration_code": "DPEN08",
+                                "decoration_code": "DPEN01",
                                 "decoration_type": "Engraving",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.20",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.15",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.10",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.07",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.05",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.04",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            }
-                        ]
-                    },
-                    {
-                        "decorationList": [
-                            {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.76",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.38",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.36",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.34",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.32",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.30",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            }
-                        ]
-                    },
-                    {
-                        "decorationList": [
-                            {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.76",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.38",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.36",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.34",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.32",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.30",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            },
-                            {
-                                "decoration_code": "DPPS15",
-                                "decoration_type": "Screen Print",
-                                "website_setup": "",
+                                "price_decoration_description": "1 pos",
+                                "website_setup": "70",
                                 "website_qty_1": 50,
-                                "website_price_1": "0.20",
+                                "website_price_1": "0.86",
                                 "website_qty_2": 100,
-                                "website_price_2": "0.15",
+                                "website_price_2": "0.86",
                                 "website_qty_3": 250,
-                                "website_price_3": "0.10",
+                                "website_price_3": "0.86",
                                 "website_qty_4": 500,
-                                "website_price_4": "0.07",
+                                "website_price_4": "0.86",
                                 "website_qty_5": 1000,
-                                "website_price_5": "0.05",
+                                "website_price_5": "0.86",
                                 "website_qty_6": 2500,
-                                "website_price_6": "0.04",
+                                "website_price_6": "POA",
                                 "website_qty_7": 5000,
                                 "website_price_7": "POA",
                                 "website_qty_8": 10000,
                                 "website_price_8": "POA"
                             }
                         ]
-                    },
+                    }
+                ],
+                "addition": [
                     {
-                        "decorationList": [
+                        "additionList": [
                             {
-                                "decoration_code": "DPPD13",
-                                "decoration_type": "Digital Print",
-                                "website_setup": "",
+                                "name": "Additional Cost of Full Colour Header Card / Paper Girdle",
+                                "website_setup": "35",
                                 "website_qty_1": 50,
-                                "website_price_1": "0.76",
+                                "website_price_1": "-",
                                 "website_qty_2": 100,
-                                "website_price_2": "0.38",
+                                "website_price_2": "-",
                                 "website_qty_3": 250,
-                                "website_price_3": "0.36",
+                                "website_price_3": "-",
                                 "website_qty_4": 500,
-                                "website_price_4": "0.34",
+                                "website_price_4": "0.80",
                                 "website_qty_5": 1000,
-                                "website_price_5": "0.32",
+                                "website_price_5": "0.70",
                                 "website_qty_6": 2500,
-                                "website_price_6": "0.30",
+                                "website_price_6": "0.60",
                                 "website_qty_7": 5000,
                                 "website_price_7": "POA",
                                 "website_qty_8": 10000,
                                 "website_price_8": "POA"
                             },
                             {
-                                "decoration_code": "DPPS15",
-                                "decoration_type": "Screen Print",
-                                "website_setup": "",
-                                "website_qty_1": 50,
-                                "website_price_1": "0.20",
-                                "website_qty_2": 100,
-                                "website_price_2": "0.15",
-                                "website_qty_3": 250,
-                                "website_price_3": "0.10",
-                                "website_qty_4": 500,
-                                "website_price_4": "0.07",
-                                "website_qty_5": 1000,
-                                "website_price_5": "0.05",
-                                "website_qty_6": 2500,
-                                "website_price_6": "0.04",
-                                "website_qty_7": 5000,
-                                "website_price_7": "POA",
-                                "website_qty_8": 10000,
-                                "website_price_8": "POA"
-                            },
-                            {
-                                "decoration_code": "DPEN08",
-                                "decoration_type": "Engraving",
+                                "name": "Custom Shape And Size",
                                 "website_setup": "",
                                 "website_qty_1": 50,
-                                "website_price_1": "0.20",
+                                "website_price_1": "-",
                                 "website_qty_2": 100,
-                                "website_price_2": "0.15",
+                                "website_price_2": "POA",
                                 "website_qty_3": 250,
-                                "website_price_3": "0.10",
+                                "website_price_3": "POA",
                                 "website_qty_4": 500,
-                                "website_price_4": "0.07",
+                                "website_price_4": "POA",
                                 "website_qty_5": 1000,
-                                "website_price_5": "0.05",
+                                "website_price_5": "POA",
                                 "website_qty_6": 2500,
-                                "website_price_6": "0.04",
+                                "website_price_6": "POA",
                                 "website_qty_7": 5000,
                                 "website_price_7": "POA",
                                 "website_qty_8": 10000,

assets/json/api4.json

@@ -15,14 +15,14 @@
                 "create_time": "2022-11-03 17:54:32",
                 "update_time": "2023-03-12 16:57:11",
                 "main": {
-                    "image": "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221112/b336f4fe658048db4c614f459afbeaf3.jpg",
+                    "image": "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221112/b336f4fe658048db4c614f459afbeaf3.jpg",
                     "images": [
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221112/7130f02aa6aaee022841f3c2f370a77c.jpg",
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221122/89cbeca2fe4f732547d871f8c449f4f9.png",
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221122/ed098bc6d4ffe5209202b36964ba5b97.png",
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221122/1e333dc0875bcfc60801b34a344fcb0b.jpg",
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221122/d6801b53cdc15b601c6d64d70405db46.jpg",
-                        "https://promocollection.s3.ap-southeast-2.amazonaws.com/uploads/goods/20221122/04cc6a140618c8ff426d97805ddb551a.png"
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221112/7130f02aa6aaee022841f3c2f370a77c.jpg",
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221122/89cbeca2fe4f732547d871f8c449f4f9.png",
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221122/ed098bc6d4ffe5209202b36964ba5b97.png",
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221122/1e333dc0875bcfc60801b34a344fcb0b.jpg",
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221122/d6801b53cdc15b601c6d64d70405db46.jpg",
+                        "https://promocollection.oss-ap-southeast-2.aliyuncs.com/uploads/goods/20221122/04cc6a140618c8ff426d97805ddb551a.png"
                     ],
                     "video": "",
                     "description": "Upgrade your display wall with our new Monitor Mount & Shelves Stand.  Simple assembly using highly durable and lightweight aluminum tubing. This new rack suitable for backdrops with a height of 2.4m. You can attract visitors using the monitor mount, to display digital content, which can hold up to a 32inch monitor screen. (screen not included.) Our Monitor Mount & Shelves Stand is a great choice attracting visitors to your next trade stand.\n",
@@ -33,7 +33,7 @@
                     "included_packaging": "Opp bag, 600D Oxford carry bag",
                     "optional_packaging": "",
                     "optional_attachments": "",
-                    "product_dimensions": "Net Weight：6kg<br/>Gross Weight：7kg<br/>Meas：27cm x 27cm x 65cm<br/>Packing：1pc/ctn",
+                    "product_dimensions": "Net Weight：6kg<br/>\nGross Weight：7kg<br/>\nMeas：27cm x 27cm x 65cm<br/>\nPacking：1pc/ctn",
                     "Included_accessorries": "",
                     "optional_accessorries": "",
                     "dimension": "",
@@ -54,4 +54,4 @@
             }
         ]
     }
-}
+}

components/Bxh.vue

@@ -1,126 +0,0 @@
-<template>
-  <div class="iframe-main">
-    <div class="iframe-dom"  :style="{height: height }" ></div>
-  </div>
-</template>
-<script>
-export default {
-  head(){
-		return {
-			link: [
-				{ rel: 'stylesheet', href: '//yun.baoxiaohe.com/openflatform/css/v1.0/sdk.css' },],
-		}
-	},
-  props:{
-    bxhType:String,
-    design:Number,
-    height:{
-      type: String,
-      default: '99vh',
-    },
-    link:String,
-    templateArr:{
-      type: Array,
-      default: ()=>{
-        return []
-      },
-    }
-  },
-  data() {
-    return {
-      iframe: null,
-    }
-  },
-  watch:{
-  },
-  mounted() {
-    this.$nextTick(()=>{
-      this.createBxh()
-    });
-    window.addEventListener("message", this.receiveData)
-  },
-  beforeDestroy() {
-    window.removeEventListener("message", this.receiveData)
-  },
-  methods: {
-    async createBxh() {
-      if(this.bxhType=='3D'){
-        let companyToken = await this.$axios.get("/api/bxh/company/token")
-        let design=this.design || this.link
-        this.init(design,companyToken.result,this.bxhType)
-      }else if(this.bxhType=='design'){
-        let token = await this.$axios.get("/api/bxh/token")
-        this.init(this.design,token.result,this.bxhType)
-      }else if(this.bxhType=='render'){
-        let token = await this.$axios.get("/api/bxh/token")
-        this.init(this.design,token.result,this.bxhType)
-      }
-    },
-    init(id,token,bxhType) {
-      this.iframe = new window.BXHIframe({
-        // production: false,
-        // env:true,
-        elCls:'iframe-dom',
-        prefixCls:'detail-iframe-sdk',
-        locale:"en-US",
-        params: {
-            id,
-            token3D:token,
-            token,
-            project_id: id,
-            isShowRotate:false,  //右下角的旋转按钮
-            isShowFold:false,    //右下角的折叠按钮
-            locale:"en-US"
-            },
-        name: bxhType,
-      })
-    },
- 
-    receiveData(event) {
-      if (event) {
-        try {
-          if (typeof event.data === "string") {
-            const { event: e, name, params,preDesignParams } = JSON.parse(
-              event.data
-            )
-            if (e === "needLogin") {
-              this.iframe.preDesign({...preDesignParams,token: ''})
-            } else if (e === "viewDetails") {
-              this.iframe.render({ name, params })
-            }else if (e === "viewDetails") {
-              this.iframe.render({ name, params })
-            } else if (e === "startDesign") {
-              this.iframe.render({ params: { id: params.id, token: '' }, name: "design" })
-            } else if (e === "logoutSuccess") {
-              console.log("logoutSuccess")
-            } else if (e === "reloadParams") {
-              console.log("reloadParams")
-            } else if (e === "saveSuccess") {
-              console.log("saveSuccess")
-            } else if (e === "saveFail") {
-              console.log("saveFail")
-            } else if (e === "loadSuccess") {
-              console.log("loadSuccess")
-            } else if (e === "toPreview3d") {
-              console.log("手机端编辑器进入3d页面回调")
-            } else if (e === "toEditor") {
-              console.log("手机端从3d页面进入编辑器回调")
-            }  
-          }
-        } catch (error) {
-          console.log(error)
-        }
-      }
-    },
-  },
-}
-</script>
-<style scoped>
-/* .iframe-main {
-  width: 100%;
-  height: 100%;
-} */
-.iframe-dom {
-  position: relative;
-}
-</style>

components/Card.vue

@@ -31,12 +31,6 @@
           />
         </div>
       </figcaption>
-        <!-- <p
-          class="card-info-compare"
-          @click.stop="addCompareList(cardData.id, $event)"
-        >
-        Wishlist +
-        </p> -->
     </figure>
   </nuxt-link>
 </template>
@@ -60,25 +54,6 @@ export default {
     }
   },
   methods: {
-    addCompareList(id, e) {
-      this.$axios
-        .post("/api/home/compare_add", {
-          id,
-          compare_keys: "keys",
-        })
-        .then((res) => {
-          if (res.code === 1) {
-            this.$store.dispatch("getCompareList");
-            this.$emit("addCompare", e.target);
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "warning",
-            });
-          }
-        })
-        .catch(() => {});
-    },
     goProduct(cardData) {
       this.$router.push({
         name: "product-code",

components/ImageUpload.vue

@@ -149,7 +149,7 @@ export default {
       })
       formData.append('type', 1)
       this.$axios
-        .post(`/api/user_base/imagesUpload`,formData)
+        .post(`/uk-api/user_base/imagesUpload`,formData)
         .then((response) => {
           if (response.result.code === 200) {
             this.imageList.push({

components/MediaCard.vue

@@ -1,30 +1,61 @@
 <template>
-  <figure :class="['card', { 'row': toggle }]">
-    <div class="card-media" @click="handLeftBtn">
-      <video controls ref="video" v-if="cardData.type === 5 && toggle" class="card-media-content">
-        <source :src="cardData.media_url">
+  <figure :class="['card', { row: toggle }]">
+    <div
+      class="card-media"
+      @click="handLeftBtn">
+      <video
+        controls
+        ref="video"
+        v-if="cardData.type === 5 && toggle"
+        class="card-media-content">
+        <source :src="cardData.media_url" />
         Your browser does not support the video tag.
       </video>
-      <el-image :src="(cardData.type === 1 || cardData.type === 8) ? cardData.media_url : cardData.image"
-        class="card-img-1" fit="contain" style="width: 100%; height: 100%" v-else>
+      <el-image
+        :src="
+          cardData.type === 1 || cardData.type === 8
+            ? cardData.media_url
+            : cardData.image
+        "
+        class="card-img-1"
+        fit="contain"
+        style="width: 100%; height: 100%"
+        v-else>
       </el-image>
-      <div class="type-icon" v-if="cardData.typeName && !toggle">{{ cardData.typeName.toUpperCase() }}
+      <div
+        class="type-icon"
+        v-if="cardData.typeName && !toggle">
+        {{ cardData.typeName.toUpperCase() }}
       </div>
     </div>
     <figcaption class="card-info">
       <div class="card-info-1">
         <h1>{{ cardData.name }}</h1>
-        <p class="card-info-point">{{ cardData.description }}</p>
+        <p
+          class="card-info-point"
+          v-html="cardData.description"></p>
         <ul class="card-info-label">
-          <li v-for="(l, index) of cardData.mapLabel" :key="index" @click="emitLabel(l)">{{ l }}</li>
-          <nuxt-link :to="{ name: 'product-code', params: { code: item } }" v-for="(item, key) of cardData.sku" :key="key"
+          <li
+            v-for="(l, index) of cardData.mapLabel"
+            :key="index"
+            @click="emitLabel(l)">
+            {{ l }}
+          </li>
+          <nuxt-link
+            :to="{ name: 'product-code', params: { code: item } }"
+            v-for="(item, i) of cardData.sku"
+            :key="item + i"
             target="_blank">
-            <li :key="item">{{ item }}</li>
+            <li>{{ item }}</li>
           </nuxt-link>
         </ul>
       </div>
       <div class="card-info-btn">
-        <el-button @click="handLeftBtn" v-if="!toggle">View</el-button>
+        <el-button
+          @click="handLeftBtn"
+          v-if="!toggle"
+          >View</el-button
+        >
         <el-button @click="handRightBtn">Download</el-button>
       </div>
     </figcaption>
@@ -40,15 +71,15 @@ export default {
       default: false,
     },
   },
+  data() {
+    return {}
+  },
   watch: {
     'cardData.media_url': function (newVal, oldVal) {
       if (newVal !== oldVal && this.$refs.video) {
-        this.$refs.video.load(); // 重新加载视频
+        this.$refs.video.load() // 重新加载视频
       }
-    }
-  },
-  data() {
-    return {};
+    },
   },
   methods: {
     emitLabel(l) {
@@ -59,9 +90,9 @@ export default {
     },
     handRightBtn() {
       this.$emit('rightBtnEvent')
-    }
+    },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -69,13 +100,13 @@ export default {
   display: flex;
   flex-direction: column;
   position: relative;
+  align-items: flex-start;
   box-shadow: 0px 0px 10px rgba(137, 137, 137, 0.05);
   transition: all 0.2s ease-out 0s;
   box-sizing: border-box;
   overflow: hidden;
   border: 1px solid #eee;
   border-radius: 4px;
-
   // &:hover {
   //   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
 
@@ -150,6 +181,7 @@ export default {
       display: -webkit-box;
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
+      word-break: break-word;
     }
 
     .card-info-label {
@@ -225,7 +257,10 @@ export default {
       }
 
       .card-info-point {
-        -webkit-line-clamp: 7;
+        display: block;
+        overflow: visible;
+        text-overflow: unset;
+        white-space: pre-wrap;
       }
     }
   }

components/PcFooter.vue

@@ -99,7 +99,7 @@
                   target="_self"
                   >Media Centre
                 </nuxt-link>
-                <nuxt-link to="/home/newsLetter"> NewsLetter </nuxt-link>
+                <!-- <nuxt-link to="/home/newsLetter"> NewsLetter </nuxt-link> -->
                 <nuxt-link
                   to="/home/downloadCenter"
                   v-show="audit_status">
@@ -221,20 +221,20 @@ export default {
   },
   async fetch() {
     await this.$axios
-      .post('/api/home/indexBanner', { site: 1, type: 6 })
+      .post('/uk-api/home/indexBanner', { type: 6 })
       .then(res => {
         this.footerBannerList = res.result.data
         // this.$store.commit("config/setConfigInfo", res.result);
       })
-    await this.$axios.post('/api/home/indexConfigWebsite', { site: 1 }).then(res => {
+    await this.$axios.post('/uk-api/home/indexConfigWebsite', { site: 1 }).then(res => {
       this.indexConfigWebsite = res.result
       this.$store.commit('config/setConfigInfo', res.result)
     })
-    await this.$axios.post('/api/common/shopProductList').then(res => {
+    await this.$axios.post('/uk-api/common/shopProductList').then(res => {
       this.productList = res.result
     })
     await this.$axios
-      .post('/api/home/articleLists', { state: 'au', keyword: 'About us' })
+      .post('/uk-api/home/articleList', { keyword: 'About us' })
       .then(res => {
         this.aboutUsArticle = res.result.data[0]
       })

components/PcHeader.vue

@@ -245,7 +245,7 @@
                       </div>
                     </nuxt-link>
                   </div> -->
-                  <div class="sub-menu">
+                  <!-- <div class="sub-menu">
                     <a
                       href="https://www.flipsnack.com/promocollection/"
                       target="_blank">
@@ -254,15 +254,15 @@
                         <div class="sub-title">Catalogue</div>
                       </div>
                     </a>
-                  </div>
-                  <div class="sub-menu">
+                  </div> -->
+                  <!-- <div class="sub-menu">
                     <nuxt-link to="/home/EDMS">
                       <div class="flex">
                         <div class="icon book"></div>
                         <div class="sub-title">EDMS</div>
                       </div>
                     </nuxt-link>
-                  </div>
+                  </div> -->
                   <div class="sub-menu">
                     <a
                       href="mailto:Info@promocollection.uk?subject=Sample%20Request">
@@ -585,7 +585,7 @@ export default {
       showType: 'none',
       matchingList: [],
       categoryList: [],
-      leadTime: [],
+      // leadTime: [],
       budget: [],
       compareList: [],
       indentIdeasArticle: {},
@@ -631,35 +631,35 @@ export default {
     }
   },
   async fetch() {
-    const p1 = this.$axios.post('/api/common/shopProductList').then(res => {
+    const p1 = this.$axios.post('/uk-api/common/shopProductList').then(res => {
       if (res.code === 1) {
         this.categoryList = res.result
       }
     })
-    const p2 = this.$axios.get('/api/home/lead_time').then(res => {
-      if (res.code === 1) {
-        this.leadTime = res.result.sort((a, b) => a.rank - b.rank)
-      }
-    })
-    const p3 = this.$axios
-      .post('/api/common/goodsFilterList', { pid: 2 })
-      .then(res => {
-        if (res.code === 1) {
-          this.budget = res.result
-        }
-      })
+    // const p2 = this.$axios.get('/api/home/lead_time').then(res => {
+    //   if (res.code === 1) {
+    //     this.leadTime = res.result.sort((a, b) => a.rank - b.rank)
+    //   }
+    // })
+    // const p3 = this.$axios
+    //   .post('/api/common/goodsFilterList', { pid: 2 })
+    //   .then(res => {
+    //     if (res.code === 1) {
+    //       this.budget = res.result
+    //     }
+    //   })
     const p4 = this.$axios
-      .post('/api/home/articleLists', { state: 'au', keyword: 'Indent Ideas' })
+      .post('/uk-api/home/articleList', { keyword: 'Indent Ideas' })
       .then(res => {
         this.indentIdeasArticle = res.result.data[0] || {}
       })
     const p5 = this.$axios
-      .post('/api/home/articleLists', { state: 'au', keyword: 'Compliance' })
+      .post('/uk-api/home/articleList', { keyword: 'Compliance' })
       .then(res => {
         this.complianceArticle = res.result.data[0] || {}
       })
     // 并联异步操作，总耗时===耗时最长的单个请求。之前的逻辑是串联，总耗时为所有请求耗时的累加
-    await Promise.all([p1, p2, p3, p4, p5])
+    await Promise.all([p1, p4, p5])
   },
   computed: {
     email() {
@@ -719,7 +719,6 @@ export default {
     },
   },
   created() {
-    // this.$store.dispatch('getCompareList')
   },
   mounted() {
     // if (this.$route.query.keyword && this.$route.query.keyword.length) {
@@ -735,13 +734,13 @@ export default {
         '7KGEFE6I2Z',
         'e39e202ace0a2fa12ea61095e6ede35d'
       )
-      this.index = client.initIndex('mysql_test')
+      this.index = client.initIndex('test_uk')
     } else {
       const client = algoliasearch(
         '2340OWI595',
         '2d4c53cdcf2bab0c361e589c2c2272fa'
       )
-      this.index = client.initIndex('product_au')
+      this.index = client.initIndex('product_uk')
     }
   },
   beforeDestroy() {
@@ -751,8 +750,7 @@ export default {
     ...mapMutations([
       'openDialog',
       'clearUserInfo',
-      'clearCompareList',
-      'getCompareList',
+      // 'clearCompareList',
     ]),
 
     debounce(fn, wait) {
@@ -903,45 +901,45 @@ export default {
         this.$router.push('/home/compareList')
       }
     },
-    clearCompare(id) {
-      this.$axios
-        .post('/api/home/compare_clear', {
-          id,
-          compare_keys: 'keys',
-        })
-        .then(res => {
-          if (res.code === 1) {
-            this.compareList.splice(
-              this.compareList.findIndex(item => item.id === id),
-              1
-            )
-          }
-        })
-    },
-    clearAll() {
-      if (this.compareList.length) {
-        this.$axios
-          .post('/api/home/compare_clear', {
-            id: 0,
-            compare_keys: 'keys',
-          })
-          .then(res => {
-            if (res.code === 1) {
-              this.clearCompareList()
-            }
-          })
-      }
-    },
+    // clearCompare(id) {
+    //   this.$axios
+    //     .post('/api/home/compare_clear', {
+    //       id,
+    //       compare_keys: 'keys',
+    //     })
+    //     .then(res => {
+    //       if (res.code === 1) {
+    //         this.compareList.splice(
+    //           this.compareList.findIndex(item => item.id === id),
+    //           1
+    //         )
+    //       }
+    //     })
+    // },
+    // clearAll() {
+    //   if (this.compareList.length) {
+    //     this.$axios
+    //       .post('/api/home/compare_clear', {
+    //         id: 0,
+    //         compare_keys: 'keys',
+    //       })
+    //       .then(res => {
+    //         if (res.code === 1) {
+    //           this.clearCompareList()
+    //         }
+    //       })
+    //   }
+    // },
     openShopProduct() {
       this.isShopBlock = !this.isShopBlock
       this.isLeadTimeBlock = false
       this.isBudgetBlock = false
     },
-    openLeadTime() {
-      this.isLeadTimeBlock = !this.isLeadTimeBlock
-      this.isShopBlock = false
-      this.isBudgetBlock = false
-    },
+    // openLeadTime() {
+    //   this.isLeadTimeBlock = !this.isLeadTimeBlock
+    //   this.isShopBlock = false
+    //   this.isBudgetBlock = false
+    // },
     openBudget() {
       this.isBudgetBlock = !this.isBudgetBlock
       this.isLeadTimeBlock = false

components/PriceToImg.vue

@@ -49,7 +49,7 @@
           </tr>
           <tr style="padding:10px 0;" v-for="row in tableData" :key="row.project">
             <td v-for="column in tableColumns" :key="column.prop"  style="padding:10px 0;color:#00213B;border:1px solid #EFEFEF;white-space: nowrap;" :style="getColumnHeaderStyle(column)">
-             {{ row[column.prop].includes('.')?'$':'' }} {{ row[column.prop]?row[column.prop]:'0.00' }}
+             {{ row[column.prop].includes('.')?'£':'' }} {{ row[column.prop]?row[column.prop]:'0.00' }}
             </td>
           </tr>
         </tbody>
@@ -220,4 +220,4 @@ export default {
     },
    },
 };
-</script>
+</script>

components/Project.vue

@@ -1,176 +0,0 @@
-<template>
-  <section class="project-wrap">
-    <div class="project">
-      <div
-        v-show="false"
-        @click="toProductBuilder"
-        class="flex btn-nav">
-        <img src="@/assets/img/builder.png" /><span>Product builder</span>
-      </div>
-      <!-- <div
-        @click="handleAdd"
-        class="flex btn-nav">
-        <img src="@/assets/img/add.png" /><span>Add to my Project</span>
-      </div>
-      <div @click="openZoho" class="flex">
-        <img src="@/assets/img/question.png" /><span>Quick Question</span>
-      </div> -->
-      <a
-        href="https://zfrmz.com/qOMwwPGF2hVWnNheXp3h"
-        target="_target"
-        v-if="isLogin && /\@promocollection.uk/.test(userInfo.email)">
-        <div class="flex btn-nav">
-          <img src="@/assets/img/tick.png" /><span>Ticket</span>
-        </div>
-      </a>
-      <a
-        id="quickEnqriryLink"
-        target="_blank">
-        <div
-          class="flex btn-nav"
-          v-if="isLogin">
-          <img
-            src="@/assets/img/xunjia.png"
-            style="opacity: 0.8"
-            alt="" /><span>Quick Enquiry</span>
-        </div>
-      </a>
-      <a
-        target="_blank"
-        :href="`/product-record/${productInfo.product_code}?version=${productInfo.record.version}`"
-        v-if="shouldButtonRecordShow">
-        <div class="flex btn-nav">
-          <img
-            src="@/assets/img/tick.png" /><span>Item Record</span>
-        </div>
-      </a>
-    </div>
-  </section>
-</template>
-
-<script>
-export default {
-  props: {
-    productInfo: {
-      type: Object,
-      default: () => {
-        return {}
-      },
-    },
-  },
-  data() {
-    return {
-      defaultURL: 'https://zfrmz.com/felY59ar2z3FaOTSRxmZ',
-    }
-  },
-  computed: {
-    isLogin() {
-      return !!this.$store.state.userInfo?.email
-    },
-    userInfo() {
-      return this.$store.state.userInfo || {}
-    },
-    shouldButtonRecordShow() {
-      return (
-        this.isLogin &&
-        /\@promocollection.uk/.test(this.userInfo.email) &&
-        this.productInfo.record &&
-        this.productInfo.record?.record_reason?.length
-      )
-    },
-  },
-  mounted() {
-    this.generateLink()
-  },
-  methods: {
-    generateLink() {
-      const target = document.getElementById('quickEnqriryLink')
-      const config = {
-        name: this.userInfo.contacts,
-        phone: this.userInfo.phone,
-        email: this.userInfo.email,
-        company: this.userInfo.company,
-        product: `${this.productInfo.product_name} & ${this.productInfo.product_code}`,
-      }
-
-      let query = ''
-      for (const key in config) {
-        if (config[key]) {
-          query += `&${key}=${encodeURIComponent(config[key])}`
-        }
-      }
-      query = query.slice(1)
-      target.href = this.defaultURL + '?' + query
-    },
-    handleAdd() {
-      this.$emit('handleAdd')
-    },
-    openZoho() {
-      document.querySelector('#zsiq_float').click()
-    },
-    toProductBuilder() {
-      if (!this.$utils.checkLogin()) return
-      this.$emit('save-selected-data')
-      setTimeout(() => {
-        location.href =
-          location.origin + `/product-builder/${this.$route.params.code}`
-      }, 0)
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-// $width: 100px;
-@media screen and (max-width: 1400px) {
-  .btn-nav {
-    span {
-      display: none !important;
-    }
-  }
-}
-// @media screen and (min-width:1401px){
-//   .project-wrap{
-//     right:10px;
-//   }
-// }
-.project-wrap {
-  position: fixed;
-  right: 10px;
-  top: 172px;
-  z-index: 1;
-  background-color: transparent;
-  font-size: 14px;
-  .project {
-    .btn-nav {
-      text-align: center;
-      height: 40px;
-      border-radius: 40px;
-      padding: 0 10px;
-      cursor: pointer;
-      border: none;
-      color: #fff;
-      margin-bottom: 15px;
-      box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2);
-      background-color: #004a97;
-      img {
-        width: 20px;
-        height: 20px;
-      }
-    }
-    a {
-      &:hover {
-        div {
-          background-color: #013269;
-        }
-      }
-      span {
-        display: inline-block;
-        margin-left: 5px;
-        text-align: center;
-        flex:1;
-      }
-    }
-  }
-}
-</style>

components/ProjectDialog.vue

@@ -1,107 +0,0 @@
-<template>
-    <el-dialog :lock-scroll="false"
-      :visible.sync="visible"
-      width="500px"
-      :before-close="handleClose"
-      :show-close="false"
-      center
-      top="0">
-      <div class="content">
-        <el-select 
-          v-model="keyword" filterable allow-create 
-          clearable style=" width: 100% " default-first-option  :filter-method="filterMethod"
-          placeholder="Please choose your job name">
-          <el-option
-            v-for="option in selList"
-            :label="option.label_type"
-            :value="option.label_type"
-            :key="option.label_type"
-          ></el-option>
-        </el-select>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="handleSend">Add To My Project</el-button>
-        <el-button type="info" @click="handleClose" plain>CANCEL</el-button>
-      </div>
-    </el-dialog>
-</template>
-
-<script>
-export default {
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    id:[Number,String],
-    projectObj:{
-		  type: Object,
-		  default: () => {}
-	  },
-    isCopy:{
-		  type: Boolean,
-		  default: true
-	  }
-  },
-  data() {
-    return {
-      keyword:"",
-      selList:[]
-    }
-  },
-  mounted(){
-    if(this.$utils.checkLogin()){
-        this.getSelect();
-    }
-  },
-  methods: {
-    getSelect(){
-      this.$axios.post("/api/goods_cart/cartLabelLists", { keyword:this.keyword }).then(res =>{
-        this.selList=res.result
-      })
-    },
-    filterMethod(val){
-      this.keyword = val
-    },
-    handleSend() {
-      if(!this.keyword){
-        this.$message({
-								message: 'Please choose your job name',
-								type: "warning",
-							});
-              return
-      }
-      if(this.isCopy){
-          this.$axios.post("/api/goods_cart/cartLabelGoodsCopy",{
-              id: this.id,
-              label_type_new: this.keyword})
-            .then((res) => {
-              this.$message.success("Added successfully") 
-              this.$emit('sendFinish')
-            })
-          return
-      }
-      let data = { ...{label_type:this.keyword,goods_id: this.id},...this.projectObj}
-      this.$axios.post("/api/goods_cart/cartAdd", data).then(res =>{
-        this.$message.success("Add success") 
-        this.$emit("update:visible", false);
-      })
-    },
-    handleClose() {
-      this.$emit("update:visible", false);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.el-dialog__wrapper {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.content {
-  text-align: center;
-}
-
-</style>

components/ResetPasswordMail.vue

@@ -82,7 +82,7 @@
           <p style="color: #02bde3; font-size: 22px">
             Have more questions? contact us!
           </p>
-          <p style="margin: 20px 0">Phone: 1300 369 252</p>
+          <p style="margin: 20px 0">Phone: 203 916 5098</p>
           <p>
             Email:
             <span style="color: #5c7dd4; text-decoration: underline">

components/addAddressDialog.vue

@@ -1,319 +0,0 @@
-<template>
-  <div>
-    <el-dialog :lock-scroll="false"
-      title="Add address"
-      :visible.sync="dialogFormVisible"
-      width="700px"
-    >
-      <el-form :model="data" :rules="rules" ref="ruleForm">
-        <el-form-item prop="country">
-          <label>Country/Region</label>
-          <el-input v-model="data.country"></el-input>
-          <!-- <br />
-          <el-cascader
-            v-model="form.country"
-            :options="options"
-            @change="handleChange"
-          ></el-cascader> -->
-        </el-form-item>
-        <el-form-item prop="name">
-          <label>Full name</label>
-          <el-input v-model="data.name"></el-input>
-        </el-form-item>
-        <el-form-item prop="phone">
-          <label>Phone number</label>
-          <el-input v-model="data.phone"></el-input>
-        </el-form-item>
-        <el-form-item prop="address">
-          <label>Address</label>
-          <el-input
-            v-model="data.address"
-            placeholder="Street address,P.O.box,company name,c/o"
-          ></el-input>
-          <!-- <el-input v-model="form.address2" placeholder="Apt,Suite,Unit,Building,Floor"></el-input> -->
-        </el-form-item>
-        <el-form-item prop="post_code">
-          <label>Postcode</label>
-          <el-input v-model="data.post_code"></el-input>
-        </el-form-item>
-        <el-form-item prop="city">
-          <label>City/Suburb</label>
-          <el-input
-            v-model="data.city"
-            placeholder="Choose city by suburb"
-          ></el-input>
-          <!-- <el-select
-            v-model="data.city"
-            placeholder="Choose city by suburb"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in cityList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-            >
-            </el-option>
-          </el-select> -->
-        </el-form-item>
-        <el-form-item prop="state">
-          <label>State/Territory</label>
-          <el-input
-            v-model="data.state"
-            placeholder="Choose state by territory"
-          ></el-input>
-          <!-- <el-select
-            v-model="data.state"
-            placeholder="Choose state by territory"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in stateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-            >
-            </el-option>
-          </el-select> -->
-        </el-form-item>
-        <el-form-item prop="is_default">
-          <el-checkbox v-model="data.is_default">
-            Make this my default address
-          </el-checkbox>
-        </el-form-item>
-        <el-form-item>
-          <label>Delivery instruction(optional)</label>
-          <div style="color: #86d4e9; line-height: 14px">
-            <i class="el-icon-arrow-down" style="color: #a2a2a2"></i>
-            And preferences,notes,access codes and more
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="submit('ruleForm')">Add address</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      default: false,
-    },
-    componentVisible: {
-      type: Number,
-      default: 2,
-    },
-    data: {
-      type: Object,
-      default: () => {
-        return {
-          country: "Australia",
-          name: "",
-          phone: "",
-          address: "",
-          post_code: "",
-          city: "",
-          state: "",
-          is_default: null,
-        };
-      },
-    },
-  },
-  data() {
-    return {
-      value: [],
-      options: [],
-      rules: {
-        country: [
-          {
-            required: true,
-            message: "Please enter your country",
-            trigger: "blur",
-          },
-        ],
-        name: [
-          {
-            required: true,
-            message: "Please enter your name",
-            trigger: "blur",
-          },
-        ],
-        phone: [
-          {
-            required: true,
-            message: "Please enter your phone number",
-            trigger: "blur",
-          },
-        ],
-        address: [
-          {
-            required: true,
-            message: "Please enter your address",
-            trigger: "blur",
-          },
-        ],
-        post_code: [
-          {
-            required: true,
-            message: "Please enter post_code",
-            trigger: "blur",
-          },
-        ],
-        city: [
-          { required: true, message: "Please enter city", trigger: "blur" },
-        ],
-        state: [
-          { required: true, message: "Please enter state", trigger: "blur" },
-        ],
-      },
-      cityList: [
-        { id: 1, name: "Sydney" },
-        { id: 2, name: "Adelaide Mail Centre" },
-        { id: 3, name: "Melbourne" },
-        { id: 4, name: "Eastern Suburbs Mc" },
-        { id: 5, name: "Hobart" },
-        { id: 6, name: "Perth" },
-        { id: 7, name: "Launceston" },
-        { id: 8, name: "Brisbane" },
-        { id: 9, name: "Northern Suburbs Mc" },
-        { id: 10, name: "Strawberry Hills" },
-        { id: 11, name: "Springfield" },
-        { id: 12, name: "Waterloo" },
-        { id: 13, name: "Richmond" },
-        { id: 14, name: "Haymarket" },
-        { id: 15, name: "Red Hill" },
-        { id: 16, name: "Brisbane GPO Boxes" },
-        { id: 17, name: "Mayfield" },
-        { id: 18, name: "Australia Square" },
-        { id: 19, name: "Woodstock" },
-        { id: 20, name: "Sydney South" },
-        { id: 21, name: "The Gap" },
-        { id: 22, name: "Kingston" },
-        { id: 23, name: "Kensington" },
-        { id: 24, name: "Darlington" },
-      ],
-      stateList: [
-        { id: 1, name: "Australian Capital Territory" },
-        { id: 2, name: "New South Wales" },
-        { id: 3, name: "Northern Territory" },
-        { id: 4, name: "Queensland" },
-        { id: 5, name: "South Australia" },
-        { id: 6, name: "Tasmania" },
-        { id: 7, name: "Victoria" },
-        { id: 8, name: "Western Australia" },
-      ],
-
-    };
-  },
-  computed: {
-    dialogFormVisible: {
-      get: function () {
-        return this.dialogVisible;
-      },
-      set: function (val) {
-        this.$emit("update:dialogVisible", val);
-      },
-    },
-  },
-  methods: {
-    submit(ruleForm) {
-      this.$refs[ruleForm].validate((valid) => {
-        if (valid) {
-          if (this.componentVisible == 2) {
-            this.addAddress();
-            if (this.$route.fullPath.includes('product-builder')) return
-            this.$router.push({path:'/home/myDetail',query:{type:"third"}})
-          } else if (this.componentVisible == 3) {
-            this.editAddress();
-            this.$router.push({path:'/home/myDetail',query:{type:"third"}})
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    addAddress() {
-      this.$axios
-        .post("/api/address/add", this.data)
-        .then((res) => {
-          if (res.code === 1) {
-            this.$notify({
-              title: "success",
-              message: "Submitted successfully",
-              type: "success",
-              duration: 3000,
-            });
-            this.dialogFormVisible = false;
-            this.update();
-          }
-        })
-        .catch((error) => {
-          this.$message.error(error.response.data.msg);
-        });
-    },
-    editAddress() {
-      this.$axios
-        .post("/api/address/edit", this.data)
-        .then((res) => {
-          if (res.code === 1) {
-            this.$notify({
-              title: "success",
-              message: "Submitted successfully",
-              type: "success",
-              duration: 3000,
-            });
-            this.dialogFormVisible = false;
-            this.update();
-          }
-        })
-        .catch((error) => {
-          this.$message.error(error.response.data.msg);
-        });
-    },
-    update() {
-      this.$emit("update", true);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-:deep(.el-dialog) {
-  .el-dialog__header .el-dialog__title {
-    font-size: 24px;
-    font-weight: bold;
-  }
-  .el-dialog__body {
-    padding: 0 20px 20px;
-    .el-form-item {
-      margin-bottom: 0;
-      .el-form-item__content {
-        label {
-          font-weight: 600;
-        }
-        .el-cascader {
-          width: 100%;
-        }
-        .el-input {
-          margin-bottom: 5px;
-        }
-        .el-form-item__error {
-          top: 90%;
-        }
-      }
-    }
-  }
-  .el-dialog__footer .dialog-footer {
-    display: flex;
-    justify-content: flex-start;
-    .el-button {
-      background: #ffd814;
-    }
-  }
-}
-</style>

components/loginDialog.vue

@@ -436,7 +436,7 @@ export default {
         formData.address = this.selectAddress
       }
       this.$axios({
-        url: '/api/au/register',
+        url: '/uk-api/uk/register',
         method: 'post',
         data: formData,
       })
@@ -467,7 +467,7 @@ export default {
     },
     registerEmail() {
       this.$axios
-        .get('/api/member/register_email?email=' + this.registData.email)
+        .get('/uk-api/uk/register_email?email=' + this.registData.email)
         .then(res => {})
         .catch(error => {
           this.$message.error(error.response.data.msg)

components/product-builder/DialogSelectAddr.vue

@@ -1,151 +0,0 @@
-<template>
-  <div
-    class=""
-    id="dialogSelectAddr">
-    <el-dialog :lock-scroll="false"
-      title="Choose a delivery address"
-      :visible.sync="show"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="true"
-      @close="close"
-      width="50%">
-      <el-table
-        height="300"
-        :data="computedList"
-        @row-click="handleCurrentChange"
-        :row-class-name="'row-cursor'"
-        style="width: 100%"
-        ref="table">
-        <el-table-column
-          label="checked"
-          width="80px">
-          <template slot-scope="scope">
-            <el-checkbox :value="scope.row.selected"></el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column label="address">
-          <template slot-scope="scope">
-            {{ scope.row.name }}&nbsp;{{ scope.row.address }},&nbsp;{{
-              scope.row.city
-            }},&nbsp;{{ scope.row.post_code }},&nbsp;{{
-              scope.row.country
-            }},&nbsp;Phone number: {{ scope.row.phone }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <br />
-      <div>
-        <el-button
-          @click="newAddr"
-          size="mini"
-          type="text"
-          plain
-          >Add Shipping Address</el-button
-        >
-      </div>
-      <br />
-      <el-button
-        size="small"
-        type="primary"
-        @click="submit"
-        >Deliver to this address</el-button
-      >
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DialogSelectAddr',
-  components: {},
-  filters: {},
-  props: {
-    addressDetail: {
-      type: Object,
-      default: function () {
-        return {}
-      },
-    },
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    addressList: {
-      type: Array,
-      default: function () {
-        return []
-      },
-    },
-  },
-  data() {
-    return {
-      show: false,
-      selectedId: -1,
-      computedList: [],
-    }
-  },
-  computed: {},
-  watch: {
-    visible() {
-      this.show = this.visible
-      if (this.visible) {
-        this.generateAddressList()
-      }
-    },
-    addressList() {
-      this.generateAddressList()
-    },
-  },
-  mounted() {},
-  methods: {
-    generateAddressList() {
-      this.computedList = this.addressList.map(item => {
-        return {
-          ...item,
-          selected: false,
-        }
-      })
-    },
-    submit() {
-      if (this.selectedId === -1) {
-        this.$message.error('Please check address before click this button')
-        return
-      }
-      this.$emit('select-addr', this.selectedId)
-
-      this.close()
-    },
-    close() {
-      this.selectedId = -1
-      this.computedList = []
-      this.$emit('close', false)
-    },
-    newAddr() {
-      this.$emit('add-new-addr')
-      this.close()
-    },
-    handleCurrentChange(value, row, p3) {
-      this.selectedId = value.id || -1
-      this.$refs.table.setCurrentRow(value)
-      this.computedList = this.addressList.map(item => {
-        return {
-          ...item,
-          selected: item.id === value.id,
-        }
-      })
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-#dialogSelectAddr {
-  .el-dialog__body {
-    padding-top: 0;
-  }
-  :deep(.row-cursor) {
-    cursor: pointer;
-  }
-}
-</style>

components/product-builder/step-1.vue

@@ -1,627 +0,0 @@
-<template>
-  <el-card class="step-card">
-    <div
-      slot="header"
-      class="flex between">
-      <div class="step-card-title">Step1 Choose model</div>
-      <div>&gt;&gt;</div>
-    </div>
-    <div v-loading="loading">
-      <div class="card-sub-title">{{ detail.product_name }}</div>
-      <image-viewer
-        v-if="isBigImageShow"
-        :on-close="closeBigImage"
-        :initial-index="0"
-        :url-list="detail.main?.images" />
-      <div
-        class="img-wrap flex center"
-        @click="openBigImage">
-        <img :src="detail.main?.image" />
-      </div>
-      <div class="divider"></div>
-      <el-form
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-        ref="form">
-        <el-form-item
-          label="Time frame"
-          prop="cycle">
-          <el-radio-group v-model="form.cycle">
-            <el-radio
-              v-for="item in priceData.priceList"
-              :key="item.cycle_id"
-              :label="item.cycle_id"
-              >{{ item.name }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <div class="flex">
-          <el-form-item
-            label-width="120px"
-            label="Decorated in"
-            prop="decorated">
-            <el-select
-              v-model="form.decorated"
-              size="small">
-              <el-option
-                :label="'Local'"
-                :value="'Local'"></el-option>
-              <el-option
-                :label="'China'"
-                :value="'China'"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label-width="120px"
-            prop="supplyChain"
-            label="Supply chain"
-            size="small">
-            <el-select v-model="form.supplyChain">
-              <el-option
-                :label="'AU Stock'"
-                :value="'AU Stock'"></el-option>
-              <el-option
-                :label="'Air Freight'"
-                :value="'Air Freight'"></el-option>
-              <el-option
-                :label="'Sea Freight'"
-                :value="'Sea Freight'"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <el-form-item
-          label="Model"
-          prop="model">
-          <div class="custom-checkbox-wrap">
-            <div
-              class="custom-checkbox"
-              :class="{
-                active: form.model === item.id,
-                disable: form.model && form.model !== item.id,
-              }"
-              v-for="item in computedBasePriceData"
-              @click="modelClick(item)"
-              :key="item.id">
-              {{ item.point }}
-            </div>
-          </div>
-          <el-radio-group
-            v-model="form.model"
-            style="display: none"
-            size="small">
-            <el-radio-button
-              v-for="item in computedBasePriceData"
-              :key="item.id"
-              :label="item.id"
-              >{{ item.point }}</el-radio-button
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          label="Colour"
-          prop="color">
-          <div class="custom-checkbox-wrap">
-            <div
-              class="custom-checkbox"
-              :class="{
-                active: form.color.includes(0),
-              }"
-              @click="colorClick({ id: 0 })">
-              Unspecified
-            </div>
-
-            <div
-              class="custom-checkbox flex"
-              :class="{
-                active: form.color.includes(item.id),
-              }"
-              v-for="item in detail.color"
-              @click="colorClick(item)"
-              :key="item.id">
-              <div class="color-selector-label flex center">
-                <img :src="item.img" />
-              </div>
-              <div>
-                {{ item.name }}
-              </div>
-            </div>
-            <div
-              class="custom-checkbox"
-              :class="{
-                active: form.color.includes(999),
-              }"
-              @click="colorClick({ id: 999 })">
-              + PMS
-            </div>
-          </div>
-          <el-checkbox-group
-            v-model="form.color"
-            style="display: none"
-            size="small">
-            <el-checkbox-button :label="0">Unspecified</el-checkbox-button>
-            <el-checkbox-button
-              v-for="item in detail.color"
-              :label="item.id"
-              :key="item.id">
-              {{ item.name }}
-            </el-checkbox-button>
-            <el-checkbox-button :label="999">+ PMS</el-checkbox-button>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item prop="colorPmsText">
-          <el-input
-            v-show="form.color.includes(999)"
-            type="textarea"
-            :rows="5"
-            placeholder="Product color comments. Multi color instructions, specific color matchong (CMYK, RGB, PMS) etc.."
-            v-model="form.colorPmsText">
-          </el-input>
-        </el-form-item>
-
-        <div class="qty-title">
-          QTY&nbsp;(&nbsp;MOQ:{{ computedMinBuyNumber }}&nbsp;)
-        </div>
-        <div
-          class="divider"
-          v-show="form.color.length > 0"></div>
-        <div class="flex wrap">
-          <el-form-item
-            class="flex-auto color-form-item"
-            label-width="140"
-            v-for="(formItem, index) in form.autoForm"
-            :prop="`autoForm.${index}.value`"
-            :rules="{
-              required: true,
-              trigger: 'change',
-              type: 'number',
-              message: 'the number should not less then MOQ',
-              min: computedMinBuyNumber,
-            }"
-            :key="index">
-            <div class="flex end">
-              <div class="flex-auto flex end">
-                <img
-                  class="auto-form-color-image"
-                  v-if="formItem.img"
-                  :src="formItem.img"
-                  alt="" />
-                <div class="auto-form-label form-item-label">
-                  {{ formItem.label }}
-                </div>
-              </div>
-              <el-input
-                @change="
-                  value => {
-                    if (value >= computedMinBuyNumber)
-                      $refs.form.clearValidate(`autoForm.${index}.value`)
-                  }
-                "
-                style="width: 80px"
-                :min="computedMinBuyNumber"
-                type="number"
-                v-model.number="formItem.value"></el-input>
-            </div>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import imageViewer from 'element-ui/packages/image/src/image-viewer'
-import stepMixin from './stepMixin'
-
-export default {
-  name: 'Step1',
-  components: {
-    'image-viewer': imageViewer,
-  },
-  mixins: [stepMixin],
-  props: {
-    // 步骤2的表单. 因其打印价格表单会反向影响本组件的最小起购数量, 故需从父组件获取. 只用来计算, 本组件不更改这个数据.
-    form2: {
-      type: Object,
-      default: function () {
-        return {}
-      },
-    },
-  },
-  data() {
-    // this.detail 记录在mixin里；
-    return {
-      // 查看大图
-      isBigImageShow: false,
-      rules: {
-        decorated: [{ required: true, message: '请选择', trigger: 'change' }],
-        supplyChain: [{ required: true, message: '请选择', trigger: 'change' }],
-        model: [
-          {
-            required: true,
-            trigger: 'change',
-            type: 'number',
-            min: 1,
-            message: 'Please select model',
-          },
-        ],
-        color: [
-          {
-            required: true,
-            validator: (rules, value, cb) => {
-              value.length > 0
-                ? cb()
-                : cb(new Error('Please select at least one color'))
-            },
-            trigger: 'change',
-          },
-        ],
-        colorPmsText: [{ trigger: 'blur', validator: this.checkColorPmsText }],
-        cycle: [
-          {
-            required: true,
-            message: 'Please select time frame',
-            trigger: 'change',
-          },
-        ],
-      },
-      form: {
-        // 必须要有的初始值, 否则必定会报错Cannot read properties of undefined
-        color: [],
-        model: 0,
-        colorPmsText: '',
-      },
-      // 标志符，用于控制监听是否启用
-      loaded: false,
-    }
-  },
-  computed: {
-    // 商品 当前选中周期的 基础价格和打印价格数据
-    computedPriceData() {
-      return this.priceData.priceList.filter(
-        item => item.cycle_id === this.form.cycle
-      )
-    },
-    // 当前选中周期下, 商品对应的各型号基础价格数据. 可以推断当前周期有几个型号
-    computedBasePriceData() {
-      const model = this.computedPriceData.length
-        ? this.computedPriceData[0]
-        : {}
-      // 属性‘1’里面是基础价格数据, 属性 ’2‘是打印价格数据
-      if (model['1']) {
-        return model['1'].slice()
-      } else {
-        return []
-      }
-    },
-    // 当前型号位于基础价格数据的index, 用于取出型号对应的基础数据
-    computedBasePriceIndex() {
-      return this.computedBasePriceData.findIndex(
-        item => item.id === this.form.model
-      )
-    },
-    // 该商品周期的最小起订量. attributeList的属性名(website_qty1, website_qty2)排序, 然后取属性值
-    computedMinBuyNumber() {
-      // 算基础价格的第一个有效值
-      const target = this.computedBasePriceData.length
-        ? this.computedBasePriceData[
-            this.computedBasePriceIndex > 0 ? this.computedBasePriceIndex : 0
-          ]
-        : {}
-      const candidate = [
-        target.website_qty1,
-        target.website_qty2,
-        target.website_qty3,
-        target.website_qty4,
-        target.website_qty5,
-        target.website_qty6,
-        target.website_qty7,
-        target.website_qty8,
-      ]
-
-      if (!candidate.some(item => item !== undefined)) return 1
-      // 算出商品基础价格的第一个有效值
-      let index = this.findEffectIndex(candidate)
-      // 算出打印服务和附加服务的第一个有效价格所处位置.
-      Object.entries(this.form2).forEach(current => {
-        if (/\d+/.test(current[0])) {
-          const decoration = current[1].decorationList.filter(
-            i => i.id === current[1].printService
-          )
-          if (decoration.length && current[1].enable) {
-            // 打印价格的基础阶梯价格
-            const index2 = this.findEffectIndex([
-              decoration[0].website_qty1,
-              decoration[0].website_qty2,
-              decoration[0].website_qty3,
-              decoration[0].website_qty4,
-              decoration[0].website_qty5,
-              decoration[0].website_qty6,
-              decoration[0].website_qty7,
-              decoration[0].website_qty8,
-            ])
-            // 附加价格
-            const index3 = this.findEffectIndex([
-              decoration[0].supplier_qty1,
-              decoration[0].supplier_qty2,
-              decoration[0].supplier_qty3,
-              decoration[0].supplier_qty4,
-              decoration[0].supplier_qty5,
-              decoration[0].supplier_qty6,
-              decoration[0].supplier_qty7,
-              decoration[0].supplier_qty8,
-            ])
-            // 让index记录最大值
-            if (index2 > index) index = index2
-            if (index3 > index) index = index3
-          }
-        } else {
-          // 附加服务的价格
-          const additions = this.priceData.additionList[current[0]].filter(
-            item => current[1].includes(item.id)
-          )
-
-          if (additions.length) {
-            additions.forEach(target => {
-              const index4 = this.findEffectIndex([
-                target.website_qty1,
-                target.website_qty2,
-                target.website_qty3,
-                target.website_qty4,
-                target.website_qty5,
-                target.website_qty6,
-                target.website_qty7,
-                target.website_qty8,
-              ])
-              // 让index记录最大值
-              if (index4 > index) index = index4
-            })
-          }
-        }
-      })
-
-      const temp = Object.entries(this.priceData.attributeList)
-        .sort((a, b) => a[0].localeCompare(b[0]))
-        .filter((item, i) => index === i)
-
-      if (temp.length) {
-        return temp[0][1]
-      } else {
-        return 1
-      }
-    },
-  },
-  watch: {
-    computedBasePriceData() {
-      if (!this.loaded || !this.computedBasePriceData.length) return
-      // fixme 如果有从商品详情页带过来的型号选择数据, 要选中该值, 而不是默认的第一个值
-      if (
-        this.computedBasePriceData.filter(i => i.id === this.preData.model)
-          .length
-      ) {
-        this.form.model = this.preData.model
-      } else {
-        this.form.model = this.computedBasePriceData[0].id
-      }
-    },
-    'form.model': {
-      immediate: true,
-      handler: function () {
-        if (!this.loaded) return
-
-        this.generateColorForm()
-      },
-    },
-    'form.color': {
-      immediate: true,
-      handler: function () {
-        if (!this.loaded) return
-
-        this.generateColorForm()
-        this.$refs.form.clearValidate('colorPmsText')
-      },
-    },
-    form2: {
-      immediate: true,
-      handler: function () {
-        if (!this.loaded) return
-
-        this.generateColorForm()
-      },
-    },
-  },
-  mounted() {
-    this.form = {
-      supplyChain: 'AU Stock',
-      decorated: 'Local',
-      model: 0, // 型号的赋值在computedBasePriceData的监听里面, 因为其涉及到基础价格变更后的重新赋值.
-      cycle: this.preData.cycle
-        ? this.preData.cycle
-        : this.priceData.priceList[0].cycle_id,
-      color: [],
-      colorPmsText: '',
-      // 根据所选规格和颜色组合成的自动表单.需要在computedBasePriceData的watch里面生成
-      autoForm: [],
-    }
-
-    this.loaded = true
-  },
-  methods: {
-    checkForm() {
-      return new Promise((resolve, reject) => {
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            resolve(JSON.parse(JSON.stringify(this.form)))
-          } else {
-            reject(new Error('validate step1 form error'))
-          }
-        })
-      })
-    },
-    checkColorPmsText(rule, value, cb) {
-      // fixme. 颜色的两个固定值的id还未确定
-      if (!this.form.color.includes(999)) cb()
-
-      if (this.form.colorPmsText.trim().length < 1) {
-        cb(new Error('You must type color comment here if "+ PMS" is checked'))
-      } else {
-        cb()
-      }
-    },
-    // 找出第一个有效价格的index. 非变异方法, 勿对参数进行赋值操作.
-    // 价格留空和111不算到起购量, 为正常数值或者0或者999(POA)就可以算到起购量, 所以在此处将空手动重置为NaN
-    findEffectIndex(array) {
-      return array
-        .map(item => (item === '' ? Number.NaN : Number(item)))
-        .findIndex(item => !Number.isNaN(item) && item !== 111)
-    },
-    openBigImage() {
-      this.isBigImageShow = true
-    },
-    closeBigImage() {
-      this.isBigImageShow = false
-    },
-    generateColorForm() {
-      if (!this.loaded || this.form.color.length < 1) {
-        this.form.autoForm = []
-        return
-      }
-      // 生成所选规格和颜色组合成的自动表单
-      const targetModel = this.computedBasePriceData.filter(
-        item => item.id === this.form.model
-      )
-      const oldForm = JSON.parse(JSON.stringify(this.form.autoForm))
-
-      let color1 = []
-      if (targetModel.length) {
-        color1 = this.detail.color.reduce((total, item) => {
-          if (this.form.color.includes(item.id)) {
-            const temp = {
-              img: item.img || '',
-              label: `${item.name}, ${targetModel[0].point}`,
-              color: item.name,
-              colorId: item.id,
-              value: this.computedMinBuyNumber,
-            }
-            const temp2 = oldForm.filter(item => item.label === temp.label)
-            if (temp2.length && temp2[0].value >= this.computedMinBuyNumber) {
-              // 如果原来有值且原值大于等于最小起购, 则沿用原值
-              temp.value = temp2[0].value
-            }
-            total.push(temp)
-          }
-          return total
-        }, [])
-        if (this.form.color.includes(0)) {
-          const temp = {
-            img: '',
-            label: `Unspecified, ${targetModel[0].point}`,
-            color: 'Unspecified',
-            colorId: -1,
-            value: this.computedMinBuyNumber,
-          }
-          const temp2 = oldForm.filter(item => {
-            return item.label === temp.label
-          })
-          if (temp2.length && temp2[0].value >= this.computedMinBuyNumber) {
-            // 如果原来有值且原值大于等于最小起购, 则沿用原值
-            temp.value = temp2[0].value
-          }
-          color1.unshift(temp)
-        }
-        if (this.form.color.includes(999)) {
-          const temp = {
-            img: '',
-            label: `+ PMS, ${targetModel[0].point}`,
-            color: 'PMS',
-            colorId: -1,
-            value: this.computedMinBuyNumber,
-          }
-          const temp2 = oldForm.filter(item => item.label === temp.label)
-          if (temp2.length && temp2[0].value >= this.computedMinBuyNumber) {
-            // 如果原来有值且原值大于等于最小起购, 则沿用原值
-            temp.value = temp2[0].value
-          }
-          color1.push(temp)
-        }
-      }
-      this.$set(this.form, 'autoForm', color1)
-    },
-    modelClick(item) {
-      if (this.form.model === item.id) {
-        this.form.model = 0
-      } else {
-        this.form.model = item.id
-      }
-    },
-    colorClick(item) {
-      const index = this.form.color.indexOf(item.id)
-      if (index !== -1) {
-        this.form.color.splice(index, 1)
-      } else {
-        this.form.color.push(item.id)
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-@import './step.scss';
-div {
-  box-sizing: border-box;
-}
-.img-wrap {
-  $width: 140px;
-  width: $width;
-  height: $width;
-  position: relative;
-  padding: 4px;
-  border: 1px solid #eee;
-  cursor: pointer;
-  margin-bottom: 16px;
-  img {
-    width: 100%;
-  }
-}
-.el-checkbox-button {
-  min-width: 76px;
-}
-.qty-title {
-  margin-bottom: 16px;
-  font-size: 14px;
-  font-family: Proxima Nova, sans-serif;
-  color: #000;
-}
-// 选择颜色
-.color-selector-label {
-  width: 16px;
-  height: 16px;
-  position: relative;
-  margin-right: 4px;
-  img {
-    width: 100%;
-  }
-}
-// 颜色型号对应购买数量输入项
-.color-form-item {
-  box-sizing: border-box;
-  max-width: 50%;
-  padding-left: 4px;
-  .auto-form-label {
-    text-align: right;
-    padding: 0 12px;
-    min-width: 140px;
-  }
-  :deep(.el-form-item__error) {
-    text-align: right;
-    width: 100%;
-  }
-  .auto-form-color-image {
-    width: 20px;
-    height: 20px;
-    margin-right: -4px;
-  }
-}
-</style>

components/product-builder/step-2.vue

@@ -1,327 +0,0 @@
-<template>
-  <el-card class="step-card">
-    <div
-      slot="header"
-      class="flex between">
-      <div class="step-card-title">Step2 Choose options</div>
-      <div>&gt;&gt;</div>
-    </div>
-    <div v-loading="loading">
-      <div v-if="computedPrintPriceData.length">
-        <div class="card-sub-title">Decoration</div>
-        <el-form
-          :model="form"
-          :rules="rules"
-          label-width="0"
-          ref="form">
-          <div
-            v-for="item in computedPrintPriceData"
-            :key="item.id">
-            <div class="divider"></div>
-            <el-form-item>
-              <div class="flex">
-                <el-switch
-                  v-model="form[`${item.id}`].enable"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"></el-switch>
-                <div
-                  class="form-item-label"
-                  style="margin-left: 12px">
-                  {{ item.point }}
-                </div>
-              </div>
-            </el-form-item>
-
-            <el-form-item>
-              <div class="custom-checkbox-wrap">
-                <div
-                  class="custom-checkbox"
-                  :class="{
-                    active: form[`${item.id}`].printService === decoration.id,
-                    disable: !form[`${item.id}`].enable,
-                  }"
-                  v-for="decoration in item.decorationList"
-                  @click="printServiceClick(decoration, item)"
-                  :key="decoration.id">
-                  {{ decoration.dec_code }}
-                </div>
-              </div>
-              <el-radio-group
-                style="display: none"
-                v-model="form[`${item.id}`].printService"
-                :disabled="!form[`${item.id}`].enable">
-                <el-radio
-                  v-for="(decoration, index) in item.decorationList"
-                  :key="index"
-                  :label="decoration.id"
-                  >{{ decoration.dec_code }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-
-            <div
-              class="flex start"
-              v-for="(decoration, index) in item.decorationList"
-              v-show="decoration.id === form[`${item.id}`].printService"
-              :key="index">
-              <div
-                class="flex-auto"
-                v-show="decoration.max_color_count">
-                <div class="form-item-label">Numbers of colours</div>
-                <div
-                  style="height: 35px"
-                  class="flex">
-                  <el-radio-group
-                    :disabled="!form[`${item.id}`].enable"
-                    v-model="form[`${item.id}`].colorForm[index].colorNumber">
-                    <el-radio
-                      v-for="n in decoration.max_color_count"
-                      :key="n"
-                      :label="n"></el-radio>
-                  </el-radio-group>
-                </div>
-              </div>
-              <div
-                class="flex-auto"
-                style="max-width: 50%">
-                <div class="form-item-label">PMS Colours</div>
-                <el-form-item
-                  prop="pmsColor"
-                  label-width="0">
-                  <el-input
-                    :disabled="!form[`${item.id}`].enable"
-                    v-model="form[`${item.id}`].colorForm[index].pmsColorText"
-                    size="small"
-                    placeholder="PMS"></el-input>
-                </el-form-item>
-              </div>
-            </div>
-          </div>
-        </el-form>
-      </div>
-      <div v-if="hasAddition">
-        <div class="divider"></div>
-        <br />
-        <div class="addition-title">Centre Back</div>
-        <div
-          class="flex"
-          v-for="(addition, keyName, index) in priceData.additionList"
-          :key="index">
-          <div class="addition-title flex">{{ keyName }}</div>
-          <div class="flex-auto flex wrap">
-            <div
-              @click="selectAddition(item, keyName)"
-              class="addition-item"
-              :class="[
-                { selected: additionForm[`${keyName}`].includes(item.id) },
-              ]"
-              v-for="item in addition"
-              :key="item.id">
-              <div class="background"></div>
-              <div class="name">{{ item.name }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import stepMixin from './stepMixin'
-
-export default {
-  name: 'Step2',
-  mixins: [stepMixin],
-  props: {
-    // 步骤1中选中的周期. 不能直接拿form1来取form1.cycle, 否则步骤1变更时,  涉及到form1的computed会全部重新计算, 可能会导致其他异常
-    cycle: {
-      type: Number,
-      default: function () {
-        return 0
-      },
-    },
-  },
-  data() {
-    return {
-      form: {},
-      additionForm: {},
-      rules: {},
-      // 标志符，用于控制监听是否启用
-      loaded: false,
-    }
-  },
-  computed: {
-    // 商品 当前选中周期的 基础价格和打印价格数据
-    computedPriceData() {
-      return this.priceData.priceList.filter(
-        item => item.cycle_id === this.cycle
-      )
-    },
-    /**
-     * 当前选中周期下, 商品对应的各型号打印价格.
-     */
-    computedPrintPriceData() {
-      const model = this.computedPriceData.length
-        ? this.computedPriceData[0]
-        : {}
-      // 属性‘1’里面是基础价格数据, 属性 ’2‘是打印价格数据
-      if (model['2']) {
-        return model['2'].slice()
-      } else {
-        return []
-      }
-    },
-    // 计算是否存在附加项
-    hasAddition() {
-      if (!this.loaded) return false
-      let result = false
-      const target = this.priceData.additionList
-      for (const key in target) {
-        if (Array.isArray(target[key]) && target[key].length) {
-          result = true
-        }
-      }
-      return result
-    },
-  },
-  watch: {
-    computedPrintPriceData: {
-      deep: true,
-      handler: function () {
-        if (!this.loaded) return
-
-        const temp = {}
-        for (const item of this.computedPrintPriceData) {
-          let pId = 0
-          // 从 product 页面来的用户选过的打印服务数据
-          if (
-            this.preData.printService &&
-            this.preData.printService[`${item.id}`] &&
-            this.preData.printService[`${item.id}`].id
-          ) {
-            pId = this.preData.printService[`${item.id}`].id
-          }
-
-          temp[`${item.id}`] = {
-            // ...item直接把所有数据一起堆进去, 方便后续的价格计算, 不然计算需要各种遍历, 逻辑会非常难懂.
-            ...item,
-            enable: pId !== 0,
-            // 打印服务. 如果选过的打印服务在这个周期的商品里面有, 则选上. 否则选当前打印服务项的第一个
-            printService: item.decorationList.map(i => i.id).includes(pId)
-              ? pId
-              : item.decorationList[0].id,
-            colorForm: item.decorationList.map(decoration => {
-              return {
-                id: decoration.id,
-                // 默认是1, 后台数据允许留空成0, 但既然计算打印价格, 肯定会是1, 不然怎么打印、怎么计算价格
-                colorNumber:
-                  pId === decoration.id
-                    ? Number(this.preData.printService[`${item.id}`].num)
-                    : 1,
-                pmsColorText: '',
-              }
-            }),
-          }
-        }
-        this.form = Object.assign(temp, this.additionForm)
-      },
-    },
-    additionForm: {
-      deep: true,
-      handler: function () {
-        if (!this.loaded) return
-
-        Object.assign(this.form, this.additionForm)
-      },
-    },
-  },
-  mounted() {
-    for (const key in this.priceData.additionList) {
-      this.$set(
-        this.additionForm,
-        `${key}`,
-        this.preData[`${key}`] ? this.preData[`${key}`].slice() : []
-      )
-    }
-    this.loaded = true
-  },
-  methods: {
-    checkForm() {
-      return new Promise((resolve, reject) => {
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            resolve(JSON.parse(JSON.stringify(this.form)))
-          } else {
-            reject(new Error('validate step2 form error'))
-          }
-        })
-      })
-    },
-    selectAddition(item, key) {
-      if (this.additionForm[`${key}`].includes(item.id)) {
-        // 选中清除
-        this.$set(
-          this.additionForm,
-          `${key}`,
-          this.additionForm[`${key}`].filter(i => i !== item.id)
-        )
-      } else {
-        this.$set(
-          this.additionForm,
-          `${key}`,
-          this.additionForm[`${key}`].concat([item.id])
-        )
-      }
-    },
-    printServiceClick(decoration, item) {
-      if (!this.form[`${item.id}`].enable) return
-      this.form[`${item.id}`].printService = decoration.id
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-@import './step.scss';
-div {
-  box-sizing: border-box;
-}
-.addition-title {
-  font-size: 14px;
-  font-family: Proxima Nova, sans-serif;
-  color: #000;
-  min-width: 104px;
-}
-.addition-item {
-  border: 1px solid #dbdbdb;
-  max-width: 108px;
-  margin-bottom: 12px;
-  margin-right: 12px;
-  cursor: pointer;
-  .name {
-    word-break: break-all;
-    height: 32px;
-    line-height: 16px;
-    padding: 0 4px;
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-  }
-  .background {
-    border-bottom: 1px solid #dbdbdb;
-    width: 108px;
-    height: 108px;
-  }
-  &:hover,
-  &.selected {
-    border-color: #409eff;
-  }
-}
-.custom-checkbox {
-  &.disable {
-    cursor: not-allowed;
-  }
-}
-</style>

components/product-builder/step-3.vue

@@ -1,603 +0,0 @@
-<template>
-  <el-card class="step-card">
-    <div
-      slot="header"
-      class="flex between">
-      <div class="step-card-title">Step3 Confirm</div>
-    </div>
-    <div v-loading="loading">
-      <div>
-        <div v-if="addressList.length">
-          <div class="card-sub-title">Ship to</div>
-          <div class="form-item-label">Shipping address</div>
-          <div class="flex between">
-            <div>
-              <div>
-                <div class="flex">
-                  <div class="address-text name">{{ defaultAddr.name }}</div>
-                  <div class="address-text">&nbsp;{{ defaultAddr.phone }}</div>
-                </div>
-                <div class="address-text">{{ defaultAddr.address }}</div>
-                <div class="flex">
-                  <div class="address-text">{{ defaultAddr.city }}</div>
-                  <div class="address-text">
-                    &nbsp;{{ defaultAddr.post_code }}
-                  </div>
-                </div>
-              </div>
-            </div>
-            <el-button
-              type="text"
-              @click="visibleOfSelectAddressDialog = true"
-              >edit address</el-button
-            >
-          </div>
-        </div>
-        <el-button
-          @click="addAddress"
-          v-else
-          size="mini"
-          plain
-          >+&nbsp;Add delivery address</el-button
-        >
-      </div>
-      <el-form
-        :model="form"
-        :rules="rules"
-        label-width="0"
-        label-position="left"
-        ref="form">
-        <el-form-item
-          label-width="120px"
-          label="Freight type">
-          <el-radio-group
-            v-loading="freightLoading"
-            v-model="form.freight_type">
-            <el-radio :label="2">AAE</el-radio>
-            <el-radio :label="1">Road express</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <div class="price-title flex">
-          <div>Pricing Optiopns</div>
-        </div>
-        <div class="divide-solid"></div>
-        <div class="price-table">
-          <el-table
-            class=""
-            v-loading="freightLoading"
-            :data="computedPriceTableData">
-            <el-table-column
-              v-for="(column, index) in computedPriceTableColumns"
-              :fixed="column.fixed || false"
-              :width="column.width || '100px'"
-              :key="`${column.prop}-${index}`"
-              :label="column.label || column.prop"
-              :prop="column.prop"></el-table-column>
-          </el-table>
-        </div>
-
-        <el-form-item
-          label-width="0"
-          prop="job">
-          <div class="form-item-label">
-            <span style="color: red">*</span>&nbsp;Reference or Job name
-          </div>
-          <el-select
-            v-model="form.job"
-            filterable
-            allow-create
-            default-first-option
-            style="width: 100%"
-            placeholder="Ref, Choose or create new one">
-            <el-option
-              v-for="item in jobOptions"
-              :key="item.label_type"
-              :label="item.label_type"
-              :value="item.label_type">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <div class="form-item-label">Note</div>
-        <el-form-item
-          prop="note"
-          label-width="0">
-          <el-input
-            v-model="form.note"
-            placeholder="Any note"></el-input>
-        </el-form-item>
-      </el-form>
-      <div class="flex center">
-        <el-button
-          type="primary"
-          @click="addToProject">
-          <div class="flex center">
-            <span class="btn-icon el-icon-shopping-cart-2"></span>&nbsp; Add to
-            project
-          </div>
-        </el-button>
-        <el-button
-          type="info"
-          @click="sendEnquiry">
-          <div class="flex">
-            <span class="btn-icon el-icon-shopping-bag-1"></span>&nbsp; Send
-            enquiry
-          </div>
-        </el-button>
-      </div>
-      <add-address-dialog
-        :dialogVisible.sync="visibleOfEditAddressDialog"
-        :data="addressDetail"
-        :componentVisible="patternOfEditAddressDialog"
-        @close="closeAddressDialog"
-        @update="getAddressData" />
-      <select-address-dialog
-        :addressDetail="form.defaultAddr"
-        :addressList="addressList"
-        :visible.sync="visibleOfSelectAddressDialog"
-        @add-new-addr="addAddress"
-        @select-addr="selectAddress"
-        @close="closeSelectAddressDialog"></select-address-dialog>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import { plus } from 'number-precision'
-import _ from 'lodash'
-import { mapState } from 'vuex'
-import stepMixin from './stepMixin'
-import selectAddressDialog from './DialogSelectAddr.vue'
-import addAddressDialog from '@/components/addAddressDialog.vue'
-import {
-  formatPrice,
-  getUnit,
-  getSetup,
-  getPrint,
-  getAddon,
-  getPackaging,
-  getFright,
-} from '@/utils/price'
-
-export default {
-  name: 'Step3',
-  components: {
-    addAddressDialog,
-    selectAddressDialog,
-  },
-  mixins: [stepMixin],
-  props: {
-    // 步骤1中选中的周期. 不能直接拿form1来取form1.cycle, 否则步骤1变更时, 涉及到form1的computed会全部重新计算, 可能会导致其他异常
-    cycle: {
-      type: Number,
-      default: function () {
-        return 0
-      },
-    },
-    // 同cycle
-    model: {
-      type: Number,
-      default: function () {
-        return 0
-      },
-    },
-    // 同cycle. form1的autoForm, 记录对应颜色的 商品购买数量表单.
-    buyForm: {
-      type: Array,
-      default: function () {
-        return []
-      },
-    },
-    // 步骤2的表单. 因其设计选中规格, 为当前步骤的前置数据, 故需从父组件获取. 只用来计算, 本组件不更改这个数据.
-    form2: {
-      type: Object,
-      default: function () {
-        return {}
-      },
-    },
-    weightInfo: {
-      type: Object,
-      default: function () {
-        return {}
-      },
-    },
-  },
-  data() {
-    return {
-      rules: {
-        job: [
-          {
-            required: true,
-            message: 'Please select or create a job name',
-            trigger: 'change',
-          },
-        ],
-      },
-      form: {
-        // 默认的配送地址
-        defaultAddr: {},
-        freight_type: 1,
-        job: '',
-        note: '',
-      },
-      freightLoading: false,
-      // 运费信息
-      freightInfo: {},
-      // 运费浮动比. 从product页面来的数据, 记录在local storage里面
-      sellFreight: 0,
-      addressList: [],
-      addressDetail: {},
-      visibleOfSelectAddressDialog: false,
-      visibleOfEditAddressDialog: false,
-      patternOfEditAddressDialog: 1,
-      jobOptions: [],
-      priceTableColumns: [
-        {
-          prop: 'qty',
-          label: 'Qty',
-          fixed: 'left',
-        },
-      ],
-      dynamicPriceTableColumns: [],
-      dynamicPriceTableData: [],
-      priceTableData: [
-        {
-          qty: 'Unit',
-        },
-        {
-          qty: 'Set up',
-        },
-        {
-          qty: 'Print Option',
-        },
-        {
-          qty: 'Addon',
-        },
-        {
-          qty: 'Packing',
-        },
-        {
-          qty: 'Fright',
-        },
-        {
-          qty: 'SubTotal',
-        },
-      ],
-    }
-  },
-  computed: {
-    ...mapState('config', { configInfo: state => state.configInfo }),
-    // 商品 当前选中周期的 基础价格和打印价格数据
-    computedPriceData() {
-      return this.priceData.priceList.filter(
-        item => item.cycle_id === this.cycle
-      )
-    },
-    /**
-     * 当前选中周期下, 商品对应的各型号基础价格数据. 可以推断当前周期有几个型号
-     */
-    computedBasePriceData() {
-      const model = this.computedPriceData.length
-        ? this.computedPriceData[0]
-        : {}
-      // 属性‘1’里面是基础价格数据, 属性 ’2‘是打印价格数据
-      if (model['1']) {
-        return model['1'].slice()
-      } else {
-        return []
-      }
-    },
-    // 当前型号位于基础价格数据的index, 用于取出型号对应的基础数据
-    computedBasePriceIndex() {
-      return this.computedBasePriceData.findIndex(
-        item => item.id === this.model
-      )
-    },
-    /**
-     * 当前选中周期下, 商品对应的各型号打印价格.
-     */
-    computedPrintPriceData() {
-      const model = this.computedPriceData.length
-        ? this.computedPriceData[0]
-        : {}
-      // 属性‘1’里面是基础价格数据, 属性 ’2‘是打印价格数据
-      if (model['2']) {
-        return model['2'].slice()
-      } else {
-        return []
-      }
-    },
-
-    // 其实没必要的, 只是方便html上不用读多一层属性 from.defaultAddr.****这样
-    defaultAddr() {
-      return this.form.defaultAddr
-    },
-    computedPriceTableColumns() {
-      return this.priceTableColumns.concat(this.dynamicPriceTableColumns)
-    },
-    computedPriceTableData() {
-      return this.priceTableData.map((item, index) =>
-        Object.assign({}, item, this.dynamicPriceTableData[index] || {})
-      )
-    },
-  },
-  watch: {
-    addressList() {
-      const temp = this.addressList.filter(item => item.is_default === 1)
-      if (temp.length) {
-        this.form.defaultAddr = temp[0]
-      } else if (this.addressList.length) {
-        this.form.defaultAddr = this.addressList[0]
-      } else {
-        this.form.defaultAddr = {}
-      }
-      if (this.form.defaultAddr.post_code) {
-        this.getFreight()
-      }
-    },
-    'form.freight_type'() {
-      this.getFreight()
-    },
-    'form.defaultAddr'() {
-      this.getFreight()
-    },
-    buyForm: {
-      deep: true,
-      immediate: true,
-      handler: function () {
-        const temp = []
-        if (!this.loaded) return temp
-        this.dynamicPriceTableColumns = this.buyForm.map(item => {
-          return {
-            prop: `${item.value}`,
-            buyNum: item.value,
-          }
-        })
-
-        this.getDynamicPriceTableData()
-      },
-    },
-    form2: {
-      deep: true,
-      immediate: true,
-      handler: function () {
-        this.getDynamicPriceTableData()
-      },
-    },
-  },
-  mounted() {
-    if (localStorage.getItem('sellFreight')) {
-      this.sellFreight = localStorage.getItem('sellFreight')
-    }
-    this.getAddressData().then(() => {
-      this.loaded = true
-    })
-    this.getJobList()
-  },
-  methods: {
-    checkForm() {
-      return new Promise((resolve, reject) => {
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            resolve(JSON.parse(JSON.stringify(this.form)))
-          } else {
-            reject(new Error('validate step3 form error'))
-          }
-        })
-      })
-    },
-    addToProject() {
-      this.$emit('check', 1)
-    },
-    sendEnquiry() {
-      this.$emit('check', 2)
-    },
-    // Job 下拉/输入框候选数据
-    getJobList() {
-      this.$axios
-        .post('/api/goods_cart/cartLabelLists', { keyword: [] })
-        .then(res => {
-          this.jobOptions = res.result
-        })
-    },
-    // 获取配送地址数据
-    async getAddressData() {
-      return await this.$axios
-        .get('/api/address/list', {
-          params: {
-            keyword: '',
-            page: 1,
-            limit: 100,
-          },
-        })
-        .then(res => {
-          if (res.code === 1) {
-            this.addressList = res.result.data
-            this.addressTotal = res.result.total
-          }
-        })
-    },
-    addAddress() {
-      this.addressDetail = {}
-      this.patternOfEditAddressDialog = 2
-      this.visibleOfEditAddressDialog = true
-    },
-    closeAddressDialog() {
-      this.visibleOfEditAddressDialog = false
-    },
-    selectAddress(data) {
-      const temp = this.addressList.filter(item => item.id === data)
-      if (temp.length) this.form.defaultAddr = temp[0]
-      this.closeSelectAddressDialog()
-    },
-    closeSelectAddressDialog() {
-      this.visibleOfSelectAddressDialog = false
-    },
-    getDynamicPriceTableData() {
-      const temp = [
-        {}, // unit
-        {}, // setup 打印和附加价格之和
-        {}, // print option
-        {}, // addon 附加服务除了packing之外的总价
-        {}, // packing / packaging
-        {}, // fright 运费
-        {}, // 汇总
-      ]
-      const ratio = plus(this.sellFreight / 100, 1)
-      // { buyNum数量, prop标签label }
-      this.dynamicPriceTableColumns.forEach(v => {
-        const unitPrice = getUnit(
-          v.buyNum,
-          this.computedBasePriceIndex,
-          this.priceData.attributeList,
-          this.computedBasePriceData
-        )
-        temp[0][`${v.prop}`] = formatPrice(unitPrice)
-        temp[0][`${v.prop}_value`] = unitPrice
-
-        const setupPrice = getSetup(
-          v.buyNum,
-          this.form2,
-          this.priceData.additionList
-        )
-        temp[1][`${v.prop}`] = formatPrice(setupPrice)
-        temp[1][`${v.prop}_value`] = setupPrice
-
-        const printPrice = getPrint(
-          v.buyNum,
-          this.form2,
-          this.priceData.attributeList
-        )
-        temp[2][`${v.prop}`] = formatPrice(printPrice)
-        temp[2][`${v.prop}_value`] = printPrice
-
-        const addonPrice = getAddon(
-          v.buyNum,
-          this.form2,
-          this.priceData.attributeList,
-          this.priceData.additionList
-        )
-        temp[3][`${v.prop}`] = formatPrice(addonPrice)
-        temp[3][`${v.prop}_value`] = addonPrice
-
-        const packagingPrice = getPackaging(
-          v.buyNum,
-          this.form2,
-          this.priceData.attributeList,
-          this.priceData.additionList
-        )
-        temp[4][`${v.prop}`] = formatPrice(packagingPrice)
-        temp[4][`${v.prop}_value`] = packagingPrice
-
-        const frightPrice = getFright(
-          v.buyNum,
-          this.configInfo,
-          this.freightInfo,
-          this.weightInfo,
-          ratio
-        )
-        temp[5][`${v.prop}`] = formatPrice(frightPrice)
-        temp[5][`${v.prop}_value`] = frightPrice
-
-        // 最后一行汇总行的数据
-        const total = [
-          temp[0][`${v.prop}_value`],
-          temp[1][`${v.prop}_value`],
-          temp[2][`${v.prop}_value`],
-          temp[3][`${v.prop}_value`],
-          temp[4][`${v.prop}_value`],
-          temp[5][`${v.prop}_value`],
-        ].reduce((total, curr) => {
-          const value = Number(curr)
-          if (total === 'POA' || curr === 'POA') {
-            return 'POA'
-          } else if (typeof value === 'number') {
-            return plus(total, value)
-          } else {
-            return total
-          }
-        }, 0)
-
-        temp[6][`${v.prop}`] =
-          typeof total === 'number' ? formatPrice(total) : total
-        temp[6][`${v.prop}_value`] = total
-      })
-      // console.log(temp, '计算动态表格数据')
-      this.dynamicPriceTableData = temp
-    },
-    getFreight: _.debounce(function () {
-      if (!this.form.defaultAddr.post_code) return
-      this.freightLoading = true
-      this.$axios
-        .post('/api/quote/freight', {
-          postcode: this.form.defaultAddr.post_code,
-          type: this.form.freight_type,
-        })
-        .then(res => {
-          this.freightInfo = res.result
-          this.getDynamicPriceTableData()
-        })
-        .finally(() => {
-          setTimeout(() => {
-            this.freightLoading = false
-          }, 300)
-        })
-    }, 200),
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-@import './step.scss';
-div {
-  box-sizing: border-box;
-}
-.btn-icon {
-  font-size: 20px;
-}
-.address-text {
-  font-size: 14px;
-  line-height: 18px;
-  color: #000;
-  font-family: Proxima Nova, sans-serif;
-  &.name {
-    font-weight: bold;
-  }
-}
-.price-title {
-  height: 32px;
-  padding: 0 8px;
-  background: #f8f9fd;
-  width: 100%;
-  & > div {
-    font-size: 16px;
-    color: #000;
-    font-family: Proxima Nova, sans-serif;
-  }
-}
-.divide-solid {
-  height: 4px;
-  width: 100%;
-  background-color: #a9aeba;
-  margin: 10px auto 12px;
-}
-.price-table {
-  :deep(.el-table) {
-    font-family: Proxima Nova;
-    &::before {
-      background-color: transparent;
-    }
-    td.el-table__cell {
-      font-size: 15px;
-      border-bottom: 2px solid #dddcdc;
-    }
-    th.el-table__cell {
-      font-weight: 600;
-      font-size: 20px;
-      color: #fff;
-      background-color: #626469;
-      border-bottom: none;
-    }
-  }
-}
-</style>

components/product-builder/step.scss

@@ -1,72 +0,0 @@
-.step-card {
-  width: calc((100% - 28.5px * 2) / 3);
-  margin: 0 0 36px;
-  padding-bottom: 40px;
-  min-width: 580px;
-  @media screen and (max-width: 1400px) {
-    min-width: 640px;
-  }
-  .step-card-title {
-    line-height: 24px;
-    font-size: 18px;
-    font-family: Proxima Nova, sans-serif;
-    color: #000;
-  }
-  .card-sub-title {
-    font-size: 18px;
-    font-family: Proxima Nova, sans-serif;
-    font-weight: bold;
-    color: #000;
-    margin-bottom: 14px;
-  }
-  :deep(.el-form-item__label) {
-    font-size: 14px;
-    font-family: Proxima Nova, sans-serif;
-    color: #000;
-  }
-
-  .form-item-label {
-    font-size: 14px;
-    font-family: Proxima Nova, sans-serif;
-    color: #000;
-    margin: 6px 0 8px;
-  }
-
-  .divider {
-    height: 2px;
-    border-top: 1px dashed #eee;
-    margin-bottom: 4px;
-  }
-
-  $commonColor: #898989;
-  $activeColor: #409eff;
-  .custom-checkbox-wrap {
-    min-height: 40px;
-    display: flex;
-    align-content: flex-start;
-    align-items: center;
-    flex-wrap: wrap;
-  }
-  .custom-checkbox {
-    cursor: pointer;
-    height: 32px;
-    line-height: 32px;
-    display: inline-flex;
-    color: $commonColor;
-    padding: 0 16px;
-    border: 1px solid $commonColor;
-    border-radius: 2px;
-    margin-bottom: 6px;
-    margin-right: 8px;
-    &.active {
-      color: $activeColor;
-      border-color: $activeColor;
-    }
-    &.disable {
-      border-style: dashed;
-      border-color: $commonColor;
-      color: $commonColor;
-      background-color: #dbdbdb;
-    }
-  }
-}

components/product-builder/stepMixin.vue

@@ -1,55 +0,0 @@
-<template>
-  <div class=""></div>
-</template>
-<script>
-/* 仅用于本目录3个step表单组件的共享逻辑 */
-export default {
-  name: 'StepMixin',
-  components: {},
-  props: {
-    loading: { type: Boolean, default: false },
-    priceData: {
-      type: Object,
-      default: function () {
-        return { priceList: [], attributeList: {}, additionList: {} }
-      },
-    },
-    detail: {
-      type: Object,
-      default: function () {
-        return { info: { images: [] } }
-      },
-    },
-    preData: {
-      type: Object,
-      default: function () {
-        return {}
-      },
-    },
-  },
-
-  data() {
-    return {}
-  },
-  computed: {},
-  watch: {
-    form: {
-      deep: true,
-      handler: function () {
-        if (this.loaded) {
-          this.$_emitFormData()
-        }
-      },
-    },
-  },
-  mounted() {},
-  methods: {
-    // 将this.form 自动传递给父组件
-    $_emitFormData() {
-      this.$emit('update-form', JSON.parse(JSON.stringify(this.form)))
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped></style>

components/product/ProductLeft.vue

@@ -94,12 +94,18 @@ export default {
     currentPre(){
       return this.$store.state.product.smImgUlIdx
     },
-    comInfo(){
-      const temp = this.pageData.main
-      const a = temp.image_color.map((i)=>i.image)
-      temp.mergeImages = [...temp.images,...a]
-			return temp
-		},
+    comInfo() {
+      const { main } = this.pageData;
+      const images = main.image_color.map(i => i.image); 
+
+      if (main.image) {
+        images.unshift(main.image);
+      }
+
+      main.mergeImages = images;
+      return main;
+    },
+
     comS3Img(){
 			return this.comInfo.mergeImages.map(url => this.$utils.repaceDomain(url));
 		}
@@ -129,17 +135,6 @@ export default {
     selectCurrent3D(val) {
       this.current3D = val;
     },
-    goDesign(template_id, goods_id) {
-      this.$axios
-        .get("/api/bxh/design", { params: { template_id, goods_id } })
-        .then((res) => {
-          const { href } = this.$router.resolve({
-            name: "design-id",
-            params: { id: res.result },
-          });
-          window.open(href, "_black");
-        });
-    },
     getStyle(val) {
       const bigImg = this.$refs.big;
       bigImg.style.left = -2 * val.left + "px";

components/product/ProductRight.vue

@@ -21,9 +21,7 @@
             v-for="(item,i) of pageData.main.image_color"
             :key="item.id">
             <div class="color-item" v-if="item.color?.img">
-              <div
-                @click="setSmImgUlIdx(pageData.main?.images?.length + i)"
-                :class="currentPre == pageData.main?.images?.length + i ? 'slip' : ''">
+              <div @click="setSmImgUlIdx(computedIndex(i))" :class="currentPre == (computedIndex(i)) ? 'slip' : ''">
                 <el-tooltip
                 :content="item.color?.name"
                 placement="top"
@@ -322,15 +320,15 @@
           <img :src="item.filter?.img" v-for="(item,i) in pageData.goodsCompliance" :key=i @click="download(item.pic)">
         </div>
       </div>
-      <div
+      <!-- <div
         class="change"
         v-show="typeTab == 4">
         <change-table :data="pageData.change"></change-table>
-      </div>
+      </div> -->
     </div>
     <no-ssr>
       <!-- Ticket浮动框 -->
-      <form-dialog
+      <!-- <form-dialog
           title="网页产品问题反馈"
           sendbtnCext="提交"
           cancelbtnCext="取消"
@@ -340,18 +338,7 @@
           :enquiryConfig="ticketConfig"
           :visible.sync="ticketFormVisible"
           @handleSend="sendTicket"
-          :rules="rules"></form-dialog>
-      <!-- 右侧project浮动框 -->
-      <project
-        :productInfo="pageData"
-        @handleAdd="openProjectdDialog"
-        @save-selected-data="saveUserSelected"></project>
-      <!-- 加入project弹框 -->
-      <project-dialog
-        :visible.sync="projectdDialogVisible"
-        :id="pageData.id"
-        :projectObj="projectObj"
-        :isCopy="false"></project-dialog>
+          :rules="rules"></form-dialog> -->
       <ElImageViewer
         v-if="showViewer"
         :on-close="closeViewer"
@@ -415,7 +402,7 @@ export default {
       projectObj: {
         decoration_id: '',
       },
-      ticketFormVisible:false,
+      // ticketFormVisible:false,
       ticketForm:{
         英文品名: this.pageData.product_name,
         SKU: this.pageData.product_code,
@@ -470,7 +457,7 @@ export default {
       handler(val){
         if(val){
           this.tabList[1].isShow = true
-          this.tabList[4].isShow = true
+          // this.tabList[4].isShow = true
         }
       },
       immediate: true
@@ -485,6 +472,9 @@ export default {
     isProduct(str) {
       return /^[A-z]{1,4}\d{1,4}[A-z]?$/.test(str)
     },
+    computedIndex(i) {
+      return this.pageData.main?.image ? 1 + i : i;
+    },
     // 保存一下用户选择的周期、型号、打印服务、addon、packaging, product builder页面要用到
     saveUserSelected() {
       let result = {
@@ -529,11 +519,11 @@ export default {
         JSON.stringify(result)
       )
     },
-    getStock() {
-      this.$axios.get('/api/quote/stock_new', { params: {id: this.id} }).then(res => {
-        this.stockData = res.result
-      })
-    },
+    // getStock() {
+    //   this.$axios.get('/api/quote/stock_new', { params: {id: this.id} }).then(res => {
+    //     this.stockData = res.result
+    //   })
+    // },
     openProjectdDialog() {
       if (!isLogin) {
         this.openDialog()
@@ -590,11 +580,12 @@ export default {
         if (this.userInfo.audit_status == 1) {
           if (i == 1) {
             this.$refs.quote.getQuote()
-            this.$refs.quote.getWeight()
+            // this.$refs.quote.getWeight()
             this.tabList[1].isClick = true
           } else if (i == 2) {
-            this.getStock()
-            this.tabList[2].isClick = true
+            // uk 没有这个
+            // this.getStock()
+            // this.tabList[2].isClick = true
           }
         } else {
           this.typeTab = 0
@@ -612,19 +603,19 @@ export default {
       let a = url.indexOf('http') > -1 ? url : 'http://' + url
       window.open(a, '_blank')
     },
-    sendTicket() {
-      this.$axios.post('/api/ticket/add', { product_code: this.pageData.product_code,ticket_type: this.ticketForm['问题类型'].join(),content: this.ticketForm['反馈详情']  }).then(res => {
-        this.setLoading(false)
-        this.$notify({
-              title: "success",
-              message: "提交成功",
-              type: "success",
-              duration: 3000,
-            });
-      }).catch(() => {
-          this.setLoading(false)
-        })
-    }
+    // sendTicket() {
+    //   this.$axios.post('/api/ticket/add', { product_code: this.pageData.product_code,ticket_type: this.ticketForm['问题类型'].join(),content: this.ticketForm['反馈详情']  }).then(res => {
+    //     this.setLoading(false)
+    //     this.$notify({
+    //           title: "success",
+    //           message: "提交成功",
+    //           type: "success",
+    //           duration: 3000,
+    //         });
+    //   }).catch(() => {
+    //       this.setLoading(false)
+    //     })
+    // }
   },
 }
 </script>

components/product/Quote.vue

@@ -250,14 +250,14 @@
               >Download</el-button>
           </div>
         </el-dialog>
-        <form-dialog
+        <!-- <form-dialog
           :emailForm="commentObj"
           :enquiryConfig="enquiryConfig1"
           :visible.sync="downloadDialogVisible"
           @handleSend="sendPdfMail"
           :rules="rules1"
           :labelWidth="120"
-          :isSendPdf="true"></form-dialog>
+          :isSendPdf="true"></form-dialog> -->
         <price-to-img
           ref="pdf"
           v-show="false"
@@ -597,7 +597,7 @@ export default {
 
     getQuote() {
       this.$axios
-        .post('/api/quote/pricequote', { id: this.id })
+        .post('/uk-api/quote/pricequote', { id: this.id })
         .then(res => {
           if (localStorage.getItem('unit')) {
             this.unitData = JSON.parse(localStorage.getItem('unit'))
@@ -749,31 +749,31 @@ export default {
 
       return result;
     },
-    getWeight() {
-      this.$axios
-        .post('/api/quote/weight', { id: this.id })
-        .then(res => {
-          this.weight = res.result
-        })
-        .catch(() => {})
-    },
-    getFreight(k) {
-      const postcode = this.comCurBaseTotalColumns[k].postcode
-      const type = this.comCurBaseTotalColumns[k].freight_type
-      const init = { basic:0,pickup:0,minimum:0 }
-      if (postcode.length < 3) {
-        this.comCurBaseTotalColumns[k].freight = init
-        return
-      }
-      this.$axios
-        .post('/api/quote/freight', {
-          postcode,
-          type
-        })
-        .then(res => {
-          this.comCurBaseTotalColumns[k].freight = Array.isArray(res.result)?init:res.result
-        })
-    },
+    // getWeight() {
+    //   this.$axios
+    //     .post('/api/quote/weight', { id: this.id })
+    //     .then(res => {
+    //       this.weight = res.result
+    //     })
+    //     .catch(() => {})
+    // },
+    // getFreight(k) {
+    //   const postcode = this.comCurBaseTotalColumns[k].postcode
+    //   const type = this.comCurBaseTotalColumns[k].freight_type
+    //   const init = { basic:0,pickup:0,minimum:0 }
+    //   if (postcode.length < 3) {
+    //     this.comCurBaseTotalColumns[k].freight = init
+    //     return
+    //   }
+    //   this.$axios
+    //     .post('/api/quote/freight', {
+    //       postcode,
+    //       type
+    //     })
+    //     .then(res => {
+    //       this.comCurBaseTotalColumns[k].freight = Array.isArray(res.result)?init:res.result
+    //     })
+    // },
     getDebFreight: _.debounce(function (k) {
       this.getFreight(k)
     }, 200),  
@@ -799,27 +799,27 @@ export default {
     dividePrice(a) {
       return npDivide(+a, 100)
     },
-    openMailDialog() {
-      if (this.$utils.checkLogin()) {
-        this.getUserInfo()
-        const { contacts, email, phone, crm_users_id:crmUsersId } = this.userInfo
-        this.enquiryForm.Name = contacts
-        this.enquiryForm.Email = email
-        this.enquiryForm.Phone = phone
-        if (crmUsersId?.length) {
-          this.enquiryConfig[3].selectlist = crmUsersId
-          if (crmUsersId?.length === 1) {
-            this.enquiryForm['Customer manager'] = crmUsersId[0].name
-          }
-        } else {
-          this.enquiryConfig[3].isShow = false
-          this.$delete(this.enquiryForm, 'Customer manager')
-        }
-        this.enquiryFormVisible = true
-      } else {
-        this.openDialog()
-      }
-    },
+    // openMailDialog() {
+    //   if (this.$utils.checkLogin()) {
+    //     this.getUserInfo()
+    //     const { contacts, email, phone, crm_users_id:crmUsersId } = this.userInfo
+    //     this.enquiryForm.Name = contacts
+    //     this.enquiryForm.Email = email
+    //     this.enquiryForm.Phone = phone
+    //     if (crmUsersId?.length) {
+    //       this.enquiryConfig[3].selectlist = crmUsersId
+    //       if (crmUsersId?.length === 1) {
+    //         this.enquiryForm['Customer manager'] = crmUsersId[0].name
+    //       }
+    //     } else {
+    //       this.enquiryConfig[3].isShow = false
+    //       this.$delete(this.enquiryForm, 'Customer manager')
+    //     }
+    //     this.enquiryFormVisible = true
+    //   } else {
+    //     this.openDialog()
+    //   }
+    // },
     getMailData() {
       this.mailData.Url = window.location.href
       const { Name, Email, Phone, Comments } = this.enquiryForm
@@ -835,63 +835,63 @@ export default {
       this.mailData['Quote time'] = this.$utils.formatTime(new Date())
     },
     // 发送价格邮件 Enquiry按钮
-    async sendPriceMail() {
-      await this.getMailData()
-      await this.getCustomerQuoteData()
-      const {
-        Name,
-        Email,
-        Phone,
-        Comments,
-        'Customer manager': customerManager,
-      } = this.enquiryForm
-      this.$axios
-        .post('/api/quote/sendenquiry', {
-          content: this.$refs.mailtable.$el.innerHTML,
-          name: Name,
-          email: Email,
-          phone: Phone,
-          customer_manager: customerManager || '',
-          url: this.mailData.Url,
-          product_code: this.pageData.product_code,
-          comments: Comments,
-          member_id: this.userInfo.id,
-        })
-        .then(res => {
-          this.setLoading(false)
-          this.enquiryFormVisible = false
-          this.$confirm('Enquiry Sent', {
-            confirmButtonText: 'OK',
-            showCancelButton: false,
-            type: 'success',
-            center: true,
-            showClose: false,
-            confirmButtonClass: 'com-btnblack',
-          }).then(() => {})
-        })
-        .catch(() => {
-          this.setLoading(false)
-        })
-    },
-    getCustomerQuoteData() {
-      const { name, selectAdditionRow } = this.comCurWeekPrice
-      this.specificationsObj.time = name
-      this.specificationsObj.model = this.comBasePrice.model
-      this.specificationsObj.decoration = this.comCurBasePrice.name
-      if (selectAdditionRow.length) {
-        this.specificationsObj.addonArr = selectAdditionRow.map(
-          item => item.name
-        )
-      } else {
-        this.specificationsObj.addonArr = null
-      }
-    },
-    openDownloadDialog(type) {
-      this.getCustomerQuoteData()
-      type
-        ? (this.downloadDialogVisible = true)
-        : (this.priceToImgVisible = true)
-    },
+    // async sendPriceMail() {
+    //   await this.getMailData()
+    //   await this.getCustomerQuoteData()
+    //   const {
+    //     Name,
+    //     Email,
+    //     Phone,
+    //     Comments,
+    //     'Customer manager': customerManager,
+    //   } = this.enquiryForm
+    //   this.$axios
+    //     .post('/uk-api/quote/sendenquiry', {
+    //       content: this.$refs.mailtable.$el.innerHTML,
+    //       name: Name,
+    //       email: Email,
+    //       phone: Phone,
+    //       customer_manager: customerManager || '',
+    //       url: this.mailData.Url,
+    //       product_code: this.pageData.product_code,
+    //       comments: Comments,
+    //       member_id: this.userInfo.id,
+    //     })
+    //     .then(res => {
+    //       this.setLoading(false)
+    //       this.enquiryFormVisible = false
+    //       this.$confirm('Enquiry Sent', {
+    //         confirmButtonText: 'OK',
+    //         showCancelButton: false,
+    //         type: 'success',
+    //         center: true,
+    //         showClose: false,
+    //         confirmButtonClass: 'com-btnblack',
+    //       }).then(() => {})
+    //     })
+    //     .catch(() => {
+    //       this.setLoading(false)
+    //     })
+    // },
+    // getCustomerQuoteData() {
+    //   const { name, selectAdditionRow } = this.comCurWeekPrice
+    //   this.specificationsObj.time = name
+    //   this.specificationsObj.model = this.comBasePrice.model
+    //   this.specificationsObj.decoration = this.comCurBasePrice.name
+    //   if (selectAdditionRow.length) {
+    //     this.specificationsObj.addonArr = selectAdditionRow.map(
+    //       item => item.name
+    //     )
+    //   } else {
+    //     this.specificationsObj.addonArr = null
+    //   }
+    // },
+    // openDownloadDialog(type) {
+    //   this.getCustomerQuoteData()
+    //   type
+    //     ? (this.downloadDialogVisible = true)
+    //     : (this.priceToImgVisible = true)
+    // },
     handleDownloadPdf() {
       this.pdfLoading = true
       this.$nextTick(() => {
@@ -899,29 +899,29 @@ export default {
       })
     },
     // 发送PDF邮件
-    sendPdfMail() {
-      this.$axios
-        .post('/api/quote/sendpdf', {
-          content: this.$refs.pdf.$el.innerHTML,
-          product_code: this.pageData.product_code,
-          email: this.commentObj['Email Address'],
-        })
-        .then(res => {
-          this.setLoading(false)
-          this.downloadDialogVisible = false
-          this.$confirm('Enquiry Sent', {
-            confirmButtonText: 'OK',
-            showCancelButton: false,
-            type: 'success',
-            center: true,
-            showClose: false,
-            confirmButtonClass: 'com-btnblack',
-          })
-        })
-        .catch(() => {
-          this.setLoading(false)
-        })
-    },
+    // sendPdfMail() {
+    //   this.$axios
+    //     .post('/api/quote/sendpdf', {
+    //       content: this.$refs.pdf.$el.innerHTML,
+    //       product_code: this.pageData.product_code,
+    //       email: this.commentObj['Email Address'],
+    //     })
+    //     .then(res => {
+    //       this.setLoading(false)
+    //       this.downloadDialogVisible = false
+    //       this.$confirm('Enquiry Sent', {
+    //         confirmButtonText: 'OK',
+    //         showCancelButton: false,
+    //         type: 'success',
+    //         center: true,
+    //         showClose: false,
+    //         confirmButtonClass: 'com-btnblack',
+    //       })
+    //     })
+    //     .catch(() => {
+    //       this.setLoading(false)
+    //     })
+    // },
     copyData(data) {
       return JSON.parse(JSON.stringify(data))
     },

components/resetPasswordDialog.vue

@@ -94,7 +94,7 @@ export default {
           }
         }, 1000)
         this.$axios
-            .post('/api/au/resetemail', {
+            .post('/uk-api/uk/resetemail', {
               email: this.email,
               content: this.$refs.resetPasswordMail.$el.innerHTML,
             })

mixins/category.js

@@ -268,7 +268,7 @@ export default {
     },
   },
   async fetch() {
-    const res = await this.$axios.post('/api/common/shopProductList')
+    const res = await this.$axios.post('/uk-api/common/shopProductList')
     this.categoryList = res.code === 1 ? res.result : []
     return true
   },
@@ -388,13 +388,13 @@ export default {
         '7KGEFE6I2Z',
         'e39e202ace0a2fa12ea61095e6ede35d'
       )
-      this.index = client.initIndex('mysql_test')
+      this.index = client.initIndex('test_uk')
     } else {
       const client = algoliasearch(
         '2340OWI595',
         '2d4c53cdcf2bab0c361e589c2c2272fa'
       )
-      this.index = client.initIndex('product_au')
+      this.index = client.initIndex('product_uk')
     }
     this.getList()
   },
@@ -561,6 +561,16 @@ export default {
                   ? parseInt(item.rank)
                   : Math.floor(Math.random() * 10000),
               }
+              // if (item.price_max) {
+              //   console.log(item.product_code)
+              // } else {
+              //   console.log(item.product_code, ' null max')
+              // }
+              // if (item.price_min) {
+              //   console.log(item.product_code)
+              // } else {
+              //   console.log(item.product_code, ' null min')
+              // }
               const min = Number(item.price_min)
               const max = Number(item.price_max)
               if (min < this.priceMin && min !== 0) {

nuxt.config.js

@@ -27,7 +27,7 @@ export default {
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
     script: [
-      { src: '//yun.baoxiaohe.com/openflatform/sdk/v2.2/staticwwnf5q1r.js' },
+      // { src: '//yun.baoxiaohe.com/openflatform/sdk/v2.2/staticwwnf5q1r.js' },
     ],
   },
 
@@ -63,22 +63,12 @@ export default {
       target:
         process.env.NODE_ENV === 'development'
           ? 'http://192.168.10.64:80'
-          : 'http://127.0.0.1:8082',
+          : 'http://192.168.10.64:80',
       changeOrigin: true,
       pathRewrite: {
         '^/uk-api': '',
       },
     },
-    '/api': {
-      target:
-        process.env.NODE_ENV === 'development'
-          ? 'http://13.55.42.195:9003'
-          : 'http://127.0.0.1:8082',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/api': '',
-      },
-    },
   },
   build: {
     extend(config, ctx) {

pages/3D/_id.vue

@@ -1,11 +0,0 @@
-<template>
-    <div>
-        <bxh :bxhType="'3D'" :design="+$route.params.id"></bxh>
-    </div>
-  </template>
-    
-  <script>
-  export default {
-    layout: "blank_layout",
-  };
-  </script>

pages/design/_id.vue

@@ -1,169 +0,0 @@
-<template>
-  <div>
-    <bxh :bxhType="'design'" :design="+$route.params.id"></bxh>
-    <ul class="handle_list">
-      <!-- <li onclick="history.back(-1);">
-        <img src="@/assets/img/bxh/return.png"/>Return</li> -->
-      <li @click="openExportFrom">
-        <img src="@/assets/img/bxh/export.png"/>Export
-      </li>
-      <li @click="openEmailFrom">
-        <img src="@/assets/img/bxh/email.png"/>E-mail
-      </li>
-      <!-- <nuxt-link :to="{ name:'render-id',params:{id:+$route.params.id} }" tag="li">
-        <img src="@/assets/img/bxh/photo.png"/>Render
-      </nuxt-link> -->
-    </ul>
-    <export-dialog :emailForm="exportForm"  :visible.sync="exportDialogVisible" :labelWidth="70" :title="'Export'"></export-dialog>
-    <!-- <design-form-dialog :formData="emailForm" :formConfig="formConfig"  :visible.sync="emailDialogVisible" @handleSend="sendMail" :rules="rules" :labelWidth="95" :title="'Email To info@promocollection.uk'"></design-form-dialog> -->
-  </div>
-</template>
-  
-<script>
-export default {
-  layout: "blank_layout",
-  data() {
-    return {
-      exportDialogVisible:false,
-      emailDialogVisible:false,
-      exportForm:{
-        Link:'',
-        Artwork:'',
-      },
-      emailForm:{
-        from:'',
-        to:'',
-        cc:'info@promocollection.uk',
-        subject:'',
-        job_name:'',
-        link:'',
-        pdf:'',
-        notes:'',
-      },
-      // 表单配置
-      formConfig: [
-        {
-          label: "From",
-          prop: "from",
-          type: "selectObj",
-          selectList: {
-            1:'',
-            2:'on-reply@promocollection.uk'
-          },
-        },
-        {
-          label: "To",
-          prop: "to",
-          type: "input",
-        },
-        {
-          label: "CC",
-          prop: "cc",
-          type: "selectObj",
-          selectList: {
-            1:'info@promocollection.com.au',
-            2:'astro@promocollection.com.au',
-            3:'grace@promocollection.com.au'
-          },
-        },
-        {
-          label: "Subject",
-          prop: "subject",
-          type: "input",
-        },
-        {
-          label: "Job Name",
-          prop: "job_name",
-          type: "input",
-        },
-        {
-          label: "Link",
-          prop: "link",
-          type: "input",
-          readonly: true,
-        },
-        {
-          label: "Artwork",
-          prop: "pdf",
-          type: "input",
-          readonly: true,
-        },
-        {
-          label: "Notes",
-          prop: "notes",
-          type: "tinymce",
-          width: '100%',
-          height: 200,
-        },
-      ],
-      rules:{
-        from: [{ required: true, message: "Please select", trigger: "change" }],
-        to: [{ required: true, message: "The recipient is unknown. Specify another recipient", pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/,trigger: "blur" }],
-        subject: [{ required: true, message: "Send this message without a subject?", trigger: "blur" }],
-        job_name: [{ required: true, message: "Please fill in your job name！", trigger: "blur" }],
-        link: [{ required: true, message: "Please enter", trigger: "blur" }],
-        pdf: [{ required: true, message: "Please enter", trigger: "blur" }],
-        notes: [{ required: true, message: "Please enter", trigger: "blur" }],
-      },
-      pdf_id:null
-    };
-  },
-  mounted(){
-    this.emailForm.link=this.exportForm.Link=window.location.origin+'/3D/'+this.$route.params.id
-    this.emailForm.pdf=this.exportForm.Artwork=window.location.origin+'/pdf/'+this.$route.params.id
-    if (this.$cookies.get('can-use-cookie')) {
-      this.emailForm.from=this.$cookies.get("email")
-      this.formConfig[0].selectList['1']=this.$cookies.get("email")
-    }
-  },
-  methods: {
-    openExportFrom() {
-      this.exportDialogVisible=true
-    },
-    openEmailFrom() {
-      this.emailDialogVisible=true
-    },
-    sendMail() {
-      this.$axios.post("/api/bxh/email", this.emailForm).then(res =>{
-        this.emailDialogVisible=false
-        this.$confirm("send successfully", {
-              confirmButtonText: "OK",
-              showCancelButton: false,
-              type: "success",
-              center: true,
-              showClose: false,
-            }).then(() => {
-            });
-      }).catch(() => {
-        
-      });
-    },
-  },
-};
-</script>
-  
-<style lang="scss" scoped>
-.handle_list {
-  position: absolute;
-  right: 30px;
-  top: 11px;
-  z-index: 1;
-  display: flex;
-
-  li {
-    cursor: pointer;
-    border: 1px solid rgb(201, 201, 201);
-    margin-left: 5px;
-    padding-right: 5px;
-    border-radius: 2px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  img {
-    width: 20px;
-    padding: 5px;
-  }
-}
-</style>

pages/home/EDMS.vue

@@ -1,130 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item> EDMS</el-breadcrumb-item>
-    </el-breadcrumb>
-    <p class="title">EDMS</p>
-    <div class="line"></div>
-    <div
-      class="item"
-      v-loading="listLoading">
-      <ul>
-        <book-card
-          v-for="item in edmList"
-          :key="item.id"
-          :cardData="item"></book-card>
-      </ul>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.limit"
-        @pagination="getInfoList" />
-    </div>
-    <div v-if="!edmList.length">
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      total: 0,
-      listQuery: {
-        page: 1,
-        limit: 20,
-      },
-      edmList: [],
-      listLoading: true,
-    }
-  },
-  async created() {
-    await this.getInfoList()
-  },
-  methods: {
-    getInfoList() {
-      this.$axios
-        .post('/api/resources/edm/list', {
-          page: this.listQuery.page,
-          limit: this.listQuery.limit,
-        })
-        .then(res => {
-          if (res.code == 1) {
-            this.total = res.result.total
-            res.result.data.forEach(item => {
-              item.filepath = !this.$mediaRegExp.test(item.url)
-                ? this.$OSS_PREFIX + item.url
-                : item.url
-              item.img = !this.$mediaRegExp.test(item.images)
-                ? this.$OSS_PREFIX + item.images
-                : item.images
-            })
-            this.edmList = res.result.data
-            this.listLoading = false
-          }
-          this.$nextTick(() => {
-            window.scroll(0, 0)
-          })
-        })
-        .catch(() => {
-          this.listLoading = false
-          this.newsLetterInfo = []
-        })
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.title {
-  height: 50px;
-  font-size: 35px;
-  font-family: Proxima Nova;
-  font-weight: bold;
-  color: #00213b;
-  text-align: center;
-  line-height: 50px;
-}
-.line {
-  width: 99px;
-  height: 4px;
-  background: #e90000;
-  margin: 15px auto;
-}
-.item {
-  ul {
-    width: 940px;
-    margin: 0 auto;
-    display: flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-  }
-}
-:deep(.el-pagination.is-background) {
-  .el-pager {
-    li.number {
-      background-color: #f8f8f8;
-      border-radius: 50%;
-      color: #a7a7a7;
-    }
-    li:not(.disabled).active {
-      background-color: #00213b;
-      color: #d4d7da;
-    }
-  }
-  .btn-prev,
-  .btn-next {
-    border-radius: 50%;
-    background-color: #fff;
-    .el-icon-arrow-left:before {
-      content: '';
-    }
-    .el-icon-arrow-right:before {
-      content: '';
-    }
-  }
-}
-</style>

pages/home/FAQs.vue

@@ -1,277 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item>FAQs</el-breadcrumb-item>
-    </el-breadcrumb>
-    <p class="title">FAQs</p>
-    <div class="line"></div>
-    <div v-show="issueInfo.length > 0">
-      <div class="item" v-show="generalList.length > 0">
-        <div class="item-title">
-          <span></span>
-          <span>General</span>
-        </div>
-        <el-collapse v-loading="listLoading">
-          <el-collapse-item
-            v-for="item in generalList"
-            :key="item.id"
-            @click.native="handleChange($event)"
-          >
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus-outline"></i>
-              <i class="header-icon el-icon-remove" style="display: none"></i>
-              {{ item.issue }}
-            </template>
-            <div>
-              {{ item.answer }}
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-      <div class="item" v-show="orderingList.length > 0">
-        <div class="item-title">
-          <span></span>
-          <span>Ordering</span>
-        </div>
-        <el-collapse v-loading="listLoading">
-          <el-collapse-item
-            v-for="item in orderingList"
-            :key="item.id"
-            @click.native="handleChange($event)"
-          >
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus-outline"></i>
-              <i class="header-icon el-icon-remove" style="display: none"></i>
-              {{ item.issue }}
-            </template>
-            <div>
-              {{ item.answer }}
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-      <div class="item" v-show="artworkList.length > 0">
-        <div class="item-title">
-          <span></span>
-          <span>Artwork</span>
-        </div>
-        <el-collapse v-loading="listLoading">
-          <el-collapse-item
-            v-for="item in artworkList"
-            :key="item.id"
-            @click.native="handleChange($event)"
-          >
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus-outline"></i>
-              <i class="header-icon el-icon-remove" style="display: none"></i>
-              {{ item.issue }}
-            </template>
-            <div>
-              {{ item.answer }}
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-      <div class="item" v-show="paymentList.length > 0">
-        <div class="item-title">
-          <span></span>
-          <span>Payment</span>
-        </div>
-        <el-collapse v-loading="listLoading">
-          <el-collapse-item
-            v-for="item in paymentList"
-            :key="item.id"
-            @click.native="handleChange($event)"
-          >
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus-outline"></i>
-              <i class="header-icon el-icon-remove" style="display: none"></i>
-              {{ item.issue }}
-            </template>
-            <div>
-              {{ item.answer }}
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-      <div class="item" v-show="shippingReturnsList.length > 0">
-        <div class="item-title">
-          <span></span>
-          <span>Shipping & Returns</span>
-        </div>
-        <el-collapse v-loading="listLoading">
-          <el-collapse-item
-            v-for="item in shippingReturnsList"
-            :key="item.id"
-            @click.native="handleChange($event)"
-          >
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus-outline"></i>
-              <i class="header-icon el-icon-remove" style="display: none"></i>
-              {{ item.issue }}
-            </template>
-            <div>
-              {{ item.answer }}
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-    </div>
-    <div v-if="issueInfo.length == 0">
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      issueInfo: [],
-      listLoading: true,
-      generalList: [],
-      orderingList: [],
-      artworkList: [],
-      paymentList: [],
-      shippingReturnsList: [],
-    };
-  },
-  async created() {
-    await this.getInfoList();
-  },
-  methods: {
-    getInfoList() {
-      this.$axios
-        .get("/api/others/issue/list")
-        .then((res) => {
-          if (res.code == 1) {
-            this.issueInfo = res.result;
-            this.issueInfo.forEach((item) => {
-              if (item.id === 1) {
-                this.generalList = item.issue;
-              } else if (item.id === 2) {
-                this.orderingList = item.issue;
-              } else if (item.id === 3) {
-                this.artworkList = item.issue;
-              } else if (item.id === 4) {
-                this.paymentList = item.issue;
-              } else if (item.id === 5) {
-                this.shippingReturnsList = item.issue;
-              }
-            });
-            this.listLoading = false;
-          }
-        })
-        .catch(() => {
-          this.listLoading = false;
-          this.issueInfo = [];
-        });
-    },
-    handleChange(e) {
-      let targetDom = e.currentTarget.children[0].children[0];
-      if (targetDom.className.indexOf("is-active") > 0) {
-       targetDom.children[0].style.display = "none";
-        targetDom.children[1].style.display = "block";
-      } else {
-        targetDom.children[0].style.display = "block";
-        targetDom.children[1].style.display = "none";
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  height: 50px;
-  font-size: 35px;
-  font-family: Proxima Nova;
-  font-weight: bold;
-  color: #00213b;
-  text-align: center;
-  line-height: 50px;
-}
-.line {
-  width: 99px;
-  height: 4px;
-  background: #e90000;
-  margin: 15px auto;
-}
-.item {
-  margin-bottom: 30px;
-  .item-title {
-    margin-bottom: 5px;
-    span:nth-of-type(1) {
-      display: inline-block;
-      width: 3px;
-      height: 13px;
-      background: #e90000;
-      border-radius: 2px;
-    }
-    span:nth-of-type(2) {
-      height: 24px;
-      font-size: 18px;
-      font-family: Proxima Nova;
-      font-weight: bold;
-      color: #333333;
-      line-height: 24px;
-    }
-  }
-}
-:deep(.el-collapse) {
-  border: 1px solid #e3e3e3;
-  background: rgba(255, 255, 255, 0.05);
-  .el-collapse-item {
-    font-family: Proxima Nova;
-    font-weight: 400;
-    color: #333333;
-    .el-collapse-item__header {
-      font-size: 16px;
-      height: 40px;
-      padding-left: 10px;
-      border-bottom: 1px solid #e3e3e3;
-      line-height: 40px;
-      .header-icon {
-        margin-right: 5px;
-      }
-      .el-collapse-item__arrow {
-        display: none;
-      }
-    }
-    .el-collapse-item__header.is-active {
-      background: rgba(0, 33, 59, 0.05);
-    }
-    .el-collapse-item__content {
-      padding-left: 25px;
-      padding-top: 5px;
-      font-size: 14px;
-      background: rgba(0, 33, 59, 0.05);
-    }
-  }
-}
-:deep(.el-pagination.is-background) {
-  .el-pager {
-    li.number {
-      background-color: #f8f8f8;
-      border-radius: 50%;
-      color: #a7a7a7;
-    }
-    li:not(.disabled).active {
-      background-color: #00213b;
-      color: #d4d7da;
-    }
-  }
-  .btn-prev,
-  .btn-next {
-    border-radius: 50%;
-    background-color: #fff;
-    .el-icon-arrow-left:before {
-      content: "";
-    }
-    .el-icon-arrow-right:before {
-      content: "";
-    }
-  }
-}
-</style>

pages/home/catalogue.vue

@@ -1,203 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item>Catalogue</el-breadcrumb-item>
-    </el-breadcrumb>
-    <p class="title">Catalogue Library</p>
-    <div class="line"></div>
-    <div class="item" v-loading="listLoading">
-      <div class="backgroung-img-1" v-show="catalogueList.length > 0">
-        <img src="@/assets/img/home/Wood.png" alt="" />
-      </div>
-      <div class="backgroung-img-2" v-show="catalogueList.length > 4">
-        <img src="@/assets/img/home/Wood.png" alt="" />
-      </div>
-      <div class="backgroung-img-3" v-show="catalogueList.length > 8">
-        <img src="@/assets/img/home/Wood.png" alt="" />
-      </div>
-      <ul>
-        <li v-for="item in catalogueList" :key="item.id">
-          <a :href="item.filepath" target="_blank">
-            <div class="item-img">
-              <!-- <img src="@/assets/img/home/Book.png" alt="" /> -->
-              <el-image :src="$utils.generateResizedImageUrl(item.img,500)" fit="cover" style="width: 100%; height: 100%"></el-image>
-            </div>
-            <div class="item-title">
-              <p>Promo Collection</p>
-              <p>{{ item.title }}</p>
-            </div>
-            <p class="item-date">{{ item.update_time }}</p>
-          </a>
-        </li>
-      </ul>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.limit"
-        @pagination="getList"
-      />
-    </div>
-    <div v-if="!catalogueList.length">
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      total: 0,
-      listQuery: {
-        page: 1,
-        limit: 12,
-      },
-      catalogueList: [],
-      listLoading: true,
-    };
-  },
-  async created() {
-    await this.getList();
-  },
-  methods: {
-    getList() {
-      this.$axios
-        .post("/api/resources/catalogue/list", {
-          state: "au",
-          page: this.listQuery.page,
-          limit: this.listQuery.limit,
-        })
-        .then((res) => {
-          if (res.code === 1) {
-            res.result.data.forEach((item) => {
-              item.filepath =
-                !this.$mediaRegExp.test(item.filepath)
-                  ? this.$OSS_PREFIX +
-                    item.filepath
-                  : item.filepath;
-                  item.img =
-                !this.$mediaRegExp.test(item.img)
-                  ? this.$OSS_PREFIX +
-                    item.img
-                  : item.img;
-            });
-            this.catalogueList = res.result.data;
-            this.total = res.result.total;
-            this.listLoading = false;
-          }
-          // if(process.client){
-          //   this.$nextTick(() => {
-          //     window.scroll(0, 0);
-          //   });
-          // }
-        })
-        .catch(() => {
-          this.listLoading = false;
-          this.catalogueList = [];
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  height: 50px;
-  font-size: 35px;
-  font-family: Proxima Nova;
-  font-weight: bold;
-  color: #00213b;
-  text-align: center;
-  line-height: 50px;
-}
-.line {
-  width: 99px;
-  height: 4px;
-  background: #e90000;
-  margin: 15px auto;
-}
-.item {
-  width: 1320px;
-  margin: 0 auto;
-  position: relative;
-  .backgroung-img-1 {
-    position: absolute;
-    left: -15px;
-    top: 330px;
-  }
-  .backgroung-img-2 {
-    position: absolute;
-    left: -15px;
-    top: 846px;
-  }
-  .backgroung-img-3 {
-    position: absolute;
-    left: -15px;
-    top: 1363px;
-  }
-  ul {
-    display: flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-    li {
-      margin: 10px 44px 40px 55px;
-      a {
-        .item-img {
-          width: 231px;
-          height: 337px;
-          img {
-            width: 100%;
-            height: 100%;
-            border-radius: 5px;
-          }
-        }
-        .item-title {
-          width: 200px;
-          height: 52px;
-          line-height: 26px;
-          font-size: 18px;
-          color: #00213b;
-          text-align: center;
-          margin: 0 auto;
-          margin-top: 45px;
-          margin-bottom: 10px;
-        }
-        .item-date {
-          width: 208px;
-          line-height: 18px;
-          font-size: 14px;
-          color: #606e80;
-          text-align: center;
-          margin: 0 auto;
-        }
-      }
-    }
-  }
-}
-:deep(.el-pagination.is-background) {
-  .el-pager {
-    li.number {
-      background-color: #f8f8f8;
-      border-radius: 50%;
-      color: #a7a7a7;
-    }
-    li:not(.disabled).active {
-      background-color: #00213b;
-      color: #d4d7da;
-    }
-  }
-  .btn-prev,
-  .btn-next {
-    border-radius: 50%;
-    background-color: #fff;
-    .el-icon-arrow-left:before {
-      content: "";
-    }
-    .el-icon-arrow-right:before {
-      content: "";
-    }
-  }
-}
-</style>

pages/home/compareList.vue

@@ -1,272 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item>Product Comparisons</el-breadcrumb-item>
-    </el-breadcrumb>
-    <div class="compare-title">
-      <h1>Product Comparisons</h1>
-      <div class="line"></div>
-      <p>All prices exclude GST.</p>
-    </div>
-    <div class="compare-list">
-      <ul>
-        <li class="compare-item" v-for="item in compareList" :key="item.id">
-          <div class="item-header item-title">
-            <p>{{ item.product_name }}</p>
-            <p>{{ item.product_code }}</p>
-          </div>
-          <div class="item-content img">
-            <img
-              :src="
-                $mediaRegExp.test(item.info.image)
-                  ? item.info.image
-                  : 'https://www.promocollection.com.au/' + item.info.image
-              "
-            />
-          </div>
-          <div class="item-title">
-            <p>Primary Branding Prices</p>
-          </div>
-          <div class="item-content">
-            <!-- <div class="Qty-Price">
-              <ul>
-                <li>Qty</li>
-                <li>50+</li>
-                <li>100+</li>
-                <li>250+</li>
-                <li>500+</li>
-                <li>1000+</li>
-                <li>2500+</li>
-                <li>5000+</li>
-                <li>10000+</li>
-              </ul>
-              <ul>
-                <li>Price</li>
-                <li>-</li>
-                <li>-</li>
-                <li>-</li>
-                <li>1.04</li>
-                <li>0.96</li>
-                <li>0.89</li>
-                <li>0.85</li>
-                <li>POA</li>
-              </ul>
-            </div>
-            <div class="Setup"><span>Setup:</span><span>＄120/col</span></div> -->
-          </div>
-          <div class="item-title">
-            <p>Details</p>
-          </div>
-          <div class="item-content">
-            <div class="details">
-              <span>Prodect size:</span>
-              <span>{{ item.info.product_size }}</span>
-            </div>
-            <div class="details">
-              <span>Print size:</span>
-              <span>{{ item.info.print_size_area }}</span>
-            </div>
-          </div>
-          <div class="item-title">
-            <p>Colours</p>
-          </div>
-          <div class="item-content">
-            <div class="colour">{{ item.info.colors_au }}</div>
-          </div>
-          <div class="item-title">
-            <p>Description</p>
-          </div>
-          <div class="item-content">
-            <div class="description">{{ item.info.description }}</div>
-          </div>
-        </li>
-      </ul>
-    </div>
-    <div class="bottom-info">
-      <p>1.Prices are subject to change at any time and without prior notice</p>
-      <p>2.Prices shown are based on the client supplying suitable artwork</p>
-      <p>3.Freight is additional to prices shown and will be charged at cost</p>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      compareList: [],
-    };
-  },
-  async created() {
-    await this.getCompareList();
-  },
-  methods: {
-    getCompareList() {
-      this.$axios
-        .post("/api/home/compare_list", { compare_keys: "keys" })
-        .then((res) => {
-          this.compareList = res.result;
-        })
-        .catch((error) => {
-          this.$message.error(error.response.data.msg);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.com-main {
-  .compare-title {
-    font-family: Proxima Nova;
-    text-align: center;
-    margin: 55px auto 15px;
-    h1 {
-      height: 30px;
-      font-size: 36px;
-      font-weight: bold;
-      color: #00213b;
-      line-height: 23px;
-      margin-bottom: 10px;
-    }
-    .line {
-      width: 99px;
-      height: 4px;
-      background: #e90000;
-      margin: 15px auto;
-    }
-    p {
-      height: 12px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #999999;
-      line-height: 23px;
-      margin-bottom: 25px;
-    }
-  }
-  .bottom-info {
-    margin: 50px auto;
-    width: 400px;
-    p {
-      height: 24px;
-      font-size: 12px;
-      font-family: Proxima Nova;
-      font-weight: 400;
-      color: #333333;
-      line-height: 24px;
-    }
-  }
-  .compare-list {
-    font-family: Proxima Nova;
-    ul {
-      display: flex;
-      justify-content: center;
-      // align-items: center;
-      li.compare-item {
-        width: 280px;
-        .item-title {
-          height: 38px;
-          font-size: 14px;
-          background: #fafafa;
-          border: 1px solid #e7eaf4;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-        }
-        .item-content {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
-          align-items: center;
-          min-height: 100px;
-          font-size: 12px;
-          padding: 10px 5px;
-          color: #333333;
-          border: 1px solid #e7eaf4;
-          img {
-            width: 70px;
-            height: 70px;
-          }
-          .Qty-Price {
-            display: flex;
-            justify-content: space-around;
-            ul {
-              display: block;
-              width: 100px;
-              text-align: center;
-              margin: 10px auto;
-              li {
-                margin-bottom: 10px;
-              }
-            }
-          }
-          .Setup {
-            height: 23px;
-            line-height: 23px;
-            text-align: center;
-            color: #333333;
-            span:nth-of-type(1) {
-              font-weight: bold;
-              margin-right: 5px;
-            }
-            span:nth-of-type(2) {
-              font-family: Microsoft YaHei;
-              font-weight: 400;
-            }
-          }
-          .details {
-            margin-top: 5px;
-            span {
-              display: inline-block;
-              height: 23px;
-              font-weight: 400;
-              line-height: 23px;
-            }
-            span:nth-of-type(1) {
-              width: 80px;
-              text-align: center;
-            }
-            span:nth-of-type(2) {
-              width: 155px;
-              margin-left: 15px;
-            }
-          }
-          .colour,
-          .description {
-            text-align: left;
-            word-break: break-all;
-            line-height: 20px;
-          }
-          .description {
-            height: 140px;
-            overflow: hidden; 
-            text-overflow: ellipsis; 
-            display: -webkit-box; 
-            -webkit-box-orient: vertical; 
-            -webkit-line-clamp: 7;
-          }
-        }
-        .item-header {
-          height: 76px;
-          p:nth-of-type(1) {
-            height: 23px;
-            font-size: 14px;
-            font-weight: bold;
-            color: #0181c9;
-            line-height: 23px;
-          }
-          p:nth-of-type(2) {
-            height: 23px;
-            font-size: 12px;
-            font-weight: 400;
-            color: #999999;
-            line-height: 23px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

pages/home/contact.vue

@@ -107,7 +107,7 @@ export default {
     getInfoList() {
       this.$axios
         .get(
-          "others/contact/list"
+          "/uk-api/others/contact/list"
           // ,{
           //   page: this.listQuery.page,
           //   limit: this.listQuery.limit,

pages/home/contactPromoCollection.vue

@@ -170,7 +170,7 @@ export default {
             }
           }, 1000);
           this.$axios
-            .post("/api/others/visitor", this.ruleForm)
+            .post("/uk-api/others/visitor", this.ruleForm)
             .then((res) => {
               if (res.code == 1) {
                 this.$notify({

pages/home/currentFlyer/index.vue

@@ -62,8 +62,7 @@ export default {
   methods: {
     getList() {
       this.$axios
-        .post("/api/home/articleLists", {
-          state: "au",
+        .post("/uk-api/home/articleList", {
           page: this.listQuery.page,
           limit: this.listQuery.limit,
         })

pages/home/downloadCenter.vue

@@ -50,7 +50,7 @@ export default {
   methods: {
     getInfoList() {
       this.$axios
-        .get('/api/others/download/list', {
+        .get('/uk-api/others/download/list', {
           page: this.listQuery.page,
           limit: this.listQuery.limit,
         })

pages/home/myDetail/components/orderDetailPart.vue

@@ -1,331 +1,567 @@
 <template>
-    <div class="com-main com-margin-auto">
-      <div v-if="isLoading" v-loading="true" class="com-loading"></div>
-      <template v-else>
-          <section class="main-header">
-            <div class="main-header-mid flex between">
-              <h1>Job Name：{{ orderDetail.Sales_Order_Title_Job_Name }}</h1>
-              <img :src="orderDetail.user_logo" class="user_logo">
-            </div>
-            <div class="main-header-mid flex between">
-              <ul class="left">
-                <li class="left-i" @click="shareDialogVisible=true"  v-if="isShow"><i class="el-icon-share"></i> <span>Client Tracking Share</span></li>
-                <li class="left-i" v-if="orderDetail.crm_pr_res?.length">
-                  <image-list :data="orderDetail.crm_pr_res"/>
-                </li>
-              </ul>
-              <ul class="right">
-                <li v-if="orderDetail.Job_Group && isShow">Order Type: {{ orderDetail.Job_Group }}</li>
-                <li>Order No: {{ orderDetail.Reference }}</li>
-                <li>Order Date: {{ formatStepDesc(orderDetail.Sales_Order_Created) }}</li>
-                <li v-if="orderDetail.Expected_Delivery_Date">ETA: {{ formatStepDesc(orderDetail.Expected_Delivery_Date) }}</li>
-                <li v-if="isShow">Payment Status: {{ orderDetail.Payment_Status1 }}</li>
-              </ul>
-            </div>
-            <div class="steps">
-              <el-steps :active="comOrderState" align-center  finish-status="success" process-status="wait">
-                <el-step title="Confirmed" :description="formatStepDesc(orderDetail.Order_Confirm)">
-                </el-step>
-                <el-step title="In Production" :description="formatStepDesc(orderDetail.Sampling_Factory_Confirm)"></el-step>
-                <el-step title="QC Inspection" :description="formatStepDesc(orderDetail.GZ_WH)"></el-step>
-                <el-step title="International Shipment" :description="formatStepDesc(orderDetail.International_transshipment)"></el-step>
-                <el-step title="AU Warehouse" :description="formatStepDesc(orderDetail.AU_WH)"></el-step>
-                <el-step :title="packageQty<productQty?'Shipped':'Domestic Delivery'" :description="formatStepDesc(orderDetail.AU_WH_Client)"></el-step>
-                <el-step title="Delivered" :description="formatStepDesc(orderDetail.Delivered_time)"></el-step>
-              </el-steps>
-            </div>
-          </section>
-          <section class="main-custom">
-            <p class="sharing-title">Customer information</p>
-            <div>
-              <p class="sharing-subtitle">{{isShow?'Billing':'Supplier'}} Address</p>
-              <div class="sharing-address">
-                <p>{{ orderDetail.Account_Name_name }}</p>
-                <p>{{ orderDetail.Billing_Unit_Building_Name }}</p>
-                <p>{{ orderDetail.Billing_Street }}</p>
-                <p>{{ orderDetail.Billing_City }}</p>
-                <p>{{ orderDetail.Billing_State }}</p>
-                <p>{{ orderDetail.Billing_Code }}</p>
-                <p>{{ orderDetail.Billing_Country }}</p>
-              </div>
-            </div>
-            <div>
-              <p class="sharing-subtitle">Shipping Address</p>
-              <div class="sharing-address">
-                <p>{{ orderDetail.Shipping_Unit_Building_Name }}</p>
-                <p>{{ orderDetail.Shipping_Street }}</p>
-                <p>{{ orderDetail.Shipping_City }}</p>
-                <p>{{ orderDetail.Shipping_State }}</p>
-                <p>{{ orderDetail.Shipping_Code }}</p>
-                <p>{{ orderDetail.Shipping_Country }}</p>
-              </div>
-            </div>
-          </section>
-          <section>
-            <p class="sharing-title">Shipping information</p>
-            <el-table
-                :data="orderDetail.shipping_tracking"
-                style="width: 100%"
+  <div class="order-detail-part">
+    <div
+      v-if="isLoading == 1"
+      v-loading="true"
+      class="com-loading"></div>
+    <template v-else-if="isLoading == 2">
+      <section class="main-header">
+        <div class="main-header-mid flex between">
+          <h1>Job Name：{{ orderDetail.Sales_Order_Title_Job_Name }}</h1>
+          <img
+            :src="orderDetail.user_logo"
+            class="user_logo"
+            v-if="orderDetail.user_logo" />
+        </div>
+        <div class="main-header-mid flex between">
+          <ul class="left">
+            <li
+              class="left-i"
+              @click="shareDialogVisible = true"
+              v-if="isShow">
+              <i class="el-icon-share"></i>
+              <span>Client Tracking Share</span>
+            </li>
+            <li
+              class="left-i"
+              v-if="orderDetail.crm_pr_res?.length">
+              <image-list :data="orderDetail.crm_pr_res" />
+            </li>
+          </ul>
+          <ul class="right">
+            <li v-if="orderDetail.Job_Group && isShow">
+              Order Type: {{ orderDetail.Job_Group }}
+            </li>
+            <li>Order No: {{ orderDetail.Reference }}</li>
+            <li>
+              Order Date: {{ formatStepDesc(orderDetail.Sales_Order_Created) }}
+            </li>
+            <li v-if="orderDetail.Expected_Delivery_Date">
+              ETA: {{ formatStepDesc(orderDetail.Expected_Delivery_Date) }}
+            </li>
+            <li v-if="isShow">
+              Payment Status: {{ orderDetail.Payment_Status1 }}
+            </li>
+          </ul>
+        </div>
+        <div class="steps margin-b-30">
+          <p class="steps-title margin-b-50">Bulk Production</p>
+          <el-steps
+            :active="comOrderState"
+            align-center
+            :direction="computedStepDirection"
+            finish-status="success"
+            process-status="wait">
+            <el-step
+              title="Confirmed"
+              :description="formatStepDesc(orderDetail.Order_Confirm)">
+            </el-step>
+            <el-step
+              title="In Production"
+              :description="
+                formatStepDesc(orderDetail.Sampling_Factory_Confirm)
+              "></el-step>
+            <el-step
+              title="QC Inspection"
+              :description="formatStepDesc(orderDetail.GZ_WH)"></el-step>
+            <el-step
+              title="International Shipment"
+              :description="
+                formatStepDesc(orderDetail.International_transshipment)
+              "></el-step>
+            <el-step
+              title="AU Warehouse"
+              :description="formatStepDesc(orderDetail.AU_WH)"></el-step>
+            <el-step
+              :title="
+                orderDetail.Order_Stage === 'Bulk Production Shipping'
+                  ? 'Domestic Delivery'
+                  : 'Shipped'
+              "
+              :description="formatStepDesc(orderDetail.AU_WH_Client)"></el-step>
+            <el-step
+              title="Delivered"
+              :description="formatStepDesc(orderDetail.Delivered)"></el-step>
+          </el-steps>
+        </div>
+        <div
+          class="steps"
+          :class="{ 'margin-b-30': stepShow }"
+          v-if="orderDetail.Sample_Stage">
+          <p
+            class="steps-title pointer"
+            :class="{ 'margin-b-50': stepShow }"
+            @click="toggleStep">
+            Sample Dispatch
+            <i
+              :class="
+                stepShow ? 'el-icon-arrow-down' : 'el-icon-arrow-right'
+              "></i>
+          </p>
+          <el-steps
+            :active="comSampleState"
+            align-center
+            :space="180"
+            v-if="stepShow"
+            :direction="computedStepDirection"
+            finish-status="success"
+            process-status="wait">
+            <el-step
+              title="Factory Process"
+              :description="
+                formatStepDesc(orderDetail.Sample_Factory_Confirmed)
+              ">
+            </el-step>
+            <el-step
+              title="Sample Dispatching"
+              :description="
+                formatStepDesc(orderDetail.Sample_Dispatching)
+              "></el-step>
+            <el-step
+              title="Sample Delivered"
+              :description="
+                formatStepDesc(orderDetail.Sample_Delivered)
+              "></el-step>
+          </el-steps>
+        </div>
+      </section>
+      <section class="main-custom">
+        <p class="sharing-title">Customer information</p>
+        <div>
+          <p class="sharing-subtitle">
+            {{ isShow ? 'Billing' : 'Supplier' }} Address
+          </p>
+          <div class="sharing-address">
+            <p>{{ orderDetail.Account_Name_name }}</p>
+            <p>{{ orderDetail.Billing_Unit_Building_Name }}</p>
+            <p>{{ orderDetail.Billing_Street }}</p>
+            <p>{{ orderDetail.Billing_City }}</p>
+            <p>{{ orderDetail.Billing_State }}</p>
+            <p>{{ orderDetail.Billing_Code }}</p>
+            <p>{{ orderDetail.Billing_Country }}</p>
+          </div>
+        </div>
+        <div>
+          <p class="sharing-subtitle">Shipping Address</p>
+          <div class="sharing-address">
+            <p>{{ orderDetail.Shipping_Unit_Building_Name }}</p>
+            <p>{{ orderDetail.Shipping_Street }}</p>
+            <p>{{ orderDetail.Shipping_City }}</p>
+            <p>{{ orderDetail.Shipping_State }}</p>
+            <p>{{ orderDetail.Shipping_Code }}</p>
+            <p>{{ orderDetail.Shipping_Country }}</p>
+          </div>
+        </div>
+      </section>
+      <section>
+        <p class="sharing-title">Shipping information</p>
+        <el-table
+          :data="orderDetail.shipping_tracking"
+          style="width: 100%"
+          :header-cell-style="{
+            background: '#F7F8FC',
+            color: '#101010',
+            fontWeight: 'normal',
+          }">
+          <el-table-column
+            type="expand"
+            style="padding: 0">
+            <template slot-scope="props">
+              <el-table
+                :data="props.row.test_pkg_details"
+                style="margin-left: 50px; width: calc(100% - 50px)"
                 :header-cell-style="{
                   background: '#F7F8FC',
                   color: '#101010',
-                  fontWeight: 'normal'
+                  fontWeight: 'normal',
                 }">
-                <el-table-column type="expand" style="padding: 0;">
-                  <template slot-scope="props">
-                    <el-table
-                      :data="props.row.test_pkg_details"
-                      style="margin-left: 50px; width: calc(100% - 50px);"
-                      :header-cell-style="{
-                        background: '#F7F8FC',
-                        color: '#101010',
-                        fontWeight: 'normal'
-                      }">
-                      <el-table-column prop="Product_name" label="Item & Description"></el-table-column>
-                      <el-table-column prop="Quantity_to_pack" label="QTY" width="450"></el-table-column>
-                    </el-table>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="Title" label="Job Name"> </el-table-column>
-                <el-table-column prop="Courier" label="Carrier"></el-table-column>
-                <el-table-column prop="Tracking_No" label="Tracking#"></el-table-column>
-                <el-table-column prop="Package_Status" label="Shipment Status"></el-table-column>
-                <el-table-column label="Delivery Address"  width="250">
-                <template slot-scope="scope">
-                  <span>
-                    {{ scope.row.Shipping_Unit_Building_Name }}<br>
-                    {{ scope.row.Shipping_Street }}<br>
-                    {{ scope.row.Shipping_City }}<br>
-                    {{ scope.row.Shipping_State }}
-                  </span>
-                </template>
-              </el-table-column>
-                <el-table-column prop="Tracking_URL" label=""  width="200">
-                  <template slot-scope="scope" v-if="scope.row.Tracking_URL">
-                  <el-button 
-                      size="mini" @click.native="openTracking_URL(scope.row.Tracking_URL)"
-                      style="background-color: rgb(0, 33, 59); color: #fff" plain>TRACK SHIPMENT</el-button></template>
-                </el-table-column>
-            </el-table>
-          </section>
-          <section class="orderTable">
-            <p class="sharing-title">Products Information</p>
-            <el-table
-                :data="orderDetail.sales_orders_details"
-                style="width: 100%"
-                :header-cell-style="{
-                  background: '#fff',
-                  color: '#101010',
-                  fontWeight: 'normal'
-                }">
-                <el-table-column type="index" label="S.NO" width="70"> </el-table-column>
-                <el-table-column  label="Product Name"  min-width="300">
-                  <template slot-scope="scope">
-                    <p class="colorBlue" >{{ scope.row.product_name }}</p>
-                    <p v-html="scope.row.product_description"></p>
-                    <!-- <p :class="scope.row.showMore?'ellipsis':''" v-html="scope.row.product_description"></p>
+                <el-table-column
+                  prop="Product_name"
+                  label="Item & Description"></el-table-column>
+                <el-table-column
+                  prop="Quantity_to_pack"
+                  label="QTY"
+                  width="450"></el-table-column>
+              </el-table>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="Title"
+            label="Job Name"
+            width="190"></el-table-column>
+          <el-table-column
+            prop="Courier"
+            label="Carrier"
+            width="190"></el-table-column>
+          <el-table-column
+            prop="Tracking_No"
+            label="Tracking#"
+            width="190"></el-table-column>
+          <el-table-column
+            prop="Package_Status"
+            label="Shipment Status"
+            width="190"></el-table-column>
+          <el-table-column
+            label="Delivery Address"
+            width="250">
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.Shipping_Unit_Building_Name }}<br />
+                {{ scope.row.Shipping_Street }}<br />
+                {{ scope.row.Shipping_City }}<br />
+                {{ scope.row.Shipping_State }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="Tracking_URL"
+            label=""
+            width="200">
+            <template
+              slot-scope="scope"
+              v-if="scope.row.Tracking_URL">
+              <el-button
+                size="mini"
+                @click.native="openTracking_URL(scope.row.Tracking_URL)"
+                style="background-color: rgb(0, 33, 59); color: #fff"
+                plain
+                >TRACK SHIPMENT</el-button
+              ></template
+            >
+          </el-table-column>
+        </el-table>
+      </section>
+      <section class="orderTable">
+        <p class="sharing-title">Products Information</p>
+        <el-table
+          :data="orderDetail.sales_orders_details"
+          style="width: 100%"
+          :header-cell-style="{
+            background: '#fff',
+            color: '#101010',
+            fontWeight: 'normal',
+          }">
+          <el-table-column
+            type="index"
+            label="S.NO"
+            width="70"
+            fixed>
+          </el-table-column>
+          <el-table-column
+            label="Product Name"
+            min-width="300">
+            <template slot-scope="scope">
+              <p class="colorBlue">{{ scope.row.product_name }}</p>
+              <p v-html="scope.row.product_description"></p>
+              <!-- <p :class="scope.row.showMore?'ellipsis':''" v-html="scope.row.product_description"></p>
                     <p class="colorBlue cursor" @click="toggleShow(scope.row)" v-if="scope.row.product_description">{{scope.row.showMore?'Show More':'Conceal'}}<i  :class="scope.row.showMore?'el-icon-caret-bottom':'el-icon-caret-top'"></i></p> -->
-                  </template>
-                </el-table-column>
-                <el-table-column prop="quantity" label="Quantity" align="left" :width="isShow?125:200">
-                </el-table-column>
-                <template v-if="isShow">
-                <el-table-column prop="list_price" :label="`List Price(${comCurrency})`" width="125">
-                  <template slot-scope="scope">
-                    {{ transformNumber(scope.row.list_price) }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="amount" :label="`Amount(${comCurrency})`" width="125">
-                  <template slot-scope="scope">
-                    {{ transformNumber(scope.row.amount) }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="Tax" :label="`Tax(${comCurrency})`" width="125">
-                  <template slot-scope="scope">
-                    {{ transformNumber(scope.row.Tax) }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="Discount" :label="`Discount(${comCurrency})`" width="125">
-                  <template slot-scope="scope">
-                    {{ transformNumber(scope.row.Discount) }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="net_total" :label="`Total(${comCurrency})`" width="125">
-                  <template slot-scope="scope">
-                    {{ transformNumber(scope.row.net_total) }}
-                  </template>
-                </el-table-column>
-                </template>
-            </el-table>
-            <div class="table-wrap" v-if="isShow">
-              <table class="total">
-                <tr><td>Sub Total</td><td>{{comCurrency}} {{ transformNumber(orderDetail.Sub_Total) }}</td></tr>
-                <tr><td>Total Taxes</td><td>{{comCurrency}} {{ transformNumber(orderDetail.Tax_Total) }}</td></tr>
-                <tr><td>Total Discount</td><td>{{comCurrency}} {{ transformNumber(orderDetail.Total_Including_Discount) }}</td></tr>
-                <tr><td>Adjustment</td><td>{{comCurrency}} {{ transformNumber(orderDetail.Total_Adjustment) }}</td></tr>
-                <tr><td>Grand Total</td><td>{{comCurrency}} {{ transformNumber(orderDetail.Grand_Total) }}</td></tr>
-              </table>
-            </div>
-            <template v-if="isShow">
-              <p class="notes-1">Notes</p>
-              <p class="notes-2">Terms & conditions</p>
-              <p class="notes-2">Artwork Approval</p>
-              <p class="notes-3">{{ orderDetail.Subject }}</p>
             </template>
-          </section>
-      </template>
-      <el-dialog 
-        :lock-scroll=false
-        :visible.sync="urlDialogShow" 
-        center width="850px"
-        top="20vh">
-        <iframe 
-        :src="Tracking_URL"
-        style="width:100%;height:500px;"
-          frameborder="0"></iframe>
-      </el-dialog>
-      <export-dialog :emailForm="shareForm"  :visible.sync="shareDialogVisible" :title="'Client Tracking Share (no pricing displayed)'" :labelShow=false></export-dialog>
+          </el-table-column>
+          <el-table-column
+            prop="quantity"
+            label="Quantity"
+            align="left"
+            :width="isShow ? 125 : 200">
+          </el-table-column>
+          <template v-if="isShow">
+            <el-table-column
+              prop="list_price"
+              :label="`List Price(${comCurrency})`"
+              width="125">
+              <template slot-scope="scope">
+                {{ transformNumber(scope.row.list_price) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="amount"
+              :label="`Amount(${comCurrency})`"
+              width="125">
+              <template slot-scope="scope">
+                {{ transformNumber(scope.row.amount) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="Tax"
+              :label="`Tax(${comCurrency})`"
+              width="125">
+              <template slot-scope="scope">
+                {{ transformNumber(scope.row.Tax) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="Discount"
+              :label="`Discount(${comCurrency})`"
+              width="125">
+              <template slot-scope="scope">
+                {{ transformNumber(scope.row.Discount) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="net_total"
+              :label="`Total(${comCurrency})`"
+              width="125">
+              <template slot-scope="scope">
+                {{ transformNumber(scope.row.net_total) }}
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+        <div
+          class="table-wrap"
+          v-if="isShow">
+          <table class="total">
+            <tr>
+              <td>Sub Total</td>
+              <td>
+                {{ comCurrency }} {{ transformNumber(orderDetail.Sub_Total) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Total Taxes</td>
+              <td>
+                {{ comCurrency }} {{ transformNumber(orderDetail.Tax_Total) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Total Discount</td>
+              <td>
+                {{ comCurrency }}
+                {{ transformNumber(orderDetail.Total_Including_Discount) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Adjustment</td>
+              <td>
+                {{ comCurrency }}
+                {{ transformNumber(orderDetail.Total_Adjustment) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Grand Total</td>
+              <td>
+                {{ comCurrency }} {{ transformNumber(orderDetail.Grand_Total) }}
+              </td>
+            </tr>
+          </table>
+        </div>
+        <template v-if="isShow">
+          <p class="notes-1">Notes</p>
+          <p class="notes-2">Terms & conditions</p>
+          <p class="notes-2">Artwork Approval</p>
+          <p class="notes-3">{{ orderDetail.Subject }}</p>
+        </template>
+      </section>
+    </template>
+    <div v-else>
+      <el-empty description="No Data"></el-empty>
     </div>
-  </template>
-  
-  <script>
+    <el-dialog
+      :lock-scroll="false"
+      :visible.sync="urlDialogShow"
+      center
+      width="850px"
+      top="20vh">
+      <iframe
+        :src="Tracking_URL"
+        style="width: 100%; height: 500px"
+        frameborder="0"></iframe>
+    </el-dialog>
+    <export-dialog
+      :emailForm="shareForm"
+      :visible.sync="shareDialogVisible"
+      :title="'Client Tracking Share (no pricing displayed)'"
+      :labelShow="false"></export-dialog>
+  </div>
+</template>
 
-  import { round } from '@/utils/price.js'
-  
-  export default {
-    name: "OrderDetailPart",
-    props:{
-        isShow:{   // 订单分享页面隐藏元素
-            type:Boolean,
-            default: true
-        },
+<script>
+import throttle from 'lodash.throttle'
+import { mapMutations } from 'vuex'
+import { round } from '@/utils/price.js'
+
+export default {
+  name: 'OrderDetailPart',
+  props: {
+    isShow: {
+      // 订单分享页面隐藏元素
+      type: Boolean,
+      default: true,
     },
-    data() {
-      return {
-        orderDetail:{},
-        isLoading: true,
-        packageTable: [],
-        urlDialogShow: false,
-        shareDialogVisible: false,
-        shareForm:{
-          Link:''
-        },
-        Tracking_URL: '',
-        stepConfig:{
-          'Order Confirmed':1,
-          'Factory Confirmed':2,
-          'GZ WH':3,
-          'Transshipment':4,
-          'AU WH':5,
-          'AUWH - Client':6,
-          'Completed Sales Order':7
-        },
-        packageQty:0,
-        productQty:0,
-      };
+    hasUid: {
+      type: Boolean,
+      default: true,
     },
-    computed:{
-      comCurrency(){
-        return this.orderDetail.Currency
+  },
+  data() {
+    return {
+      orderDetail: {},
+      isLoading: 1,
+      packageTable: [],
+      stepShow: false,
+      urlDialogShow: false,
+      shareDialogVisible: false,
+      loginCount: 0,
+      shareForm: {
+        Link: '',
       },
-      comOrderState(){
-        if(this.orderDetail.Order_Stage ==='Cancelled'){
-          return 0;
-        }
-        if(this.orderDetail.Order_Stage !=='Completed Sales Order'){
-          return this.stepConfig[this.orderDetail.Order_Stage]
-        }else{
-          return this.orderDetail.shipping_isDelivered?7:6;
-        }
+      Tracking_URL: '',
+      stepConfig: {
+        'Order Confirmed': 1,
+        'Factory Confirmed': 2,
+        'GZ WH': 3,
+        Transshipment: 4,
+        'AU WH': 5,
+        'AUWH - Client': 6,
+        'Bulk Production Shipping': 6,
+        'Bulk Production Delivered': 7,
+        'Completed Sales Order': 7,
+        'Factory Process': 1,
+        'Sample Dispatching': 2,
+        'Sample Delivered': 3,
+      },
+      computedStepDirection: 'horizontal',
+    }
+  },
+  computed: {
+    loginSuccess() {
+      return this.$store.state.loginSuccess
+    },
+    comCurrency() {
+      return this.orderDetail.Currency
+    },
+    comOrderState() {
+      if (this.orderDetail.Order_Stage === 'Cancelled') {
+        return 0
       }
+      return this.stepConfig[this.orderDetail.Order_Stage]
     },
-    mounted() {
-        this.getOrderDetail();
+    comSampleState() {
+      return this.stepConfig[this.orderDetail.Sample_Stage]
     },
-    methods: {
-        getOrderDetail() {
-            let path = ''
-            let data = {}
-            if (this.isShow) {
-                const { id } = this.$store.state.userInfo;
-                const { crm, id: queryId } = this.$route.query;
+  },
+  watch: {
+    loginSuccess(newVal) {
+      if (newVal) {
+        this.getOrderDetail() // 当登录成功后调用获取订单详情
+        this.$store.commit('setLoginSuccess', false)
+      }
+    },
+  },
+  beforeMount() {
+    window.addEventListener('resize', this.judgeStepDirection, false)
+    this.judgeStepDirection()
+  },
+  created() {
+    this.getOrderDetail()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.judgeStepDirection, false)
+  },
+  methods: {
+    ...mapMutations({ openDialog: 'openDialog' }),
+    judgeStepDirection: throttle(function () {
+      this.computedStepDirection =
+        window.document.body.clientWidth >= 1000 ? 'horizontal' : 'vertical'
+    }, 300),
+    toggleStep() {
+      this.stepShow = !this.stepShow
+    },
+    getOrderDetail() {
+      let path = ''
+      let data = {}
+      if (this.isShow) {
+        const { id } = this.$store.state.userInfo
+        const { crm, id: queryId } = this.$route.query
 
-                path = '/crmdata/orders_detail';
-                this.shareForm.Link = `https://www.trackship.com.au/orderShare/${id}/${crm}/${queryId}`;
-                data = { accounts_id: crm, id: queryId };
-            }else{
-              const { uid, aid, id } = this.$route.params;
-              path = '/crmdata/showOrdersDetail';
-              data = { user_id: uid, accounts_id: aid, id };
+        path = '/uk-api/crmdata/orders_detail'
+        this.shareForm.Link = `https://www.trackship.com.au/orderShare/${id}/${crm}/${queryId}`
+        data = { accounts_id: crm, id: queryId }
+      } else {
+        path = '/uk-api/crmdata/showOrdersDetail'
+        if (this.hasUid) {
+          const { uid, aid, id } = this.$route.params
+          data = { user_id: uid, accounts_id: aid, id }
+        } else {
+          const { aid, id } = this.$route.params
+          data = { accounts_id: aid, id }
+        }
+      }
+      this.$axios
+        .post(path, data)
+        .then(res => {
+          if (res.result === null) {
+            this.handleBranchLogic()
+          }
+          this.orderDetail = res.result
+          if (this.orderDetail.shipping_tracking?.length) {
+            const isDelivered = true
+
+            for (const items of this.orderDetail.shipping_tracking) {
+              if (items.test_pkg_details?.length) {
+                items.test_pkg_details.forEach(item => {
+                  item.Courier = items.Courier
+                  item.Tracking_No = items.Tracking_No
+                  item.Package_Status = items.Package_Status
+                  item.Tracking_URL = items.Tracking_URL
+                })
+              }
             }
-            this.$axios
-                .post(path,data)
-                .then((res) => {
-                if (res.result === null) {
-                    this.$router.replace('/')
-                    return
-                }
-                this.orderDetail = res.result;
-                if(this.orderDetail.shipping_tracking?.length){
-                    this.orderDetail.shipping_tracking.forEach(items=>{
-                    // 取包裹的到达时间
-                    if(items.Package_Status === 'Delivered' ){
-                        !this.orderDetail.Delivered_time && this.$set(this.orderDetail,'Delivered_time',items['Delivered_Date'])
-                        if(items['Delivered_Date'] > this.orderDetail['Delivered_time'] ){
-                        this.$set(this.orderDetail,'Delivered_time',items['Delivered_Date'])
-                        }
-                        this.$set(this.orderDetail,'shipping_isDelivered',true)
-                    }else{
-                        this.$set(this.orderDetail,'shipping_isDelivered',false)
-                    }
-                    if(items.test_pkg_details?.length){
-                        items.test_pkg_details.forEach(item=>{
-                        this.$set(item,'Courier',items.Courier)
-                        this.$set(item,'Tracking_No',items['Tracking_No'])
-                        this.$set(item,'Package_Status',items['Package_Status'])
-                        this.$set(item,'Tracking_URL',items['Tracking_URL'])
-                        this.packageQty += +item.Quantity_to_pack
-                        })
-                    }
-                    })
-                }
-                if(this.orderDetail.sales_orders_details?.length){
-                  if (this.isShow) {
-                      this.orderDetail.sales_orders_details.forEach(items => {
-                        this.$set(items, 'showMore', true); 
-                        this.productQty += +items.quantity;
-                      });
-                    } else {
-                      this.orderDetail.sales_orders_details = this.orderDetail.sales_orders_details.filter(item => {
-                        return item.product_Product_Code !== "PC Setup Service" && item.product_Product_Code !== "PC Freight";
-                      }).map(item => {
-                        this.$set(item, 'showMore', true); 
-                        this.productQty += +item.quantity;
-                        return item;
-                      });
-                  }
-                }
-                this.isLoading=false
-                });
-       },
-      transformNumber(value) {
-        return round(Number(value)).toFixed(2)
-      },
-      formatStepDesc(date, isUnix = false) {
-        return this.$utils.formatTime(date, 'DD/MM/YYYY',isUnix)
-      },
-      toggleShow(row){
-        row.showMore = !row.showMore
-      },
-      openTracking_URL(url){
-        this.Tracking_URL= url
-        this.urlDialogShow= true
+          }
+          if (this.orderDetail.sales_orders_details?.length) {
+            if (this.isShow) {
+              this.orderDetail.sales_orders_details.forEach(items => {
+                this.$set(items, 'showMore', true)
+              })
+            } else {
+              this.orderDetail.sales_orders_details =
+                this.orderDetail.sales_orders_details
+                  .filter(item => {
+                    return (
+                      item.product_Product_Code !== 'PC Setup Service' &&
+                      item.product_Product_Code !== 'PC Freight'
+                    )
+                  })
+                  .map(item => {
+                    this.$set(item, 'showMore', true)
+                    return item
+                  })
+            }
+          }
+          this.isLoading = 2
+        })
+        .catch(() => {
+          this.handleBranchLogic()
+        })
+    },
+    handleBranchLogic() {
+      this.isLoading = 3
+      if (this.loginCount) {
+        this.$router.push('/')
+        return
       }
-    }
-  };
-  </script>
-  
-  <style lang="scss" scoped>
-  @import '../detail.scss';
-  </style>
-  
+      this.isShow &&
+        setTimeout(() => {
+          this.openDialog()
+          this.loginCount = 1
+        }, 1000)
+    },
+    transformNumber(value) {
+      return round(Number(value)).toFixed(2)
+    },
+    formatStepDesc(date, isUnix = false) {
+      return this.$utils.formatTime(date, 'DD/MM/YYYY', isUnix)
+    },
+    toggleShow(row) {
+      row.showMore = !row.showMore
+    },
+    openTracking_URL(url) {
+      this.Tracking_URL = url
+      this.urlDialogShow = true
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../detail.scss';
+</style>

pages/home/myDetail/enquiryDetail.vue

@@ -408,7 +408,7 @@ export default {
     },
     getDetail() {
       this.$axios
-        .post('/api/crmdata/enquiries_detail', {
+        .post('/uk-api/crmdata/enquiries_detail', {
           accounts_id: this.$store.state.userInfo?.crm_accounts_id || '',
           id: this.$route.query.id,
         })

pages/home/myDetail/index.vue

@@ -5,10 +5,13 @@
       <el-breadcrumb-item>{{ tabName }}</el-breadcrumb-item>
     </el-breadcrumb>
     <div class="content">
-      <el-menu background-color="#e8eaee"
-        text-color="#4a596c" ref="menu"
+      <el-menu
+        background-color="#e8eaee"
+        text-color="#4a596c"
+        ref="menu"
         active-text-color="#fff"
-        class="el-menu-vertical" :default-active="activeMenu"
+        class="el-menu-vertical"
+        :default-active="activeMenu"
         @select="handleClick">
         <el-menu-item index="profile">
           <i class="iconfont">&#xe630;</i>
@@ -27,62 +30,66 @@
             <i class="iconfont">&#xe610;</i>
             <span slot="title">My Orders</span>
           </template>
-            <el-menu-item index="all-orders">All Orders</el-menu-item>
-            <el-menu-item index="open-orders">Open Orders</el-menu-item>
-            <el-menu-item index="closed-orders">Closed Orders</el-menu-item>
-          </el-submenu>
+          <el-menu-item index="all-orders">All Orders</el-menu-item>
+          <el-menu-item index="open-orders">Open Orders</el-menu-item>
+          <el-menu-item index="closed-orders">Closed Orders</el-menu-item>
+        </el-submenu>
         <!-- <el-menu-item index="account">
           <i class="iconfont">&#xe638;</i>
           <span slot="title">Account And Password</span>
         </el-menu-item> -->
       </el-menu>
       <div class="content-right">
-        <div  v-show="activeMenu === 'profile'">
-          <div class="content-form"> 
+        <div v-show="activeMenu === 'profile'">
+          <div class="content-form">
             <p class="content-title">{{ tabName }}</p>
             <el-form
-            ref="form"
-            :model="profileform"
-            :rules="rules"
-            label-width="220px">
-            <el-row>
-              <el-col :span="15">
-                <el-form-item
-                label="Email Address"
-                prop="email">
-                <el-input
-                v-model="profileform.email"
-                :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item class='upload-item'
-                  label="Your Logo">
-                    <image-upload :list.sync="profileform.logo" :disablePreview="true" :max="1"></image-upload>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item
-              label="Company Name"
-              prop="company">
-              <el-input v-model="profileform.company"></el-input>
-            </el-form-item>
-            <el-form-item
-              label="First Name"
-              prop="contacts">
-              <el-input v-model="profileform.contacts"></el-input>
-            </el-form-item>
-            <el-form-item
-              label="Last Name"
-              prop="last_name">
-              <el-input v-model="profileform.last_name"></el-input>
-            </el-form-item>
-            <el-form-item
-              label="Contact Phone Number"
-              prop="phone">
-              <el-input v-model="profileform.phone"></el-input>
-            </el-form-item>
-            <!-- <el-form-item>
+              ref="form"
+              :model="profileform"
+              :rules="rules"
+              label-width="220px">
+              <el-row>
+                <el-col :span="15">
+                  <el-form-item
+                    label="Email Address"
+                    prop="email">
+                    <el-input
+                      v-model="profileform.email"
+                      :disabled="true"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                  <el-form-item
+                    class="upload-item"
+                    label="Your Logo">
+                    <image-upload
+                      :list.sync="profileform.logo"
+                      :disablePreview="true"
+                      :max="1"></image-upload>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item
+                label="Company Name"
+                prop="company">
+                <el-input v-model="profileform.company"></el-input>
+              </el-form-item>
+              <el-form-item
+                label="First Name"
+                prop="contacts">
+                <el-input v-model="profileform.contacts"></el-input>
+              </el-form-item>
+              <el-form-item
+                label="Last Name"
+                prop="last_name">
+                <el-input v-model="profileform.last_name"></el-input>
+              </el-form-item>
+              <el-form-item
+                label="Contact Phone Number"
+                prop="phone">
+                <el-input v-model="profileform.phone"></el-input>
+              </el-form-item>
+              <!-- <el-form-item>
               <el-button
                 class="saveBtn"
                 @click="onSave('form')"
@@ -90,67 +97,73 @@
             </el-form-item> -->
             </el-form>
           </div>
-          <div class="content-form" style="margin-top:20px;">
+          <div
+            class="content-form"
+            style="margin-top: 20px">
             <p class="content-title">Account And Password</p>
             <el-form
-            ref="ruleForm"
-            :model="accountPasswordForm"
-            label-width="220px"
-            class="accountPasswordForm">
-            <el-form-item
-              label="Enter the new password"
-              prop="password">
-              <el-input v-model="accountPasswordForm.password"></el-input>
-            </el-form-item>
-            <el-form-item
-              label="Retype the password"
-              prop="confirm_password">
-              <el-input v-model="accountPasswordForm.confirm_password"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button
-                class="saveBtn"
-                @click="onSave('form')">
-                Save
-              </el-button>
-            </el-form-item>
-          </el-form>
+              ref="ruleForm"
+              :model="accountPasswordForm"
+              label-width="220px"
+              class="accountPasswordForm">
+              <el-form-item
+                label="Enter the new password"
+                prop="password">
+                <el-input v-model="accountPasswordForm.password"></el-input>
+              </el-form-item>
+              <el-form-item
+                label="Retype the password"
+                prop="confirm_password">
+                <el-input
+                  v-model="accountPasswordForm.confirm_password"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  class="saveBtn"
+                  @click="onSave('form')">
+                  Save
+                </el-button>
+              </el-form-item>
+            </el-form>
           </div>
         </div>
-        <div v-show="activeMenu === 'enquiry'" class="content-form"> 
+        <div
+          v-show="activeMenu === 'enquiry'"
+          class="content-form">
           <p class="content-title">{{ tabName }}</p>
           <div class="searchInput">
-          <el-input
-            placeholder="Search your job name"
-            v-model="enquiryKeyword"
-            clearable
-            @keyup.enter.native="getEnquiryList"
-            @clear="getEnquiryList"
-            ><i
-              slot="suffix"
-              class="el-input__icon el-icon-search"
-              @click="getEnquiryList"></i>
-          </el-input>
-        </div>
-        <el-table
-        :data="enquiryList"
-        stripe
-        style="width: 100%"
-        @row-click="goEnquiryDetail"
-        :header-cell-style="{ background: '#00213b', color: '#ffffff' }" v-loading="tableLoading">
-        <el-table-column
-          prop="Auto_Number"
-          label="Enquiry No">
-        </el-table-column>
-        <el-table-column
-          prop="Enquiry_Title"
-          label="Job Name"
-          width="300">
-        </el-table-column>
-        <el-table-column
-          prop="Customize_Pipeline_Stage"
-          label="Status"></el-table-column>
-        <!-- <el-table-column
+            <el-input
+              placeholder="Search your job name"
+              v-model="enquiryKeyword"
+              clearable
+              @keyup.enter.native="getEnquiryList"
+              @clear="getEnquiryList"
+              ><i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="getEnquiryList"></i>
+            </el-input>
+          </div>
+          <el-table
+            :data="enquiryList"
+            stripe
+            style="width: 100%"
+            @row-click="goEnquiryDetail"
+            :header-cell-style="{ background: '#00213b', color: '#ffffff' }"
+            v-loading="tableLoading">
+            <el-table-column
+              prop="Auto_Number"
+              label="Enquiry No">
+            </el-table-column>
+            <el-table-column
+              prop="Enquiry_Title"
+              label="Job Name"
+              width="300">
+            </el-table-column>
+            <el-table-column
+              prop="Customize_Pipeline_Stage"
+              label="Status"></el-table-column>
+            <!-- <el-table-column
           prop="Rating"
           label="Ratiing"></el-table-column> -->
             <el-table-column
@@ -186,70 +199,74 @@
             <el-button>Download</el-button>
           </template>
         </el-table-column> -->
-      </el-table>
-      <pagination
-        v-show="enquiryTotal > 0"
-        :total="enquiryTotal"
-        :page.sync="enquiryListQuery.page"
-        :limit.sync="enquiryListQuery.limit"
-        @pagination="getEnquiryList" />
+          </el-table>
+          <pagination
+            v-show="enquiryTotal > 0"
+            :total="enquiryTotal"
+            :page.sync="enquiryListQuery.page"
+            :limit.sync="enquiryListQuery.limit"
+            @pagination="getEnquiryList" />
         </div>
-        <div v-show="activeMenu === 'address'" class="content-form">
+        <!-- <div
+          v-show="activeMenu === 'address'"
+          class="content-form">
           <p class="content-title">{{ tabName }}</p>
           <div class="address-content">
-          <div
-            class="my-addresses add-address"
-            @click="addAddress(2)">
-            <img
-              src="@/assets/img/myAccount/add-address.png"
-              alt="" />
-            <p>Add address</p>
-          </div>
-          <div
-            class="my-addresses address"
-            v-for="item in addressList"
-            :key="item.id">
-            <div class="username">
-              <p>{{ item.name }}</p>
-              <span v-show="item.is_default">Default</span>
+            <div
+              class="my-addresses add-address"
+              @click="addAddress(2)">
+              <img
+                src="@/assets/img/myAccount/add-address.png"
+                alt="" />
+              <p>Add address</p>
             </div>
-            <div class="my-address-content">
-              <p>{{ item.state }}</p>
-              <p>{{ item.city }}</p>
-              <p>{{ item.address }}</p>
-              <p>{{ item.post_code }}</p>
-              <p>{{ item.country }}</p>
-              <p>Phone number: {{ item.phone }}</p>
-            </div>
-            <div class="edit-btns">
-              <el-button
-                size="mini"
-                @click="editAddress(3, item.id)">
-                Edit
-              </el-button>
-              <el-button
-                size="mini"
-                @click="delAddress(item.id)">
-                Remove
-              </el-button>
-              <el-button
-                size="mini"
-                @click="setDefault(item.id)"
-                v-show="!item.is_default">
-                Set as Default
-              </el-button>
+            <div
+              class="my-addresses address"
+              v-for="item in addressList"
+              :key="item.id">
+              <div class="username">
+                <p>{{ item.name }}</p>
+                <span v-show="item.is_default">Default</span>
+              </div>
+              <div class="my-address-content">
+                <p>{{ item.state }}</p>
+                <p>{{ item.city }}</p>
+                <p>{{ item.address }}</p>
+                <p>{{ item.post_code }}</p>
+                <p>{{ item.country }}</p>
+                <p>Phone number: {{ item.phone }}</p>
+              </div>
+              <div class="edit-btns">
+                <el-button
+                  size="mini"
+                  @click="editAddress(3, item.id)">
+                  Edit
+                </el-button>
+                <el-button
+                  size="mini"
+                  @click="delAddress(item.id)">
+                  Remove
+                </el-button>
+                <el-button
+                  size="mini"
+                  @click="setDefault(item.id)"
+                  v-show="!item.is_default">
+                  Set as Default
+                </el-button>
+              </div>
             </div>
           </div>
-        </div>
-        <pagination
-          v-show="addressTotal > 0"
-          :total="addressTotal"
-          :page.sync="addressListQuery.page"
-          :limit.sync="addressListQuery.limit"
-          @pagination="getAddressList" />
-        </div>
+          <pagination
+            v-show="addressTotal > 0"
+            :total="addressTotal"
+            :page.sync="addressListQuery.page"
+            :limit.sync="addressListQuery.limit"
+            @pagination="getAddressList" />
+        </div> -->
         <!-- My Orders -->
-        <div v-show="activeMenu.includes('orders')" class="content-form">
+        <div
+          v-show="activeMenu.includes('orders')"
+          class="content-form">
           <p class="content-title">{{ tabName }}</p>
           <div class="searchInput">
             <el-input
@@ -263,35 +280,45 @@
                 class="el-input__icon el-icon-search"
                 @click="getOrdersList"></i>
             </el-input>
-            <el-select 
+            <el-select
               v-if="selShow"
-              v-model="selword" filterable 
-              clearable default-first-option  
+              v-model="selword"
+              filterable
+              clearable
+              default-first-option
               placeholder="Select the status">
               <el-option
                 v-for="option in orderSelList"
                 :label="option"
                 :value="option"
-                :key="option"
-              ></el-option>
+                :key="option"></el-option>
             </el-select>
-            <el-select 
+            <el-select
               v-if="$store.state.userInfo?.memberCrmcomList?.length > 1"
-              v-model="accounts_id" filterable 
+              v-model="accounts_id"
+              filterable
               clearable
-              default-first-option  
+              default-first-option
               placeholder="Select the CRM">
               <el-option
                 v-for="option in $store.state.userInfo?.memberCrmcomList"
                 :label="option.name"
                 :value="option.id"
-                :key="option.id"
-              ></el-option>
+                :key="option.id"></el-option>
             </el-select>
-            <el-button type="primary" @click="getOrdersList" style='background-color: rgb(0, 33, 59);border-color:rgb(0, 33, 59)'>Submit</el-button>
+            <el-button
+              type="primary"
+              @click="getOrdersList"
+              style="
+                background-color: rgb(0, 33, 59);
+                border-color: rgb(0, 33, 59);
+              "
+              >Submit</el-button
+            >
           </div>
           <el-table
-            :data="tableData" v-loading="tableLoading"
+            :data="tableData"
+            v-loading="tableLoading"
             stripe
             style="width: 100%"
             :header-cell-style="{ background: '#00213b', color: '#ffffff' }">
@@ -330,7 +357,12 @@
               label="Tracking No#">
               <template slot-scope="scope">
                 <ul class="location">
-                  <li v-for="item in scope.row.Tracking_No_arr" :key="item.Tracking_No"  @click="openTracking_URL(item.Tracking_URL)"><i class="el-icon-location"></i>{{item.Tracking_No}}</li>
+                  <li
+                    v-for="item in scope.row.Tracking_No_arr"
+                    :key="item.Tracking_No"
+                    @click="openTracking_URL(item.Tracking_URL)">
+                    <i class="el-icon-location"></i>{{ item.Tracking_No }}
+                  </li>
                 </ul>
               </template>
             </el-table-column>
@@ -347,7 +379,7 @@
               width="80"
               align="center">
               <template slot-scope="scope">
-                <el-button 
+                <el-button
                   @click="goOrderDetail(scope.row)"
                   size="small"
                   style="background-color: rgb(0, 33, 59); color: #fff"
@@ -366,38 +398,43 @@
         </div>
       </div>
     </div>
-    <add-address-dialog
+    <!-- <add-address-dialog
       :dialogVisible.sync="dialogVisible"
       :data="addressDetail"
       :componentVisible="componentVisible"
       @close="closeAddressDialog"
-      @update="update" />
+      @update="update" /> -->
     <dialog-XX-success
       :visible.sync="xxContentVisible"
       :content="xxContent"
       @notify-parent="handleNotification"></dialog-XX-success>
-    <el-dialog 
-        :lock-scroll="false"
-        :visible.sync="urlDialogShow" 
-        center width="850px"
-        top="20vh">
-        <iframe 
-          :src="Tracking_URL"
-          style="width:100%;height:500px;"
-          frameborder="0"></iframe>
+    <el-dialog
+      :lock-scroll="false"
+      :visible.sync="urlDialogShow"
+      center
+      width="850px"
+      top="20vh">
+      <iframe
+        :src="Tracking_URL"
+        style="width: 100%; height: 500px"
+        frameborder="0"></iframe>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { mapMutations } from 'vuex'
-import addAddressDialog from '../../../components/addAddressDialog.vue'
+// import addAddressDialog from '../../../components/addAddressDialog.vue'
 import dialogXXSuccess from '@/components/DIalogXXSuccess.vue'
 import imageUpload from '@/components/ImageUpload'
 import { round } from '@/utils/price.js'
 
 export default {
-  components: { addAddressDialog, 'dialog-XX-success': dialogXXSuccess,imageUpload },
+  components: {
+    // addAddressDialog,
+    'dialog-XX-success': dialogXXSuccess,
+    imageUpload,
+  },
   data() {
     return {
       xxContentVisible: false,
@@ -486,18 +523,20 @@ export default {
         limit: 20,
       },
       enquiryTotal: 0,
-      orderSelList:[],
+      orderSelList: [],
       Tracking_URL: '',
       urlDialogShow: false,
     }
   },
   computed: {
     activeMenu() {
-      return this.$route.query.type ?? 'profile';
+      return this.$route.query.type ?? 'profile'
+    },
+    selShow() {
+      return (
+        this.activeMenu === 'all-orders' || this.activeMenu === 'open-orders'
+      )
     },
-    selShow(){
-      return this.activeMenu === 'all-orders' || this.activeMenu === 'open-orders'
-    }
   },
   watch: {
     $route: {
@@ -510,15 +549,14 @@ export default {
       },
     },
     orderKeyword() {
-        this.orderListQuery.page = 1;
+      this.orderListQuery.page = 1
     },
     enquiryKeyword() {
-        this.enquiryListQuery.page = 1;
-    }
+      this.enquiryListQuery.page = 1
+    },
   },
   mounted() {
     if (this.$utils.checkLogin()) {
-      this.getMemberDetail()
       this.updateType()
     } else {
       this.$router.replace('/')
@@ -539,19 +577,25 @@ export default {
     updateType() {
       if (this.activeMenu === 'profile') {
         this.tabName = 'My Profile'
+        this.getMemberDetail()
       } else if (this.activeMenu === 'enquiry') {
         this.tabName = 'My Enquiry'
         this.getEnquiryList()
       } else if (this.activeMenu === 'address') {
-        this.tabName = 'My Address'
-        this.getAddressList()
+        // this.tabName = 'My Address'
+        // this.getAddressList()
       } else {
         this.selword = ''
-        if(this.activeMenu === 'all-orders'){
-          this.orderSelList= ['Order Confirmed','In Production','In Transit','Order Completed']
+        if (this.activeMenu === 'all-orders') {
+          this.orderSelList = [
+            'Order Confirmed',
+            'In Production',
+            'In Transit',
+            'Order Completed',
+          ]
         }
-        if(this.activeMenu === 'open-orders'){
-          this.orderSelList = ['Order Confirmed','In Production','In Transit']
+        if (this.activeMenu === 'open-orders') {
+          this.orderSelList = ['Order Confirmed', 'In Production', 'In Transit']
         }
         this.tabName = 'My Orders'
         this.getOrdersList()
@@ -563,17 +607,19 @@ export default {
     // 获取用户信息
     getMemberDetail() {
       this.$axios
-        .get('/api/au/member/detail')
+        .get('/uk-api/uk/member/detail')
         .then(res => {
           if (res.code === 1) {
             this.profileform = res.result
-            this.profileform.logo = this.profileform.logo?this.formatLogo(this.profileform.logo):[];
+            this.profileform.logo = this.profileform.logo
+              ? this.formatLogo(this.profileform.logo)
+              : []
           }
         })
         .catch(() => {})
     },
-    formatLogo(params){
-      return [{ 'url': params }];
+    formatLogo(params) {
+      return [{ url: params }]
     },
     onSave(form) {
       if (
@@ -592,30 +638,31 @@ export default {
             last_name: this.profileform.last_name,
             phone: this.profileform.phone,
             logo: this.profileform.logo[0]?.url ?? '',
-          };
+          }
           let needLogout = false
           if (this.accountPasswordForm.password.trim() !== '') {
-            requestBody.password = this.accountPasswordForm.password;
-            requestBody.confirm_password = this.accountPasswordForm.confirm_password;
+            requestBody.password = this.accountPasswordForm.password
+            requestBody.confirm_password =
+              this.accountPasswordForm.confirm_password
             needLogout = true
           }
           this.$axios
-            .post('/api/au/member/edit', requestBody)
+            .post('/uk-api/uk/member/edit', requestBody)
             .then(res => {
               if (res.code === 1) {
-                  this.$notify({
-                    customClass: 'custom-notify-class',
-                    title: 'success',
-                    message: 'The profile information is modified successfully',
-                    type: 'success',
-                  })
-                  if(needLogout){
-                    setTimeout(() => {
-                      this.$store.dispatch('logout').then(() => {
-                        this.$router.push('/')
-                      })
-                    }, 500)
-                  }
+                this.$notify({
+                  customClass: 'custom-notify-class',
+                  title: 'success',
+                  message: 'The profile information is modified successfully',
+                  type: 'success',
+                })
+                if (needLogout) {
+                  setTimeout(() => {
+                    this.$store.dispatch('logout').then(() => {
+                      this.$router.push('/')
+                    })
+                  }, 500)
+                }
               }
             })
             .catch(() => {})
@@ -627,17 +674,24 @@ export default {
     },
     // 获取订单列表
     getOrdersList() {
-      const accounts_id = this.accounts_id ? this.accounts_id : this.$store.state.userInfo?.memberCrmcomList.map((i)=>i.id).join()
-      const type = this.activeMenu === 'all-orders'?'':this.activeMenu === 'open-orders'? 'Open Orders':'Closed Orders'
+      const accounts_id = this.accounts_id
+        ? this.accounts_id
+        : this.$store.state.userInfo?.memberCrmcomList.map(i => i.id).join()
+      const type =
+        this.activeMenu === 'all-orders'
+          ? ''
+          : this.activeMenu === 'open-orders'
+          ? 'Open Orders'
+          : 'Closed Orders'
       this.tableLoading = true
       this.$axios
-        .post('/api/crmdata/order_lists', {
+        .post('/uk-api/crmdata/order_lists', {
           keyword: this.orderKeyword,
           page: this.orderListQuery.page,
           limit: this.orderListQuery.limit,
           accounts_id,
           Order_Stage: this.selword,
-          type
+          type,
         })
         .then(res => {
           if (res.code === 1) {
@@ -656,14 +710,14 @@ export default {
     goOrderDetail(row) {
       const routeUrl = this.$router.resolve({
         path: '/home/myDetail/orderDetail',
-        query: { id: row.sales_orders_id,crm: row.Account_Name_id },
+        query: { id: row.sales_orders_id, crm: row.Account_Name_id },
       })
       window.open(routeUrl.href, '_blank')
     },
     getEnquiryList() {
       this.tableLoading = true
       this.$axios
-        .post('/api/crmdata/enquiries_lists', {
+        .post('/uk-api/crmdata/enquiries_lists', {
           keyword: this.enquiryKeyword,
           page: this.enquiryListQuery.page,
           limit: this.enquiryListQuery.limit,
@@ -690,70 +744,68 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 获取地址列表
-    getAddressList() {
-      this.$axios
-        .get('/api/address/list', {
-          params: {
-            page: this.addressListQuery.page,
-            limit: this.addressListQuery.limit,
-          },
-        })
-        .then(res => {
-          if (res.code === 1) {
-            this.addressList = res.result.data
-            this.addressTotal = res.result.total
-          }
-          if (process.client) {
-            this.$nextTick(() => {
-              window.scroll(0, 0)
-            })
-          }
-        })
-        .catch(() => {})
-    },
-    addAddress(num) {
-      this.addressDetail = {}
-      this.componentVisible = num
-      this.dialogVisible = true
-    },
-    editAddress(num, id) {
-      this.$axios
-        .get('/api/address/detail/' + id)
-        .then(res => {
-          this.addressDetail = res.result
-          this.addressDetail.is_default = res.result.is_default === 1
-          this.componentVisible = num
-          this.dialogVisible = true
-        })
-        .catch(() => {})
-    },
-    delAddress(id) {
-      this.$axios.get('/api/address/delete/' + id).then(res => {
-        this.$notify({
-          title: 'success',
-          message: 'Deleted successfully',
-          type: 'success',
-          duration: 3000,
-        })
-        this.getAddressList()
-      })
-      // .catch((error) => {});
-    },
-    setDefault(id) {
-      this.$axios.get('/api/address/set_default/' + id).then(res => {
-        this.$notify({
-          title: 'success',
-          message: 'Default address is set successfully',
-          type: 'success',
-          duration: 3000,
-        })
-        this.getAddressList()
-      })
-      // .catch((error) => {});
-    },
-    update() {
-      this.getAddressList()
-    },
+    // getAddressList() {
+    //   this.$axios
+    //     .get('/api/address/list', {
+    //       params: {
+    //         page: this.addressListQuery.page,
+    //         limit: this.addressListQuery.limit,
+    //       },
+    //     })
+    //     .then(res => {
+    //       if (res.code === 1) {
+    //         this.addressList = res.result.data
+    //         this.addressTotal = res.result.total
+    //       }
+    //       if (process.client) {
+    //         this.$nextTick(() => {
+    //           window.scroll(0, 0)
+    //         })
+    //       }
+    //     })
+    //     .catch(() => {})
+    // },
+    // addAddress(num) {
+    //   this.addressDetail = {}
+    //   this.componentVisible = num
+    //   this.dialogVisible = true
+    // },
+    // editAddress(num, id) {
+    //   this.$axios
+    //     .get('/api/address/detail/' + id)
+    //     .then(res => {
+    //       this.addressDetail = res.result
+    //       this.addressDetail.is_default = res.result.is_default === 1
+    //       this.componentVisible = num
+    //       this.dialogVisible = true
+    //     })
+    //     .catch(() => {})
+    // },
+    // delAddress(id) {
+    //   this.$axios.get('/api/address/delete/' + id).then(res => {
+    //     this.$notify({
+    //       title: 'success',
+    //       message: 'Deleted successfully',
+    //       type: 'success',
+    //       duration: 3000,
+    //     })
+    //     this.getAddressList()
+    //   })
+    // },
+    // setDefault(id) {
+    //   this.$axios.get('/api/address/set_default/' + id).then(res => {
+    //     this.$notify({
+    //       title: 'success',
+    //       message: 'Default address is set successfully',
+    //       type: 'success',
+    //       duration: 3000,
+    //     })
+    //     this.getAddressList()
+    //   })
+    // },
+    // update() {
+    //   this.getAddressList()
+    // },
     resetPassword() {
       if (
         this.accountPasswordForm.confirm_password !==
@@ -762,7 +814,7 @@ export default {
         this.$message.error('The second password is inconsistent!')
       } else {
         this.$axios({
-          url: '/api/au/member/reset',
+          url: '/uk-api/uk/member/reset',
           method: 'POST',
           data: this.accountPasswordForm,
         })
@@ -777,9 +829,9 @@ export default {
           })
       }
     },
-    openTracking_URL(url){
-        this.Tracking_URL= url
-        this.urlDialogShow= true
+    openTracking_URL(url) {
+      this.Tracking_URL = url
+      this.urlDialogShow = true
     },
     handleNotification() {
       this.$router.push('/')
@@ -800,59 +852,59 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-.content{
+.content {
   display: flex;
-  .el-menu-vertical{
+  .el-menu-vertical {
     width: 260px;
     min-height: 606px;
     background: #e8eaee;
     .iconfont {
-          font-size: 22px;
+      font-size: 22px;
     }
-    :deep(.el-menu-item){
-      font-size: 16px; 
+    :deep(.el-menu-item) {
+      font-size: 16px;
       &:hover {
-        background-color: #e8eaee !important; 
+        background-color: #e8eaee !important;
       }
       &.is-active {
-        background-color: #00213b !important; 
+        background-color: #00213b !important;
       }
     }
-    :deep(.el-submenu__title){
-      font-size: 16px; 
-      &:hover { 
-        background-color: #e8eaee !important; 
+    :deep(.el-submenu__title) {
+      font-size: 16px;
+      &:hover {
+        background-color: #e8eaee !important;
       }
     }
   }
-  :deep(.content-right){
-    flex:1;
+  :deep(.content-right) {
+    flex: 1;
     margin-left: 15px;
-    &>div{
+    & > div {
       min-height: 606px;
     }
     .content-title {
-        margin: 15px 0px 25px 15px;
-        position: relative;
-        width: 282px;
-        height: 27px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #102f47;
-        &::before {
-          content: "";
-          position: absolute;
-          left: -14px;
-          top: 50%;
-          transform: translateY(-50%);
-          width: 4px;
-          height: 17px;
-          background: #e90000;
-          border-radius: 2px;
-          margin-right: 10px;
+      margin: 15px 0px 25px 15px;
+      position: relative;
+      width: 282px;
+      height: 27px;
+      font-size: 24px;
+      font-weight: bold;
+      color: #102f47;
+      &::before {
+        content: '';
+        position: absolute;
+        left: -14px;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 4px;
+        height: 17px;
+        background: #e90000;
+        border-radius: 2px;
+        margin-right: 10px;
       }
     }
-    .content-form{
+    .content-form {
       border: 1px solid #c7c7c7;
       padding: 0 20px;
       .avatar-uploader .el-upload {
@@ -883,8 +935,8 @@ export default {
         }
       }
     }
-    .upload-item{
-      .el-form-item__content{
+    .upload-item {
+      .el-form-item__content {
         z-index: 1;
       }
     }
@@ -1014,13 +1066,13 @@ export default {
         }
       }
     }
-    .location{
-      color: #004A97;
-      li{
+    .location {
+      color: #004a97;
+      li {
         cursor: pointer;
       }
     }
-    .center{
+    .center {
       text-align: center;
     }
   }

pages/home/newsLetter.vue

@@ -1,133 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item> NewsLetter</el-breadcrumb-item>
-    </el-breadcrumb>
-    <p class="title">NewsLetter</p>
-    <div class="line"></div>
-    <div class="item" v-loading="listLoading">
-      <ul>
-        <book-card
-          v-for="item in newsLetterInfo"
-          :key="item.id"
-          :cardData="item"></book-card>
-      </ul>
-      <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getInfoList"
-    />
-    </div>
-    <div v-if="!newsLetterInfo.length">
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      total: 0,
-      listQuery: {
-        page: 1,
-        limit: 20,
-      },
-      newsLetterInfo: [],
-      listLoading: true,
-    };
-  },
-  async created() {
-    await this.getInfoList();
-  },
-  methods: {
-    getInfoList() {
-      this.$axios
-        .get("/api/others/au/newsletter",{
-          page: this.listQuery.page,
-          limit: this.listQuery.limit,
-        })
-        .then((res) => {
-          if (res.code == 1) {
-            this.total = res.result.total;
-             res.result.data.forEach((item) => {
-              item.filepath =
-                !this.$mediaRegExp.test(item.filepath)
-                  ? this.$OSS_PREFIX +
-                    item.filepath
-                  : item.filepath;
-                  item.img =
-                !this.$mediaRegExp.test(item.img)
-                  ? this.$OSS_PREFIX +
-                    item.img
-                  : item.img;
-            });
-            this.newsLetterInfo = res.result.data;
-            this.listLoading = false;
-          }
-           this.$nextTick(() => {
-            window.scroll(0, 0);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-          this.newsLetterInfo = [];
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  height: 50px;
-  font-size: 35px;
-  font-family: Proxima Nova;
-  font-weight: bold;
-  color: #00213B;
-  text-align: center;
-  line-height: 50px;
-}
-.line {
-  width: 99px;
-  height: 4px;
-  background: #e90000;
-  margin: 15px auto;
-}
-.item {
-  ul {
-    width: 940px;
-    margin: 0 auto;
-    display: flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-  }
-}
-:deep(.el-pagination.is-background) {
-  .el-pager {
-    li.number {
-      background-color: #f8f8f8;
-      border-radius: 50%;
-      color: #a7a7a7;
-    }
-    li:not(.disabled).active {
-      background-color: #00213b;
-      color: #d4d7da;
-    }
-  }
-  .btn-prev,
-  .btn-next {
-    border-radius: 50%;
-    background-color: #fff;
-    .el-icon-arrow-left:before {
-      content: "";
-    }
-    .el-icon-arrow-right:before {
-      content: "";
-    }
-  }
-}
-</style>

pages/home/privacyPolicy.vue

@@ -20,7 +20,7 @@ export default {
   },
   methods: {
     getInfoList() {
-      this.$axios.get("/api/others/privacy").then((res) => {
+      this.$axios.get("/uk-api/others/privacy").then((res) => {
         if(res.code==1){
           this.privacyInfo = res.result.content;
         }

pages/home/projects.vue

@@ -1,610 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto main pro-wrap">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item>My Projects</el-breadcrumb-item>
-    </el-breadcrumb>
-
-    <div class="topbar com-flex">
-      <div class="search-input">
-        <el-input @keyup.enter.native="getProjectList"
-          v-model="keyword" clearable @clear="getProjectList"
-          placeholder="Search Item here"
-        ><i slot="suffix" class="el-input__icon el-icon-search" @click="getProjectList" ></i></el-input>
-      </div>
-      <div class="topbar-item com-flex">{{ total }} Projects</div>
-    </div>
-
-    <section class="project-wrap" v-if="total">
-      <ul class="project">
-        <li class="project-li" v-for="(items, index) in list" :key="items.id">
-          <div class="head">
-            <div class="head-item left">
-              <img
-                :src="items.open ? close : open"
-                @click="toggle(index)"
-                class="toggle"/>
-              <el-input @keyup.enter.native="toggleEdit(items)" v-model="items.label_type" size="medium"
-                class="edit-input" 
-                v-if="items.lableEdit"
-              />
-              <span v-else>{{ items.label_type }}</span>
-              <img src="@/assets/img/edit.png" @click="toggleEdit(items)" />
-            </div>
-            <!-- <div class="head-item right" @click="sendEnquiry">
-              <img src="@/assets/img/email1.png" alt="" />
-              Send enquiry
-            </div> -->
-          </div>
-          <transition name="fade">
-            <div v-show="items.open">
-              <ul class="content" v-if="items.lists.length">
-                <li
-                  class="content-li"
-                  v-for="(item, idx) in items.lists"
-                  :key="item.id">
-                  <div class="content-li-wrap">
-                  <el-image lazy 
-                    :src="item.info?.image"
-                    fit="cover"
-                    style="width: 335px; height: 290px"
-                  ></el-image>
-                  <div class="content-li-r">
-                    <ul class="info">
-                      <li>
-                        <div class="name">{{ item.goods?.product_name }}</div>
-                      </li>
-                      <li>
-                        <div class="left">Model</div>
-                        <div class="right">
-                          {{ item.goods?.product_code }}<span v-if="item.cycle?.name">,{{ item.cycle?.name }}</span>
-                          <span v-if="item.priceUnit?.point">, {{ item.priceUnit?.point }} </span>
-                          <span v-if="item.priceUnit?.colours_number">, {{ item.priceUnit?.colours_number }} colours</span>
-                        </div>
-                      </li>
-                      <li v-if="item.goods_cart_decunit?.length">
-                        <div class="left">Decoration</div>
-                        <div class="right">
-                          <div
-                            v-for="option in item.goods_cart_decunit"
-                            :key="option.id">
-                          {{ option.point }} , {{ option.dec_name }} <span v-if="option.colours_number"></span>
-                          </div>
-                        </div>
-                      </li>
-                      <li  v-if="item.addition">
-                        <div class="left">Addon</div>
-                        <div class="right">{{ item.addition }}</div>
-                      </li>
-                      <li v-if="item.packaging_addition">
-                        <div class="left">Packaging</div>
-                        <div class="right">{{ item.packaging_addition }}</div>
-                      </li>
-                      <!-- <li>
-                      <div class="left">3D link</div>
-                      <div class="right">{{item.create_time}}</div>
-                    </li> -->
-                      <li>
-                        <div class="left">Created</div>
-                        <div class="right">
-                          {{ item.create_time | setTime }}
-                        </div>
-                      </li>
-                      <li>
-                        <div class="left">Last Edited</div>
-                        <div class="right">
-                          {{ item.update_time | setTime }}
-                        </div>
-                      </li>
-                    </ul>
-                    <div class="func">
-                      <el-tooltip
-                        content="Copy"
-                        placement="bottom"
-                        effect="light"
-                      >
-                        <img
-                          src="@/assets/img/copy.png"
-                          alt=""
-                          @click="copy(item)"
-                        />
-                      </el-tooltip>
-                      <!-- <el-tooltip  content="Edit" placement="bottom" effect="light">
-                      <img src="@/assets/img/pan.png" alt="">
-                    </el-tooltip>
-                    <el-tooltip  content="Build" placement="bottom" effect="light">
-                      <img src="@/assets/img/build.png" alt="">
-                    </el-tooltip> -->
-                      <el-tooltip
-                        content="Delete"
-                        placement="bottom"
-                        effect="light"
-                      >
-                        <img
-                          src="@/assets/img/del.png"
-                          alt=""
-                          @click="del(item, index, idx)"
-                        />
-                      </el-tooltip>
-                    </div>
-                  </div>
-                  </div>
-                  <div class="mask" v-if="item.goods_check_update || item.goods?.for_au==0">
-                    <p v-if="!item.goods?.for_au">This item has been discontinued and cannot be purchased</p>
-                    <p v-else>Product information changes, please revise your project</p>
-                    <div class="mask-btn">
-                      <span class="del" @click="delGoods(item.id,index, idx)">remove</span>
-                      <span class="edit" v-if="!item.goods?.for_au">Edit</span>
-                      <span class="edit" v-else @click="goCategory(item.cate_arr)">buy the same item</span>
-                    </div>
-                  </div>
-                </li>
-              </ul>
-              <el-empty
-                v-else
-                :image="empty"
-                description="No Data!"
-                :image-size="180"
-              ></el-empty>
-            </div>
-          </transition>
-        </li>
-      </ul>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="listQuery.page"
-        :limit.sync="listQuery.limit"
-        @pagination="getProjectList"
-      />
-    </section>
-    <el-empty
-      v-else
-      :image="empty"
-      description="No projects have been saved yet!"
-      :image-size="180"
-    ></el-empty>
-    <project-dialog
-      :visible.sync="projectdDialogVisible"
-      :id="projectId" @sendFinish="finishCopy"
-    ></project-dialog>
-    <!-- 邮箱 -->
-    <form-dialog :emailForm="emailForm"  :visible.sync="formDialogVisible" @handleSend="sendPriceMail" :rules="rules" :labelWidth="90"></form-dialog>
-      <!-- <mail-table ref="mailtable" :mailData="mailData" v-show="false"></mail-table> -->
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      empty: require("@/assets/img/empty.png"),
-      open: require("@/assets/img/open.png"),
-      close: require("@/assets/img/close.png"),
-      keyword: "",
-      listQuery: {
-        page: 1,
-        limit: 10,
-      },
-      total: 0,
-      list: [],
-      projectdDialogVisible: false,
-      projectId: null,
-      old_label_type:"",
-      formDialogVisible:false,
-      emailForm:{
-        Name:'',
-        Email:'',
-        Phone:'',
-        Quantity:'',
-        Comments:'',
-      },
-      rules:{
-        Name: [{ required: true, message: "Please enter", trigger: "blur" }],
-        Email: [{ required: true, message: "Please enter the correct format", pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/,trigger: "blur" }],
-        Phone: [{ required: true, message: "Please enter the correct format",  pattern:/^1[0-9]{10}$/, trigger: "blur" }],
-        Quantity: [{ required: true, message: "Please enter", trigger: "blur" }],
-      },
-    };
-  },
-  filters: {
-    setTime(val) {
-      if (val) {
-        let tempArr = val.split(" ");
-        let timeStr = tempArr[0];
-        let timeArr = timeStr.split("-");
-        return `${timeArr[2]}/${timeArr[1]}/${timeArr[0]}`;
-      }
-    },
-  },
-  mounted() {
-    this.getProjectList();
-  },
-  methods: {
-    getProjectList() {
-      this.$axios
-        .post("/api/goods_cart/lists", {
-          keyword: this.keyword,
-          page: this.listQuery.page,
-          limit: this.listQuery.limit,
-        })
-        .then((res) => {
-          if (res.code == 1) {
-            this.list = res.result.data;
-            this.total = res.result.total;
-            this.list.forEach((items, i) => {
-              this.$set(items, "lableEdit", false);
-              i == 0
-                ? this.$set(items, "open", true)
-                : this.$set(items, "open", false);
-            });
-          }
-        })
-        .catch(() => {});
-    },
-    // 修改input
-    toggleEdit(items,) {
-      // this.$nextTick(function() {
-      //     this.$refs[row.id].querySelector('input').focus();
-      // })
-      if (items.lableEdit) {
-        if(!items.label_type){
-          this.$message.warning('Please enter');
-          return
-        }
-        this.$axios
-        .post("/api/goods_cart/cartLabelEdit", {
-          label_type_new: items.label_type,
-          label_type_used: this.old_label_type
-        })
-        .then((res) => {});
-      }else{
-        this.old_label_type=items.label_type
-      }
-      items.lableEdit = !items.lableEdit;
-    },
-    toggle(i) {
-      this.list[i].open = !this.list[i].open;
-    },
-    sendEnquiry(){
-      this.formDialogVisible=true
-    },
-    sendPriceMail(){
-
-    },
-    copy(i) {
-      this.projectdDialogVisible = true;
-      this.projectId = i.id;
-    },
-    finishCopy(){
-      this.projectdDialogVisible=false;
-      location.reload()
-    },
-    del(item, index, idx) {
-      this.$confirm("Are you sure that you want to delete your project?", {
-        confirmButtonText: "Yes,remove",
-        cancelButtonText: "No,thanks",
-        showCancelButton: true,
-        type: "error",
-        center: true,
-        confirmButtonClass: "project-sure",
-        cancelButtonClass: "project-cancel",
-        showClose: false,
-        customClass: "message_style",
-      }).then(() => {
-        this.$axios.post("/api/goods_cart/delete", { id: item.id }).then((res) => {
-          this.list[index].lists.splice(idx, 1);
-          if (!this.list[index].lists.length) {
-            this.list.splice(index, 1);
-            this.total-=1;
-          }
-          this.projectdDialogVisible = false;
-          this.$message.success("successfully deleted");
-        });
-      });
-    },
-    delGoods(id,index,idx){
-      this.$axios.post("/api/goods_cart/delete", { id: id }).then((res) => {
-          this.list[index].lists.splice(idx, 1);
-          if (!this.list[index].lists.length) {
-            this.list.splice(index, 1);
-            this.total-=1;
-          }
-          this.$message.success("successfully deleted");
-        });
-    },
-    goCategory(cate_arr){
-      let index=cate_arr.length-1
-      console.log('index: ', index);
-      switch (index) {
-        case 0:
-          this.$router.push({
-            name: "category-firstCategory",
-            params: {
-              firstCategory: cate_arr[0].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase(),
-            },
-          });
-          break;
-        case 1:
-          this.$router.push({
-            name: "category-firstCategory-secondCategory",
-            params: {
-              firstCategory: cate_arr[0].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase(),
-              secondCategory: cate_arr[1].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase(),
-            },
-          });
-          break;
-
-        case 2:
-          this.$router.push({
-            name: "category-firstCategory-secondCategory-thirdCategory",
-            params: {
-              firstCategory: cate_arr[0].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase(),
-              secondCategory: cate_arr[1].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase(),
-              thirdCategory: cate_arr[2].name
-                .replace(/\s+/g, "-")
-                .replace("-&", "")
-                .toLowerCase()
-            },
-          });
-          break;
-
-          default:
-          this.$router.push({ path: '/category' })
-
-      }
-    }
-  },
-};
-</script>
-
-<style lang="scss" >
-.pro-wrap {
-  :deep(.el-breadcrumb) {
-    font-family: Proxima Nova;
-    font-style: italic;
-    margin-top: 15px;
-    line-height: 19px;
-    .el-breadcrumb__item {
-      .el-breadcrumb__inner.is-link {
-        color: #4a596c;
-      }
-      .el-breadcrumb__inner {
-        color: #0b6dc9;
-      }
-    }
-  }
-
-  :deep(.el-empty) {
-    p {
-      font-size: 24px;
-      font-family: ProximaNova-Regular;
-    }
-  }
-  .main {
-    font-size: 16px;
-  }
-  .topbar {
-    display: flex;
-    justify-content: space-between;
-    margin: 20px 0;
-    padding: 0 10px;
-    .search-input {
-      width: 60%;
-      padding: 0 26px 0 0;
-      position: relative;
-      i{
-        cursor: pointer;
-      }
-    }
-    :deep(.el-input) {
-      .el-input__inner {
-        border-radius: 18px;
-      }
-    }
-    .topbar-item {
-      color: #102f47;
-    }
-  }
-  .project-wrap {
-    ul.project {
-      .project-li {
-        border-radius: 5px;
-        overflow: hidden;
-        margin-bottom: 14px;
-        .head {
-          position: relative;
-          z-index: 1;
-          padding: 0 20px;
-          height: 45px;
-          line-height: 45px;
-          background-color: #00213b;
-          color: #fff;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          .head-item {
-            display: flex;
-            align-items: center;
-          }
-          .edit-input {
-            display: inline-block;
-            width: 150px;
-            margin: 0 10px;
-            :deep(.el-input__inner) {
-              font-size: 16px;
-              border-top: none;
-              border-left: none;
-              border-right: none;
-              border-bottom: 1px solid rgb(196, 194, 194);
-              color: #fff;
-              border-radius: 0;
-              background-color: #00213b;
-            }
-          }
-          .left {
-            img {
-              cursor: pointer;
-            }
-            span {
-              margin: 0 10px;
-            }
-          }
-          .right {
-            font-size: 12px;
-            border: 1px solid #fff;
-            padding: 0 8px;
-            height: 36px;
-            border-radius: 2px;
-            cursor: pointer;
-            img {
-              margin-right: 10px;
-            }
-          }
-        }
-        ul.content {
-          border-right: 1px solid #eee;
-          border-left: 1px solid #eee;
-          border-bottom: 1px solid #eee;
-          // display: flex;
-          // flex-direction: row;
-          // align-items: center;
-          .content-li {
-            &:not(:first-child){
-              border-top: 1px solid #eee;
-            }
-            position:relative;
-            .content-li-wrap{
-              padding: 14px 20px;
-              display: flex;
-              align-items: center;
-            }
-            .content-li-r {
-              flex: 1;
-              display: flex;
-              ul.info {
-                flex: 1;
-                color: #666;
-                margin-left: 20px;
-                font-size: 16px;
-                li {
-                  display: flex;
-                  margin-bottom: 20px;
-                  .name {
-                    font-size: 24px;
-                    color: #333;
-                    font-family: ProximaNova-Bold;
-                    font-weight: bold;
-                  }
-                  .left {
-                    width: 110px;
-                    text-align: right;
-                    margin-right: 24px;
-                  }
-                  .right {
-                    div:nth-child(1) {
-                      margin-bottom: 15px;
-                    }
-                  }
-                }
-              }
-              .func {
-                // align-self:flex-start;
-                img {
-                  cursor: pointer;
-                  margin-left: 20px;
-                }
-              }
-            }
-            .mask{
-              position: absolute;
-              top:0;
-              left: 0;
-              width: 100%;
-              height: 100%;
-              background-color: rgba(0,0,0,0.6);
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              flex-direction: column;
-              p{
-                color:#fff;
-                font-size: 22px;
-                margin-bottom: 20px;
-              }
-              .mask-btn{
-                font-size: 16px;
-                span{
-                  display: inline-block;
-                  padding:10px 0;
-                  width: 160px;
-                  text-align: center;
-                  border-radius: 5px;
-                  cursor: pointer;
-                }
-                .del{
-                  border: 1px solid #e90000;
-                  color:#e90000;
-                  margin-right: 20px;
-                  &:hover{
-                    background-color: rgba(233, 0, 0,0.9);
-                    color:#fff;
-                  }
-                }
-                .edit{
-                  border: 1px solid #fff;
-                  color:#fff;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .fade-enter-active,
-  .fade-leave-active {
-    transition: all 0.6s;
-  }
-
-  .fade-enter,
-  .fade-leave-to {
-    transform: translateY(-100%);
-  }
-}
-
-.message_style {
-  width: 550px;
-  .el-message-box__content {
-    font-size: 20px;
-  }
-  .el-message-box__btns {
-    display: block !important;
-    margin-top: 20px;
-  }
-  .project-sure {
-    background-color: #00213b;
-    color: #fff;
-  }
-  .project-cancel {
-    color: #00213b;
-    border: 1px solid #00213b;
-  }
-}
-</style>

pages/home/refundReturns.vue

@@ -22,7 +22,7 @@ export default {
   },
   methods: {
     getInfoList() {
-      this.$axios.get("/api/others/au/refund").then((res) => {
+      this.$axios.get("/uk-api/others/uk/refund").then((res) => {
         if(res.code==1){
           this.refundInfo = res.result.content;
         }

pages/home/termsConditions.vue

@@ -6,7 +6,9 @@
     </el-breadcrumb>
     <p class="title">Terms & Conditions</p>
     <div class="line"></div>
-    <div class="item" v-html="termsConditionsInfo"></div>
+    <div
+      class="item"
+      v-html="termsConditionsInfo"></div>
   </div>
 </template>
 
@@ -14,32 +16,31 @@
 export default {
   data() {
     return {
-      termsConditionsInfo: "",
-    };
+      termsConditionsInfo: '',
+    }
   },
   async created() {
-    await this.getInfoList();
+    await this.getInfoList()
   },
   methods: {
     getInfoList() {
-      this.$axios.get("/api/others/clause").then((res) => {
-        if(res.code==1){
-          this.termsConditionsInfo = res.result.content;         
+      this.$axios.get('/uk-api/others/clause').then(res => {
+        if (res.code == 1) {
+          this.termsConditionsInfo = res.result.content
         }
-      });
+      })
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
-
 .title {
   height: 50px;
   font-size: 35px;
   font-family: Proxima Nova;
   font-weight: bold;
-  color: #00213B;
+  color: #00213b;
   text-align: center;
   line-height: 50px;
 }
@@ -49,15 +50,27 @@ export default {
   background: #e90000;
   margin: 15px auto;
 }
-:deep(.item ) {
+:deep(.item) {
   width: 1400px;
   font-size: 18px;
   font-family: Proxima Nova;
   font-weight: 400;
   color: #333333;
   line-height: 24px;
-  p{
-    word-wrap:break-word;
+  p {
+    word-wrap: break-word;
+  }
+  ul {
+    list-style-type: unset;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    padding-left: 40px;
+  }
+  ol {
+    list-style-type: decimal;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    padding-left: 40px;
   }
 }
 </style>

pages/home/video.vue

@@ -1,157 +0,0 @@
-<template>
-  <div class="com-main com-width-1400 com-margin-auto">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">Home</el-breadcrumb-item>
-      <el-breadcrumb-item>Videos</el-breadcrumb-item>
-    </el-breadcrumb>
-    <p class="title">Videos</p>
-    <div class="line"></div>
-    <ul class="item" v-loading="listLoading">
-      <li v-for="item in videoList" :key="item.id">
-        <div class="item-content">
-          <video
-            id="my-player"
-            class="video-js"
-            width="330"
-            height="186"
-            controls="controls"
-            onMouseOver="this.play()"
-            onMouseOut="this.pause()"
-            muted
-          >
-            <source :src="item.url" />
-          </video>
-        </div>
-        <p class="item-title">{{ item.title }}</p>
-      </li>
-    </ul>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getList"
-    />
-    <div v-if="!videoList.length">
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      total: 0,
-      listQuery: {
-        page: 1,
-        limit: 12,
-      },
-      videoList: [],
-      listLoading: true,
-    };
-  },
-  async created() {
-    await this.getList();
-  },
-  methods: {
-    getList() {
-      this.$axios
-        .post("/api/resources/video/list", {
-          state: "au",
-          page: this.listQuery.page,
-          limit: this.listQuery.limit,
-        })
-        .then((res) => {
-          if (res.code == 1) {
-             res.result.data.forEach((item) => {
-              item.url =
-                !this.$mediaRegExp.test(item.url)
-                  ? this.$OSS_PREFIX +
-                    item.url
-                  : item.url;
-            });
-            this.videoList = res.result.data;
-            this.total = res.result.total;
-            this.listLoading = false;
-          }
-          this.$nextTick(() => {
-            window.scroll(0, 0);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-          this.videoList = [];
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-  height: 50px;
-  font-size: 35px;
-  font-family: Proxima Nova;
-  font-weight: bold;
-  color: #00213b;
-  text-align: center;
-  line-height: 50px;
-}
-.line {
-  width: 99px;
-  height: 4px;
-  background: #e90000;
-  margin: 15px auto;
-}
-.item {
-  margin: 20px auto;
-  display: flex;
-  justify-content: flex-start;
-  flex-wrap: wrap;
-  font-family: Proxima Nova;
-  li {
-    width: 330px;
-    height: 240px;
-    background: #ffffff;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-    margin-right: 25px;
-    margin-bottom: 30px;
-    &:nth-of-type(4n) {
-      margin-right: 0;
-    }
-    .item-title {
-      height: 54px;
-      font-size: 18px;
-      font-weight: 400;
-      color: #00213b;
-      line-height: 54px;
-      padding-left: 20px;
-    }
-  }
-}
-:deep(.el-pagination.is-background) {
-  .el-pager {
-    li.number {
-      background-color: #f8f8f8;
-      border-radius: 50%;
-      color: #a7a7a7;
-    }
-    li:not(.disabled).active {
-      background-color: #00213b;
-      color: #d4d7da;
-    }
-  }
-  .btn-prev,
-  .btn-next {
-    border-radius: 50%;
-    background-color: #fff;
-    .el-icon-arrow-left:before {
-      content: "";
-    }
-    .el-icon-arrow-right:before {
-      content: "";
-    }
-  }
-}
-</style>

pages/index.vue

@@ -90,26 +90,19 @@ export default {
 
   async asyncData({ $axios, req }) {
     // type:1、首页顶部banner，2、首页小图推荐，3、中部banner，4、，5、推荐文章栏目，6、底部banner，7、社交链接
-    const indexBanner = await $axios.post('/api/home/indexBanner', {
-      site: 1,
+    const indexBanner = await $axios.post('/uk-api/home/indexBanner', {
       type: 1,
     })
-    const secondaryBanner = await $axios.post('/api/home/indexBanner', {
-      site: 1,
+    const secondaryBanner = await $axios.post('/uk-api/home/indexBanner', {
       type: 2,
     })
     const indexGoodsRankLists = await $axios.post(
-      '/api/home/indexGoodsRankLists',
-      {
-        site: 1,
-      }
+      '/uk-api/home/indexGoodsRankList'
     )
-    const midBanner = await $axios.post('/api/home/indexBanner', {
-      site: 1,
+    const midBanner = await $axios.post('/uk-api/home/indexBanner', {
       type: 3,
     })
-    const articleList = await $axios.post('/api/home/indexBanner', {
-      site: 1,
+    const articleList = await $axios.post('/uk-api/home/indexBanner', {
       type: 5,
     })
 

pages/media.vue

@@ -41,14 +41,13 @@ export default {
     return {
       list: [
         { id: 0, typeName: 'All Content' },
-        { id: 3, typeName: 'EDM' },
-        { id: 1, typeName: 'Images' },
+        { id: 3, typeName: 'EDMs' },
+        { id: 1, typeName: 'Banners' },
         { id: 4, typeName: 'Catalogues' },
+        { id: 2, typeName: 'Social Media' },
         { id: 8, typeName: 'Email Signature' },
         { id: 5, typeName: 'Videos' },
         { id: 7, typeName: 'News' },
-        { id: 2, typeName: 'Social Media' },
-        { id: 6, typeName: 'New Products Mailer' },
       ],
       curTab: 0,
       keyword: '',
@@ -87,7 +86,7 @@ export default {
       }
       this.curTab && (params.type = this.comCurObj?.id)
       this.$axios
-        .get('/api//data/list', {
+        .get('/uk-api/data/list', {
           params
         })
         .then(res => {

pages/news/_newsName.vue

@@ -94,9 +94,9 @@ export default {
       let title = this.$route.params.newsName || ''
       title = decodeURIComponent(title)
       this.$axios
-        .post('/apihome/articleDetails', {
+        .post('/uk-api/home/articleDetail', {
           title: title.replaceAll('-', ' '),
-          state: 'au',
+          // state: 'au',
         })
         .then(res => {
           if (res.code === 1) {

pages/pdf/_id.vue

@@ -1,41 +0,0 @@
-<template>
-    <div>
-    </div>
-  </template>
-    
-  <script>
-  export default {
-    layout: "blank_layout",
-    created(){
-      this.$axios.get("/api/bxh/pdf", { params:{project_id: +this.$route.params.id}}).then((res) => {
-        fetch(res.result.file_path, {
-        method: 'get',
-        responseType: 'arraybuffer',
-      })
-        .then(function (res) {
-          if (res.status !== 200) {
-            return res.json()
-          }
-          return res.arrayBuffer()
-        })
-        .then((blobRes) => {
-          // 生成 Blob 对象，设置 type 等信息
-          const e = new Blob([blobRes], {
-            type: 'application/octet-stream',
-            'Content-Disposition': 'attachment'
-          })
-          // 将 Blob 对象转为 url
-          const link = window.URL.createObjectURL(e)
-          let a = document.createElement('a');
-          a.href = link;
-          a.download = res.result.file_name;
-          a.click();
-        }).catch(err => {
-          console.error(err)
-        })
-      });
-    },
-    method:{
-    }
-  };
-  </script>

pages/product-builder/_code.vue

@@ -1,346 +0,0 @@
-<template>
-  <div
-    id="productBuilder"
-    class="flex between stretch wrap">
-    <template v-if="detail.id">
-      <step1
-        :loading="loading"
-        :detail="detail"
-        :priceData="priceData"
-        :form2="form2"
-        :preData="preData"
-        @update-form="$event => updateForm($event, 1)"
-        ref="step1"></step1>
-      <step2
-        :loading="loading"
-        :detail="detail"
-        :priceData="priceData"
-        :cycle="form1.cycle"
-        :preData="preData"
-        @update-form="$event => updateForm($event, 2)"
-        ref="step2"></step2>
-      <step3
-        :loading="loading"
-        :detail="detail"
-        :priceData="priceData"
-        :weightInfo="weightInfo"
-        :cycle="form1.cycle"
-        :model="form1.model"
-        :buyForm="form1.autoForm"
-        :form2="form2"
-        @check="checkForm"
-        @update-form="$event => updateForm($event, 3)"
-        ref="step3"></step3>
-    </template>
-    <div
-      class="flex-auto flex center"
-      v-else>
-      <el-empty description="No Data"></el-empty>
-    </div>
-  </div>
-</template>
-
-<script>
-import step1 from '@/components/product-builder/step-1'
-import step2 from '@/components/product-builder/step-2'
-import step3 from '@/components/product-builder/step-3'
-
-export default {
-  name: 'PageProductBuilder',
-  components: {
-    step1,
-    step2,
-    step3,
-  },
-  layout: 'product_builder_layout',
-  async asyncData({ $axios, params }) {
-    const detail = await $axios
-      .get(`/api/au/goods/detail/${params.code}`)
-      .catch(e => {
-        console.log(e)
-        return {}
-      })
-    let priceData = {}
-    if (detail.result && detail.result.id) {
-      priceData = await $axios
-        .post('/api/quote/price', {
-          id: detail.result.id,
-        })
-        .catch(e => {
-          console.log(e)
-        })
-    }
-    return {
-      detail: detail.result || {},
-      priceData: priceData.result || {},
-    }
-  },
-  data() {
-    return {
-      // 商品详情数据
-      detail: {},
-      priceData: {},
-      loading: false,
-      // 用于3个step组件间互通数据
-      form1: {},
-      form2: {},
-      form3: {},
-      weightInfo: {},
-      preData: {},
-    }
-  },
-  head() {
-    return {
-      title: this.detail.product_name
-        ? `Product Builder: ${this.detail.product_name}`
-        : 'PromoCollection',
-      meta: [
-        { name: 'keywords', content: this.detail.main?.keywords },
-        { name: 'description', content: this.detail.main?.seo_title },
-      ],
-    }
-  },
-  computed: {},
-  beforeMount() {
-    const preData = localStorage.getItem(
-      `product-user-select-${this.$route.params.code}`
-    )
-    if (preData) {
-      this.preData = JSON.parse(preData)
-    }
-  },
-  mounted() {
-    // 从页脚组件抄过来的. 运费计算需要里面的一些数据
-    this.$axios.post('/api/home/indexConfigWebsite', { site: 1 }).then(res => {
-      this.$store.commit('config/setConfigInfo', res.result)
-    })
-    if (!this.detail.id) return
-    this.$axios.post('/api/quote/weight', { id: this.detail.id }).then(res => {
-      this.weightInfo = res.result
-    })
-  },
-  methods: {
-    checkForm(type) {
-      this.loading = true
-      Promise.all([
-        this.$refs.step1.checkForm(),
-        this.$refs.step2.checkForm(),
-        this.$refs.step3.checkForm(),
-      ])
-        .then(res => {
-          if (type === 2) {
-            this.sendEnquiry(res)
-          } else {
-            this.addToProject(res)
-          }
-          // 点击按钮后删除从product页面带过来的数据
-          this.preData = {}
-          localStorage.removeItem(
-            `product-user-select-${this.$route.params.code}`
-          )
-          this.loading = false
-        })
-        .catch(e => {
-          console.log(e)
-          this.$message.closeAll()
-          this.$message.error('Please make sure to fill in the required fields')
-          this.loading = false
-        })
-    },
-    addToProject(res) {
-      const temp = {
-        cycle_id: res[0].cycle,
-        price_unit_id: res[0].model,
-        label_type: res[2].job,
-        goods_id: this.detail.id,
-        // 这个字段从product页面抄过来的, 本来就是空的, 不知道用来干嘛.
-        decoration_id: '',
-        // 以下3字段在后续逻辑赋值
-        addition_ids: '',
-        packaging_addition_ids: '',
-        decoration_methods: [],
-      }
-      if (Array.isArray(res[1].packaging)) {
-        temp.packaging_addition_ids = res[1].packaging.join(',')
-      }
-      if (Array.isArray(res[1].addon)) {
-        temp.addition_ids = res[1].addon.join(',')
-      }
-      for (const key in res[1]) {
-        if (/\d+/.test(key)) {
-          const t = res[1][key].colorForm.filter(
-            i => i.id === res[1][key].printService
-          )
-
-          temp.decoration_methods.push({
-            colours_number: t.length ? t[0].colorNumber : 1,
-            decoration_id: res[1][key].printService,
-            price_unit_id: res[1][key].id,
-          })
-        }
-      }
-
-      this.$axios
-        .post('/api/goods_cart/cartAdd', temp)
-        .then(res => {
-          console.log(res)
-          if (res.code === 1) {
-            this.$notify({
-              title: 'success',
-              message: 'Submitted successfully',
-              type: 'success',
-              duration: 3000,
-            })
-            // 天坑. 本页面用了不同的layout, 如果直接用router.push跳转会导致页面空白...
-            location.href = location.origin + '/home/projects'
-          }
-        })
-        .catch(e => {
-          console.log(e)
-        })
-    },
-    sendEnquiry(res) {
-      const result = {
-        product_code: this.detail.product_code,
-        cycle_id: res[0].cycle,
-        price_unit_id: res[0].model,
-        supply_chain: res[0].supplyChain,
-        decorated_in: res[0].decorated,
-        address_id: res[2].defaultAddr.id,
-        freight_type: res[2].freight_type || 1,
-        // 目前没这功能, 暂时写死固定值
-        transit_time: '2 Days',
-        job_name: res[2].job || 'default_job',
-        note: res[2].note || '',
-        item: [],
-        // addon: [], // 在后续逻辑赋值
-        // decoration: [],
-        // packaging: [],
-      }
-      const priceData = this.$refs.step3.computedPriceTableData
-      result.item = res[0].autoForm.map(i => {
-        const temp = {
-          qty: i.value,
-          colour: i.color,
-          colour_type: 1,
-          model: res[0].model,
-          unit: priceData[0][`${i.value}_value`],
-          set_up: priceData[1][`${i.value}_value`],
-          print_option: priceData[2][`${i.value}_value`],
-          addon: priceData[3][`${i.value}_value`],
-          packaging: priceData[4][`${i.value}_value`],
-          fright: priceData[5][`${i.value}_value`],
-          sub_total: priceData[6][`${i.value}_value`],
-        }
-        if (i.color === 'Unspecified') temp.colour_type = 3
-        if (i.color === 'PMS') {
-          temp.colour_type = 2
-          temp.colour = res[0].colorPmsText
-        }
-        if (i.colorId >= 0) temp.colour_id = i.colorId
-        return temp
-      })
-      if (this.priceData.additionList) {
-        if (this.priceData.additionList.addon) {
-          const tempAddon = this.priceData.additionList.addon
-            .filter(item => res[1].addon.includes(item.id))
-            .map(item => {
-              return {
-                addition_id: item.id,
-                addition_config: item.addition_code,
-                addition_config_id: item.addition_config_id,
-                image: '',
-                name: item.name,
-              }
-            })
-          if (tempAddon.length) result.addon = tempAddon
-        }
-        if (this.priceData.additionList.packaging) {
-          const tempPackaging = this.priceData.additionList.packaging
-            .filter(item => res[1].packaging.includes(item.id))
-            .map(item => {
-              return {
-                addition_id: item.id,
-                addition_config: item.addition_code,
-                addition_config_id: item.addition_config_id,
-                image: '',
-                name: item.name,
-              }
-            })
-          if (tempPackaging.length) result.packaging = tempPackaging
-        }
-      }
-      const tempPrint = []
-      for (const key in res[1]) {
-        const target = res[1][key]
-        if (/\d+/.test(key) && target.enable) {
-          const v = {
-            point: target.point,
-            decoration_id: target.printService,
-          }
-
-          const decoration = target.decorationList.filter(
-            i => i.id === target.printService
-          )
-          if (decoration.length) {
-            v.price_type_id = decoration[0].price_type_id
-            v.price_type_name = decoration[0].pricetype.name || ''
-          }
-
-          const formItem = target.colorForm.filter(
-            i => i.id === target.printService
-          )
-          if (formItem.length) {
-            v.pms = formItem[0].pmsColorText || ''
-            v.max_color_count = formItem[0].colorNumber || 0
-          }
-          tempPrint.push(v)
-        }
-      }
-      if (tempPrint.length) result.decoration = tempPrint
-      // console.log(result)
-      this.$axios
-        .post('/api/order/add', result)
-        .then(res => {
-          console.log(res)
-          if (res.code === 1) {
-            this.$notify({
-              title: 'success',
-              message: 'Submitted successfully',
-              type: 'success',
-              duration: 3000,
-            })
-            // 对应的跳转页面还没开发.
-            location.href = location.origin + '/product/' + `${this.detail.product_code}`
-          }
-        })
-        .catch(e => {
-          console.log(e)
-        })
-    },
-    updateForm(data, step) {
-      switch (step) {
-        case 1:
-          this.form1 = data
-          break
-        case 2:
-          this.form2 = data
-          break
-        case 3:
-          this.form3 = data
-          break
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-#productBuilder {
-  position: relative;
-  width: 100%;
-  div {
-    box-sizing: border-box;
-  }
-}
-</style>

pages/product-record/_code.vue

@@ -135,7 +135,7 @@ export default {
       return !!this.userInfo.email
     },
     isPromocollection() {
-      return /\@promocollection.uk/.test(this.userInfo.email)
+      return /\@promocollection.(com\.au|uk)/.test(this.userInfo.email)
     },
   },
   watch: {
@@ -166,7 +166,7 @@ export default {
     },
     async getData() {
       const query = this.$route.query
-      let url = '/api/au/goods/record?product_code=' + this.$route.params.code
+      let url = '/uk-api/uk/goods/record/?product_code=' + this.$route.params.code
       if (query.version && query.version.length) {
         url += `&version=${query.version}`
       }
@@ -230,6 +230,10 @@ export default {
   img + img {
     margin-top: 24px;
   }
+  a {
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
 }
 .content-link {
   color: #0096ff;

pages/product/_code.vue

@@ -57,6 +57,23 @@
 <script>
 export default {
   layout: "default",
+  async asyncData({ $axios, params, error, redirect }) {
+    const pageData = await $axios.get(`/uk-api/uk/goods/detail?product_code=${params.code}`);
+    let indexGoodsRankLists=[]
+    if(pageData.result?.category_id){
+        try{
+          indexGoodsRankLists = await $axios.get(`/uk-api/uk/goods/recommend/${pageData.result?.category_id}`);
+        }catch (err) {
+          console.log(err);
+        }
+      }else{
+        indexGoodsRankLists = await $axios.get("/uk-api/home/indexGoodsRankList");
+    }
+    return {
+      pageData: pageData.result,
+      indexGoodsRankLists: indexGoodsRankLists.result,
+    };
+  },
   // middleware: 'auth',
   data() {
     return {
@@ -73,23 +90,6 @@ export default {
       ],
     };
   },
-  async asyncData({ $axios, params, error, redirect }) {
-    let pageData = await $axios.get(`/api/au/goods/detail?product_code=${params.code}`);
-    let indexGoodsRankLists=[]
-    if(pageData.result?.category_id){
-        try{
-          indexGoodsRankLists = await $axios.get(`/api/au/goods/recommend/${pageData.result?.category_id}`);
-        }catch (err) {
-          console.log(err);
-        }
-      }else{
-        indexGoodsRankLists = await $axios.post("/api/home/indexGoodsRankLists", { site: 1 });
-    }
-    return {
-      pageData: pageData.result,
-      indexGoodsRankLists: indexGoodsRankLists.result,
-    };
-  },
 };
 </script>
 

pages/product/index.vue

@@ -12,17 +12,15 @@
 <script>
 export default {
   layout:'default',
-  data() {
+   async asyncData({ $axios }) {
+    const indexGoodsRankLists = await $axios.get("/uk-api/home/indexGoodsRankList");
     return {
-      
+      indexGoodsRankLists: indexGoodsRankLists.result,
     };
   },
-   async asyncData({ $axios }) {
-    let indexGoodsRankLists = await $axios.post("/api/home/indexGoodsRankLists", {
-      site: 1,
-    });
+  data() {
     return {
-      indexGoodsRankLists: indexGoodsRankLists.result,
+      
     };
   },
   methods:{

pages/qrcode/_id.vue

@@ -58,14 +58,9 @@ export default {
       return !this.isImageType && !this.isVideoType && !this.isAudioType && !this.isPdfType;
     },
   },
-  methods: {
-    isType(types) {
-      return types.includes(this.fileExtension);
-    },
-  },
   created() {
     this.$axios
-      .get(`/api/data/detail/${+this.$route.params.id}`)
+      .get(`/uk-api/data/detail/${+this.$route.params.id}`)
       .then((response) => {
         const { media_url, type } = response.result;
         this.mediaUrl = media_url;
@@ -79,6 +74,11 @@ export default {
         this.loading = false;
       });
   },
+  methods: {
+    isType(types) {
+      return types.includes(this.fileExtension);
+    },
+  },
 };
 </script>
 

pages/render/_id.vue

@@ -1,60 +0,0 @@
-<template>
-  <div style="position: relative">
-    <bxh :bxhType="'render'" :design="+$route.params.id"></bxh>
-    <nuxt-link
-      :to="{ name: 'design-id', params: { id: +$route.params.id } }">
-      <div class="return"
-        @mouseenter="changeImageSrc(true)"
-        @mouseleave="changeImageSrc(false)">
-        <img :src="src" />
-        <div class="content">Return</div>
-      </div>
-    </nuxt-link>
-  </div>
-</template>
-  
-<script>
-export default {
-  layout: "blank_layout",
-  data() {
-    return {
-      src: require(`@/assets/img/bxh/return.png`),
-    };
-  },
-  mounted() {},
-  methods: {
-    changeImageSrc(key) {
-      if (key) {
-        this.src = require(`@/assets/img/bxh/return_hover.png`);
-      } else {
-        this.src = require(`@/assets/img/bxh/return.png`);
-      }
-    },
-  },
-};
-</script>
-  
-<style lang="scss" scoped>
-.return {
-    position: absolute;
-    right: 100px;
-    top: 0;
-    color: #e5e5e6;
-    height: 54px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    &:hover {
-      .content{
-        color: #ff7714;
-      }
-  }
-  }
-img {
-  width: 18px;
-}
-.content {
-  margin-top: 6px;
-}
-</style>

pages/setNewPassword.vue

@@ -141,7 +141,7 @@ export default {
             })
           } else {
             this.$axios
-              .post('/api/au/reset', {
+              .post('/uk-api/uk/reset', {
                 // email: this.ruleForm.email,
                 email: this.email,
                 password: this.ruleForm.password,

plugins/router.js

@@ -10,13 +10,19 @@ export default ({ app, store, redirect, $cookies }) => {
       return next(false)
     }
 
-    let token = '' 
-    if ($cookies.get('can-use-cookie')) token = $cookies.get("token");
+    let token = ''
+    // console.log($cookies.get('can-use-cookie'), 'can use cookie')
+    // console.log($cookies.get('token'), 'token')
+    if ($cookies.get('can-use-cookie')) {
+      token = $cookies.get('token')
+    }
     if (token) {
-      store.commit("setUserInfo", $cookies.get("user-info"));
+      // console.log('set status')
+      store.commit('setUserInfo', $cookies.get('user-info'))
     } else {
-      store.commit("clearUserInfo");
+      // console.log('remove status')
+      store.commit('clearUserInfo')
     }
-    next();
+    next()
   })
 }

store/index.js

@@ -60,7 +60,7 @@ export const actions = {
   getUserInfo({ commit, dispatch }) {
     return new Promise((resolve, reject) => {
       this.$axios({
-        url: "/api/au/member/detail",
+        url: "/uk-api/uk/member/detail",
         method: "GET",
       }).then((res) => {
         commit("setUserInfo", res.result);
@@ -74,18 +74,6 @@ export const actions = {
       // reject(error);
     });
   },
-  getCompareList({ commit, dispatch }) {
-    return new Promise((resolve, reject) => {
-      this.$axios
-        .post("/api/home/compare_list", { compare_keys: "keys" })
-        .then((res) => {
-          commit("setCompareList", res.result);
-          resolve(res);
-        });
-    }).catch(() => {
-      // reject(error);
-    });
-  },
   logout({ commit, dispatch }) {
     return new Promise((resolve, reject) => {
       //未有退出登录接口

utils/getCookie.js

@@ -1,21 +1,21 @@
 import Cookie from 'js-cookie'
 
 export default {
-  //获取服务端cookie
+  // 获取服务端cookie
   getcookiesInServer: function (req) {
     console.log('get server cookie')
-    let service_cookie = {}
+    const service_cookie = {}
     req &&
       req.headers.cookie &&
       req.headers.cookie.split(';').forEach(function (val) {
-        let parts = val.split('=')
+        const parts = val.split('=')
         service_cookie[parts[0].trim()] = (parts[1] || '').trim()
       })
     return service_cookie
   },
-  //获取客户端cookie
+  // 获取客户端cookie
   getcookiesInClient: function (key) {
-    if (Cookies.get('can-use-cookie')) {
+    if (Cookie.get('can-use-cookie')) {
       return Cookie.get(key) || ''
     } else {
       return ''