diff --git a/azure_m/azure_m/azure_m.Android/Resources/drawable/all5.png b/azure_m/azure_m/azure_m.Android/Resources/drawable/all5.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c4e8d69faf87df1d45b2d4bda34efd510ea1684
Binary files /dev/null and b/azure_m/azure_m/azure_m.Android/Resources/drawable/all5.png differ
diff --git a/azure_m/azure_m/azure_m.Android/Resources/drawable/subs5.png b/azure_m/azure_m/azure_m.Android/Resources/drawable/subs5.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f8b3a6a98deedc7712da89d68342a1a9a7a4851
Binary files /dev/null and b/azure_m/azure_m/azure_m.Android/Resources/drawable/subs5.png differ
diff --git a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
index 0062e1b85f406a1003c8a667ea8b686e2082480e..19657eb6780787c384e15a3beb1dd533dfa6eb73 100644
--- a/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
+++ b/azure_m/azure_m/azure_m.Android/azure_m.Android.csproj
@@ -94,6 +94,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Resources\icon\" />
     <AndroidResource Include="Resources\drawable\add1.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_0 b/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_0
new file mode 100644
index 0000000000000000000000000000000000000000..48845257c0518f1f45f140fde0f47b773b0c3d5e
Binary files /dev/null and b/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_0 differ
diff --git a/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_1 b/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_1
new file mode 100644
index 0000000000000000000000000000000000000000..48845257c0518f1f45f140fde0f47b773b0c3d5e
Binary files /dev/null and b/azure_m/azure_m/azure_m.iOS/Resources/icon_about.png~merged_1 differ
diff --git a/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_0 b/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_0
new file mode 100644
index 0000000000000000000000000000000000000000..fdf6daf8c9af60bf3cfabca744f23483e0f50704
Binary files /dev/null and b/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_0 differ
diff --git a/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_1 b/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_1
new file mode 100644
index 0000000000000000000000000000000000000000..fdf6daf8c9af60bf3cfabca744f23483e0f50704
Binary files /dev/null and b/azure_m/azure_m/azure_m.iOS/Resources/icon_feed.png~merged_1 differ
diff --git a/azure_m/azure_m/azure_m/Views/AllService.xaml b/azure_m/azure_m/azure_m/Views/AllService.xaml
new file mode 100644
index 0000000000000000000000000000000000000000..385a50e55db2acb27345ef64dafaf1e90ec29af3
--- /dev/null
+++ b/azure_m/azure_m/azure_m/Views/AllService.xaml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="azure_m.Views.AllService"
+             >
+
+    <FlexLayout Direction="Column">
+        <StackLayout Orientation="Horizontal" HeightRequest="40" Spacing="20" Margin="20">
+            <Entry Placeholder="筛选服务" WidthRequest="150"/>
+            <Button Text="显示已有筛选器" WidthRequest="160"/>
+        </StackLayout>
+        <Grid Margin="10">
+            <StackLayout Orientation="Vertical" WidthRequest="50"  Grid.Column="0" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Vertical" WidthRequest="50"  Grid.Column="1" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Vertical" WidthRequest="50"  Grid.Column="2" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Vertical" WidthRequest="50"  Grid.Column="3" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+        </Grid>
+        <StackLayout Orientation="Horizontal" Margin="5,0,0,0" >
+            <Label Text="常规"/>
+            <Line X1="10" X2="300" Y1="10" Y2="10" StrokeThickness="2" Stroke="lightgray" />
+        </StackLayout>
+        <Grid  Margin="10" RowSpacing="10" ColumnSpacing="10">
+            <StackLayout Orientation="Horizontal"  Grid.Column="0" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Horizontal"  Grid.Column="1" Grid.Row="0">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Horizontal"  Grid.Column="0" Grid.Row="1">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Horizontal"  Grid.Column="0" Grid.Row="2">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+            <StackLayout Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
+                <Image Source="icon_about.png"/>
+                <Label Text="Azure目录"/>
+            </StackLayout>
+        </Grid>
+        <StackLayout Orientation="Horizontal" Margin="5,0,0,0">
+            <Label Text="计算"/>
+            <Line X1="10" X2="300" Y1="10" Y2="10" StrokeThickness="2" Stroke="lightgray" />
+        </StackLayout>
+        <StackLayout Orientation="Horizontal" WidthRequest="150" Margin="10,10,10,10">
+            <Image Source="icon_feed.png"/>
+            <Label Text="虚拟机"/>
+        </StackLayout>
+    </FlexLayout>
+</ContentPage>
diff --git a/azure_m/azure_m/azure_m/Views/AllService.xaml.cs b/azure_m/azure_m/azure_m/Views/AllService.xaml.cs
new file mode 100644
index 0000000000000000000000000000000000000000..48f5241071001926ffcdbaba223077524e6bf6d4
--- /dev/null
+++ b/azure_m/azure_m/azure_m/Views/AllService.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace azure_m.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class AllService : ContentPage
+    {
+        public AllService()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml b/azure_m/azure_m/azure_m/Views/MainPage.xaml
index 7112b1e0f90c5f5c44c2f71aafd1eabe7784033f..c91e917976a6d87dfb41b2fb75232d020c6eb586 100644
--- a/azure_m/azure_m/azure_m/Views/MainPage.xaml
+++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml
@@ -9,7 +9,11 @@
     <ContentPage.ToolbarItems>
         <ToolbarItem x:Name="Alert" IconImageSource="alert0.png" Clicked="OnAlert_Clicked" />
         <ToolbarItem x:Name="Setting" IconImageSource="setting0.png" Clicked="OnSetting_Clicked" />
+<<<<<<< HEAD
+        <ToolbarItem x:Name="My" IconImageSource="user0.png" Clicked="OnMy_Clicked" />
+=======
         <ToolbarItem x:Name="My" IconImageSource="user0.png" Clicked="OnMyIcon_Clicked" />
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
     </ContentPage.ToolbarItems>
     <!--#endregion-->
     
@@ -28,6 +32,16 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+<<<<<<< HEAD
+        <!--<StackLayout BackgroundColor="{StaticResource Accent}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
+            <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
+                <ContentView Padding="0,40,0,40" VerticalOptions="FillAndExpand">
+                    <Image Source="xamarin_logo.png" VerticalOptions="Center" HeightRequest="64" />
+                </ContentView>
+            </StackLayout>
+        </StackLayout>-->
+=======
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
         <ScrollView Grid.Row="1">
             <StackLayout Orientation="Vertical" Padding="5,0,5,0" Spacing="10">
                 
@@ -42,6 +56,14 @@
                         <!--<ColumnDefinition Width="*" />
                         <ColumnDefinition Width="*" />-->
                         <ColumnDefinition Width="*" />
+<<<<<<< HEAD
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+=======
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="50" />
@@ -49,6 +71,12 @@
                         <RowDefinition Height="50" />
                         <RowDefinition Height="50" />
                     </Grid.RowDefinitions>
+<<<<<<< HEAD
+                    <ImageButton Source="add1.png" Grid.Row="0" Grid.Column="0" BackgroundColor="White" />
+                    <Label Text="创建资源" Grid.Row="1" Grid.Column="0" HorizontalTextAlignment="Center" />
+                    <ImageButton Source="subscribe5.png" Grid.Row="0" Grid.Column="1" BackgroundColor="White" 
+                                 WidthRequest="50">
+=======
                     <ImageButton Source="add1.png" Grid.Row="0" Grid.Column="0" BackgroundColor="White" Clicked="OnAdd_Clicked"/>
 
                     <Label Text="创建资源" Grid.Row="1" Grid.Column="0" HorizontalTextAlignment="Center" >
@@ -59,6 +87,7 @@
 
                     <ImageButton Source="subscribe5.png" Grid.Row="0" Grid.Column="1" BackgroundColor="White" 
                                  WidthRequest="50" Clicked="OnSubscribe_Clicked">
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal">
@@ -78,6 +107,16 @@
                         </VisualStateManager.VisualStateGroups>
                     </ImageButton>
                     <Label Text="订阅" Grid.Row="1" Grid.Column="1" HorizontalTextAlignment="Center" />
+<<<<<<< HEAD
+                    <ImageButton Source="vm2" Grid.Row="0" Grid.Column="2" BackgroundColor="White" />
+                    <Label Text="虚拟机" Grid.Row="1" Grid.Column="2" HorizontalTextAlignment="Center"/>
+
+                    <ImageButton Source="dashboard2.png" Grid.Row="2" Grid.Column="0" BackgroundColor="White" />
+                    <Label Text="仪表盘" Grid.Row="3" Grid.Column="0" HorizontalTextAlignment="Center" />
+                    <ImageButton Source="monitor2.png"   Grid.Row="2" Grid.Column="1" BackgroundColor="White" />
+                    <Label Text="Azure Monitor" Grid.Row="3" Grid.Column="1" HorizontalTextAlignment="Center" />
+                    <ImageButton Source="more6.png"  Grid.Row="2" Grid.Column="2" BackgroundColor="White" />
+=======
                     <ImageButton Source="vm2" Grid.Row="0" Grid.Column="2" BackgroundColor="White" Clicked="OnVM_Clicked"/>
                     <Label Text="虚拟机" Grid.Row="1" Grid.Column="2" HorizontalTextAlignment="Center"/>
 
@@ -86,6 +125,7 @@
                     <ImageButton Source="monitor2.png"   Grid.Row="2" Grid.Column="1" BackgroundColor="White" Clicked="OnMonitor_Clicked"/>
                     <Label Text="Azure Monitor" Grid.Row="3" Grid.Column="1" HorizontalTextAlignment="Center"  />
                     <ImageButton Source="more6.png"  Grid.Row="2" Grid.Column="2" BackgroundColor="White" Clicked="OnMoreService_Clicked"/>
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
                     <Label Text="更多服务" Grid.Row="3" Grid.Column="2" HorizontalTextAlignment="Center" />
                 </Grid>
                 <!--#endRegion-->
@@ -93,6 +133,18 @@
                 <!--#region Resources-->
                 
                 <Label Text="Resources" FontSize="Title"  Margin="0,40,0,0"/>
+<<<<<<< HEAD
+                <Grid Margin="20,0,20,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.11*"/>
+                        <ColumnDefinition Width="0.15*"/>
+                        <ColumnDefinition Width="0.1*"/>
+                        <ColumnDefinition Width="0.1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.1*" />
+                        <RowDefinition Height="0.1*" />
+=======
                 <Grid Margin="20,0,20,0" ColumnSpacing="0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -102,6 +154,7 @@
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="0.1*" />
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
                     </Grid.RowDefinitions>
                     <Button x:Name="RecentBtn" Text="Recent" FontSize="10" TextColor="white" BorderColor="white" BackgroundColor="#1e6ede" Grid.Column="0" Clicked="onRecentBtn_Clicked"/>
                     <Button x:Name="FavoriteBtn" Text="Favorite" FontSize="10" TextColor="#1e6ede" BorderColor="#1e6ede" BackgroundColor="LightGray" Grid.Column="1" Clicked="onFavoriteBtn_Clicked"/>
@@ -117,12 +170,34 @@
                     <Label Text="类型" FontSize="15" HorizontalTextAlignment="Center" Grid.Row="0" Grid.Column="1"/>
                     <Label Text="上次查看" FontSize="15" Grid.Row="0" Grid.Column="2"/>
                 </Grid>
+<<<<<<< HEAD
+                <ListView>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell>
+                                <Grid Margin="20,0,20,0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Label Text="名称" FontAttributes="Bold" Grid.Row="0" Grid.Column="0"/>
+                                    <Label Text="类型" FontSize="15" HorizontalTextAlignment="Center" Grid.Row="0" Grid.Column="1"/>
+                                    <Label Text="上次查看" FontSize="15" Grid.Row="0" Grid.Column="2"/>
+                                </Grid>
+                            </ViewCell> 
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+                <Button x:Name="MoreResourceBtn" BackgroundColor="White" Text="查看全部" TextColor="#1e6ede" HorizontalOptions="Start"/>
+=======
                 <ScrollView>
                     <StackLayout x:Name="ResourceLayout" Margin="5,0,0,5" >
                         
                     </StackLayout>
                 </ScrollView>
                 <Button x:Name="MoreResourceBtn" BackgroundColor="White" Text="查看全部" TextColor="#1e6ede" HorizontalOptions="Start" Clicked="MoreResourceBtn_Clicked"/>
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
 
                 <!--#endRegion-->
             </StackLayout>
diff --git a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
index c43ee1f55d7e80d9b35e177fc5c82601c9dda139..3637adefbf1873aee1f0e6e0e8e9634ee349c712 100644
--- a/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
+++ b/azure_m/azure_m/azure_m/Views/MainPage.xaml.cs
@@ -1,15 +1,28 @@
 using System;
+<<<<<<< HEAD
+using System.ComponentModel;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+=======
 using System.Collections.Generic;
 using System.ComponentModel;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using Xamarin.Essentials;
 using azure_m.Models;
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
 
 namespace azure_m.Views
 {
     public partial class MainPage : ContentPage
     {
+<<<<<<< HEAD
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+
+=======
         List<StackLayout> ResourcesLayout = null;
 
         public MainPage()
@@ -94,6 +107,7 @@ namespace azure_m.Views
             //DEBUG
             return "vm2.png";
         }
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
 
         private void swapBtnColors()
         {
@@ -104,13 +118,20 @@ namespace azure_m.Views
             FavoriteBtn.BackgroundColor = (Color)bgc;
             FavoriteBtn.TextColor = (Color)tc;
             FavoriteBtn.BorderColor = (Color)bc;
+<<<<<<< HEAD
+
+=======
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
         }
 
         public void onFavoriteBtn_Clicked(object sender, EventArgs e)
         {
             swapBtnColors();
             //异步 querying datas, 在此期间出现一个刷新标志
+<<<<<<< HEAD
+=======
             GetResources(1);
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
 
         }
 
@@ -125,17 +146,26 @@ namespace azure_m.Views
         {
             //this.Navigation.PushAsync(new MyPage());
             DisplayAlert("Alert", "My page", "OK");
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
         }
 
         public void OnSetting_Clicked(object sender, EventArgs e)
         {
             //this.Navigation.PushAsync(new SettingsPage());
+<<<<<<< HEAD
+=======
             DisplayAlert("Alert", "SettingPage", "OK");
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
         }
 
         public void OnAlert_Clicked(object sender, EventArgs e)
         {
             //this.Navigation.PushAsync(new AlertsPage());
+<<<<<<< HEAD
+        }
+
+
+=======
             DisplayAlert("Alert", "AlertPage", "OK");
         }
 
@@ -176,5 +206,6 @@ namespace azure_m.Views
         {
             DisplayAlert("MoreResourceBtn_Clicked", "", "ok");
         }
+>>>>>>> 42735ec5a8e439555450b089f4f583e37d4e44f3
     }
 }
\ No newline at end of file