From 59d6e51cdb7fbb0073ed29bf0b3f34277f75b895 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 30 Mar 2023 17:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=B3=E6=8E=A2=E9=87=87=E8=B4=AD=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Setting/ShopSettingViewModel.cs           |  8 +++
 BBWY.Client/Views/Setting/ShopSetting.xaml    | 68 ++++++++++++-------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs b/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs
index ddf919fe..9c8c108e 100644
--- a/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs
+++ b/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs
@@ -147,6 +147,14 @@ namespace BBWY.Client.ViewModels
                 MessageBox.Show("店铺密码验证未通过", "保存店铺设置");
                 return;
             }
+
+            if (PurchaseAccount.PurchasePlatformId == Platform.拳探)
+            {
+                PurchaseAccount.AppKey = "BBWY2023022001";
+                PurchaseAccount.AppSecret = "908e131365d5448ca651ba20ed7ddefe";
+                PurchaseAccount.AppToken = PurchaseAccount.AccountName;
+            }
+
             if (string.IsNullOrEmpty(PurchaseAccount.AppKey) ||
                 string.IsNullOrEmpty(PurchaseAccount.AppSecret) ||
                 string.IsNullOrEmpty(PurchaseAccount.AppToken) ||
diff --git a/BBWY.Client/Views/Setting/ShopSetting.xaml b/BBWY.Client/Views/Setting/ShopSetting.xaml
index 852e73e6..e450b056 100644
--- a/BBWY.Client/Views/Setting/ShopSetting.xaml
+++ b/BBWY.Client/Views/Setting/ShopSetting.xaml
@@ -88,45 +88,63 @@
                            Foreground="{Binding PanelIndex,Converter={StaticResource objConverter},ConverterParameter=2:White:#4A4A4A}"/>
             </StackPanel>
 
-            <Grid Grid.Row="2" Margin="20,0" Visibility="{Binding PanelIndex,Converter={StaticResource objConverter},ConverterParameter=0:Visible:Collapsed}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-
-                <TextBlock Text="采购平台" Style="{StaticResource textblockPropertyStyle}"/>
-                <ComboBox ItemsSource="{Binding Source={StaticResource PlatformProvider}}" Grid.Column="1"
+            <StackPanel Grid.Row="2" Margin="20,0" Visibility="{Binding PanelIndex,Converter={StaticResource objConverter},ConverterParameter=0:Visible:Collapsed}">
+                <Grid Margin="0,10,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="采购平台" Style="{StaticResource textblockPropertyStyle}"/>
+                    <ComboBox ItemsSource="{Binding Source={StaticResource PlatformProvider}}" Grid.Column="1"
                       SelectedItem="{Binding PurchasePlatform,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                       DisplayMemberPath="."
                       Height="25"
                       Width="150"
                       HorizontalAlignment="Left"
                       VerticalContentAlignment="Center"/>
+                </Grid>
 
-                <TextBlock Text="账号名称" Style="{StaticResource textblockPropertyStyle}" Grid.Row="1"/>
-                <c:BTextBox Grid.Column="1" Style="{StaticResource textboxValueStyle}" Grid.Row="1"
+                <Grid Margin="0,10,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="{Binding PurchasePlatform,ConverterParameter=拳探:用户账号:账号名称,Converter={StaticResource objConverter}}" Style="{StaticResource textblockPropertyStyle}" Grid.Row="1"/>
+                    <c:BTextBox Grid.Column="1" Style="{StaticResource textboxValueStyle}" Grid.Row="1"
                         Text="{Binding PurchaseAccount.AccountName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                </Grid>
 
-                <TextBlock Text="AppKey" Style="{StaticResource textblockPropertyStyle}" Grid.Row="2"/>
-                <c:BTextBox Grid.Column="1" Grid.Row="2"
+                <Grid Margin="0,10,0,0"
+                      Visibility="{Binding PurchasePlatform,ConverterParameter=拳探:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="AppKey" Style="{StaticResource textblockPropertyStyle}" Grid.Row="2"/>
+                    <c:BTextBox Grid.Column="1" Grid.Row="2"
                         Text="{Binding PurchaseAccount.AppKey,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                </Grid>
 
-                <TextBlock Text="AppSecret" Style="{StaticResource textblockPropertyStyle}" Grid.Row="3"/>
-                <c:BTextBox Grid.Column="1" Grid.Row="3"
+                <Grid Margin="0,10,0,0" Visibility="{Binding PurchasePlatform,ConverterParameter=拳探:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="AppSecret" Style="{StaticResource textblockPropertyStyle}" Grid.Row="3"/>
+                    <c:BTextBox Grid.Column="1" Grid.Row="3"
                         Text="{Binding PurchaseAccount.AppSecret,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                </Grid>
 
-                <TextBlock Text="AppToken" Style="{StaticResource textblockPropertyStyle}" Grid.Row="4"/>
-                <c:BTextBox Grid.Column="1" Grid.Row="4"
+                <Grid Margin="0,10,0,0" Visibility="{Binding PurchasePlatform,ConverterParameter=拳探:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="AppToken" Style="{StaticResource textblockPropertyStyle}" Grid.Row="4"/>
+                    <c:BTextBox Grid.Column="1" Grid.Row="4"
                         Text="{Binding PurchaseAccount.AppToken,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-            </Grid>
+                </Grid>
+            </StackPanel>
 
             <Grid Grid.Row="2" Margin="20,0" Visibility="{Binding PanelIndex,Converter={StaticResource objConverter},ConverterParameter=1:Visible:Collapsed}">
                 <Grid.RowDefinitions>