@@ -40,7 +40,7 @@ namespace HKCardOUT | |||||
DataBus.SaasRoute = configer["SaasRoute"]; | DataBus.SaasRoute = configer["SaasRoute"]; | ||||
DataBus.StoreId = configer["StoreId"]; | DataBus.StoreId = configer["StoreId"]; | ||||
DbContext.InitTable(); | DbContext.InitTable(); | ||||
//RemoteService.PullShopInfo(); | |||||
RemoteService.PullShopInfo(); | |||||
base.Configure(); | base.Configure(); | ||||
} | } | ||||
@@ -16,5 +16,6 @@ namespace DTO | |||||
set => SetAndNotify(ref _IsActive, value); | set => SetAndNotify(ref _IsActive, value); | ||||
} | } | ||||
public string Ad { get; set; } | public string Ad { get; set; } | ||||
public string Stalls { get; set; } | |||||
} | } | ||||
} | } |
@@ -40,11 +40,12 @@ namespace HKCardOUT.Logic | |||||
/// </summary> | /// </summary> | ||||
public static void PullShopInfo() | public static void PullShopInfo() | ||||
{ | { | ||||
IHttpMultiClient.HttpMulti.AddNode(t => | |||||
var data = IHttpMultiClient.HttpMulti.AddNode(t => | |||||
{ | { | ||||
t.NodePath = ApiRoute.PullShopInfo; | t.NodePath = ApiRoute.PullShopInfo; | ||||
}).Build().RunStringFirst() | }).Build().RunStringFirst() | ||||
.ToModel<JObject>()["data"].ToJson().ToModel<StoreInfoResponse>(); | .ToModel<JObject>()["data"].ToJson().ToModel<StoreInfoResponse>(); | ||||
DataBus.StoreInfo = data; | |||||
} | } | ||||
} | } | ||||
} | } |
@@ -33,7 +33,8 @@ namespace HKCardOUT.ViewModels | |||||
{ | { | ||||
Ad = x.Remaek, | Ad = x.Remaek, | ||||
IsActive = false, | IsActive = false, | ||||
Device = $"{x.Name}({t.Name})" | |||||
Device =t.Name, | |||||
Stalls=x.Name | |||||
}).ToList(); | }).ToList(); | ||||
if (Init != null) | if (Init != null) | ||||
Ad = new ObservableCollection<AdDTO>(Init); | Ad = new ObservableCollection<AdDTO>(Init); | ||||
@@ -53,7 +53,7 @@ | |||||
<ListBox.ItemTemplate> | <ListBox.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Button | <Button | ||||
Width="100" | |||||
Width="160" | |||||
Height="80" | Height="80" | ||||
Margin="20,0,0,0" | Margin="20,0,0,0" | ||||
s:View.ActionTarget="{Binding DataContext, ElementName=Main}" | s:View.ActionTarget="{Binding DataContext, ElementName=Main}" | ||||
@@ -67,7 +67,13 @@ | |||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
FontSize="18" | FontSize="18" | ||||
FontWeight="Bold" | FontWeight="Bold" | ||||
Text="{Binding Device}" /> | |||||
Text="{Binding Stalls, StringFormat=档口:{0}}" /> | |||||
<TextBlock | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
FontSize="18" | |||||
FontWeight="Bold" | |||||
Text="{Binding Device, StringFormat=设备:{0}}" /> | |||||
<TextBlock | <TextBlock | ||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
@@ -1,7 +1,7 @@ | |||||
{ | { | ||||
"SaasRoute": "https://bpa.black-pa.com:21527/kitchen/", | "SaasRoute": "https://bpa.black-pa.com:21527/kitchen/", | ||||
"Cron": "0 0 11,15 * * ? ", | "Cron": "0 0 11,15 * * ? ", | ||||
"StoreId": "", | |||||
"StoreId": "0ff87696-957b-475a-9dbf-41eae349dab4", | |||||
"ConnectionStrings": { | "ConnectionStrings": { | ||||
"Sqlite": "HKSQL.db3" | "Sqlite": "HKSQL.db3" | ||||
} | } | ||||