Merge branch 'develop'
This commit is contained in:
@@ -60,7 +60,7 @@
|
||||
string answ = "";
|
||||
if (CurrItem != null)
|
||||
{
|
||||
answ = $"{BaseUrl}&MatrOpr={CurrItem.MatrOpr}&UserAuthKey={CurrItem.AuthKey}";
|
||||
answ = $"{BaseUrl}MatrOpr={CurrItem.MatrOpr}&UserAuthKey={CurrItem.AuthKey}";
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
@foreach (var item in ListRecords)
|
||||
{
|
||||
<div class="col-6 my-2 userCard">
|
||||
<UserCard CurrItem="@item" BaseUrl="@BaseUrl" Environment="@Environment"></UserCard>
|
||||
<UserCard CurrItem="@item" BaseUrl="@BaseUrlTab" Environment="@Environment"></UserCard>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
@@ -63,9 +63,9 @@ namespace MP.Land.Pages
|
||||
[Inject]
|
||||
protected MessageService AppMService { get; set; }
|
||||
|
||||
protected string BaseUrl
|
||||
protected string BaseUrlTab
|
||||
{
|
||||
get => Configuration["BaseUrl"];
|
||||
get => $"{Configuration["BaseUrl"]}{Configuration["QrJumpPath"]}";
|
||||
}
|
||||
|
||||
[Inject]
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"BaseUrl": "IIS01",
|
||||
"BaseUrl": "https://IIS01/",
|
||||
"Environment": "Steam STAG"
|
||||
}
|
||||
@@ -15,6 +15,7 @@
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"BaseUrl": "https://localhost:44309/",
|
||||
"QrJumpPath": "MP/TAB/jumper?",
|
||||
"Environment": "Steam DEV",
|
||||
"downloadPath": "C:\\Steamware\\installers\\MP",
|
||||
"appVers": "stable",
|
||||
|
||||
Reference in New Issue
Block a user