Merge remote-tracking branch 'origin/dev' into dev

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'),
     }

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>

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()
     },
 

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>
 
@@ -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
           })