From 7412c286727d01348e38b07e052ba21fc218a8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 7 Jan 2022 18:49:50 +0800
Subject: [PATCH] votes

---
 src/apps/AppVillageDiscuss/Detail.vue   |  4 +-
 src/apps/AppVillageDiscuss/userList.vue | 56 ++++++++++++++++++-------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index e2bd0d03..b4892c0d 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -318,7 +318,7 @@ export default {
     },
 
     toUserList() {
-      uni.navigateTo({ url: `./userList` })
+      uni.navigateTo({ url: `./userList?id=${this.id}&anonymous=${this.data.anonymous}` })
     },
   },
 }
@@ -327,7 +327,7 @@ export default {
 <style scoped lang="scss">
 .Detail {
   padding-bottom: 40px;
-  background: #F6F7F9;
+  background: #f6f7f9;
 
   .end-btn {
     position: fixed;
diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue
index 782e50c2..9ba7a335 100644
--- a/src/apps/AppVillageDiscuss/userList.vue
+++ b/src/apps/AppVillageDiscuss/userList.vue
@@ -1,22 +1,23 @@
 <template>
   <div class="userList">
-    <!-- <div v-if="data.length > 0"></div> -->
-    <div class="datas" v-for="(item, index) in 10" :key="index">
-      <div class="avatLeft">李毅</div>
+    <div v-if="data.votes && data.votes.length > 0">
+      <div class="datas" v-for="(item, index) in data.votes" :key="index">
+        <div class="avatLeft">{{ item.userName.substring(item.userName.length, item.userName.length - 2) }}</div>
 
-      <div class="right">
-        <div class="top">
-          <span class="names">李毅</span>
-          <!-- <span>匿名用户</span> -->
+        <div class="right">
+          <div class="top">
+            <span class="names" v-if="anonymous && anonymous == 1">{{ item.userName }}</span>
+            <span v-else>匿名用户</span>
 
-          <span class="times">1111</span>
+            <span class="times">{{ item.createTime }}</span>
+          </div>
+
+          <div class="bottom">选择了选择了{{ item.item }}</div>
         </div>
-
-        <div class="bottom">选择了选择了三联村篮球队、蟠龙镇篮球队选择了三联村篮球队、蟠龙镇篮球队</div>
       </div>
     </div>
 
-    <AiEmpty description="暂无数据"></AiEmpty>
+    <AiEmpty description="暂无数据" v-else></AiEmpty>
   </div>
 </template>
 
@@ -28,25 +29,50 @@ export default {
   data() {
     return {
       data: [],
+      id: '',
+      anonymous: '',
     }
   },
   computed: {},
   watch: {},
-  onLoad() {},
+  onLoad(o) {
+    console.log(o)
+    this.anonymous = o.anonymous
+    this.id = o.id
+    this.getDetail()
+  },
   onShow() {
     document.title = '投票详情'
   },
-  methods: {},
+  methods: {
+    getDetail() {
+      this.$loading()
+      this.$http
+        .post(`/app/appvillagediscuss/queryDetailById?id=${this.id}`)
+        .then((res) => {
+          if (res?.data) {
+            this.data = res.data
+            this.$hideLoading()
+          } else {
+            this.$hideLoading()
+          }
+        })
+        .catch(() => {
+          this.$hideLoading()
+        })
+    },
+  },
 }
 </script>
 
 <style scoped lang="scss">
 uni-page-body {
-  // height: 100%;
+  height: 100%;
+  background: #fff;
 }
 .userList {
   // height: 100%;
-  // background: #fff;
+
   .datas {
     display: flex;