村民圈

src/mods/AppVillager/AppVillager.vue

@@ -1,20 +1,16 @@
 <template>
   <div class="Page">
-    <u-tabs class="u-tabs1" :list="tabs" :is-scroll="false" :current="tabIndex" @change="change" bg-color="#197df0" style="width: 50%" active-color="#FFF;" inactive-color="#FFF"></u-tabs>
+    <u-tabs class="u-tabs1" :list="tabs" :is-scroll="false" :current="tabIndex1" @change="change" bg-color="#197df0" style="width: 50%" active-color="#FFF;" inactive-color="#FFF"></u-tabs>
 
     <div class="top">
-      <div class="tabIndex012" v-if="tabIndex != 3">
+      <div class="tabIndex012" v-if="tabIndex1 != 3">
-        <div class="tags">美丽庭院</div>
+        <div class="tags" v-for="(items, i) in $dict.getDict('villagerCircleTopic')" :key="i">{{ items.dictName }}</div>
-
-        <div class="tags">美丽庭院</div>
-
-        <div class="tags">美丽庭院</div>
       </div>
 
-      <u-tabs class="u-tabs2" :list="tabList" :is-scroll="false" :current="tabCurrent" @change="changetabIndex" bg-color="#fff" active-color="#333;" inactive-color="#999" v-if="tabIndex == 3"></u-tabs>
+      <u-tabs class="u-tabs2" :list="tabList" :is-scroll="false" :current="tabCurrent2" @change="changetabIndex" bg-color="#fff" active-color="#333;" inactive-color="#999" v-if="tabIndex1 == 3"></u-tabs>
 
-      <div class="indexTab" v-if="tabIndex == 3">
+      <div class="indexTab3" v-if="tabIndex1 == 3">
-        <div class="tags" v-for="(e, i) in itemList" :key="i" :class="indexTab == i ? 'active' : 'noactive'" @click="hander(i)">{{ e.name }}</div>
+        <div class="tags" v-for="(e, i) in itemList" :key="i" :class="indexTab3 == i ? 'active' : 'noactive'" @click="hander(i)">{{ e.name }}</div>
       </div>
     </div>
 
@@ -32,11 +28,15 @@
               </div>
 
               <!-- :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }"  -->
-              <div class="status status0" v-if="tabIndex == 3">审核中</div>
+              <div class="statusDele">
+                <div class="status status0" v-if="tabIndex1 == 3">审核中</div>
+
+                <img src="../../static/AppVillager/4.png" alt="" @click.stop="delShow = true" class="dels" />
+              </div>
             </div>
           </div>
 
-          <div class="tabCurrent0" v-if="tabIndex != 3 || tabCurrent == 0">
+          <div class="tabCurrent0" v-if="tabIndex1 != 3 || tabCurrent2 == 0">
             <div class="cardConts">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
 
             <div class="cardImg">
@@ -49,7 +49,7 @@
                 <span>东湖生态旅游风景区听涛景区</span>
               </div>
 
-              <div class="icones" v-if="tabIndex != 3">
+              <div class="icones" v-if="tabIndex1 != 3">
                 <div class="img1">
                   <img src="../../static/AppVillager/1.png" alt="" class="img11" />
                 </div>
@@ -62,7 +62,7 @@
             </div>
           </div>
 
-          <div class="tabCurrent1" v-if="tabIndex == 3 && tabCurrent == 1">
+          <div class="tabCurrent1" v-if="tabIndex1 == 3 && tabCurrent2 == 1">
             <div class="cardsConts">针不戳！</div>
 
             <div class="reply">
@@ -80,9 +80,12 @@
       <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
     </div>
 
-    <AiFixedBtn v-if="tabIndex == 3 && tabCurrent == 1">
+    <!-- <AiFixedBtn v-if="tabIndex1 == 3 && tabCurrent2 == 1" @click.native="toAdd()">
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()"></div>
+      <div class="addBtn iconfont iconfont-iconfangda">发起审核</div>
-    </AiFixedBtn>
+    </AiFixedBtn> -->
+    <div class="addBtn" v-if="tabIndex1 == 3 && tabCurrent2 == 1" @click.native="toAdd()">发起审核</div>
+
+    <u-modal v-model="delShow" content="确定删除该数据" :mask-close-able="true" @confirm="confirmDel"></u-modal>
   </div>
 </template>
 
@@ -108,7 +111,7 @@ export default {
           name: '我参与的',
         },
       ],
-      tabIndex: 0,
+      tabIndex1: 3,
       tabList: [
         {
           name: '我的话题',
@@ -117,32 +120,38 @@ export default {
           name: '我的评论',
         },
       ],
-      tabCurrent: 0,
+      tabCurrent2: 0,
       data: [{ value: 0, title: '弃捐勿复道，努力加餐饭' }],
       itemList: [
         {
           name: '全部',
-          indexTab: 0,
+          indexTab3: 0,
         },
         {
           name: '已通过',
-          indexTab: 1,
+          indexTab3: 1,
         },
         {
           name: '未通过',
-          indexTab: 2,
+          indexTab3: 2,
         },
         {
           name: '审核中',
-          indexTab: 3,
+          indexTab3: 3,
         },
       ],
-      indexTab: 0,
+      indexTab3: 0,
+      delShow: false,
     }
   },
   computed: {},
   watch: {},
-  onLoad() {},
+  onLoad() {
+    this.$dict.load('villagerCircleTopic').then(() => {
+      // this.getList()
+      console.log(this.$dict.getDict('villagerCircleTopic'))
+    })
+  },
   onShow() {
     uni.$on('updateList', () => {
       this.getList()
@@ -151,17 +160,17 @@ export default {
   methods: {
     change(index) {
       // this.data = []
-      this.tabIndex = index
+      this.tabIndex1 = index
       this.current = 1
       // this.getList()
     },
 
     changetabIndex(e) {
-      this.tabCurrent = e
+      this.tabCurrent2 = e
     },
 
     hander(i) {
-      this.indexTab = i
+      this.indexTab3 = i
     },
 
     toDetail(item) {
@@ -169,8 +178,26 @@ export default {
     },
 
     toAdd() {
+      console.log(1)
       this.$linkTo(`./add`)
     },
+
+    confirmDel() {
+      this.$instance
+        .post(`/app/appvillagercircleinfo/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)
+        })
+    },
   },
 }
 </script>
@@ -205,6 +232,7 @@ export default {
     .tabIndex012 {
       padding-top: 32px;
       display: flex;
+      flex-wrap: wrap;
       .tags {
         padding: 8px 32px;
         background: #ffffff;
@@ -212,9 +240,12 @@ export default {
         margin-left: 16px;
         border: 1px solid #4181ff;
       }
+      .tags:nth-child(n + 4) {
+        margin-top: 10px;
+      }
     }
 
-    .indexTab {
+    .indexTab3 {
       padding-top: 32px;
       display: flex;
       .tags {
@@ -266,17 +297,27 @@ export default {
                 margin-top: 6px;
               }
             }
-            .status {
+
-              font-size: 28px;
+            .statusDele {
-            }
+              display: flex;
-            .status0 {
+              align-items: center;
-              color: #42d784;
+              .status {
-            }
+                font-size: 28px;
-            .status1 {
+              }
-              color: #ff4466;
+              .status0 {
-            }
+                color: #42d784;
-            .status2 {
+              }
-              color: #ff883c;
+              .status1 {
+                color: #ff4466;
+              }
+              .status2 {
+                color: #ff883c;
+              }
+              .dels {
+                margin-left: 20px;
+                width: 68px;
+                height: 68px;
+              }
             }
           }
         }
@@ -381,5 +422,19 @@ export default {
       }
     }
   }
+
+  .addBtn {
+    position: fixed;
+    right: 5%;
+    bottom: 15%;
+    width: 96px;
+    height: 96px;
+    line-height: 96px;
+    text-align: center;
+    font-size: 24px;
+    color: #1365dd;
+    border-radius: 50%;
+    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
+  }
 }
 </style>

src/mods/AppVillager/add.vue

@@ -2,26 +2,30 @@
   <div class="add">
     <div class="u-forms">
       <u-form class="u-form" :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
-        <u-form-item label="话题类型" prop="applyIntegralType" required :border-bottom="false" right-icon="arrow-right">
+        <u-form-item label="话题类型" class="topics" prop="topic" required :border-bottom="false" right-icon="arrow-right">
-          <u-input v-model="forms.applyIntegralType" disabled placeholder="请选择话题类型" @click="showStstus = true" />
+          <u-input v-model="forms.topic" disabled placeholder="请选择话题类型" @click="showStstus = true" />
 
-          <u-select v-model="showStstus" :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+          <u-select v-model="showStstus" :list="$dict.getDict('villagerCircleTopic')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
         </u-form-item>
 
         <div class="line"></div>
 
-        <u-form-item label="内容" prop="description" required :border-bottom="false" label-position="top" class="contents">
+        <u-form-item label="内容" prop="content" required :border-bottom="false" label-position="top" class="contents">
-          <u-input v-model="forms.description" placeholder="请输入详细描述信息" type="textarea" :auto-height="true" maxlength="500" />
+          <u-input v-model="forms.content" placeholder="请输入详细描述信息" type="textarea" :auto-height="true" maxlength="500" />
         </u-form-item>
-        <div class="wordLength">{{ forms.description.length }}/500</div>
+        <div class="wordLength">{{ forms.content.length }}/500</div>
 
         <div class="line"></div>
 
-        <u-form-item label="图片上传 (最多9张)" prop="applyFiles" :border-bottom="false" class="avatars" label-position="top">
+        <u-form-item label="图片上传 (最多9张)" prop="pictures" :border-bottom="false" class="avatars" label-position="top">
-          <AiUploader v-model="forms.applyFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+          <AiUploader v-model="forms.pictures" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
         </u-form-item>
 
         <div class="line"></div>
+
+        <u-form-item label="所在位置" class="topics" prop="gpsDesc" required :border-bottom="false" right-icon="arrow-right">
+          <u-input v-model="forms.gpsDesc" disabled placeholder="点击定位" @click="chooseAddress" />
+        </u-form-item>
       </u-form>
     </div>
 
@@ -39,10 +43,13 @@ export default {
   data() {
     return {
       forms: {
-        applyIntegralType: '',
+        topic: '',
-        applyIntegralTypeValue: '',
+        topicValue: '',
-        description: '',
+        content: '',
-        applyFiles: [],
+        pictures: [],
+        gpsDesc: '',
+        lat: '',
+        lng: '',
       },
       showStstus: false,
       flag: false,
@@ -50,7 +57,7 @@ export default {
   },
   computed: { ...mapState(['user']) },
   onLoad() {
-    this.$dict.load('atWillReportType').then(() => {})
+    this.$dict.load('villagerCircleTopic').then(() => {})
   },
   onShow() {},
   methods: {
@@ -59,27 +66,34 @@ export default {
 
       this.$refs.uForm.validate((valid) => {
         if (valid) {
-          if (!this.forms.applyIntegralType) {
+          if (!this.forms.topicValue) {
             return this.$u.toast('请选择话题类型')
           }
-          if (!this.forms.description) {
+          if (!this.forms.content) {
             return this.$u.toast('请输入内容')
           }
+          if (!this.forms.lat && !this.forms.lng) {
+            return this.$u.toast('请选择所在位置')
+          }
 
           const imgs = []
-          if (this.forms.applyFiles) {
+          if (this.forms.pictures) {
-            this.forms.applyFiles.map((e) => {
+            this.forms.pictures.map((e) => {
               imgs.push({ url: e.url, id: e.id })
             })
           }
 
           this.flag = true
           this.$instance
-            .post(`/app/appvillagerintegraldeclare/addOrUpdate`, {
+            .post(`/app/appvillagercircleinfo/addOrUpdate`, {
-              applyIntegralType: this.forms.applyIntegralTypeValue,
+              topic: this.forms.topicValue,
-              description: this.forms.description,
+              content: this.forms.content,
-              applyFiles: imgs || [],
+              pictures: imgs || [],
-              residentId: this.user.residentId,
+              createUserResidentId: this.user.id,
+              areaId: this.$areaId,
+              gpsDesc: this.gpsDesc,
+              lat: this.forms.lat,
+              lng: this.forms.lng,
             })
             .then((res) => {
               if (res.code == 0) {
@@ -102,8 +116,19 @@ export default {
     },
 
     selectStatus(e) {
-      this.forms.applyIntegralType = e[0].label
+      this.forms.topic = e[0].label
-      this.forms.applyIntegralTypeValue = e[0].value
+      this.forms.topicValue = e[0].value
+    },
+
+    chooseAddress() {
+      uni.chooseLocation({
+        success: (res) => {
+          console.log(res)
+          this.forms.gpsDesc = res.gpsDesc
+          this.forms.lat = res.latitude
+          this.forms.lng = res.longitude
+        },
+      })
     },
   },
 }
@@ -118,7 +143,7 @@ export default {
     ::v-deep .u-form {
       background: #fff;
       .u-form-item {
-        padding: 0 45px !important;
+        padding: 0 32px !important;
         .u-form-item__body {
           .u-form-item--right__content__slot {
             padding-bottom: 0;
@@ -130,7 +155,13 @@ export default {
       }
 
       .u-form-item:last-child {
-        margin-bottom: 40px;
+        margin-bottom: 0;
+      }
+
+      .topics {
+        .u-form-item__body {
+          padding: 30px 0 !important;
+        }
       }
 
       .contents {

src/mods/AppVillager/detail.vue

@@ -16,6 +16,7 @@
           </div>
 
           <!-- :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }"  -->
+
           <div class="status status0">审核中</div>
         </div>
       </div>
@@ -74,6 +75,15 @@
         </div>
       </div>
     </u-popup>
+
+    <u-popup v-model="deleShow" mode="bottom" class="popupdele">
+      <div class="hint">删除评论</div>
+      <div class="dele" @click="modalShow = true">删除</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>
   </div>
 </template>
 
@@ -84,23 +94,35 @@ export default {
   props: {},
   data() {
     return {
-      id: '',
+      id: '888',
       data: {},
       poupShow: false,
       content: '',
       flag: false,
       pageShow: false,
+      deleShow: false,
+      modalShow: false,
+      deleId: '',
     }
   },
   computed: {},
   watch: {},
   onLoad(o) {
     this.$dict.load('atWillReportType').then(() => {
-      this.id = o.id
+      // this.id = o.id
+      this.getDetail()
     })
   },
   onShow() {},
   methods: {
+    getDetail() {
+      this.$instance.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.detail = res.data
+        }
+      })
+    },
+
     send() {
       if (this.flag) return
       if (!this.content) {
@@ -108,25 +130,25 @@ export default {
       }
 
       this.$instance
-        .post(`/app/appvillagediscussmessage/addOrUpdate`, {
+        .post(`/app/appvillagercirclecomment/addOrUpdate`, {
           content: this.content,
-          avatar: this.user.avatar,
+          replyUserResidentId: this.user.id,
-          createUserId: this.user.id,
+          replyUserName: this.user.name,
-          createUserName: this.user.name,
+          id: this.id,
-          discussId: this.id,
         })
         .then((res) => {
           if (res?.code == 0) {
             this.$u.toast('留言成功')
             this.flag = false
             this.content = ''
-            this.showBottomInput = false
+            this.poupShow = false
-            this.getDetail()
+            // this.getDetail()
           }
         })
     },
 
-    like(id) {
+    like() {
+      var id = '88'
       this.$instance
         .post(`/app/appvillagediscussmessage/suport?id=${id}&userId=${this.user.id}`)
         .then((res) => {
@@ -140,6 +162,23 @@ export default {
           this.$u.toast(err)
         })
     },
+
+    confirmDelete() {
+      this.$instance
+        .post(`/app/appvillagercirclecomment/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)
+        })
+    },
   },
 }
 </script>
@@ -188,8 +227,10 @@ export default {
             margin-top: 6px;
           }
         }
+
         .status {
           font-size: 28px;
+          margin-right: 10px;
         }
         .status0 {
           color: #42d784;