cgx/petwash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化UI

Browse Source
This commit is contained in:
GukSang.Jin
2026-02-26 17:10:29 +08:00
parent 779162d064
commit 1e37d8056e
7 changed files with 123 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PetWash.Api/petwash.db
View File

Binary file not shown.

BIN
PetWash.Api/petwash.db-shm
View File

Binary file not shown.

BIN
PetWash.Api/petwash.db-wal
View File

Binary file not shown.

BIN
PetWashControl/Images/kef.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 MiB

1
PetWashControl/PetWashControl.csproj
View File

@@ -20,6 +20,7 @@
<Resource Include="Images\dog.png" /> <Resource Include="Images\dog.png" />
<Resource Include="Images\dog1.png" /> <Resource Include="Images\dog1.png" />
<Resource Include="Images\dog2.png" /> <Resource Include="Images\dog2.png" />
<Resource Include="Images\kef.png" />
<Resource Include="Images\liuc.png" /> <Resource Include="Images\liuc.png" />
<Resource Include="Images\qrcode.png" /> <Resource Include="Images\qrcode.png" />
</ItemGroup> </ItemGroup>

17
PetWashControl/ViewModels/MainViewModel.cs
View File

@@ -88,6 +88,9 @@ public partial class MainViewModel : ObservableObject
[ObservableProperty] [ObservableProperty]
private bool _isInstructionDialogOpen; private bool _isInstructionDialogOpen;
[ObservableProperty]
private bool _isCustomerServiceDialogOpen;
private readonly System.Timers.Timer _carouselTimer; private readonly System.Timers.Timer _carouselTimer;
private readonly System.Timers.Timer _clockTimer; private readonly System.Timers.Timer _clockTimer;
private readonly string[] _carouselImages = { "/Images/dog.png", "/Images/dog1.png", "/Images/dog2.png" }; private readonly string[] _carouselImages = { "/Images/dog.png", "/Images/dog1.png", "/Images/dog2.png" };
@@ -220,6 +223,20 @@ public partial class MainViewModel : ObservableObject
_logger.LogInfo("关闭使用说明"); _logger.LogInfo("关闭使用说明");
} }
[RelayCommand]
private void ShowCustomerService()
{
IsCustomerServiceDialogOpen = true;
_logger.LogInfo("显示联系客服");
}
[RelayCommand]
private void CloseCustomerService()
{
IsCustomerServiceDialogOpen = false;
_logger.LogInfo("关闭联系客服");
}
[RelayCommand] [RelayCommand]
private void BackToIdle() private void BackToIdle()
{ {

107
PetWashControl/Views/MainWindow.xaml
View File

@@ -561,7 +561,8 @@
<Button Content="📞 联系客服" <Button Content="📞 联系客服"
Height="70" Height="70"
Margin="5" Margin="5"
Style="{StaticResource RoundButton}"/> Style="{StaticResource RoundButton}"
Command="{Binding ShowCustomerServiceCommand}"/>
<Button Content="⚙ 设置" <Button Content="⚙ 设置"
Height="70" Height="70"
Margin="5" Margin="5"
@@ -1635,7 +1636,7 @@
<Border Background="White" <Border Background="White"
CornerRadius="20" CornerRadius="20"
MaxWidth="1000" MaxWidth="1000"
MaxHeight="800" MaxHeight="700"
Padding="0" Padding="0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"> VerticalAlignment="Center">
@@ -1730,5 +1731,107 @@
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
<!-- 联系客服弹窗 -->
<Grid Visibility="{Binding IsCustomerServiceDialogOpen, Converter={StaticResource BoolToVisibilityConverter}}"
Background="#80000000">
<Border Background="White"
CornerRadius="20"
MaxWidth="800"
MaxHeight="600"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Border.Effect>
<DropShadowEffect Color="#000000" BlurRadius="30" ShadowDepth="10" Opacity="0.5"/>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!-- 标题栏 -->
<Border Grid.Row="0"
Background="#FF6F00"
CornerRadius="20,20,0,0"
Padding="30,20">
<Grid>
<TextBlock Text="联系客服"
FontSize="28"
FontWeight="Bold"
Foreground="White"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<Button Content="✕"
FontSize="24"
Width="40"
Height="40"
Background="Transparent"
Foreground="White"
BorderThickness="0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Cursor="Hand"
Command="{Binding CloseCustomerServiceCommand}">
<Button.Template>
<ControlTemplate TargetType="Button">
<Border Background="{TemplateBinding Background}"
CornerRadius="20">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
</Button.Template>
</Button>
</Grid>
</Border>
<!-- 图片内容区 -->
<Border Grid.Row="1"
Padding="20"
Background="White"
MinHeight="400">
<Grid>
<!-- 图片 -->
<Image x:Name="CustomerServiceImage"
Stretch="Uniform"
HorizontalAlignment="Center"
VerticalAlignment="Center"
RenderOptions.BitmapScalingMode="HighQuality">
<Image.Source>
<BitmapImage UriSource="/Images/kef.png"
CacheOption="OnLoad"
CreateOptions="IgnoreColorProfile"/>
</Image.Source>
</Image>
<!-- 加载失败时的提示 -->
<TextBlock Text="客服联系方式"
FontSize="24"
Foreground="#999"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Visibility="Collapsed"/>
</Grid>
</Border>
<!-- 底部按钮 -->
<Border Grid.Row="2"
Padding="30,20"
Background="White"
CornerRadius="0,0,20,20">
<Button Content="关闭"
Height="50"
Width="200"
FontSize="20"
FontWeight="Bold"
Style="{StaticResource RoundButton}"
Command="{Binding CloseCustomerServiceCommand}"/>
</Border>
</Grid>
</Border>
</Grid>
</Grid> </Grid>
</Window> </Window>