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

src/apps/AppVillageDiscuss/AppVillageDiscuss.vue

@@ -45,7 +45,6 @@
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
       <div class="addBtn iconfont iconfont-iconDouble_Up" @tap.stop="backTop" v-if="showBackTop" />
     </AiFixedBtn>
-
     <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
   </div>
 </template>
@@ -101,6 +100,7 @@ export default {
 
     this.$areaId = this.user.areaName
     this.areaName = this.user.areaName
+    this.areaId = this.user.areaId
 
     this.getList()
     uni.$on('update', () => {
@@ -219,6 +219,15 @@ export default {
   padding-bottom: 10px;
   background: #f2f2f2;
 
+  ::v-deep .AiCard {
+    border-radius: 0!important;
+    box-shadow: none;
+
+    .start {
+      border-radius: 0!important;
+    }
+  }
+
   .areatop {
     display: flex;
     justify-content: space-between;

src/apps/AppVillageDiscuss/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="Detail" v-if="pageShow">
+  <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" />
@@ -79,9 +79,7 @@
       </div>
     </u-popup>
 
-    <!-- <div class="bottomBar">
-      <div v-if="data.status < 2" @click="handleComplete">结束公示</div>
-    </div> -->
+    <div class="end-btn" hover-class="text-hover" v-if="data.status === '1'" @click="handleComplete">结束公示</div>
   </div>
 </template>
 
@@ -253,8 +251,10 @@ export default {
     handleComplete() {
       this.$confirm('是否要结束公示')
         .then(() => {
-          let { id } = this
-          this.$http.post('/app/appvillagediscuss/finishPublic', { id }).then((res) => {
+          this.$http.post('/app/appvillagediscuss/finishPublic', {
+            status: '2',
+            id: this.id
+          }).then((res) => {
             if (res?.code == 0) {
               this.$u.toast('已结束公示!')
               this.getDetail()
@@ -269,7 +269,25 @@ export default {
 
 <style scoped lang="scss">
 .Detail {
-  padding-bottom: 112px;
+  padding-bottom: 40px;
+
+  .end-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    color: #fff;
+    font-size: 32px;
+    background: #1365DD;
+  }
+
+  &.detail-active {
+    padding-bottom: 132px;
+  }
 
   .detail-top {
     padding: 30px;