From 5ff431e3c735c1c81247dea9a21e6a3773413901 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 31 Dec 2021 16:28:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPageBasic/AppPageBasic.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppPageBasic/AppPageBasic.vue b/src/apps/AppPageBasic/AppPageBasic.vue
index a98d1746..56fc9d49 100644
--- a/src/apps/AppPageBasic/AppPageBasic.vue
+++ b/src/apps/AppPageBasic/AppPageBasic.vue
@@ -22,11 +22,11 @@ export default {
           icon: require('./img/shgk.png'),
           url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
         },
-        {
-          name: '问卷表单',
-          icon: require('./img/wjbd.png'),
-          url: '../AppAskForm/AppAskForm'
-        }
+        // {
+        //   name: '问卷表单',
+        //   icon: require('./img/wjbd.png'),
+        //   url: '../AppAskForm/AppAskForm'
+        // }
       ],
       headerBg: require('./img/header-bg.png'),
     }

From 462b7fd1f9930e9ec04ca0344e073badcd3b9d47 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 31 Dec 2021 16:39:35 +0800
Subject: [PATCH 2/4] bug

---
 src/apps/AppWalkask/AppWalkask.vue | 2 ++
 src/apps/AppWalkask/selectType.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 42990358..63d90c02 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -154,6 +154,7 @@ export default {
     areaSelect(e) {
       this.data = []
       this.areaId = e
+      this.current = 1
       this.getList()
     },
 
@@ -162,6 +163,7 @@ export default {
       this.areaId = this.user.areaId
       this.keyword = ''
       this.currentTabs = index
+      this.current = 1
       this.getList()
     },
 
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 0ee707fc..679beb0c 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="selectType">
-    <div class="header-top">
+    <div class="header-top" v-if="!showType">
       <u-search v-model="keyword" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
 

From 0e81b4e86a2a60386755ab27689b10d31a9e362d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 31 Dec 2021 16:41:01 +0800
Subject: [PATCH 3/4] bug

---
 src/apps/AppWalkask/selectType.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 679beb0c..1b19f82b 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -116,10 +116,6 @@ export default {
       })
       this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
-          uni.showToast({
-            title: '加载完毕',
-            icon: 'none',
-          })
           res.data.records.map((item) => {
             item.isChecked = false
           })

From 134e8eeb800c05e3e07840a5e77f5800b96fc67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 16:49:59 +0800
Subject: [PATCH 4/4] 25942

---
 src/apps/AppResidentActivitie/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index 1bdbd3e2..5abf55b6 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -102,7 +102,7 @@
       <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
     </div>
 
-    <AiFixedBtn v-if="this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">
+    <AiFixedBtn v-if="detail.status != 0 && this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
     </AiFixedBtn>
   </div>