Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppHandSnapshot/SelectUser.vue

@@ -115,7 +115,7 @@ export default {
           }
         })
       }else { //查网格员
-        this.$http.post(`/app/appgirdmemberinfo/listByGirdId`, {girdId: row.id}).then((res) => {
+        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
           if (res?.data) {
             this.userList = res.data
             this.userList.map((item) => {

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,7 +144,6 @@ export default {
       if (!this.form.discussDeadline) {
         return this.$u.toast('请选择议事截止时间')
       }
-
       if (this.form.type === '1') {
         if (!this.list.length) {
           return this.$u.toast('请添加选项')
@@ -156,13 +155,13 @@ export default {
         list = this.list.map((v, index) => {
           return {
             content: v.content,
-            item: this.keys[index],
+            item: this.keys[index]
           }
         })
 
         for (let i = 0; i < list.length; i ++) {
           if (!list[i].content) {
-            return this.$u.toast(`请输入第${i + 1}个选项的内容`)
+            return this.$u.toast(`请输入弟${i + 1}个选项的内容`)
           }
         }
       }
@@ -184,7 +183,7 @@ export default {
         if (res.code == 0) {
           uni.$emit('update')
           this.$u.toast('发布成功')
-          this.flag = publish
+          this.flag = true
           setTimeout(() => {
             uni.navigateBack({})
           }, 600)
@@ -197,7 +196,7 @@ export default {
       //   return this.$u.toast('请输入选项内容')
       // }
       this.list.push({
-        content: '',
+        content: ''
       })
     },
 
@@ -206,7 +205,6 @@ export default {
     },
 
     areaSelect(e) {
-      console.log(e)
       this.form.areaId = e
     },
 
@@ -316,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;

src/apps/AppVillageDiscuss/AppVillageDiscuss.vue

@@ -23,9 +23,7 @@
             </div>
             <div class="statusTag" :class="{ over: item.status > 0 }" v-text="item.status == 0 ? (item.type == 0 ? '征集中' : '投票中') : $dict.getLabel('discussStatus', item.status)" />
           </div>
-          <p class="item-content">
-            <u-parse :html="item.content"></u-parse>
-          </p>
+          <p class="item-content">{{ item.content }}</p>
           <div v-if="item.images && item.images.length">
             <div class="img-list" v-if="item.contentType != 1">
               <img :src="items.url" alt="" v-for="(items, index) in item.images" :key="index" v-if="index < 3" @click.stop="previewImage(item.images, items.url)" />

src/apps/AppVillageDiscuss/Detail.vue

@@ -57,7 +57,10 @@
       </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>
@@ -164,7 +167,7 @@ export default {
               this.timestamp = discussTime - nowTime
             }
 
-            if (res.data.type === '1') {
+            if (res.data.type === '1' && res.data.statistic) {
               const total = Object.values(res.data.statistic).reduce((x, y) => {
                 return x + y
               })
@@ -176,11 +179,12 @@ export default {
                 }
               })
             }
+            this.pageShow = true
 
             this.$hideLoading()
-            this.pageShow = true
           } else {
             this.$hideLoading()
+            this.pageShow = true
           }
         })
         .catch(() => {
@@ -437,15 +441,32 @@ export default {
       position: relative;
       align-items: center;
       justify-content: space-between;
-      height: 64px;
-      line-height: 64px;
+      padding: 24px 32px;
       margin-bottom: 16px;
-      padding: 0 32px;
       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;
@@ -456,6 +477,7 @@ export default {
       }
 
       span {
+        flex-shrink: 1;
         position: relative;
         z-index: 1;
         color: #5b84b3;