ct

2022-01-07 17:35:55 +08:00
parent 62e14875dd 82ebdb2235
commit 5c4c107f8a
2 changed files with 123 additions and 75 deletions
--- a/src/apps/AppVillageDiscuss/Add.vue
+++ b/src/apps/AppVillageDiscuss/Add.vue
@@ -42,10 +42,10 @@
          <div class="items" v-for="(item, index) in list" :key="index">
            <img src="./img/22.png" alt="" @click="del(index)" />
            <div class="rightopts">
-              <u-input v-model="item.content" placeholder="选项" maxlength="200" :clearable="false" />
+              <u-input :height="40" type="textarea" v-model="item.content" placeholder="选项" maxlength="200" :clearable="false" />
            </div>
          </div>
-          <div class="items" @click="addOpts">
+          <div class="items" style="padding-top: 20px" @click="addOpts">
            <img src="./img/11.png" alt="" />

            <div class="addopts">添加选项</div>
@@ -144,10 +144,6 @@ export default {
      if (!this.form.discussDeadline) {
        return this.$u.toast('请选择议事截止时间')
      }
-      if (!this.form.publicityDeadline) {
-        return this.$u.toast('请选择公示截止时间')
-      }
-
      if (this.form.type === '1') {
        if (!this.list.length) {
          return this.$u.toast('请添加选项')
@@ -209,7 +205,6 @@ export default {
    },

    areaSelect(e) {
-      console.log(e)
      this.form.areaId = e
    },

@@ -319,11 +314,16 @@ export default {
          display: flex;
          justify-content: space-between;
          align-items: center;
-          padding: 0 40px 0 32px !important;
+          padding: 20px 40px 0 !important;
          width: 100%;
-          height: 120px;
-          line-height: 120px;
+          // height: 120px;
+          // line-height: 120px;
          box-sizing: border-box;
+
+          ::v-deep .u-input__textarea {
+            padding-bottom: 20px;
+          }
+
          img {
            width: 36px;
            height: 36px;
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -36,8 +36,11 @@
            <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)" />
+          <u-icon name="thumb-up" :label="op.suport" :color="op.isSuport ? 'red' : '#ccc'" @click="like(op.id)" />
        </div>
+
+        <div class="content" v-text="op.content" @click="adddeleShow(op.id)" />
+
        <div class="content" v-text="op.content" />
        <div class="content color-999" v-text="op.createTime" />
      </div>
@@ -57,7 +60,7 @@
        <div class="vote-item" v-for="(item, index) in data.voteList" :key="index">
          <span>{{ item.content }}</span>
          <i>{{ item.count }}</i>
-          <em :style="{width: item.percentage}"></em>
+          <em :style="{ width: item.percentage }"></em>
        </div>
      </div>
    </div>
@@ -79,6 +82,13 @@
      </div>
    </u-popup>

+    <u-popup v-model="deleShow" mode="bottom" class="popupdele">
+      <div class="dele" @click="modalShow = true">删除</div>
+      <div @click="deleShow = false">取消</div>
+    </u-popup>
+
+    <u-modal v-model="modalShow" content="确定删除该留言" @confirm="confirmDelete"></u-modal>
+
    <div class="end-btn" hover-class="text-hover" v-if="data.status === '1'" @click="handleComplete">结束公示</div>
  </div>
 </template>
@@ -98,7 +108,11 @@ export default {
      content: '',
      flag: false,
      pageShow: false,
-      isAnnouncer: false
+      isAnnouncer: false,
+      deleShow: false,
+      modalShow: false,
+      deleId: '',
+      isAnnouncer: false,
    }
  },
  computed: {
@@ -120,53 +134,58 @@ export default {
  methods: {
    getDetail() {
      this.$loading()
-      this.$http.post(`/app/appvillagediscuss/queryDetailById?id=${this.id}`).then((res) => {
-        if (res?.data) {
-          this.data = {
-            ...res.data,
-            avatar: res.data.createUserName?.substr(0, 2) || '游客',
-            messages: res.data.messages ? res.data.messages.map(v => {
-              return {
-                ...v,
-                isSuport: v.suportUser ? v.suportUser.indexOf(this.user.id) > -1 : false
-              }
-            }) : []
-          }
-          this.data.images = JSON.parse(res.data.images)
-          this.isAnnouncer = this.user.id === res.data.createUserId
+      this.$http
+        .post(`/app/appvillagediscuss/queryDetailById?id=${this.id}`)
+        .then((res) => {
+          if (res?.data) {
+            this.data = {
+              ...res.data,
+              avatar: res.data.createUserName?.substr(0, 2) || '游客',
+              messages: res.data.messages
+                ? res.data.messages.map((v) => {
+                    return {
+                      ...v,
+                      isSuport: v.suportUser ? v.suportUser.indexOf(this.user.id) > -1 : false,
+                    }
+                  })
+                : [],
+            }
+            this.data.images = JSON.parse(res.data.images)
+            this.isAnnouncer = this.user.id === res.data.createUserId

-          var discussTime = (new Date(res.data.discussDeadline).getTime() * 1) / 1000
-          var nowTime = (new Date().getTime() * 1) / 1000
-          if (discussTime >= nowTime) {
-            this.timestamp = discussTime - nowTime
-          }
+            var discussTime = (new Date(res.data.discussDeadline).getTime() * 1) / 1000
+            var nowTime = (new Date().getTime() * 1) / 1000
+            if (discussTime >= nowTime) {
+              this.timestamp = discussTime - nowTime
+            }

-          if (res.data.type === '1') {
-            const total = Object.values(res.data.statistic).reduce((x, y) => {
-              return x + y
-            })
-            this.data.voteList = res.data.voteItems.map(v => {
-              return {
-                ...v,
-                count: res.data.statistic[v.item],
-                percentage: (res.data.statistic[v.item] / total) * 100 + '%'
-              }
-            })
-          }
+            if (res.data.type === '1') {
+              const total = Object.values(res.data.statistic).reduce((x, y) => {
+                return x + y
+              })
+              this.data.voteList = res.data.voteItems.map((v) => {
+                return {
+                  ...v,
+                  count: res.data.statistic[v.item],
+                  percentage: (res.data.statistic[v.item] / total) * 100 + '%',
+                }
+              })
+            }

+            this.$hideLoading()
+            this.pageShow = true
+          } else {
+            this.$hideLoading()
+          }
+        })
+        .catch(() => {
          this.$hideLoading()
-          this.pageShow = true
-        } else {
-          this.$hideLoading()
-        }
-      }).catch(() => {
-        this.$hideLoading()
-      })
+        })
    },

-    like (id) {
+    like(id) {
      this.$loading()
-      this.$http.post(`/app/appvillagediscussmessage/suport?id=${id}&userId=${this.user.id}`).then(res => {
+      this.$http.post(`/app/appvillagediscussmessage/suport?id=${id}&userId=${this.user.id}`).then((res) => {
        this.$hideLoading()
        if (res.code === 0) {
          this.$u.toast('点赞成功')
@@ -177,12 +196,29 @@ export default {
        } else {
          this.$u.toast(res.msg)
        }
-
-      }).catch((e) => {
-        this.$hideLoading()
-        this.$u.toast(e)
      })
    },
+    adddeleShow(id) {
+      this.deleId = id
+      this.deleShow = true
+    },
+
+    confirmDelete() {
+      this.$http
+        .post(`/app/appvillagediscussmessage/delete?ids=${this.deleId}`)
+        .then((res) => {
+          if (res?.data) {
+            this.deleShow = false
+            this.modalShow = false
+            this.deleId = ''
+            this.getDetail()
+          }
+        })
+        .catch((e) => {
+          this.$hideLoading()
+          this.$u.toast(e)
+        })
+    },

    publish() {
      if (this.flag) return
@@ -201,7 +237,7 @@ export default {
        .then((res) => {
          if (res?.code == 0) {
            this.$u.toast('留言成功')
-            this.flag = true
+            this.flag = false
            this.content = ''
            this.showBottomInput = false
            this.getDetail()
@@ -251,15 +287,17 @@ export default {
    handleComplete() {
      this.$confirm('是否要结束公示')
        .then(() => {
-          this.$http.post('/app/appvillagediscuss/finishPublic', {
-            status: '2',
-            id: this.id
-          }).then((res) => {
-            if (res?.code == 0) {
-              this.$u.toast('已结束公示!')
-              this.getDetail()
-            }
-          })
+          this.$http
+            .post('/app/appvillagediscuss/finishPublic', {
+              status: '2',
+              id: this.id,
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$u.toast('结束公示成功!')
+                this.getDetail()
+              }
+            })
        })
        .catch(() => 0)
    },
@@ -282,7 +320,7 @@ export default {
    text-align: center;
    color: #fff;
    font-size: 32px;
-    background: #1365DD;
+    background: #1365dd;
  }

  &.detail-active {
@@ -377,7 +415,7 @@ export default {
    text-align: center;
    color: #fff;
    font-size: 24px;
-    background: #1AAAFF;
+    background: #1aaaff;
    border-radius: 8px;
  }

@@ -399,10 +437,10 @@ export default {
      line-height: 64px;
      margin-bottom: 16px;
      padding: 0 32px;
-      background: #FFFFFF;
+      background: #ffffff;
      border-radius: 8px;
      overflow: hidden;
-      border: 1px solid #95CBFF;
+      border: 1px solid #95cbff;

      em {
        position: absolute;
@@ -410,13 +448,13 @@ export default {
        top: 0;
        z-index: 0;
        height: 100%;
-        background: #DCE8F4;
+        background: #dce8f4;
      }

      span {
        position: relative;
        z-index: 1;
-        color: #5B84B3;
+        color: #5b84b3;
        font-size: 28px;
      }

@@ -424,7 +462,7 @@ export default {
        position: relative;
        z-index: 1;
        font-style: normal;
-        color: #5B84B3;
+        color: #5b84b3;
        font-size: 28px;
      }
    }
@@ -494,7 +532,7 @@ export default {
    .u-input {
      background: #f7f7f7;
      border-radius: 8px 8px 0 0;
-      padding: 10px!important;
+      padding: 10px !important;
      margin: 0 30px 0 30px;
      .uni-textarea-placeholder {
        padding: 16px 0 0 16px;
@@ -534,6 +572,16 @@ export default {
    }
  }

+  .popupdele {
+    ::v-deep .u-drawer-content {
+      text-align: center;
+      div {
+        padding: 5px 0;
+        color: #666;
+      }
+    }
+  }
+
  // ::v-deep .u-drawer {
  //   .u-drawer-content {
  //     .u-drawer__scroll-view {