add search

huinongbao-app/src/app/search/search.page.html

@@ -34,10 +34,6 @@
         <ion-icon name="citrus"></ion-icon>
         <p>柑橘</p>
       </ion-col>
-      <ion-col size="3" class="icon-button">
-        <ion-icon name="apple"></ion-icon>
-        <p>苹果</p>
-      </ion-col>
     </ion-row>
   </div>
 

huinongbao-app/src/app/tabs/tabs-routing.module.ts

@@ -20,21 +20,7 @@ const routes: Routes = [
         path: 'tab3',
         loadChildren: () => import('../tab3/tab3.module').then(m => m.Tab3PageModule)
       },
-      {
-<<<<<<< HEAD
-        path: 'search',
-        loadChildren: () => import('../search/search.module').then(m => m.SearchPageModule),
-=======
-        path: 'tab4',
-        loadComponent: () =>
-          import('../market-forecast/market-forecast.component').then((m) => m.MarketForecastComponent),
-      }, 
-      {
-        path: 'tab5',
-        loadComponent: () =>
-          import('../plan-create/plan-create.component').then((m) => m.PlanCreateComponent),
->>>>>>> 33e180900e50434dacddf4242832738391448665
-      },
+      
       {
         path: '',
         redirectTo: '/tabs/tab1',