完善推荐页显示

2022-10-16 22:51:53 +08:00
parent 6d99539730
commit 50d43a2fc5
8 changed files with 33 additions and 26 deletions
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs
@@ -50,7 +50,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        public override Task<Result> Add(ArticleEntity entity)
        {
            //如果标题为空，默认为内容的前20个字符
-            entity.Title = string.IsNullOrEmpty(entity.Title) ? entity.Content.Substring(0, 20): entity.Title;
+            entity.Title = string.IsNullOrEmpty(entity.Title) ? 
+                (entity.Content.Length > 20 ? entity.Content.Substring(0, 20) : entity.Content) :
+                entity.Title;
            entity.UserId = HttpContext.GetUserIdInfo();
            return base.Add(entity);
        }
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/FileController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/FileController.cs
@@ -56,10 +56,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
            try
            {
                //路径为： 文件路径/文件id+文件扩展名
-                var path = Path.Combine($"{PathConst.wwwroot}/{file.FilePath}", file.Id.ToString()+ Path.GetExtension(file.FileName));
+                var path = Path.Combine($"{PathConst.wwwroot}/{file.FilePath}", file.Id.ToString() + Path.GetExtension(file.FileName));
                var stream = System.IO.File.OpenRead(path);
                var MimeType = Common.Helper.MimeHelper.GetMimeMapping(file.FileName);
-                return  File(stream, MimeType, file.FileName);
+                return File(stream, MimeType, file.FileName);
            }
            catch
            {
@@ -76,22 +76,18 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        /// <returns></returns>
        [Route("/api/file/Upload/{type?}")]
        [HttpPost]
-        public async Task<Result> Upload([FromRoute] string? type, [FromForm] IFormFileCollection file,[FromQuery] string? remark)
+        public async Task<Result> Upload([FromRoute] string? type, [FromForm] IFormFileCollection file, [FromQuery] string? remark)
        {
-            if (type is null)
+            type = type ?? PathEnum.File.ToString();
+
+            type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(type.ToLower());
+            if (!Enum.IsDefined(typeof(PathEnum), type))
            {
-                type = PathEnum.File.ToString();
-            }
-            else
-            {
-                type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(type!.ToLower());
-                if (!Enum.IsDefined(typeof(PathEnum), type))
-                {
-                    //后续类型可从字典表中获取
-                    return Result.Error("上传失败！文件类型不支持！");
-                }
+                //后续类型可从字典表中获取
+                return Result.Error("上传失败！文件类型不支持！");
            }

+
            if (file.Count() == 0)
            {
                return Result.Error("未选择文件");
@@ -118,7 +114,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
                    string filename = data.Id.ToString() + Path.GetExtension(f.FileName);
                    string typePath = $"{PathConst.wwwroot}/{type}";
                    if (!Directory.Exists(typePath))
-                    { 
+                    {
                        Directory.CreateDirectory(typePath);
                    }
                    using (var stream = new FileStream(Path.Combine(typePath, filename), FileMode.CreateNew, FileAccess.Write))
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
--- a/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs
@@ -11,14 +11,14 @@ namespace Yi.Framework.Common.Helper
    {
        public static List<T> SetTree<T>(List<T> list, Action<T> action = null)
        {
-            if (list != null && list.Count > 0)
+            if (list is not null && list.Count > 0)
            {
                IList<T> result = new List<T>();
                long pid = list.Min(m => (m as ITreeModel<T>).ParentId);
                IList<T> t = list.Where(m => (m as ITreeModel<T>).ParentId == pid).ToList();
                foreach (T model in t)
                {
-                    if (action != null)
+                    if (action is not null)
                    {
                        action(model);
                    }
@@ -40,7 +40,7 @@ namespace Yi.Framework.Common.Helper
            mm.Children = new List<T>();
            foreach (T item in children)
            {
-                if (action != null)
+                if (action is not null)
                {
                    action(item);
                }
--- a/Yi.Vue3.x.Vant/components.d.ts
+++ b/Yi.Vue3.x.Vant/components.d.ts
@@ -25,6 +25,7 @@ declare module '@vue/runtime-core' {
    VanIcon: typeof import('vant/es')['Icon']
    VanImage: typeof import('vant/es')['Image']
    VanList: typeof import('vant/es')['List']
+    VanLoading: typeof import('vant/es')['Loading']
    VanNavBar: typeof import('vant/es')['NavBar']
    VanPopup: typeof import('vant/es')['Popup']
    VanPullRefresh: typeof import('vant/es')['PullRefresh']
--- a/Yi.Vue3.x.Vant/src/main.ts
+++ b/Yi.Vue3.x.Vant/src/main.ts
@@ -7,9 +7,11 @@ import 'vant/es/notify/style';
 import router from './router'
 import store from './store'
 import './permission'
+import { Lazyload } from 'vant';
 import App from './App.vue'

 const app=createApp(App)
 app.use(router)
 app.use(store)
+app.use(Lazyload);
 app.mount('#app');
--- a/Yi.Vue3.x.Vant/src/view/main/recommend.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
@@ -30,13 +30,18 @@
          v-for="(image, imageIndex) in item.images"
          :key="imageIndex"
          class="imageCol"
-          @click="openImage(item.images)"
+          @click="openImage(item.images,imageIndex)"
          ><van-image
+          lazy-load
+          fit="cover"
            width="100%"
            height="7rem"
            :src="url + image"
            radius="5"
          />
+          <template v-slot:loading>
+    <van-loading type="spinner" size="20" />
+  </template>
        </van-col> 

        <van-col span="24" class="bottomRow">
@@ -61,6 +66,7 @@
  <van-image-preview
    v-model:show="imageShow"
    :images="imagesPreview"
+    :startPosition="startIndex"
    @change="onChange"
    :closeable="true"
  >
@@ -102,7 +108,7 @@ const list = ref<Number[]>([]);
 const loading = ref(false);
 const finished = ref(false);
 const refreshing = ref(false);
-
+const startIndex=ref(0)
 const show = ref(false);
 const actions = [{ name: "取消关注" }, { name: "将TA拉黑" }, { name: "举报" }];

@@ -138,8 +144,9 @@ const onRefresh = () => {
  queryParams.value.pageNum = 1;
  onLoad();
 };
-const openImage = (imagesUrl: string[]) => {
+const openImage = (imagesUrl: string[],imageIndex:any) => {
  imagesPreview.value = imagesUrl.map((i) => url + i);
+  startIndex.value=imageIndex;
  imageShow.value = true;
 };
 onMounted(() => {
@@ -149,7 +156,7 @@ onMounted(() => {

 const getList = () => {
  articleApi.pageList(queryParams.value).then((response: any) => {
-    articleList.value.unshift(...(response.data.data));
+    articleList.value.push(...(response.data.data));
    totol.value = response.data.totol;
  });
 };
--- a/Yi.Vue3.x.Vant/src/view/send/imageText.vue
+++ b/Yi.Vue3.x.Vant/src/view/send/imageText.vue
@@ -53,12 +53,11 @@ import articleApi from "@/api/articleApi";
 import { Toast } from "vant";
 import { useRouter } from 'vue-router'
 const router = useRouter();
-const form = reactive<ArticleEntity>({
+const form = reactive<any>({
  title: "",
  content: "",
  images: [],
-  isDeleted: false,
-  createTime:""
+  isDeleted: false
 });

 const isSend=ref(false)