Browse Source

加入拼多多分类

master
feng 3 years ago
parent
commit
620f8e20b7
  1. 7
      src/Coldairarrow.Business/HuiYan/catsBusiness.cs
  2. 5
      src/Coldairarrow.Entity/DTO/TeamCatTimeDto.cs
  3. 5
      src/Coldairarrow.Entity/HuiYan/cats.cs
  4. 4
      src/Coldairarrow.Entity/HuiYan/teamcattime.cs
  5. 6
      src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs
  6. 2
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
  7. 5
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
  8. 2
      客户端/齐越慧眼/齐越慧眼/Properties/PublishProfiles/FolderProfile.pubxml
  9. 6
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
  10. 12
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue
  11. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  12. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
  13. 1
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

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

@ -258,7 +258,8 @@ namespace Coldairarrow.Business.HuiYan
{ {
LastTeamShowJDTime = b.LastShowJDTime, LastTeamShowJDTime = b.LastShowJDTime,
LastTeamShowPddTime = b.LastShowPddTime, LastTeamShowPddTime = b.LastShowPddTime,
LastTeamShowTBTime = b.LastShowTBTime LastTeamShowTBTime = b.LastShowTBTime,
LastTeamShowAlbbTime=b.LastShowAlbbTime
}; };
select = select.BuildExtendSelectExpre(); select = select.BuildExtendSelectExpre();
@ -282,9 +283,11 @@ namespace Coldairarrow.Business.HuiYan
IsShowJDTime = x.LastShowJDTime == null ? true : (DateTime.Now - x.LastShowJDTime.Value).TotalDays > 45, IsShowJDTime = x.LastShowJDTime == null ? true : (DateTime.Now - x.LastShowJDTime.Value).TotalDays > 45,
IsShowPddTime = x.LastShowPddTime == null ? true : (DateTime.Now - x.LastShowPddTime.Value).TotalDays > 45, IsShowPddTime = x.LastShowPddTime == null ? true : (DateTime.Now - x.LastShowPddTime.Value).TotalDays > 45,
IsShowTBTime = x.LastShowTBTime == null ? true : (DateTime.Now - x.LastShowTBTime.Value).TotalDays > 45, IsShowTBTime = x.LastShowTBTime == null ? true : (DateTime.Now - x.LastShowTBTime.Value).TotalDays > 45,
IsShowAlbbTime = x.LastShowAlbbTime == null ? true : (DateTime.Now - x.LastShowAlbbTime.Value).TotalDays > 45,
IsTeamShowJDTime = x.LastTeamShowJDTime == null ? true : (DateTime.Now - x.LastTeamShowJDTime.Value).TotalDays > 45, IsTeamShowJDTime = x.LastTeamShowJDTime == null ? true : (DateTime.Now - x.LastTeamShowJDTime.Value).TotalDays > 45,
IsTeamShowPddTime = x.LastTeamShowPddTime == null ? true : (DateTime.Now - x.LastTeamShowPddTime.Value).TotalDays > 45, IsTeamShowPddTime = x.LastTeamShowPddTime == null ? true : (DateTime.Now - x.LastTeamShowPddTime.Value).TotalDays > 45,
IsTeamShowTBTime = x.LastTeamShowTBTime == null ? true : (DateTime.Now - x.LastTeamShowTBTime.Value).TotalDays > 45 IsTeamShowTBTime = x.LastTeamShowTBTime == null ? true : (DateTime.Now - x.LastTeamShowTBTime.Value).TotalDays > 45,
IsTeamShowAlbbTime = x.LastTeamShowAlbbTime == null ? true : (DateTime.Now - x.LastTeamShowAlbbTime.Value).TotalDays > 45,
}).ToList(); }).ToList();
return TreeHelper.BuildTree(treeList); return TreeHelper.BuildTree(treeList);

5
src/Coldairarrow.Entity/DTO/TeamCatTimeDto.cs

@ -23,5 +23,10 @@ namespace Coldairarrow.Entity.DTO
/// 最后一次打开拼多多时间 /// 最后一次打开拼多多时间
/// </summary> /// </summary>
public DateTime? LastTeamShowPddTime { get; set; } public DateTime? LastTeamShowPddTime { get; set; }
/// <summary>
/// 最后一次打开阿里巴巴时间
/// </summary>
public DateTime? LastTeamShowAlbbTime { get; set; }
} }
} }

5
src/Coldairarrow.Entity/HuiYan/cats.cs

@ -62,6 +62,11 @@ namespace Coldairarrow.Entity.HuiYan
/// </summary> /// </summary>
public DateTime? LastShowPddTime { get; set; } public DateTime? LastShowPddTime { get; set; }
/// <summary>
/// 最后一次打开阿里巴巴时间
/// </summary>
public DateTime? LastShowAlbbTime { get; set; }
/// <summary> /// <summary>
/// 团队ID /// 团队ID
/// </summary> /// </summary>

4
src/Coldairarrow.Entity/HuiYan/teamcattime.cs

@ -56,6 +56,10 @@ namespace Coldairarrow.Entity.HuiYan
/// 最后一次拼多多查看 /// 最后一次拼多多查看
/// </summary> /// </summary>
public DateTime? LastShowPddTime { get; set; } public DateTime? LastShowPddTime { get; set; }
/// <summary>
/// 最一次打开阿里巴巴时间
/// </summary>
public DateTime? LastShowAlbbTime { get; set; }
} }
} }

6
src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs

@ -55,11 +55,17 @@ namespace Coldairarrow.Business.HuiYan
/// </summary> /// </summary>
public bool IsShowPddTime { get; set; } public bool IsShowPddTime { get; set; }
/// <summary>
/// 阿里巴巴时间是否超时
/// </summary>
public bool IsShowAlbbTime { get; set; }
public bool IsTeamShowTBTime { get; set; } public bool IsTeamShowTBTime { get; set; }
public bool IsTeamShowJDTime { get; set; } public bool IsTeamShowJDTime { get; set; }
public bool IsTeamShowPddTime { get; set; } public bool IsTeamShowPddTime { get; set; }
public bool IsTeamShowAlbbTime { get; set; }
} }
} }

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

@ -11,7 +11,7 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
ActiveGlowColor="{DynamicResource PrimaryColor}" ActiveGlowColor="{DynamicResource PrimaryColor}"
Height="780" Height="780"
Title="慧眼 V1.0.1.3" Title="慧眼 V1.0.1.4"
Width="1468" Icon="/icon.ico" Width="1468" Icon="/icon.ico"
> >
<Border Padding="0 10" Background="#EEEEEE"> <Border Padding="0 10" Background="#EEEEEE">

5
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs

@ -100,6 +100,11 @@ namespace 齐越慧眼
brower.NewTab($"https://s.1688.com/selloffer/offer_search.htm?keywords={keyWord}"); brower.NewTab($"https://s.1688.com/selloffer/offer_search.htm?keywords={keyWord}");
brower.albbRb.IsChecked = true; brower.albbRb.IsChecked = true;
break; break;
case 3:
keyWord = System.Web.HttpUtility.UrlEncode(keyWord, Encoding.GetEncoding("gb2312"));
brower.NewTab($"https://mobile.yangkeduo.com/search_result.html?search_key={keyWord}");
brower.albbRb.IsChecked = true;
break;
} }
}); });
} }

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

@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration>Location</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
<PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir> <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol> <PublishProtocol>FileSystem</PublishProtocol>

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

@ -10,8 +10,9 @@ let $httpVue = null, currentToken = '';
//'application/json;charset=utf-8';// //'application/json;charset=utf-8';//
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
//axios.defaults.baseURL = 'http://localhost:5000/';
currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA' currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA'
currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY5MDI1NTI1Nn0.McaUJU3XY_twiL5TI_-KBn9X_ePzLfsEIhgiZ274Bv0' // currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY5MDI1NTI1Nn0.McaUJU3XY_twiL5TI_-KBn9X_ePzLfsEIhgiZ274Bv0'
} }
else if (process.env.NODE_ENV == 'production') { else if (process.env.NODE_ENV == 'production') {
axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
@ -19,9 +20,8 @@ else if (process.env.NODE_ENV == 'production') {
let ipAddress = axios.defaults.baseURL; let ipAddress = axios.defaults.baseURL;
//axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';
//axios.defaults.baseURL = 'http://111.230.132.27:8033/'; //axios.defaults.baseURL = 'http://111.230.132.27:8033/';
axios.defaults.baseURL = 'http://localhost:5000/';
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
//axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken(); //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();

12
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue

@ -9,6 +9,9 @@
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="阿里巴巴"> <a-tab-pane key="2" tab="阿里巴巴">
</a-tab-pane>
<a-tab-pane key="3" tab="拼多多">
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@ -117,9 +120,14 @@
return keyword.IsShowTBTime?'red':'' return keyword.IsShowTBTime?'red':''
case 1: case 1:
case '1': case '1':
return keyword.IsShowJDTime?'red':'' return keyword.IsShowJDTime?'red':''
case 2: case 2:
case '2': case '2':
return keyword.IsShowAlbbTime?'red':''
case 3:
case '3':
return keyword.IsShowPddTime?'red':'' return keyword.IsShowPddTime?'red':''
} }
console.log(this.currentTab,'this.currentTab') console.log(this.currentTab,'this.currentTab')
@ -140,6 +148,10 @@
case 2: case 2:
case '2': case '2':
return keyword.IsTeamShowAlbbTime?'red':''
case 3:
case '3':
return keyword.IsTeamShowPddTime?'red':'' return keyword.IsTeamShowPddTime?'red':''
} }
console.log(this.currentTab,'this.currentTab') console.log(this.currentTab,'this.currentTab')

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

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

@ -114,6 +114,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="vuepage\client\" /> <Folder Include="vuepage\client\" />
<Folder Include="vuepage\client\dist\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

Loading…
Cancel
Save