From e1784839149b231d78e20168927be5c52294b3d4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 7 Jan 2022 19:00:11 +0800
Subject: [PATCH 1/8] 26540

---
 src/apps/AppVillageDiscuss/Add.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue
index 9e94be74..f382d53c 100644
--- a/src/apps/AppVillageDiscuss/Add.vue
+++ b/src/apps/AppVillageDiscuss/Add.vue
@@ -68,7 +68,6 @@
         </div>
       </div>
     </div>
-    <div class="pad-b112"></div>
     <div class="btn" @click="submit">保存</div>
   </div>
 </template>
@@ -243,7 +242,8 @@ export default {
 
 <style lang="scss" scoped>
 .add {
-  // height: 100%;
+  padding-bottom: 200px;
+  background: #f5f5f5;
 
   .header-description {
     ::v-deep .u-form {

From c241a5f99511be7700118309fc84a385677a5171 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 19:05:11 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E5=8C=BF=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppVillageDiscuss/Detail.vue       |  12 +++++++++---
 src/apps/AppVillageDiscuss/img/user-img.png | Bin 0 -> 2733 bytes
 src/apps/AppVillageDiscuss/userList.vue     |   8 +++++---
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 src/apps/AppVillageDiscuss/img/user-img.png

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index 10d508ed..0189d361 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -94,6 +94,7 @@
     </u-popup>
 
     <u-popup v-model="deleShow" mode="bottom" class="popupdele">
+      <div class="hint">删除我的评论</div>
       <div class="dele" @click="modalShow = true">删除</div>
       <div @click="deleShow = false">取消</div>
     </u-popup>
@@ -633,10 +634,15 @@ export default {
 
   .popupdele {
     ::v-deep .u-drawer-content {
+      border-radius: 24px 24px 0px 0px;
       text-align: center;
-      div {
-        padding: 5px 0;
-        color: #666;
+      .hint {
+        padding-top: 40px;
+        font-size: 24px;
+        color: #666666;
+      }
+      .dele{
+        
       }
     }
   }
diff --git a/src/apps/AppVillageDiscuss/img/user-img.png b/src/apps/AppVillageDiscuss/img/user-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae49d85fa8ea96c766d1678f7b9b1aacf95641a8
GIT binary patch
literal 2733
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

literal 0
HcmV?d00001

diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue
index 9ba7a335..9c49ca1c 100644
--- a/src/apps/AppVillageDiscuss/userList.vue
+++ b/src/apps/AppVillageDiscuss/userList.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="userList">
-    <div v-if="data.votes && data.votes.length > 0">
+    <div v-if="data.votes && data.votes.length">
       <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="avatLeft" v-if="anonymous == 0">{{ item.userName.substring(item.userName.length, item.userName.length - 2) }}</div>
+
+        <img class="avatLeft" src="./img/user-img.png" alt="" />
 
         <div class="right">
           <div class="top">
-            <span class="names" v-if="anonymous && anonymous == 1">{{ item.userName }}</span>
+            <span class="names" v-if="anonymous && anonymous == 0">{{ item.userName }}</span>
             <span v-else>匿名用户</span>
 
             <span class="times">{{ item.createTime }}</span>

From e9d2d3ab281c5268e6f8f22aea86f7d4f23b9289 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 19:07:05 +0800
Subject: [PATCH 3/8] bug

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

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index 0189d361..6624cabd 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -641,8 +641,9 @@ export default {
         font-size: 24px;
         color: #666666;
       }
-      .dele{
-        
+      div {
+        padding: 10px 0;
+        color: #666666;
       }
     }
   }
diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue
index 9c49ca1c..94097dac 100644
--- a/src/apps/AppVillageDiscuss/userList.vue
+++ b/src/apps/AppVillageDiscuss/userList.vue
@@ -4,7 +4,7 @@
       <div class="datas" v-for="(item, index) in data.votes" :key="index">
         <div class="avatLeft" v-if="anonymous == 0">{{ item.userName.substring(item.userName.length, item.userName.length - 2) }}</div>
 
-        <img class="avatLeft" src="./img/user-img.png" alt="" />
+        <img class="avatLeft" src="./img/user-img.png" alt="" v-else />
 
         <div class="right">
           <div class="top">

From cc088201a41a1e59823e026590e212b072202086 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: Mon, 10 Jan 2022 09:08:27 +0800
Subject: [PATCH 4/8] 26544

---
 src/apps/AppVillageDiscuss/userList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue
index 94097dac..bff787f3 100644
--- a/src/apps/AppVillageDiscuss/userList.vue
+++ b/src/apps/AppVillageDiscuss/userList.vue
@@ -77,7 +77,6 @@ uni-page-body {
 
   .datas {
     display: flex;
-
     padding: 20px 32px 0 32px;
 
     .avatLeft {
@@ -94,7 +93,7 @@ uni-page-body {
     }
     .right {
       border-bottom: 1px solid #ddd;
-      width: 100%;
+      width: calc(100% - 90px);
       margin: 10px 0 0 16px;
       padding-bottom: 32px;
       .top {

From fde3708baaf1294f7e6314dd9629d0a968e05b85 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: Mon, 10 Jan 2022 09:18:06 +0800
Subject: [PATCH 5/8] 26541

---
 src/apps/AppVillageDiscuss/AppVillageDiscuss.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue
index 5de5f843..7796f346 100644
--- a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue
+++ b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue
@@ -237,7 +237,7 @@ export default {
       width: 100%;
 
       .addresss {
-        .u-form-item__body {
+        ::v-deep .u-form-item__body {
           .u-form-item--right {
             .u-form-item--right__content {
               .u-form-item--right__content__slot {
@@ -252,6 +252,11 @@ export default {
                   }
                 }
               }
+              .u-form-item--right__content__icon {
+                .u-icon {
+                  margin-bottom: 8px !important;
+                }
+              }
             }
           }
         }

From 2e1231376dcaf28465d1909626e5e99f0fa9c117 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: Mon, 10 Jan 2022 09:33:11 +0800
Subject: [PATCH 6/8] 26396

---
 src/apps/AppVillageDiscuss/Detail.vue | 35 +++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index 6624cabd..4b7327ca 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -96,7 +96,8 @@
     <u-popup v-model="deleShow" mode="bottom" class="popupdele">
       <div class="hint">删除我的评论</div>
       <div class="dele" @click="modalShow = true">删除</div>
-      <div @click="deleShow = false">取消</div>
+      <div class="liness"></div>
+      <div class="cancel" @click="deleShow = false">取消</div>
     </u-popup>
 
     <u-modal v-model="modalShow" content="确定删除该留言" :mask-close-able="true" @confirm="confirmDelete"></u-modal>
@@ -637,26 +638,28 @@ export default {
       border-radius: 24px 24px 0px 0px;
       text-align: center;
       .hint {
-        padding-top: 40px;
+        padding: 40px 0 44px 0;
+        border-bottom: 1px solid #e7e8e9;
+        font-size: 24px;
+        color: #666666;
         font-size: 24px;
         color: #666666;
       }
-      div {
-        padding: 10px 0;
-        color: #666666;
+      .dele {
+        padding: 24px 0 28px 0;
+        font-size: 32px;
+        color: #c25450;
+      }
+      .liness {
+        height: 12px;
+        background: #f6f7f8;
+      }
+      .cancel {
+        padding: 24px 0 62px 0;
+        font-size: 32px;
+        color: #333333;
       }
     }
   }
-
-  // ::v-deep .u-drawer {
-  //   .u-drawer-content {
-  //     .u-drawer__scroll-view {
-  //       .uni-scroll-view {
-  //         // overflow: hidden;
-  //         overflow: inherit !important;
-  //       }
-  //     }
-  //   }
-  // }
 }
 </style>

From cf8237de2e5bcb346a8ee5509c15a716dc7f02c0 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: Mon, 10 Jan 2022 10:04:14 +0800
Subject: [PATCH 7/8] 26546 eslint

---
 src/apps/AppVillageDiscuss/Detail.vue | 503 +++++++++++++-------------
 1 file changed, 255 insertions(+), 248 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index 4b7327ca..7829b195 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -1,78 +1,81 @@
 <template>
   <div class="Detail" v-if="pageShow" :class="[isAnnouncer && data.status === '0' && data.type === '0' ? 'detail-active' : '']">
-    <div class="detail-top">
-      <div flex class="w-100">
-        <div class="avatar" v-text="data.avatar" />
-        <div flex class="column start fill">
-          <b class="color-333" v-text="data.createUserName" />
-          <span class="color-999" v-text="data.createTime" />
-        </div>
-        <div class="statusTag" :class="{ over: data.status > 0 }" v-text="data.status == 0 ? (data.type == 0 ? '征集中' : '投票中') : $dict.getLabel('discussStatus', data.status)" />
-      </div>
-
-      <div class="header-middle">
-        <div class="contsnts">
-          <u-parse :html="data.content"></u-parse>
-        </div>
-      </div>
-
-      <div class="img-list" v-if="data.images && data.images.length">
-        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" @click="previewImage(data.images, item.url)" />
-      </div>
-    </div>
-    <div v-if="data.type == 0" class="comments">
-      <span class="totalCount">
-        <span class="total" v-text="`全部评论(${commentCount})`" />
-        <span class="rightCount">
-          <u-icon name="clock" v-if="data.status === '0'"></u-icon>
-          <u-count-down v-if="data.status === '0'" :timestamp="timestamp" separator="zh" show-days show-hours show-minutes show-seconds></u-count-down>
-          <span style="color: #999" v-else>已截止</span>
-        </span>
-      </span>
-      <div v-for="op in data.messages" :key="op.id">
-        <div flex class="header">
-          <u-avatar :src="op.avatar" size="48" />
-          <div flex class="fill">
-            <b v-text="op.createUserName" />
-            <span class="tags">{{ data.createUserId === op.createUserId ? '话事人' : '居民' }}</span>
+    <div class="details">
+      <div class="detail-top">
+        <div flex class="w-100">
+          <div class="avatar" v-text="data.avatar" />
+          <div flex class="column start fill">
+            <b class="color-333" v-text="data.createUserName" />
+            <span class="color-999" v-text="data.createTime" />
           </div>
-          <u-icon name="thumb-up" :label="op.suport" :color="op.isSuport ? 'red' : '#ccc'" @click="like(op.id)" />
+          <div class="statusTag" :class="{ over: data.status > 0 }" v-text="data.status == 0 ? (data.type == 0 ? '征集中' : '投票中') : $dict.getLabel('discussStatus', data.status)" />
         </div>
 
-        <div class="content" v-text="op.content" @click="adddeleShow(op.id)" />
-
-        <div class="content color-999" v-text="op.createTime" />
-      </div>
-      <AiEmpty v-if="!data.messages.length"></AiEmpty>
-    </div>
-
-    <div v-else-if="data.type == 1" class="comments">
-      <span class="totalCount">
-        <span class="total">{{ data.voteType === '1' ? '投票清单（可多选）' : '投票清单' }}</span>
-        <span class="rightCount">
-          <u-icon name="clock" v-if="data.status === '0'"></u-icon>
-          <u-count-down v-if="data.status === '0'" :timestamp="timestamp" separator="zh" show-days show-hours show-minutes show-seconds></u-count-down>
-          <span style="color: #999" v-else>已截止</span>
-        </span>
-      </span>
-      <div class="comments-vote">
-        <div class="vote-item" v-for="(item, index) in data.voteList" :key="index">
-          <div class="left">
-            <span>{{ item.item }}：</span>
-            <span>{{ item.content }}</span>
+        <div class="header-middle">
+          <div class="contsnts">
+            <u-parse :html="data.content"></u-parse>
           </div>
-          <i>{{ item.count }}</i>
-          <em :style="{ width: item.percentage }"></em>
+        </div>
+
+        <div class="img-list" v-if="data.images && data.images.length">
+          <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" @click="previewImage(data.images, item.url)" />
         </div>
       </div>
-    </div>
 
-    <div class="votePeople" v-if="data.type === '1'">
-      <div class="leftPeople">共{{ data.voteCount }}人参与投票</div>
+      <div v-if="data.type == 0" class="comments">
+        <span class="totalCount">
+          <span class="total" v-text="`全部评论(${commentCount})`" />
+          <span class="rightCount">
+            <u-icon name="clock" v-if="data.status === '0'"></u-icon>
+            <u-count-down v-if="data.status === '0'" :timestamp="timestamp" separator="zh" show-days show-hours show-minutes show-seconds></u-count-down>
+            <span style="color: #999" v-else>已截止</span>
+          </span>
+        </span>
+        <div v-for="op in data.messages" :key="op.id">
+          <div flex class="header">
+            <u-avatar :src="op.avatar" size="48" />
+            <div flex class="fill">
+              <b v-text="op.createUserName" />
+              <span class="tags">{{ data.createUserId === op.createUserId ? '话事人' : '居民' }}</span>
+            </div>
+            <u-icon name="thumb-up" :label="op.suport" :color="op.isSuport ? 'red' : '#ccc'" @click="like(op.id)" />
+          </div>
 
-      <div class="right">
-        <span @click="toUserList">查看详情</span>
-        <u-icon name="arrow-right" color="#999"></u-icon>
+          <div class="content" v-text="op.content" @click="adddeleShow(op.id)" />
+
+          <div class="content color-999" v-text="op.createTime" />
+        </div>
+        <AiEmpty v-if="!data.messages.length"></AiEmpty>
+      </div>
+
+      <div v-else-if="data.type == 1" class="comments">
+        <span class="totalCount">
+          <span class="total">{{ data.voteType === '1' ? '投票清单（可多选）' : '投票清单' }}</span>
+          <span class="rightCount">
+            <u-icon name="clock" v-if="data.status === '0'"></u-icon>
+            <u-count-down v-if="data.status === '0'" :timestamp="timestamp" separator="zh" show-days show-hours show-minutes show-seconds></u-count-down>
+            <span style="color: #999" v-else>已截止</span>
+          </span>
+        </span>
+        <div class="comments-vote">
+          <div class="vote-item" v-for="(item, index) in data.voteList" :key="index">
+            <div class="left">
+              <span>{{ item.item }}：</span>
+              <span>{{ item.content }}</span>
+            </div>
+            <i>{{ item.count }}</i>
+            <em :style="{ width: item.percentage }"></em>
+          </div>
+        </div>
+      </div>
+
+      <div class="votePeople" v-if="data.type === '1'">
+        <div class="leftPeople">共{{ data.voteCount }}人参与投票</div>
+
+        <div class="right">
+          <span @click="toUserList">查看详情</span>
+          <u-icon name="arrow-right" color="#999"></u-icon>
+        </div>
       </div>
     </div>
 
@@ -330,6 +333,7 @@ export default {
 .Detail {
   padding-bottom: 40px;
   background: #f6f7f9;
+  height: 100%;
 
   .end-btn {
     position: fixed;
@@ -349,214 +353,217 @@ export default {
     padding-bottom: 132px;
   }
 
-  .detail-top {
-    padding: 30px;
-    background: #fff;
-    border-bottom: 16px solid #f6f7f9;
+  .details {
+    // padding-bottom: 112px;
+    .detail-top {
+      padding: 30px;
+      background: #fff;
+      border-bottom: 16px solid #f6f7f9;
 
-    .avatar {
-      height: 64px;
-      width: 64px;
-      color: #fff;
-      background: $uni-color-primary;
-      border-radius: 50%;
-      font-size: 24px;
+      .avatar {
+        height: 64px;
+        width: 64px;
+        color: #fff;
+        background: $uni-color-primary;
+        border-radius: 50%;
+        font-size: 24px;
+        text-align: center;
+        line-height: 64px;
+        margin-right: 16px;
+      }
+
+      .color-999 {
+        color: #999999;
+      }
+
+      .color-333 {
+        color: #333;
+      }
+
+      .w-100 {
+        width: 100%;
+      }
+
+      .statusTag {
+        padding: 0 12px;
+        line-height: 30px;
+        border: 1px solid #2573ff;
+        color: #2573ff;
+        font-size: 22px;
+
+        &.over {
+          border-color: #666;
+          color: #666;
+        }
+      }
+
+      .header-middle {
+        padding: 32px 0 48px 0;
+
+        .contsnts {
+          font-size: 26px;
+          line-height: 1.5;
+          word-break: break-all;
+        }
+
+        img {
+          margin-top: 30px;
+          width: 686px;
+          height: 486px;
+        }
+      }
+
+      .img-list {
+        img {
+          width: calc(33vw - 6px - 24px);
+          height: calc(33vw - 6px - 24px);
+          margin: 0 12px 12px 0;
+
+          &:nth-of-type(3n) {
+            margin-right: 0;
+          }
+        }
+
+        .title {
+          width: 100%;
+          line-height: 112px;
+          background: #fff;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+        }
+      }
+    }
+
+    .tags {
+      width: 80px;
+      height: 34px;
+      line-height: 34px;
+      margin-left: 16px;
       text-align: center;
-      line-height: 64px;
-      margin-right: 16px;
+      color: #fff;
+      font-size: 24px;
+      background: #1aaaff;
+      border-radius: 8px;
     }
 
-    .color-999 {
-      color: #999999;
-    }
-
-    .color-333 {
-      color: #333;
-    }
-
-    .w-100 {
+    ::v-deep uni-video {
       width: 100%;
     }
 
-    .statusTag {
-      padding: 0 12px;
-      line-height: 30px;
-      border: 1px solid #2573ff;
-      color: #2573ff;
-      font-size: 22px;
+    .comments {
+      padding: 0 32px 20px;
+      font-size: 28px;
+      background: #fff;
 
-      &.over {
-        border-color: #666;
-        color: #666;
-      }
-    }
-
-    .header-middle {
-      padding: 32px 0 48px 0;
-
-      .contsnts {
-        font-size: 26px;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-
-      img {
-        margin-top: 30px;
-        width: 686px;
-        height: 486px;
-      }
-    }
-
-    .img-list {
-      img {
-        width: calc(33vw - 6px - 24px);
-        height: calc(33vw - 6px - 24px);
-        margin: 0 12px 12px 0;
-
-        &:nth-of-type(3n) {
-          margin-right: 0;
-        }
-      }
-
-      .title {
-        width: 100%;
-        line-height: 112px;
-        background: #fff;
-        font-size: 32px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        color: #999;
-      }
-    }
-  }
-
-  .tags {
-    width: 80px;
-    height: 34px;
-    line-height: 34px;
-    margin-left: 16px;
-    text-align: center;
-    color: #fff;
-    font-size: 24px;
-    background: #1aaaff;
-    border-radius: 8px;
-  }
-
-  ::v-deep uni-video {
-    width: 100%;
-  }
-
-  .comments {
-    padding: 0 32px 20px;
-    font-size: 28px;
-    background: #fff;
-
-    .vote-item {
-      display: flex;
-      position: relative;
-      align-items: center;
-      justify-content: space-between;
-      padding: 24px 32px;
-      margin-bottom: 16px;
-      background: #ffffff;
-      border-radius: 8px;
-      overflow: hidden;
-      border: 1px solid #95cbff;
-
-      .left {
+      .vote-item {
         display: flex;
-        flex: 1;
-        line-height: 1.2;
-        margin-right: 20px;
+        position: relative;
+        align-items: center;
+        justify-content: space-between;
+        padding: 24px 32px;
+        margin-bottom: 16px;
+        background: #ffffff;
+        border-radius: 8px;
+        overflow: hidden;
+        border: 1px solid #95cbff;
+
+        .left {
+          display: flex;
+          flex: 1;
+          line-height: 1.2;
+          margin-right: 20px;
+
+          span {
+            word-break: break-word;
+
+            &:first-child {
+              flex-shrink: 1;
+            }
+
+            &:last-child {
+              flex: 1;
+            }
+          }
+        }
+
+        em {
+          position: absolute;
+          left: 0;
+          top: 0;
+          z-index: 0;
+          height: 100%;
+          background: #dce8f4;
+        }
 
         span {
-          word-break: break-word;
+          flex-shrink: 1;
+          position: relative;
+          z-index: 1;
+          color: #5b84b3;
+          font-size: 28px;
+        }
 
-          &:first-child {
-            flex-shrink: 1;
-          }
-
-          &:last-child {
-            flex: 1;
-          }
+        i {
+          position: relative;
+          z-index: 1;
+          font-style: normal;
+          color: #5b84b3;
+          font-size: 28px;
         }
       }
 
-      em {
-        position: absolute;
-        left: 0;
-        top: 0;
-        z-index: 0;
-        height: 100%;
-        background: #dce8f4;
+      .totalCount {
+        display: flex;
+        justify-content: space-between;
+
+        .total {
+          display: block;
+          font-size: 30px;
+          height: 120px;
+          box-sizing: border-box;
+          padding-top: 44px;
+        }
+        .rightCount {
+          padding-top: 44px;
+        }
       }
 
-      span {
-        flex-shrink: 1;
-        position: relative;
-        z-index: 1;
-        color: #5b84b3;
-        font-size: 28px;
+      .u-avatar {
+        margin-right: 24px;
       }
 
-      i {
-        position: relative;
-        z-index: 1;
-        font-style: normal;
-        color: #5b84b3;
-        font-size: 28px;
+      .content {
+        color: #333;
+        margin-left: 72px;
+        margin-top: 10px;
+
+        &.color-999 {
+          color: #999999;
+          font-size: 24px;
+          margin-bottom: 48px;
+        }
       }
     }
 
-    .totalCount {
+    .votePeople {
       display: flex;
+      align-items: center;
       justify-content: space-between;
-
-      .total {
-        display: block;
-        font-size: 30px;
-        height: 120px;
-        box-sizing: border-box;
-        padding-top: 44px;
-      }
-      .rightCount {
-        padding-top: 44px;
-      }
-    }
-
-    .u-avatar {
-      margin-right: 24px;
-    }
-
-    .content {
-      color: #333;
-      margin-left: 72px;
-      margin-top: 10px;
-
-      &.color-999 {
-        color: #999999;
-        font-size: 24px;
-        margin-bottom: 48px;
-      }
-    }
-  }
-
-  .votePeople {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 16px;
-    height: 112px;
-    padding: 0 32px 0 52px;
-    background: #fff;
-    .leftPeople {
-      font-size: 28px;
-      color: #333;
-    }
-
-    .right {
-      span {
-        color: #2573ff;
+      margin-top: 16px;
+      height: 112px;
+      padding: 0 32px 0 52px;
+      background: #fff;
+      .leftPeople {
         font-size: 28px;
+        color: #333;
+      }
+
+      .right {
+        span {
+          color: #2573ff;
+          font-size: 28px;
+        }
       }
     }
   }

From 9e6ea4d1e0f486ab1b4a0f3e1be0ada879655f2e 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: Mon, 10 Jan 2022 10:11:28 +0800
Subject: [PATCH 8/8] bug

---
 src/apps/AppVillageDiscuss/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue
index f382d53c..175ae64e 100644
--- a/src/apps/AppVillageDiscuss/Add.vue
+++ b/src/apps/AppVillageDiscuss/Add.vue
@@ -160,7 +160,7 @@ export default {
 
         for (let i = 0; i < list.length; i ++) {
           if (!list[i].content) {
-            return this.$u.toast(`请输入弟${i + 1}个选项的内容`)
+            return this.$u.toast(`请输入第${i + 1}个选项的内容`)
           }
         }
       }