diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index a12cd5c..4549c3b 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -215,6 +215,7 @@ class ComboController extends Controller 'desc' => $Info['desc'], 'order' => $Info['order'], 'sale_count' => $Info['sale_count'], + 'is_hot' => isset($Info['is_hot'])?$Info['is_hot']:0, ]); if ($u) { return \Yz::Return(true, "更新完成", []); diff --git a/admin/src/style/global.css b/admin/src/style/global.css index 31ad19f..f77cbd5 100644 --- a/admin/src/style/global.css +++ b/admin/src/style/global.css @@ -14,8 +14,8 @@ color: #00aeb7; } .el-switch__core{ - background:#00aeb7; - background-color: #00aeb7; + /* background:#00aeb7; + background-color: #00aeb7; */ } .el-menu-item.is-active{ color: #00aeb7; diff --git a/admin/src/views/ComboMngr/Combo.vue b/admin/src/views/ComboMngr/Combo.vue index 6d1521f..9fb01a1 100644 --- a/admin/src/views/ComboMngr/Combo.vue +++ b/admin/src/views/ComboMngr/Combo.vue @@ -91,6 +91,10 @@ :value="item.id" /> + + +