diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485082603520.gif b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485082603520.gif new file mode 100644 index 00000000..d0be1ed6 Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485082603520.gif differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485116157952.png b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485116157952.png new file mode 100644 index 00000000..dc4b7124 Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485116157952.png differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485124546560.gif b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485124546560.gif new file mode 100644 index 00000000..d916a66d Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447485124546560.gif differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538480287744.gif b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538480287744.gif new file mode 100644 index 00000000..d0be1ed6 Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538480287744.gif differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538488676352.png b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538488676352.png new file mode 100644 index 00000000..dc4b7124 Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538488676352.png differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538509647872.gif b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538509647872.gif new file mode 100644 index 00000000..d916a66d Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Image/1580447538509647872.gif differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index cb071cce..e46999f6 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs new file mode 100644 index 00000000..7b4d9814 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs @@ -0,0 +1,27 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Model.SeedData +{ + public class FileSeed : AbstractSeed + { + public override List GetSeed() + { + FileEntity file1 = new FileEntity() + { + Id = 0, + FilePath = "Image", + FileType = "", + IsDeleted = false, + FileName = "0.jpg" + }; + Entitys.Add(file1); + return Entitys; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs index d6cedacf..27defca5 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs @@ -40,6 +40,11 @@ namespace Yi.Framework.Model.SeedData { return new DeptSeed().GetSeed(); } + + public static List GetFileSeed() + { + return new FileSeed().GetSeed(); + } public static List GetUserRoleSeed(List users, List roles) { List userRoleEntities = new(); diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs index e8b1270d..e16171a0 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs @@ -23,6 +23,7 @@ namespace Yi.Framework.WebCore.DbExtend var posts = SeedFactory.GetPostSeed(); var dictinfos = SeedFactory.GetDictionaryInfoSeed(); var depts = SeedFactory.GetDeptSeed(); + var files = SeedFactory.GetFileSeed(); try { _Db.AsTenant().BeginTran(); @@ -68,6 +69,12 @@ namespace Yi.Framework.WebCore.DbExtend { _Db.Insertable(SeedFactory.GetRoleMenuSeed(roles, menus)).ExecuteCommand(); } + + if (!_Db.Queryable().Any()) + { + _Db.Insertable(files).ExecuteCommand(); + } + _Db.AsTenant().CommitTran(); res = true; } diff --git a/Yi.Vue3.x.Vant/components.d.ts b/Yi.Vue3.x.Vant/components.d.ts index c2a4e70d..f9d48ee6 100644 --- a/Yi.Vue3.x.Vant/components.d.ts +++ b/Yi.Vue3.x.Vant/components.d.ts @@ -9,6 +9,7 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AppCreateTime: typeof import('./src/components/AppCreateTime.vue')['default'] AppGrid: typeof import('./src/components/AppGrid.vue')['default'] + AppUserIcon: typeof import('./src/components/AppUserIcon.vue')['default'] HelloWorld: typeof import('./src/components/HelloWorld.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/Yi.Vue3.x.Vant/src/components/AppUserIcon.vue b/Yi.Vue3.x.Vant/src/components/AppUserIcon.vue new file mode 100644 index 00000000..e49c2268 --- /dev/null +++ b/Yi.Vue3.x.Vant/src/components/AppUserIcon.vue @@ -0,0 +1,34 @@ + + + + diff --git a/Yi.Vue3.x.Vant/src/view/main/recommend.vue b/Yi.Vue3.x.Vant/src/view/main/recommend.vue index 75228783..6f7a2a97 100644 --- a/Yi.Vue3.x.Vant/src/view/main/recommend.vue +++ b/Yi.Vue3.x.Vant/src/view/main/recommend.vue @@ -10,12 +10,7 @@ > - + @@ -77,6 +72,7 @@ import { ref, onMounted, reactive, toRefs } from "vue"; import { ImagePreview, Toast } from "vant"; import AppCreateTime from "@/components/AppCreateTime.vue"; +import AppUserIcon from "@/components/AppUserIcon.vue"; import articleApi from "@/api/articleApi.ts"; import { ArticleEntity } from "@/type/interface/ArticleEntity.ts"; const VanImagePreview = ImagePreview.Component; @@ -172,7 +168,7 @@ const getList = () => { .rowBody { text-align: left; background-color: white; - min-height: 2rem; + margin-top: 1rem; margin-bottom: 1rem; } diff --git a/Yi.Vue3.x.Vant/src/view/my.vue b/Yi.Vue3.x.Vant/src/view/my.vue index 27ecb391..fabdc36c 100644 --- a/Yi.Vue3.x.Vant/src/view/my.vue +++ b/Yi.Vue3.x.Vant/src/view/my.vue @@ -9,12 +9,7 @@ - + {{user.nick}} (false); let data1: AppGridData = { head: "个人中心",