修改bug

.env.development

@@ -1 +1 @@
-VUE_APP_JTXT_URL = "http://120.77.221.199:7000"
+VUE_APP_JTXT_URL = "http://8.141.68.219:8080"

src/api/modules/user.js

@@ -2,6 +2,8 @@
 export default {
   basePath: process.env.VUE_APP_JTXT_URL,
   apiList: {
+    //  admin获取所有用户
+    JTXT_GET_USER_ADMIN_USERS: "admin/users",
     // 查询今日积分
     JTXT_GET_USER_DAIYL_POINTS: "user/{userName}/daily-points",
     // 查询总积分

src/views/home/index.vue

@@ -91,40 +91,25 @@ export default {
   },
   created() {
     this.initFun();
-    this.getCollection();
   },
   methods: {
     // 初始化
     initFun() {
-      this.$store.commit("updateUserItemStore", {
-        field: "userInfo",
-        // value: {
-        //   id: "testuser-DHjjEuxXbN",
-        //   encodedPassword: "string",
-        //   userStatus: "suspended",
-        //   userName: "testuser-DHjjEuxXbN",
-        //   email: "test@gmail.com",
-        //   firstName: "一",
-        //   lastName: "张",
-        //   studyId: "U00000",
-        //   phone: "13060901234",
-        //   nickName: "小强",
-        //   group: "临时用户"
-        // }
-        value: {
-          id: "testuser-gjcJJmahwR",
-          encodedPassword: "string",
-          userStatus: "suspended",
-          userName: "testuser-gjcJJmahwR",
-          email: "test@gmail.com",
-          firstName: "一",
-          lastName: "张",
-          studyId: "U00000",
-          phone: "13060901234",
-          nickName: "小强",
-          group: "临时用户"
-        }
-      });
+      // 获取所有用户
+      this.$_http
+        .get(this.$_API.JTXT_GET_USER_ADMIN_USERS)
+        .then(res => {
+          console.log(res);
+          this.$store.commit("updateUserItemStore", {
+            field: "userInfo",
+            value: res.data[0]
+          });
+          // 获取所有收藏
+          this.getCollection();
+        })
+        .catch(() => {
+          this.$store.commit("toggleLoading", false);
+        });
       this.engineeringWorkList = [
         { text: "桥隧工", value: 0 },
         { text: "桥梁工", value: 1 },

src/views/home/person/collection.vue

@@ -67,6 +67,7 @@ export default {
                 index + 1 === res.data.materials.length
               );
             });
+            this.finished = true;
           } else {
             this.$store.commit("toggleLoading", false);
           }
@@ -86,7 +87,6 @@ export default {
         .then(res => {
           this.favoritesList.push(res.data);
           if (isLast) {
-            this.finished = true;
             this.$store.commit("toggleLoading", false);
           }
         })

src/views/home/person/page-person.vue

@@ -14,7 +14,7 @@
           />
           <div>
             <div class="userName">
-              {{ userInfo.userName }}
+              {{ userInfo.nickName }}
             </div>
             <div class="userGroup">组织：{{ userInfo.group }}</div>
           </div>