From 24cda70cbc5828dd4f6e4a193dd0ea8f39c640cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Tue, 11 Oct 2022 18:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=90=AD?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Vue3.x.Vant/src/view/login.vue          |  35 ++++-
 Yi.Vue3.x.Vant/src/view/main/recommend.vue | 149 +++++++++------------
 Yi.Vue3.x.Vant/src/view/main/square.vue    |  32 +----
 3 files changed, 98 insertions(+), 118 deletions(-)

diff --git a/Yi.Vue3.x.Vant/src/view/login.vue b/Yi.Vue3.x.Vant/src/view/login.vue
index 5f689b53..a422c54d 100644
--- a/Yi.Vue3.x.Vant/src/view/login.vue
+++ b/Yi.Vue3.x.Vant/src/view/login.vue
@@ -1,3 +1,34 @@
 <template>
-    登录页面
-</template>
\ No newline at end of file
+    <div class="div-top">
+        你好
+   </div>
+   <div class="div-bottom">
+      <!-- <van-field v-model="value" label="文本" placeholder="请输入用户名" /> -->
+   </div>
+</template>
+<script setup lang="ts">
+import {ref} from 'vue';
+const value=ref("")
+
+</script>
+<style scoped>
+.div-top{
+    background-color: aqua;
+    position:absolute;
+    top: 0;
+    left: 0;
+   right: 0;
+   bottom: 60%;
+}
+.div-bottom{
+   background-color: bisque;
+   position:absolute;
+    top: 30%;
+    left: 0;
+   right: 0;
+   bottom: 0;
+   border-radius: 4rem 4rem 0rem 0rem;
+   /* min-height: 70%; */
+}
+
+</style>
\ No newline at end of file
diff --git a/Yi.Vue3.x.Vant/src/view/main/recommend.vue b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
index 59116ee5..c88c2d76 100644
--- a/Yi.Vue3.x.Vant/src/view/main/recommend.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
@@ -1,5 +1,5 @@
 <template>
-  
+  <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
     <van-list
       class="list"
       v-model:loading="loading"
@@ -7,8 +7,7 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-
-      <van-row v-for="(item,index) in articleList" :key="index" class="row">
+      <van-row v-for="(item, index) in articleList" :key="index" class="row">
         <van-col span="4" class="leftCol">
           <van-image
             round
@@ -19,29 +18,27 @@
         </van-col>
 
         <van-col span="14" class="centerTitle">
-       <span class="justtitle">   大白</span>
+          <span class="justtitle"> 大白</span>
           <br />
-        <app-createTime :time="item.createTime"/>
+          <app-createTime :time="item.createTime" />
         </van-col>
 
         <van-col span="6" class="down">
           <van-icon name="arrow-down" @click="show = true" />
         </van-col>
 
-        <van-col class="rowBody" span="24"
-          >{{item.content}}</van-col
-        >
+        <van-col class="rowBody" span="24">{{ item.content }}</van-col>
 
         <van-col
           span="8"
-          v-for="(image,imageIndex) in item.images"
+          v-for="(image, imageIndex) in item.images"
           :key="imageIndex"
           class="imageCol"
           @click="openImage(item.images)"
           ><van-image
             width="100%"
             height="7rem"
-            :src="url+image"
+            :src="url + image"
             radius="5"
           />
         </van-col>
@@ -55,8 +52,7 @@
         </van-col>
       </van-row>
     </van-list>
-
-
+  </van-pull-refresh>
   <!-- 功能页面 -->
   <van-action-sheet
     v-model:show="show"
@@ -70,37 +66,36 @@
     v-model:show="imageShow"
     :images="imagesPreview"
     @change="onChange"
-    :closeable=true
+    :closeable="true"
   >
-    <template v-slot:index>第{{ index+1 }}页</template>
+    <template v-slot:index>第{{ index + 1 }}页</template>
   </van-image-preview>
 </template>
 
 <script setup lang="ts">
-import { ref ,onMounted,reactive, toRefs} from "vue";
+import { ref, onMounted, reactive, toRefs } from "vue";
 import { ImagePreview, Toast } from "vant";
-import AppCreateTime from '@/components/AppCreateTime.vue'
+import AppCreateTime from "@/components/AppCreateTime.vue";
 import articleApi from "@/api/articleApi.ts";
 import { ArticleEntity } from "@/type/interface/ArticleEntity.ts";
 const VanImagePreview = ImagePreview.Component;
-const url=`${import.meta.env.VITE_APP_BASE_API}/file/image/`
-const data=reactive({
-
-  queryParams:{
+const url = `${import.meta.env.VITE_APP_BASE_API}/file/image/`;
+const data = reactive({
+  queryParams: {
     pageNum: 1,
     pageSize: 10,
     // dictName: undefined,
     // dictType: undefined,
-    isDeleted: false
-  }
+    isDeleted: false,
+  },
 });
-const {queryParams} =toRefs(data);
+const { queryParams } = toRefs(data);
 
-const articleList=ref<ArticleEntity[]>([]);
-const totol=ref<Number>(0);
+const articleList = ref<ArticleEntity[]>([]);
+const totol = ref<Number>(0);
 const imageShow = ref(false);
 const index = ref(0);
-let imagesPreview =ref<string[]>([]);
+let imagesPreview = ref<string[]>([]);
 
 const onChange = (newIndex: any) => {
   index.value = newIndex;
@@ -112,69 +107,55 @@ const finished = ref(false);
 const refreshing = ref(false);
 
 const show = ref(false);
-const actions = [
-  { name: "取消关注" },
-  { name: "将TA拉黑" },
-  { name: "举报"}
-];
-// const onLoad = () => {
- 
-//     if (refreshing.value) {
-//       articleList.value = [];
-//       refreshing.value = false;
-//       queryParams.value.pageNum=0;
-//     }
+const actions = [{ name: "取消关注" }, { name: "将TA拉黑" }, { name: "举报" }];
 
-//     queryParams.value.pageNum+=1;
-//     getList();
+const onLoad = async () => {
+  if (refreshing.value) {
+    articleList.value = [];
+    refreshing.value = false;
+  }
+  // 异步更新数据
+  // setTimeout 仅做示例，真实场景中一般为 ajax 请求
+  articleApi.pageList(queryParams.value).then((response: any) => {
+    if (response.data.data.length == 0) {
+      console.log("结束");
+      finished.value = true;
+    } else {
+      console.log("执行");
+      articleList.value.push(...(response.data.data as ArticleEntity[]));
+      totol.value = response.data.totol;
+      queryParams.value.pageNum += 1;
+    }
 
-//     loading.value = false;
+    loading.value = false;
 
-//     if (articleList.value.length >= 40) {
-//       finished.value = true;
-//     }
-
-// };
-const onLoad = async() => {
-      // 异步更新数据
-      // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-      setTimeout(async() => {
-        console.log("执行")
-        // await getList();
-        // queryParams.value.pageNum+=1
-        // 加载状态结束
-        loading.value = false;
-
-        // 数据全部加载完成
-        if (list.value.length >= 4000) {
-          finished.value = true;
-        }
-      }, 1000);
-    };
+    console.log(loading.value);
+  });
+};
 const onRefresh = () => {
-  // 清空列表数据
   finished.value = false;
 
   // 重新加载数据
   // 将 loading 设置为 true，表示处于加载状态
   loading.value = true;
-  // onLoad();
+  queryParams.value.pageNum = 1;
+  onLoad();
 };
-const openImage=(imagesUrl :string[])=>{
-  imagesPreview.value=imagesUrl.map(i=>url+i);
-  imageShow.value=true;
-}
-onMounted(()=>{
-  articleList.value=[];
-  getList();
-})
+const openImage = (imagesUrl: string[]) => {
+  imagesPreview.value = imagesUrl.map((i) => url + i);
+  imageShow.value = true;
+};
+onMounted(() => {
+  articleList.value = [];
+  // getList();
+});
 
-const getList=()=>{
-  articleApi.pageList(queryParams.value).then((response:any)=>{
-    articleList.value.push(...response.data.data as ArticleEntity[]);
-    totol.value=response.data.totol;
-  })
-}
+const getList = () => {
+  articleApi.pageList(queryParams.value).then((response: any) => {
+    articleList.value.push(...(response.data.data as ArticleEntity[]));
+    totol.value = response.data.totol;
+  });
+};
 </script>
 <style scoped>
 .list {
@@ -210,19 +191,17 @@ const getList=()=>{
 .imageCol {
   padding: 0.1rem 0.1rem 0.1rem 0.1rem;
 }
-.subtitle{
-color: #CBCBCB;
-
+.subtitle {
+  color: #cbcbcb;
 }
 
-.justtitle{
+.justtitle {
   font-size: large;
 }
-.bottomRow{
+.bottomRow {
   color: #979797;
 }
-.down
-{
+.down {
   text-align: right;
   padding-right: 0.5rem;
 }
diff --git a/Yi.Vue3.x.Vant/src/view/main/square.vue b/Yi.Vue3.x.Vant/src/view/main/square.vue
index 70719896..1c49ddbd 100644
--- a/Yi.Vue3.x.Vant/src/view/main/square.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/square.vue
@@ -3,14 +3,7 @@
 
   <van-row class="test ">
     <van-col span="24">
-      <van-list
-  v-model:loading="loading"
-  :finished="finished"
-  finished-text="没有更多了"
-  @load="onLoad"
->
-  <van-cell v-for="item in list" :key="item" :title="item" />
-</van-list>
+    这里是广场
     </van-col>
 
   </van-row>
@@ -22,27 +15,4 @@
 <script lang="ts" setup>
 import {ref} from 'vue'
 
-  const list = ref([]);
-    const loading = ref(false);
-    const finished = ref(false);
-
-    const onLoad = () => {
-      console.log("执行")
-      // 异步更新数据
-      // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-      setTimeout(() => {
-        for (let i = 0; i < 100; i++) {
-          list.value.push(list.value.length + 1);
-        }
-
-        // 加载状态结束
-        loading.value = false;
-
-        // 数据全部加载完成
-        if (list.value.length >= 1000) {
-          finished.value = true;
-        }
-      }, 1);
-    };
-
 </script>
\ No newline at end of file