Browse Source

完成全部对接

master
С·æ 4 years ago
parent
commit
d50e07f848
  1. 2
      src/Coldairarrow.Business/HuiYan/catsBusiness.cs
  2. 2
      src/Coldairarrow.Web/.env
  3. 3
      客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
  4. 4
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
  5. 18
      客户端/齐越慧眼/齐越慧眼/Properties/PublishProfiles/FolderProfile.pubxml
  6. 2
      客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
  7. 4
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
  8. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  9. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
  10. 2
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

2
src/Coldairarrow.Business/HuiYan/catsBusiness.cs

@ -26,7 +26,7 @@ namespace Coldairarrow.Business.HuiYan
public async Task<List<CatTreeDTO>> GetTreeDataListAsync(CatsTreeInputDTO input)
{
var where = LinqHelper.True<cats>();
var where = LinqHelper.True<cats>().And(c => c.Type == 0);
if (!input.parentId.IsNullOrEmpty())
where = where.And(x => x.ParentId == input.parentId);

2
src/Coldairarrow.Web/.env

@ -5,7 +5,7 @@ VUE_APP_ProjectName=Colder框架
#首页路径
VUE_APP_DesktopPath=/Home/Introduce
#发布后接口根地址
VUE_APP_PublishRootUrl=http://localhost:5000
VUE_APP_PublishRootUrl=http://hyapi.qiyue666.com
#本地调试接口根地址
VUE_APP_LocalRootUrl=http://localhost:5000
#接口超时时间ms

3
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs

@ -10,7 +10,8 @@ namespace 齐越慧眼
{
public class ApiHelper
{
public static string ApiBase { get; set; } = "http://localhost:5000";
// public static string ApiBase { get; set; } = "http://localhost:5000";
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
public static string JwtToken { get; set; }

4
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml

@ -10,8 +10,8 @@
Background="White"
WindowStartupLocation="CenterScreen"
ActiveGlowColor="{DynamicResource PrimaryColor}"
Height="450"
Width="800"
Height="780"
Width="1280"
>
<Border Padding="0 10" Background="#EEEEEE">
<hc:TabControl IsAnimationEnabled="True" IsTabFillEnabled="False" TabItemWidth="150" Name="tab">

18
客户端/齐越慧眼/齐越慧眼/Properties/PublishProfiles/FolderProfile.pubxml

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>False</PublishReadyToRun>
<PublishTrimmed>False</PublishTrimmed>
</PropertyGroup>
</Project>

2
客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs

@ -367,7 +367,7 @@ namespace 齐越慧眼.UserControls
BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""bgYellow"">竞</div>')");
}
if (type == 1)
if (type == 0)
{
BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")");
}

4
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js

@ -8,10 +8,10 @@ axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
//'application/json;charset=utf-8';//
if (process.env.NODE_ENV == 'development') {
axios.defaults.baseURL = 'http://localhost:5000/';
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
}
else if (process.env.NODE_ENV == 'production') {
axios.defaults.baseURL = 'http://localhost:5000/';
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
}
let ipAddress = axios.defaults.baseURL;
axios.interceptors.request.use((config) => {

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

@ -87,8 +87,6 @@
<ItemGroup>
<Folder Include="vuepage\client\" />
<Folder Include="vuepage\client\dist\css\" />
<Folder Include="vuepage\client\dist\js\" />
</ItemGroup>
</Project>

Loading…
Cancel
Save