diff --git a/UWPDDD/Dlls/AyxMVVM.dll b/UWPDDD/Dlls/AyxMVVM.dll
index d9cfbdd..3f64f5d 100644
Binary files a/UWPDDD/Dlls/AyxMVVM.dll and b/UWPDDD/Dlls/AyxMVVM.dll differ
diff --git a/UWPDDD/Domain/Model/ANote.cs b/UWPDDD/Domain/Model/ANote.cs
index 69bebb6..63c387a 100644
--- a/UWPDDD/Domain/Model/ANote.cs
+++ b/UWPDDD/Domain/Model/ANote.cs
@@ -1,5 +1,7 @@
 
 
+using Domain.Repository;
+
 namespace Domain.Model
 {
     public sealed class ANote
@@ -10,5 +12,10 @@ public sealed class ANote
         public string Title { get; set; }
         public string Content { get; set; }
         public ACategory Category { get; set; }
+
+        public void UpdateContent()
+        {
+            Content = Repositories.ANoteRepository.GetContent(ID);
+        }
     }
 }
diff --git a/UWPDDD/Domain/Repository/Common/IANoteRepository.cs b/UWPDDD/Domain/Repository/Common/IANoteRepository.cs
index 508bf15..60451b4 100644
--- a/UWPDDD/Domain/Repository/Common/IANoteRepository.cs
+++ b/UWPDDD/Domain/Repository/Common/IANoteRepository.cs
@@ -10,5 +10,6 @@ namespace Domain.Repository.Common
     public interface IANoteRepository:IRepository<ANote>
     {
         ANote GetOne(int id);
+        string GetContent(int id);
     }
 }
diff --git a/UWPDDD/Domain/Repository/Database/ANoteDataRepo.cs b/UWPDDD/Domain/Repository/Database/ANoteDataRepo.cs
index 2a4f63a..a2b0792 100644
--- a/UWPDDD/Domain/Repository/Database/ANoteDataRepo.cs
+++ b/UWPDDD/Domain/Repository/Database/ANoteDataRepo.cs
@@ -20,6 +20,11 @@ public IEnumerable<ANote> GetAll()
             throw new NotImplementedException();
         }
 
+        public string GetContent(int id)
+        {
+            throw new NotImplementedException();
+        }
+
         public ANote GetOne(int id)
         {
             throw new NotImplementedException();
diff --git a/UWPDDD/Domain/Repository/Mars/ANoteMarsRepo.cs b/UWPDDD/Domain/Repository/Mars/ANoteMarsRepo.cs
index a0d8e3a..a29d122 100644
--- a/UWPDDD/Domain/Repository/Mars/ANoteMarsRepo.cs
+++ b/UWPDDD/Domain/Repository/Mars/ANoteMarsRepo.cs
@@ -20,6 +20,11 @@ public IEnumerable<ANote> GetAll()
             throw new NotImplementedException();
         }
 
+        public string GetContent(int id)
+        {
+            throw new NotImplementedException();
+        }
+
         public ANote GetOne(int id)
         {
             throw new NotImplementedException();
diff --git a/UWPDDD/Domain/Repository/WebService/ANoteWebRepo.cs b/UWPDDD/Domain/Repository/WebService/ANoteWebRepo.cs
index fb8e489..2df62cc 100644
--- a/UWPDDD/Domain/Repository/WebService/ANoteWebRepo.cs
+++ b/UWPDDD/Domain/Repository/WebService/ANoteWebRepo.cs
@@ -20,6 +20,11 @@ public IEnumerable<ANote> GetAll()
             throw new NotImplementedException();
         }
 
+        public string GetContent(int id)
+        {
+            throw new NotImplementedException();
+        }
+
         public ANote GetOne(int id)
         {
             throw new NotImplementedException();
diff --git a/UWPDDD/Infrastructure/Database/ANoteData.cs b/UWPDDD/Infrastructure/Database/ANoteData.cs
index 7215947..1be1977 100644
--- a/UWPDDD/Infrastructure/Database/ANoteData.cs
+++ b/UWPDDD/Infrastructure/Database/ANoteData.cs
@@ -45,6 +45,19 @@ public IEnumerable<Dictionary<string,object>> GetAll()
             }
         }
 
+        public string GetContentByID(int id)
+        {
+            const string GETCONTENT_SQL = @"SELECT Content FROM ANote WHERE ID=?";
+            using (var statement = con.Prepare(GETCONTENT_SQL))
+            {
+                var result = statement.Step();
+                if (result == SQLiteResult.ROW)
+                    return statement[0].ToString();
+                else
+                    return string.Empty;
+            }
+        }
+
         public void Insert(string addDateTime,
                                   string editDateTime,
                                   string title,
diff --git a/UWPDDD/UWPDDD/App.xaml b/UWPDDD/UWPDDD/App.xaml
index 1fc9ec4..371bdca 100644
--- a/UWPDDD/UWPDDD/App.xaml
+++ b/UWPDDD/UWPDDD/App.xaml
@@ -2,7 +2,17 @@
     x:Class="UWPDDD.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:UWPDDD"
+    xmlns:vm="using:ViewModel"
     RequestedTheme="Light">
 
+    <Application.Resources>
+        <vm:ViewModelLocator x:Key="VMLocator"/>
+        <Style TargetType="TextBlock" x:Key="SmallText">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Foreground" Value="#FF787474"/>
+        </Style>
+    </Application.Resources>
 </Application>
diff --git a/UWPDDD/UWPDDD/MainPage.xaml b/UWPDDD/UWPDDD/MainPage.xaml
index 12ca1eb..7030feb 100644
--- a/UWPDDD/UWPDDD/MainPage.xaml
+++ b/UWPDDD/UWPDDD/MainPage.xaml
@@ -3,11 +3,65 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:UWPDDD"
+    xmlns:vm="using:ViewModel"
+    x:Name="Main"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    DataContext="{Binding NoteList, Source={StaticResource VMLocator}}">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <local:NoteListControl/>
+    <Grid Background="White">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Background="#AAA4A4A4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Button Content="菜单" Height="40" Background="Transparent"/>
+            <Button Content="新建" Height="40" Grid.Column="2" Background="Transparent"/>
+            <TextBlock Text="A-NoteBook" Grid.Column="1" VerticalAlignment="Center" FontFamily="微软雅黑" FontSize="24" FontWeight="Bold" TextAlignment="Center"/>
+        </Grid>
+        <AutoSuggestBox Grid.Row="1" Margin="20,7,20,5" Background="Transparent" 
+                        PlaceholderText="搜索标题" QueryIcon="Zoom" />
+        <ListView x:Name="NoteListView" Grid.Row="2"  Padding="5,0,5,0"
+                  ItemsSource="{Binding NoteList}"
+                  SelectedItem="{Binding SelectedNote}">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid Margin="0,2,0,2"  BorderBrush="LightGray" BorderThickness="2" 
+                          CornerRadius="5" Tapped="Grid_Tapped" Background="#AAF0ECEC">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock VerticalAlignment="Center" Text="{Binding AddDateTime}" 
+                                       FontSize="12" Margin="10,5,10,0"/>
+                        <TextBlock Grid.Row="0" Grid.Column="2" Margin="10,5,10,0" 
+                                       VerticalAlignment="Center" TextAlignment="Right" 
+                                       FontSize="12" Text="{Binding Category.Category}"/>
+                        <Border Grid.Row="1" Grid.ColumnSpan="3" Margin="5,2,5,5"
+                                BorderBrush="LightGray" BorderThickness="0,1,0,0">
+                            <TextBlock Text="{Binding Title}" VerticalAlignment="Center"
+                                           FontFamily="微软雅黑" FontSize="16" Margin="5,10,5,10"/>
+                        </Border>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </Page>
diff --git a/UWPDDD/UWPDDD/MainPage.xaml.cs b/UWPDDD/UWPDDD/MainPage.xaml.cs
index 6bbcaf2..5761cdc 100644
--- a/UWPDDD/UWPDDD/MainPage.xaml.cs
+++ b/UWPDDD/UWPDDD/MainPage.xaml.cs
@@ -3,6 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using UWPDDD.View;
+using ViewModel;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
@@ -22,9 +24,17 @@ namespace UWPDDD
     /// </summary>
     public sealed partial class MainPage : Page
     {
+        NoteListViewModel VM { get;}
+
         public MainPage()
         {
             this.InitializeComponent();
+            VM = DataContext as NoteListViewModel;
+        }
+
+        private void Grid_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(NoteInfoPage),NoteListView.SelectedItem);
         }
     }
 }
diff --git a/UWPDDD/UWPDDD/View.csproj b/UWPDDD/UWPDDD/View.csproj
index 3df3aa7..2962466 100644
--- a/UWPDDD/UWPDDD/View.csproj
+++ b/UWPDDD/UWPDDD/View.csproj
@@ -102,11 +102,8 @@
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\NoteInfoControl.xaml.cs">
-      <DependentUpon>NoteInfoControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\NoteListControl.xaml.cs">
-      <DependentUpon>NoteListControl.xaml</DependentUpon>
+    <Compile Include="View\NoteInfoPage.xaml.cs">
+      <DependentUpon>NoteInfoPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -135,11 +132,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\NoteInfoControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\NoteListControl.xaml">
+    <Page Include="View\NoteInfoPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/UWPDDD/UWPDDD/View/NoteInfoControl.xaml b/UWPDDD/UWPDDD/View/NoteInfoControl.xaml
deleted file mode 100644
index ffe7625..0000000
--- a/UWPDDD/UWPDDD/View/NoteInfoControl.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<UserControl
-    x:Class="UWPDDD.NoteInfoControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UWPDDD"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignHeight="300"
-    d:DesignWidth="400">
-
-    <Grid>
-
-    </Grid>
-</UserControl>
diff --git a/UWPDDD/UWPDDD/View/NoteInfoControl.xaml.cs b/UWPDDD/UWPDDD/View/NoteInfoControl.xaml.cs
deleted file mode 100644
index 877e523..0000000
--- a/UWPDDD/UWPDDD/View/NoteInfoControl.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
-
-namespace UWPDDD
-{
-    public sealed partial class NoteInfoControl : UserControl
-    {
-        public NoteInfoControl()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/UWPDDD/UWPDDD/View/NoteInfoPage.xaml b/UWPDDD/UWPDDD/View/NoteInfoPage.xaml
new file mode 100644
index 0000000..23f9c7d
--- /dev/null
+++ b/UWPDDD/UWPDDD/View/NoteInfoPage.xaml
@@ -0,0 +1,61 @@
+<Page
+    x:Class="UWPDDD.View.NoteInfoPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:UWPDDD.View"
+    xmlns:vm="using:ViewModel"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d" 
+    DataContext="{Binding NoteInfo, Source={StaticResource VMLocator}}">
+    <Page.Resources>
+        <Style TargetType="Button">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Height" Value="40"/>
+        </Style>
+    </Page.Resources>
+    <Grid Background="White">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid Background="#AAA4A4A4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Button Content="返回" Click="{x:Bind VM.Back}"/>
+            <Button Content="删除" Grid.Column="2"/>
+            <Button Content="分享" Grid.Column="3"/>
+        </Grid>
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+            <StackPanel Orientation="Vertical">
+                <TextBox Text="{Binding Note.Title}" Margin="0,10,0,0" Background="Transparent" 
+                     FontSize="18" BorderThickness="0" />
+                <Grid Padding="10,2,10,2" BorderThickness="0,1,0,1" BorderBrush="LightGray">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="添加时间:" Style="{StaticResource SmallText}" Margin="0,0,5,0"/>
+                    <TextBlock Text="{Binding Note.AddDateTime}" Grid.Column="1" Style="{StaticResource SmallText}"/>
+                    <TextBlock Text="所属分类:" Grid.Column="3" Style="{StaticResource SmallText}"/>
+                    <TextBlock Text="{Binding Note.Category.Category}" Margin="5" Style="{StaticResource SmallText}" Grid.Column="4"/>
+                </Grid>
+                <TextBox Text="{Binding Note.Content}" FontFamily="微软雅黑" FontSize="15"
+                 TextWrapping="Wrap" AcceptsReturn="True"
+                 BorderThickness="0" Margin="5"/>
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <TextBlock Style="{StaticResource SmallText}" Text="最后编辑:"/>
+                    <TextBlock Style="{StaticResource SmallText}" Text="{Binding Note.EditDateTime}" Margin="5,20,15,20"/>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+
+    </Grid>
+</Page>
diff --git a/UWPDDD/UWPDDD/View/NoteInfoPage.xaml.cs b/UWPDDD/UWPDDD/View/NoteInfoPage.xaml.cs
new file mode 100644
index 0000000..30dbdc1
--- /dev/null
+++ b/UWPDDD/UWPDDD/View/NoteInfoPage.xaml.cs
@@ -0,0 +1,41 @@
+using Domain.Model;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using ViewModel;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// “空白页”项模板在 http://go.microsoft.com/fwlink/?LinkId=234238 上提供
+
+namespace UWPDDD.View
+{
+    /// <summary>
+    /// 可用于自身或导航至 Frame 内部的空白页。
+    /// </summary>
+    public sealed partial class NoteInfoPage : Page
+    {
+
+        public NoteInfoViewModel VM { get; }
+
+        public NoteInfoPage()
+        {
+            this.InitializeComponent();
+            VM = DataContext as NoteInfoViewModel;
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+        }
+    }
+}
diff --git a/UWPDDD/UWPDDD/View/NoteListControl.xaml b/UWPDDD/UWPDDD/View/NoteListControl.xaml
deleted file mode 100644
index c224fb2..0000000
--- a/UWPDDD/UWPDDD/View/NoteListControl.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-<UserControl
-    x:Class="UWPDDD.NoteListControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UWPDDD"
-    xmlns:vm="using:ViewModel"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-    <UserControl.DataContext>
-        <vm:NoteListViewModel x:Name="VM"/>
-    </UserControl.DataContext>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid Background="LightGray"  Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Content="菜单" Height="40" Background="Transparent"/>
-            <Button Content="新建" Height="40" Grid.Column="2" Background="Transparent"/>
-            <TextBlock Text="A-NoteBook" Grid.Column="1" VerticalAlignment="Center" FontFamily="微软雅黑" FontSize="24" FontWeight="Bold" TextAlignment="Center"/>
-        </Grid>
-        <AutoSuggestBox Grid.Row="1" Margin="20,7,20,5" Background="Transparent" 
-                        PlaceholderText="搜索标题" QueryIcon="Zoom" />
-        <ListView Grid.Row="2"  Padding="5,0,5,0"
-                  ItemsSource="{Binding NoteList}">
-            <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                </Style>
-            </ListView.ItemContainerStyle>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid Margin="0,2,0,2"  BorderBrush="LightGray" BorderThickness="2" CornerRadius="5" Background="#FFF0ECEC">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBlock VerticalAlignment="Center" Text="{Binding AddDateTime}" 
-                                       FontSize="12" Margin="10,5,10,0"/>
-                            <TextBlock Grid.Row="0" Grid.Column="2" Margin="10,5,10,0" 
-                                       VerticalAlignment="Center" TextAlignment="Right" 
-                                       FontSize="12" Text="{Binding Category.Category}"/>
-                        <Border Grid.Row="1" Grid.ColumnSpan="3" Margin="5,2,5,5"
-                                BorderBrush="LightGray" BorderThickness="0,1,0,0">
-                            <TextBlock Text="{Binding Title}" VerticalAlignment="Center"
-                                           FontFamily="微软雅黑" FontSize="16" Margin="5,10,5,10"/>
-                        </Border>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</UserControl>
diff --git a/UWPDDD/UWPDDD/View/NoteListControl.xaml.cs b/UWPDDD/UWPDDD/View/NoteListControl.xaml.cs
deleted file mode 100644
index 6689286..0000000
--- a/UWPDDD/UWPDDD/View/NoteListControl.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
-
-namespace UWPDDD
-{
-    public sealed partial class NoteListControl : UserControl
-    {
-        public NoteListControl()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/UWPDDD/ViewModel/NoteInfoViewModel.cs b/UWPDDD/ViewModel/NoteInfoViewModel.cs
index 79272f2..ed8a376 100644
--- a/UWPDDD/ViewModel/NoteInfoViewModel.cs
+++ b/UWPDDD/ViewModel/NoteInfoViewModel.cs
@@ -4,10 +4,82 @@
 using System.Text;
 using System.Threading.Tasks;
 using AyxMVVM;
+using Domain.Model;
+using AyxMVVM.Command;
+using Windows.UI.Xaml;
+using Windows.UI.Popups;
+using Windows.UI.Xaml.Controls;
 
 namespace ViewModel
 {
-    public class NoteInfoViewModel:ObserveObject
+    public class NoteInfoViewModel:ViewModelBase
     {
+        private ANote _Note;
+
+        public ANote Note
+        {
+            get { return _Note; }
+            set
+            {
+                if (_Note != value)
+                {
+                    value.UpdateContent();
+                    _Note = value;
+                    RaisePropertyChanged("Note");
+                }
+            }
+        }
+
+        public NoteInfoViewModel()
+        {
+        }
+
+        public void Back(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                Frame.GoBack();
+            }
+            catch { }
+        }
+
+        private AyxCommand _CmdBack;
+
+        /// <summary>
+        /// Gets the CmdBack.
+        /// </summary>
+        public AyxCommand CmdBack
+        {
+            get
+            {
+                if (_CmdBack == null)
+                    _CmdBack = new AyxCommand(
+                    () =>
+                    {
+                        new MessageDialog("test").ShowAsync();
+                    });
+                return _CmdBack;
+            }
+        }
+
+        public override void InitTestData()
+        {
+            Note = new ANote
+            {
+                AddDateTime = DateTime.Now.ToString(),
+                EditDateTime = DateTime.Now.ToString(),
+                Title = "测试信息这是测试信息！",
+                Content = @"新华网北京10月26日电 联合国教科文组织第九届青年论坛26日在巴黎开幕。国家主席习近平发去贺词，代表中国政府和人民，对论坛的举行表示热烈的祝贺。贺词全文如下：
+习近平主席在联合国教科文组织第九届青年论坛开幕式上的贺词
+亲爱的青年朋友们：
+值此第九届青年论坛开幕暨联合国教科文组织成立70周年之际，我谨代表中国政府和人民，并以我个人的名义，对论坛的举行表示热烈的祝贺！本届论坛以“推动可持续发展，塑造全球公民”为主题，对促进可持续发展、开展文明对话具有重要意义。前不久，联合国可持续发展峰会通过了2030年可持续发展议程。落实好项议程确定的目标，建立一个公平、包容、可持续的地球，是包括全球青年在内的每个人都要重视和担当的责任。",
+                Category = new ACategory { Category = "默认分类" },
+            };
+        }
+
+        public override void InitRealData()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/UWPDDD/ViewModel/NoteListViewModel.cs b/UWPDDD/ViewModel/NoteListViewModel.cs
index 2192c64..2015bf6 100644
--- a/UWPDDD/ViewModel/NoteListViewModel.cs
+++ b/UWPDDD/ViewModel/NoteListViewModel.cs
@@ -6,10 +6,11 @@
 using AyxMVVM;
 using System.Collections.ObjectModel;
 using Domain.Model;
+using Domain.Repository;
 
 namespace ViewModel
 {
-    public class NoteListViewModel:ObserveObject
+    public class NoteListViewModel:ViewModelBase
     {
         private ObservableCollection<ANote> _NoteList;
         public ObservableCollection<ANote> NoteList
@@ -26,6 +27,11 @@ public ObservableCollection<ANote> NoteList
         }
 
         public NoteListViewModel()
+        {
+            
+        }
+
+        public override void InitTestData()
         {
             NoteList = new ObservableCollection<ANote>
             {
@@ -87,5 +93,12 @@ public NoteListViewModel()
                 }
             };
         }
+
+        public override void InitRealData()
+        {
+            var notes = Repositories.ANoteRepository.GetAll();
+            if (notes == null) return;
+            NoteList = new ObservableCollection<ANote>(notes);
+        }
     }
 }
diff --git a/UWPDDD/ViewModel/ViewModel.csproj b/UWPDDD/ViewModel/ViewModel.csproj
index 424d550..6bd63b1 100644
--- a/UWPDDD/ViewModel/ViewModel.csproj
+++ b/UWPDDD/ViewModel/ViewModel.csproj
@@ -110,6 +110,7 @@
     <Compile Include="NoteInfoViewModel.cs" />
     <Compile Include="NoteListViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ViewModelLocator.cs" />
     <Content Include="Properties\ViewModel.rd.xml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/UWPDDD/ViewModel/ViewModelLocator.cs b/UWPDDD/ViewModel/ViewModelLocator.cs
new file mode 100644
index 0000000..be0b596
--- /dev/null
+++ b/UWPDDD/ViewModel/ViewModelLocator.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using AyxMVVM;
+
+namespace ViewModel
+{
+    public class ViewModelLocator:VMLocatorBase
+    {
+        private NoteListViewModel _noteList;
+
+        public NoteListViewModel NoteList
+        {
+            get
+            {
+                if (_noteList == null)
+                {
+                    _noteList = GetViewModel<NoteListViewModel>();
+                }
+                return _noteList;
+            }
+        }
+
+        private NoteInfoViewModel _noteInfo;
+
+        public NoteInfoViewModel NoteInfo
+        {
+            get
+            {
+                if (_noteInfo == null)
+                {
+                    _noteInfo = GetViewModel<NoteInfoViewModel>();
+                }
+                return _noteInfo;
+            }
+        }
+
+
+    }
+}