Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/jwhx into dev

resources/admin/src/api/module/cashier.js

+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+	cart: {
+        list:{
+            url: `${config.API_URL}order/cashier/index`,
+			name: "购物车列表",
+			get: async function(data){
+				return await http.get(this.url, data);
+			}
+        },
+        edit: {
+			url: `${config.API_URL}order/cashier/edit`,
+			name: "修改购物车",
+			post: async function(params){
+				return await http.put(this.url, params);
+			}
+		},
+        delete: {
+			url: `${config.API_URL}order/cashier/delete`,
+			name: "删除购物车产品",
+			post: async function(params){
+				return await http.delete(this.url, params);
+			}
+		},
+		add: {
+			url: `${config.API_URL}order/cashier/add`,
+			name: "添加购物车",
+			post: async function(params){
+				return await http.post(this.url, params);
+			}
+		},
+    }
+}
\ No newline at end of file

resources/admin/src/pages/cashierhome/cashierhome.scss

@@ -87,4 +87,228 @@ font-size: 18px;
 .total small {
 padding: 0 10px;
 text-align: center;
+}
+
+
+
+.sku_card {
+    .sku_card_title {
+        font-size: 15px;
+        line-height: 40px;
+        color: #222;
+        font-weight: bold;
+    }
+
+    .sku_card_main {
+        display: flex;
+        justify-content: flex-start;
+        flex-wrap: wrap;
+
+        .sku_card_item {
+            font-size: 12px;
+            line-height: 24px;
+            background-color: #f1f2f2;
+            color: #373737;
+            margin-right: 10px;
+            margin-bottom: 10px;
+            padding: 0 10px;
+            flex-shrink: 0;
+            border-radius: 3px;
+            cursor: pointer;
+        }
+
+        .sku_card_item_active {
+            background-color: #409eff !important;
+            color: #fff !important;
+        }
+    }
+}
+
+
+
+
+
+
+.card {
+    margin: 18px auto 0;
+    background-color: #fff;
+
+    .top {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        height: 50px;
+        font-size: 16px;
+        line-height: 1;
+
+        .shop_name {
+            margin-left: 5px;
+            font-size: 15px;
+            font-weight: normal;
+            font-stretch: normal;
+            color: #222222;
+        }
+    }
+
+    .select_box {
+        width: 40px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+        font-size: 16px;
+
+        .circle {
+            color: #666;
+        }
+
+        .checked {
+            color: #f64f15;
+        }
+    }
+
+    .main {
+        padding-bottom: 23px;
+
+        .card_wrap {
+            margin-top: 15px;
+
+            &:first-child {
+                margin-top: 0;
+            }
+        }
+
+        .card_item {
+            width: 100%;
+            box-sizing: border-box;
+        }
+
+        .card_item_wrap {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+        }
+
+        .img_wrap {
+            width: 70px;
+            height: 70px;
+            border-radius: 10px;
+            overflow: hidden;
+            flex-shrink: 0;
+
+            img {
+                display: block;
+                width: 70px;
+                height:70px;
+            }
+        }
+
+        .info {
+            margin-left: 20px;
+            padding-right: 20px;
+            width: calc(100% - 40px - 100px - 15px);
+            // height: 70px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            .it {
+                .goods_title {
+                    display: block;
+                    width: 100%;
+                    font-size: 12px;
+                    font-weight: bold;
+                    font-stretch: normal;
+                    color: #222222;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+                .deleteicon{
+                    margin: 6px 0;
+                    display: flex;
+                    justify-content: flex-end;
+                }
+                .delete{
+                    cursor: pointer;
+                    color: red;
+                }
+
+                .sku {
+                    height: 26px;
+                    border-radius: 5px;
+                    margin-top: 11px;
+                    font-size: 12px;
+                    line-height: 26px;
+                    font-stretch: normal;
+                    color: #838383;
+                    display: flex;
+                    justify-content: flex-start;
+                    align-items: center;
+
+                    .text {
+                        padding: 0 10px;
+                        background-color: #f6f6f6;
+                    }
+
+                    .sku_arr {
+                        display: block;
+                        padding-left: 10px;
+                        padding-right: 10px;
+                        background-color: #f6f6f6;
+                    }
+                }
+            }
+
+            .ib {
+                display: flex;
+                justify-content: space-between;
+                .pricebox{
+                    display: flex;
+                    align-items: center;
+                }
+                .jfprice{
+                    margin-left: 8px;
+                    .price_icon,.price_main{
+                        font-size: 12px !important;
+                        color: #a5a5a5 !important;
+                    }
+                }
+                .price {
+                    display: flex;
+                    justify-content: flex-start;
+                    align-items: baseline;
+
+                    .price_icon {
+                        font-size: 13px;
+                        font-weight: bold;
+                        font-stretch: normal;
+                        color: #f64f15;
+                    }
+
+                    .price_main {
+                        font-size: 16px;
+                        font-weight: bold;
+                        font-stretch: normal;
+                        color: #f64f15;
+
+                        .mini {
+                            font-size: 15px;
+                        }
+                    }
+
+                    .ori {
+                        font-size: 12px;
+                        font-stretch: normal;
+                        color: #8a8a8a;
+                    }
+                }
+
+                .num {
+                    flex-shrink: 0;
+                    --stepper-input-disabled-text-color: #323233;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file