fix:select

student-vol/mock/actDetails.json

@@ -11,8 +11,8 @@
       "publisher": "福州大学至诚学院团委",
       "hour": 4,
       "total": 50,
-      "canApply": true,
+      "canApply": false,
-      "applyStatus": 0
+      "applyStatus": 1
     }
   }
 }

student-vol/mock/actList.json

@@ -12,7 +12,7 @@
         "endTime": 1671697800000,
         "palce": "福州大学至诚学院",
         "isYourSchool": true,
-        "canApply": true,
+        "canApply": false,
         "actPic": "./imgs/actImg.jpeg"
       },
       {

student-vol/mock/myApplyList.json

@@ -36,7 +36,7 @@
         "isYourSchool": false,
         "canApply": false,
         "actPic": "./imgs/actImg.jpeg",
-        "applyStatus": 2
+        "applyStatus": 1
       }
     ]
   }

student-vol/src/components/Home/ActItem.vue

@@ -23,9 +23,18 @@
 import moment from "moment";
 
 export default {
-    props: ["data"],
+    props: ["data", "isMyApply"],
+    data() {
+        return {
+            applyStatusMap: ["", "审核中", "审核通过", "审核拒绝"],
+            bgColorMap: ["", "#1989fa", "#07c160", "#f6352c"],
+        };
+    },
     methods: {
         getTagStyle(data) {
+            if (this.isMyApply && data.applyStatus !== undefined) {
+                return { backgroundColor: this.bgColorMap[data.applyStatus] };
+            }
             return { backgroundColor: data.canApply ? "#07c160" : "#999" };
         },
         formatDate(value) {
@@ -35,6 +44,9 @@ export default {
             this.$emit("goDetails", id);
         },
         getTagTxt(data) {
+            if (this.isMyApply && data.applyStatus !== undefined) {
+                return this.applyStatusMap[data.applyStatus];
+            }
             return data.canApply ? "进行中" : "已结束";
         },
     },

student-vol/src/style.css

@@ -24,8 +24,6 @@ a:hover {
 
 body {
   margin: 0;
-  display: flex;
-  place-items: center;
   min-width: 320px;
   min-height: 100vh;
 }
@@ -59,10 +57,13 @@ button:focus-visible {
 }
 
 #app {
-  max-width: 1280px;
+  max-width: 414px;
   margin: 0 auto;
-  padding: 2rem;
+  padding: 0;
-  text-align: center;
+  text-align: left;
+  min-height: 100vh;
+  box-shadow: 0 0 15px rgba(0, 0, 0, 0.15);
+  overflow-x: hidden;
 }
 
 @media (prefers-color-scheme: light) {

student-vol/src/views/ActDetails.vue

@@ -109,6 +109,11 @@ export default {
                     const { error, msg } = response.data;
                     if (error === 0) {
                         showSuccessToast("操作成功");
+                        if (payload.isApplay === false) {
+                            that.data.applyStatus = 0; // Simulate status change to 'not applied'
+                        } else {
+                            that.data.applyStatus = 1; // Simulate status change to 'under review'
+                        }
                         that.fetchDetails();
                     } else {
                         showFailToast(msg || "网络错误，请稍后重试");

student-vol/src/views/LoveReport.vue

@@ -22,7 +22,7 @@
             </div>
             <div class="dataItem">
                 <p class="dataItem-score">{{ totalScore }}</p>
-                <p class="dataItem-label">服务总积分</p>
+                <p class="dataItem-label">{{ scoreLabel }}</p>
             </div>
             <div class="dataItem">
                 <p class="dataItem-score">{{ grandeRank }}</p>
@@ -64,6 +64,11 @@ export default {
             grandeRank: "",
         };
     },
+    computed: {
+        scoreLabel() {
+            return this.curTab === 0 ? '服务总积分' : '服务年度积分';
+        }
+    },
     methods: {
         tabClick(value) {
             this.curTab = Number(value);
@@ -171,6 +176,10 @@ export default {
     color: #333; /* ⭐ 内容区统一深色 */
 }
 
+.rank-hd {
+    text-align: center;
+}
+
 .rank-title {
     font-weight: bold;
     font-size: 16px;
@@ -182,6 +191,22 @@ export default {
     margin-top: 5px;
 }
 
+.rank-list {
+    list-style: none;
+    padding: 0;
+    margin: 0 auto; /* Centering the list */
+    width: 100%;
+    max-width: 300px; /* Constrain width */
+}
+
+.rank-list li {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 0;
+    border-bottom: 1px solid #eee;
+}
+
 .rank-idx {
     width: 20px;
     text-align: center;

student-vol/src/views/MyApply.vue

@@ -18,14 +18,14 @@
         <div class="list">
             <van-list
                 v-model:loading="loading"
-                :finished="finished"
+                :finished="true"
                 finished-text="没有更多了"
-                @load="onLoad"
             >
                 <ActItem
                     v-for="item in actList"
                     :key="item.id"
                     :data="item"
+                    :isMyApply="true"
                     @goDetails="goDetails"
                 />
             </van-list>
@@ -44,58 +44,42 @@ export default {
     data() {
         return {
             curTab: 0,
-            actList: [],
+            allActList: [],
             loading: false,
-            finished: false,
-            currentPage: 1,
         };
     },
+    computed: {
+        actList() {
+            if (this.curTab === 0) {
+                return this.allActList;
+            }
+            return this.allActList.filter(item => item.applyStatus === this.curTab);
+        }
+    },
     methods: {
         tabClick(value) {
             this.curTab = value;
-            this.currentPage = 1;
-            this.fetchApplyList(1);
         },
-        fetchApplyList(currentPage = 1) {
+        fetchApplyList() {
-            const that = this;
-            const payload = {
-                currentPage,
-                pageSize: 10,
-                type: this.curTab,
-            };
-
             this.loading = true;
             axios
-                .get("/api/myApplyList", { params: payload })
+                .get("/api/myApplyList")
-                .then(function (response) {
+                .then((response) => {
                     const { error, data = {} } = response.data;
                     if (error === 0) {
-                        const currentPage = data.current;
+                        this.allActList = data.list || [];
-                        const list = data.list;
-
-                        if (currentPage === 1) {
-                            that.actList = list;
-                        } else {
-                            that.actList.push(...list);
-                        }
-
-                        that.currentPage = currentPage;
-                        that.finished = data.pageCount === currentPage;
                     }
                 })
-                .finally(function () {
+                .finally(() => {
-                    that.loading = false;
+                    this.loading = false;
                 });
         },
-        onLoad() {
-            this.fetchApplyList(this.currentPage + 1);
-        },
         goDetails(id) {
             this.$router.push("/actDetails?id=" + id);
         },
     },
     mounted() {
-        this.fetchApplyList(1);
+        this.fetchApplyList();
     },
 };
 </script>