0235615 hace 5 días
padre
commit
34e3b566a0

+ 3 - 0
menu-web/angular.json

@@ -94,5 +94,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

+ 3 - 2
menu-web/src/modules/food/mobile/page-reserve/components/header/header.component.scss

@@ -1,5 +1,6 @@
-@import 'src/styles/variables';
-
+.text {
+  color: variables.$primary-color; // 如果直接 @use
+}
 header {
   background: $white;
   padding: 15px 0 10px;

+ 1 - 1
menu-web/src/modules/food/mobile/page-reserve/components/menu-card/menu-card.component.html

@@ -1,5 +1,5 @@
 <div class="menu-card">
-  <div class="menu-img" [style.background]="getGradient()">
+  <div class="menu-img" >
     <div class="menu-badge" *ngIf="menuItem.badge">{{ menuItem.badge }}</div>
   </div>
   <div class="menu-info">

+ 14 - 15
menu-web/src/modules/food/mobile/page-reserve/components/menu-card/menu-card.component.scss

@@ -1,11 +1,10 @@
-@import 'src/styles/variables';
 
 .menu-card {
-  background: $white;
+  background: white;
   border-radius: 15px;
   overflow: hidden;
-  box-shadow: $card-shadow;
-  transition: $transition;
+  // box-shadow: $card-shadow;
+  // transition: $transition;
   position: relative;
   
   &:hover {
@@ -28,8 +27,8 @@
   position: absolute;
   top: 10px;
   right: 10px;
-  background: $accent;
-  color: $white;
+  // background: $accent;
+  // color: $white;
   padding: 3px 10px;
   border-radius: 20px;
   font-size: 12px;
@@ -52,13 +51,13 @@
 }
 
 .menu-price {
-  color: $primary;
+  // color: $primary;
   font-weight: 600;
 }
 
 .menu-desc {
   font-size: 12px;
-  color: $gray;
+  // color: $gray;
   line-height: 1.5;
   height: 36px;
   overflow: hidden;
@@ -71,7 +70,7 @@
   display: flex;
   justify-content: space-between;
   font-size: 11px;
-  color: $gray;
+  // color: $gray;
   margin-top: 8px;
   
   fa-icon {
@@ -92,9 +91,9 @@
   text-align: center;
   font-size: 12px;
   cursor: pointer;
-  transition: $transition;
+  // transition: $transition;
   background: rgba(78, 205, 196, 0.1);
-  color: $secondary;
+  // color: $secondary;
   border: none;
   
   &:hover {
@@ -105,20 +104,20 @@
 .add-btn {
   width: 32px;
   height: 32px;
-  background: $primary;
-  color: $white;
+  // background: $primary;
+  // color: $white;
   border: none;
   border-radius: 50%;
   font-size: 14px;
   display: flex;
   align-items: center;
   justify-content: center;
-  transition: $transition;
+  // transition: $transition;
   margin-left: 10px;
   cursor: pointer;
   
   &:hover {
-    background: $primary-dark;
+    // background: $primary-dark;
     transform: scale(1.1);
   }
 }

+ 4 - 4
menu-web/src/modules/food/mobile/page-reserve/page-reserve.html

@@ -3,10 +3,10 @@
   <app-header (search)="onSearch($event)"></app-header>
 
   <!-- Sorting Tabs -->
-  <app-sorting-tabs 
+  <!-- <app-sorting-tabs 
     [activeTab]="activeSort" 
     (sortChange)="onSortChange($event)">
-  </app-sorting-tabs>
+  </app-sorting-tabs> -->
 
   <!-- Stats Section -->
   <div class="section">
@@ -15,7 +15,7 @@
       <a href="#" class="more">查看详情</a>
     </div>
     
-    <app-stats-section></app-stats-section>
+    <!-- <app-stats-section></app-stats-section> -->
   </div>
 
   <!-- Menu Grid -->
@@ -69,4 +69,4 @@
 </div>
 
 <!-- Bottom Navigation -->
-<app-bottom-nav></app-bottom-nav>
+<!-- <app-bottom-nav></app-bottom-nav> -->

+ 11 - 12
menu-web/src/modules/food/mobile/page-reserve/page-reserve.scss

@@ -1,4 +1,3 @@
-@import 'src/styles/variables';
 
 .container {
   width: 100%;
@@ -26,7 +25,7 @@ body {
   
   h2 {
     font-size: 18px;
-    color: $dark;
+    // color: $dark;
     position: relative;
     padding-left: 12px;
     
@@ -38,13 +37,13 @@ body {
       transform: translateY(-50%);
       width: 4px;
       height: 16px;
-      background: $primary;
+      // background: $primary;
       border-radius: 2px;
     }
   }
   
   .more {
-    color: $gray;
+    // color: $gray;
     font-size: 13px;
     text-decoration: none;
   }
@@ -75,7 +74,7 @@ body {
   z-index: 1000;
   opacity: 0;
   visibility: hidden;
-  transition: $transition;
+  // transition: $transition;
   
   &.active {
     opacity: 1;
@@ -91,18 +90,18 @@ body {
 .culture-modal {
   width: 90%;
   max-width: 400px;
-  background: $white;
+  // background: $white;
   border-radius: 20px;
   overflow: hidden;
   transform: translateY(30px);
-  transition: $transition;
+  // transition: $transition;
   opacity: 0;
 }
 
 .modal-header {
-  background: linear-gradient(45deg, $primary, $primary-light);
+  // // background: linear-gradient(45deg, $primary, $primary-light);
   padding: 20px;
-  color: $white;
+  // color: $white;
   text-align: center;
   position: relative;
 }
@@ -146,7 +145,7 @@ body {
   display: flex;
   align-items: center;
   justify-content: center;
-  color: $white;
+  // color: $white;
   font-size: 20px;
   font-weight: bold;
   position: relative;
@@ -167,10 +166,10 @@ body {
 .modal-text {
   font-size: 14px;
   line-height: 1.8;
-  color: $gray;
+  // color: $gray;
   
   h4 {
-    color: $primary;
+    // color: $primary;
     margin: 15px 0 8px;
   }
 }

+ 7 - 4
menu-web/src/modules/food/mobile/page-reserve/page-reserve.ts

@@ -9,7 +9,7 @@ import { MenuService } from './services/menu.service';
 import { CultureService } from './services/culture.service';
 import { MenuItem } from './models/menu-item.model';
 import { CultureInfo } from './models/culture-info.model';
-import { ChartDirective } from './shared/chart/chart.directive';
+// import { ChartDirective } from './shared/chart/chart.directive';
 
 @Component({
   selector: 'app-discover',
@@ -21,10 +21,10 @@ import { ChartDirective } from './shared/chart/chart.directive';
     // StatsSectionComponent,
     MenuCardComponent,
     // BottomNavComponent,
-    ChartDirective
+    // ChartDirective
   ],
-  templateUrl: './discover.component.html',
-  styleUrls: ['./discover.component.scss']
+  templateUrl: './page-reserve.html',
+  styleUrls: ['./page-reserve.scss']
 })
 export class DiscoverComponent implements OnInit {
   menuItems: MenuItem[] = [];
@@ -41,6 +41,9 @@ export class DiscoverComponent implements OnInit {
     this.loadMenuItems();
   }
   
+  onSearch(ev:any){
+
+  }
   loadMenuItems(): void {
     this.menuItems = this.menuService.getMenuItems(this.activeSort);
   }

+ 3 - 3
menu-web/src/modules/food/mobile/page-reserve/shared/chart/chart.directive.ts

@@ -7,10 +7,10 @@ import { Chart, ChartType, ChartData, ChartOptions } from 'chart.js';
 })
 export class ChartDirective implements OnInit {
   @Input() type: ChartType = 'bar';
-  @Input() data: ChartData;
-  @Input() options: ChartOptions;
+  @Input() data: ChartData|any;
+  @Input() options: ChartOptions|undefined;
   
-  private chart: Chart;
+  private chart: Chart|undefined;
   
   constructor(private el: ElementRef) {}