From c9f9bb1f8dded9da532775b33061516fc516b920 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Dec 2021 17:56:36 +0800
Subject: [PATCH] BUG 25819

---
 .../AppServicePublic/AppServicePublic.vue     | 70 ++++++++++++-------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index 7bfdf1a0..c6307005 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -2,7 +2,8 @@
   <div class="AppServicePublic">
     <AiTopFixed v-if="tabs.length">
       <div class="tab-select" @click="tabClick(item)">
-        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(item)">{{item.categoryName}}<span></span></div>
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index"
+             @click="tabClick(item)">{{ item.categoryName }}<span></span></div>
       </div>
     </AiTopFixed>
     <div class="header-top">
@@ -10,21 +11,22 @@
       <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
     </div>
 
-    <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
+    <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch"
+              @search="search"></u-search>
 
     <template v-if="datas.length > 0">
-      <AiCard v-for="(item, i) in datas" :key="i" @click.native="toAdd(item, 1)">
+      <AiCard v-for="(item, i) in datas" :ref="item.id" :key="i" @click.native="toAdd(item, 1)">
         <template #custom>
           <div class="titles">{{ item.title }}</div>
 
           <div class="flex">
             <span class="left">
-              <span class="garydiv" v-if="item.categoryName">{{item.categoryName}}</span>
-              <span class="times">{{item.createTime.substring(0, 10)}}</span>
+              <span class="garydiv" v-if="item.categoryName">{{ item.categoryName }}</span>
+              <span class="times">{{ item.createTime.substring(0, 10) }}</span>
             </span>
 
             <span class="right">
-              <span class="font">{{item.viewCount}}</span>
+              <span class="font">{{ item.viewCount }}</span>
               <span>人看过</span>
             </span>
           </div>
@@ -40,21 +42,22 @@
         </template>
       </AiCard>
 
-      <u-loadmore :status="loadmore" color="#999" font-size="24" margin-top="32" margin-bottom="80" />
+      <u-loadmore :status="loadmore" color="#999" font-size="24" margin-top="32" margin-bottom="80"/>
     </template>
 
     <AiEmpty description="暂无数据" v-else></AiEmpty>
 
     <AiFixedBtn>
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()"/>
     </AiFixedBtn>
 
-    <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
+    <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true"
+             :show-title="false" @confirm="delet"></u-modal>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   name: 'AppServicePublic',
@@ -92,7 +95,7 @@ export default {
     this.listName = o.listName
     this.getType()
     this.getList()
-    uni.$on('update' , () => {
+    uni.$on('update', () => {
       this.getList()
     })
     uni.setNavigationBarTitle({title: this.listName})
@@ -101,13 +104,13 @@ export default {
     getType() {
       this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
         if (res.code == 0) {
-          if(res.data && res.data[0].categoryList.length) {
+          if (res.data && res.data[0].categoryList.length) {
             var all = [{
               categoryName: '全部',
               id: '',
               showIndex: 0,
             }]
-            this.tabs = [...all, ... res.data[0].categoryList]
+            this.tabs = [...all, ...res.data[0].categoryList]
           }
         }
       })
@@ -141,23 +144,24 @@ export default {
     },
 
     toAdd(item, type) {
+      if (item?.id) {
+        this.$refs?.[item.id]?.[0]?.handleClose()
+      }
       if (type == '1') {
-        console.log('详情')
-        uni.navigateTo({ url: `./Detail?id=${item.id}&listName=${this.listName}` })
+        uni.navigateTo({url: `./Detail?id=${item.id}&listName=${this.listName}`})
       }
       if (type == '2') {
-        console.log('编辑')
-        uni.navigateTo({ url: `./Add?id=${item.id}&moduleId=${this.moduleId}&listName=${this.listName}` })
+        uni.navigateTo({url: `./Add?id=${item.id}&moduleId=${this.moduleId}&listName=${this.listName}`})
       }
       if (type == null) {
-        console.log('添加')
-        uni.navigateTo({ url: `./Add?moduleId=${this.moduleId}&listName=${this.listName}` })
+        uni.navigateTo({url: `./Add?moduleId=${this.moduleId}&listName=${this.listName}`})
       }
     },
 
     toDetele(item) {
       this.deletShow = true
       this.deletId = item.id
+      this.$refs?.[item.id]?.[0]?.handleClose()
     },
 
     delet() {
@@ -181,28 +185,33 @@ export default {
 uni-page-body {
   height: 100%;
 }
-::v-deep .content{
-  padding: 0!important;
+
+::v-deep .content {
+  padding: 0 !important;
 }
-.tab-select{
+
+.tab-select {
   width: 100%;
   height: 96px;
   line-height: 96px;
   background: #3975C6;
   display: flex;
-  .item{
+
+  .item {
     flex: 1;
     text-align: center;
     font-size: 28px;
     font-family: PingFangSC-Regular, PingFang SC;
     color: #CDDCF0;
   }
-  .active{
+
+  .active {
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     position: relative;
     color: #fff;
-    span{
+
+    span {
       width: 48px;
       height: 4px;
       background: #FFF;
@@ -213,9 +222,11 @@ uni-page-body {
     }
   }
 }
-.iconfont-iconMore{
+
+.iconfont-iconMore {
   // margin-top: 8px;
 }
+
 .AppServicePublic {
   height: 100%;
 
@@ -235,19 +246,23 @@ uni-page-body {
 
   ::v-deep .AiCard {
     background: #f3f6f9;
+
     .start {
       background: #fff;
       padding: 32px;
       border-radius: 16px;
+
       .titles {
         font-size: 32px;
         font-weight: 500;
         color: #333333;
         margin-bottom: 16px;
       }
+
       .flex {
         display: flex;
         justify-content: space-between;
+
         .left {
           .garydiv {
             font-size: 28px;
@@ -256,6 +271,7 @@ uni-page-body {
             border-radius: 24px;
             padding: 4px 16px;
           }
+
           .times {
             margin-left: 16px;
             font-size: 28px;
@@ -266,12 +282,14 @@ uni-page-body {
         .right {
           font-size: 28px;
           color: #999;
+
           .font {
             color: #4181ff;
           }
         }
       }
     }
+
     .mask {
       .moreMenu {
         .menu {