From bc665d4901412c7ca4dca5c6a9cd299d8da897bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 15 Jul 2024 15:32:06 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=89=E6=B1=82?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/appeal/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/appeal/index.vue b/src/views/appeal/index.vue
index 229ad94..fc6e968 100644
--- a/src/views/appeal/index.vue
+++ b/src/views/appeal/index.vue
@@ -20,7 +20,7 @@
                 @click.prevent.stop="previewImage(index2, item.imageList)" :src="item2" :key="index2" />
             </div>
           </div>
-          <Android/>
+          <Android v-if="router=='/appeal'"/>
       </van-list>
 
   </div>
@@ -29,6 +29,7 @@
 <script>
   import { collects } from '@/api/event'
   import Android from '@/components/Android'
+import router from '@/router';
 export default {
   data() {
       return {
@@ -48,6 +49,7 @@ export default {
           finished: false,
           loading: true,
           showRegister: false,
+          router:""
       };
   },
   created() {
@@ -55,6 +57,7 @@ export default {
       this.collects();
   },
   methods: {
+    
       async collects() {
           let parm = {
             pageSize: this.pageSize,
@@ -63,6 +66,7 @@ export default {
             mobile: this.$store.state.app.userInfo.mobile ||'' || '',//'13792880745'
             agencyId:this.$store.state.app.userInfo.agencyId|| ''//'1697488876903944195'
           }
+          this.router=this.$route.path
           let res = await collects(parm)
           if (res.code === 0) {
               this.loading = false;

From 9a236907693499d9753259f264e55ba651451f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 15 Jul 2024 15:49:59 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/appeal/index.vue   | 4 ++--
 src/views/messages/index.vue | 3 +++
 src/views/search/index.vue   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/appeal/index.vue b/src/views/appeal/index.vue
index fc6e968..ccf348a 100644
--- a/src/views/appeal/index.vue
+++ b/src/views/appeal/index.vue
@@ -27,8 +27,8 @@
 </template>
 
 <script>
-  import { collects } from '@/api/event'
-  import Android from '@/components/Android'
+import { collects } from '@/api/event'
+import Android from '@/components/Android'
 import router from '@/router';
 export default {
   data() {
diff --git a/src/views/messages/index.vue b/src/views/messages/index.vue
index ba3bed8..37f67ea 100644
--- a/src/views/messages/index.vue
+++ b/src/views/messages/index.vue
@@ -28,12 +28,14 @@
             </div>
 
         </van-list>
+        <Android></Android>
     </div>
 </template>
 
 <script>
 import { querystaffmessage } from '@/api/message'
 import { eventDetail } from '@/api/event'
+import Android from '@/components/Android'
 
 export default {
     name: 'message',
@@ -58,6 +60,7 @@ export default {
             pageSize: 10
         }
     },
+    components: {Android },
     mounted() {
         this.userId = this.$store.state.app.userInfo.id;
         this.querystaffmessage()
diff --git a/src/views/search/index.vue b/src/views/search/index.vue
index 1870904..e278598 100644
--- a/src/views/search/index.vue
+++ b/src/views/search/index.vue
@@ -22,11 +22,13 @@
                 </van-cell>
             </van-list>
         </div>
+        <Android></Android>
     </div>
 </template>
 
 <script>
 import { keyWordSearch, popularSearch } from '@/api/home';
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -96,7 +98,7 @@ export default {
         }
 
     },
-    components: {},
+    components: {Android},
     computed: {
         textHighlighting(textItem, searchText) {
             return (textItem, searchText) => {

From aa7763a736db5d276b350f7afc25b5638b3bcee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 15 Jul 2024 16:06:12 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                             | 2 ++
 src/views/Enjoyableservices/index.vue   | 2 +-
 src/views/activity/detail.vue           | 4 ++--
 src/views/communityPublicity/detail.vue | 2 +-
 src/views/event/index.vue               | 2 +-
 src/views/messages/index.vue            | 2 +-
 src/views/mine/index.vue                | 2 +-
 src/views/mine/myActivity/index.vue     | 2 +-
 src/views/mine/mySatisfaction/index.vue | 2 +-
 src/views/search/index.vue              | 2 +-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main.js b/src/main.js
index 1f0ac8b..99e8909 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,9 +12,11 @@ import '@/plugins/vant'
 import '@/assets/css/index.less'
 // 移动端适配
 import 'amfe-flexible'
+
 // icon
 import './assets/icons'
 
+Vue.component('Android', Android);
 Vue.config.productionTip = false
 
 // 日期格式化插件
diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue
index efb007b..8cf1bb9 100644
--- a/src/views/Enjoyableservices/index.vue
+++ b/src/views/Enjoyableservices/index.vue
@@ -22,7 +22,7 @@
 </template>
 <script>
 import { myCommonsService } from '@/api/user'
-import Android from '@/components/Android'
+
     export default{
         data(){
             return{
diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue
index 165d7f3..8eb01a1 100644
--- a/src/views/activity/detail.vue
+++ b/src/views/activity/detail.vue
@@ -64,7 +64,7 @@ import { addActivityRecord, detail, communityActivityApplicationRecordDelete } f
 import Share from "@/components/Share"
 import registerDialog from '@/components/registerDialog';
 import { setConfig } from '@/utils/jweixin'
-import Android from '@/components/Android'
+
 
 export default {
     data() {
@@ -189,7 +189,7 @@ export default {
 
         },
     },
-    components: { Share,Android, registerDialog },
+    components: { Share, registerDialog },
     computed: {},
     watch: {},
 }
diff --git a/src/views/communityPublicity/detail.vue b/src/views/communityPublicity/detail.vue
index 8e837ba..1227a31 100644
--- a/src/views/communityPublicity/detail.vue
+++ b/src/views/communityPublicity/detail.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import Android from '@/components/Android'
+
 
 import { setConfig } from '@/utils/jweixin'
 import {communityPublicityGiveLike } from '@/api/home';
diff --git a/src/views/event/index.vue b/src/views/event/index.vue
index 0e79503..5c1266b 100644
--- a/src/views/event/index.vue
+++ b/src/views/event/index.vue
@@ -71,7 +71,7 @@ import {setConfig} from '@/utils/jweixin'
 import Recording from '@/components/Recording'
 import Perfect from '@/components/Perfect'
 import Audio from '@/components/Audio'
-import Android from '@/components/Android'
+
 import Map from '@/components/Map'
 import appeal from '@/views/appeal'
 import {uploadvariedfile} from '@/api/basic'
diff --git a/src/views/messages/index.vue b/src/views/messages/index.vue
index 37f67ea..da1a2dc 100644
--- a/src/views/messages/index.vue
+++ b/src/views/messages/index.vue
@@ -35,7 +35,7 @@
 <script>
 import { querystaffmessage } from '@/api/message'
 import { eventDetail } from '@/api/event'
-import Android from '@/components/Android'
+
 
 export default {
     name: 'message',
diff --git a/src/views/mine/index.vue b/src/views/mine/index.vue
index 8b782df..b8e2d4f 100644
--- a/src/views/mine/index.vue
+++ b/src/views/mine/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import Android from '@/components/Android'
+
 export default {
   name: 'mine',
   data() {
diff --git a/src/views/mine/myActivity/index.vue b/src/views/mine/myActivity/index.vue
index 4536ac3..a7d294b 100644
--- a/src/views/mine/myActivity/index.vue
+++ b/src/views/mine/myActivity/index.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { communityActivity } from '@/api/home';
-import Android from '@/components/Android'
+
 
 export default {
     data() {
diff --git a/src/views/mine/mySatisfaction/index.vue b/src/views/mine/mySatisfaction/index.vue
index fadea8a..7761ce6 100644
--- a/src/views/mine/mySatisfaction/index.vue
+++ b/src/views/mine/mySatisfaction/index.vue
@@ -22,7 +22,7 @@
 
 <script>
 import { inspRecord } from '@/api/satisfaction';
-import Android from '@/components/Android'
+
 
 export default {
     data() {
diff --git a/src/views/search/index.vue b/src/views/search/index.vue
index e278598..ff7a648 100644
--- a/src/views/search/index.vue
+++ b/src/views/search/index.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { keyWordSearch, popularSearch } from '@/api/home';
-import Android from '@/components/Android'
+
 export default {
     data() {
         return {

From cacf8dbdff2964a48b627f3abfff7f7ccfa28a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 15 Jul 2024 16:17:39 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                              | 2 +-
 src/views/Enjoyableservices/detail.vue   | 2 +-
 src/views/Enjoyableservices/index.vue    | 2 +-
 src/views/activity/index.vue             | 3 +--
 src/views/appeal/index.vue               | 3 +--
 src/views/appealDetail/index.vue         | 3 +--
 src/views/communityPublicity/detail.vue  | 2 +-
 src/views/communityPublicity/index.vue   | 3 +--
 src/views/discussion/discusionDetail.vue | 3 +--
 src/views/discussion/index.vue           | 3 +--
 src/views/event/index.vue                | 3 +--
 src/views/messages/index.vue             | 2 +-
 src/views/mine/index.vue                 | 2 +-
 src/views/mine/myActivity/index.vue      | 2 +-
 src/views/mine/mySatisfaction/index.vue  | 2 +-
 src/views/search/index.vue               | 2 +-
 16 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/main.js b/src/main.js
index 99e8909..0f2212c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,7 +15,7 @@ import 'amfe-flexible'
 
 // icon
 import './assets/icons'
-
+import Android from '@/components/Android'
 Vue.component('Android', Android);
 Vue.config.productionTip = false
 
diff --git a/src/views/Enjoyableservices/detail.vue b/src/views/Enjoyableservices/detail.vue
index 21f4dc3..6fdecc9 100644
--- a/src/views/Enjoyableservices/detail.vue
+++ b/src/views/Enjoyableservices/detail.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { icServiceWarmRecord } from '@/api/user'
-import Android from '@/components/Android'
+
 export default {
     data() {
         return {
diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue
index 8cf1bb9..77329c4 100644
--- a/src/views/Enjoyableservices/index.vue
+++ b/src/views/Enjoyableservices/index.vue
@@ -34,7 +34,7 @@ import { myCommonsService } from '@/api/user'
             pageNo:1
             }
         },
-        components:{Android},
+        components:{},
         created(){
             this.myCommonsService()
         },
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index fcb0965..d8c73f6 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -28,7 +28,6 @@
 <script>
 import { communityActivity } from '@/api/home';
 import registerDialog from '@/components/registerDialog';
-import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -77,7 +76,7 @@ export default {
 
         }
     },
-    components: { registerDialog,Android },
+    components: { registerDialog },
     computed: {
         recordFlag() {
             return (item) => {
diff --git a/src/views/appeal/index.vue b/src/views/appeal/index.vue
index ccf348a..76a98d6 100644
--- a/src/views/appeal/index.vue
+++ b/src/views/appeal/index.vue
@@ -28,7 +28,6 @@
 
 <script>
 import { collects } from '@/api/event'
-import Android from '@/components/Android'
 import router from '@/router';
 export default {
   data() {
@@ -77,7 +76,7 @@ export default {
           }
       },
   },
-  components: {Android},
+  components: {},
   computed: {},
   watch: {},
 }
diff --git a/src/views/appealDetail/index.vue b/src/views/appealDetail/index.vue
index e861ad8..4b07fd5 100644
--- a/src/views/appealDetail/index.vue
+++ b/src/views/appealDetail/index.vue
@@ -201,14 +201,13 @@
 import { ImagePreview } from 'vant'
 import { process, updateEvent } from '@/api/event'
 import { getUserDemandUnSolvedDetail } from '@/api/demand'
-import Android from '@/components/Android'
+
 
 export default {
   name: 'appealDetail',
   
   components: {
     [ImagePreview.Component.name]: ImagePreview.Component,
-    Android
   },
   data() {
     return {
diff --git a/src/views/communityPublicity/detail.vue b/src/views/communityPublicity/detail.vue
index 1227a31..37b7abd 100644
--- a/src/views/communityPublicity/detail.vue
+++ b/src/views/communityPublicity/detail.vue
@@ -102,7 +102,7 @@ export default {
             }
         }
     },
-    components: {Share,Android},
+    components: {Share},
     computed: {},
     watch: {},
 }
diff --git a/src/views/communityPublicity/index.vue b/src/views/communityPublicity/index.vue
index 79150ab..576dff6 100644
--- a/src/views/communityPublicity/index.vue
+++ b/src/views/communityPublicity/index.vue
@@ -47,7 +47,6 @@
 
 <script>
 import { advertisingTag, communityPublicity } from '@/api/home';
-import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -132,7 +131,7 @@ export default {
             this.communityPublicity()
         },
     },
-    components: {Android},
+    components: {},
     computed: {},
     watch: {},
 }
diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue
index bbb2984..fbaff05 100644
--- a/src/views/discussion/discusionDetail.vue
+++ b/src/views/discussion/discusionDetail.vue
@@ -42,7 +42,6 @@
 
 <script>
 import { andelClicDetail, handelClicsupport } from '@/api/home';
-import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -61,7 +60,7 @@ export default {
         };
 
     },
-    components:{Android},
+    components:{},
     created() {
         this.eventId = this.$route.query.eventId
         this.id = this.$route.query.eventId
diff --git a/src/views/discussion/index.vue b/src/views/discussion/index.vue
index af2593f..533a28a 100644
--- a/src/views/discussion/index.vue
+++ b/src/views/discussion/index.vue
@@ -34,7 +34,6 @@
 <script>
 import { communityActivity,icEventOldDiscuss,handelClicsupport } from '@/api/home';
 import registerDialog from '@/components/registerDialog';
-import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -126,7 +125,7 @@ export default {
 
         }
     },
-    components: { registerDialog,Android },
+    components: { registerDialog },
     computed: {},
     watch: {},
 }
diff --git a/src/views/event/index.vue b/src/views/event/index.vue
index 5c1266b..8930c65 100644
--- a/src/views/event/index.vue
+++ b/src/views/event/index.vue
@@ -71,7 +71,6 @@ import {setConfig} from '@/utils/jweixin'
 import Recording from '@/components/Recording'
 import Perfect from '@/components/Perfect'
 import Audio from '@/components/Audio'
-
 import Map from '@/components/Map'
 import appeal from '@/views/appeal'
 import {uploadvariedfile} from '@/api/basic'
@@ -80,7 +79,7 @@ import {mapKey} from '@/config'
 
 export default {
   name: 'event',
-  components: {Recording, Android,Audio, Perfect, Map, appeal},
+  components: {Recording,Audio, Perfect, Map, appeal},
   data() {
     return {
       type: 0,
diff --git a/src/views/messages/index.vue b/src/views/messages/index.vue
index da1a2dc..ad63496 100644
--- a/src/views/messages/index.vue
+++ b/src/views/messages/index.vue
@@ -60,7 +60,7 @@ export default {
             pageSize: 10
         }
     },
-    components: {Android },
+    components: { },
     mounted() {
         this.userId = this.$store.state.app.userInfo.id;
         this.querystaffmessage()
diff --git a/src/views/mine/index.vue b/src/views/mine/index.vue
index b8e2d4f..cb4388e 100644
--- a/src/views/mine/index.vue
+++ b/src/views/mine/index.vue
@@ -68,7 +68,7 @@ export default {
     }
   },
   components:{
-    Android
+    
   },
   mounted() {
     this.userInfo = this.$store.state.app.userInfo
diff --git a/src/views/mine/myActivity/index.vue b/src/views/mine/myActivity/index.vue
index a7d294b..1ff9bc6 100644
--- a/src/views/mine/myActivity/index.vue
+++ b/src/views/mine/myActivity/index.vue
@@ -64,7 +64,7 @@ export default {
         },
      
     },
-    components:{Android},
+    components:{},
     computed: {},
     watch: {},
 }
diff --git a/src/views/mine/mySatisfaction/index.vue b/src/views/mine/mySatisfaction/index.vue
index 7761ce6..9fb367f 100644
--- a/src/views/mine/mySatisfaction/index.vue
+++ b/src/views/mine/mySatisfaction/index.vue
@@ -59,7 +59,7 @@ export default {
             
         }
     },
-    components: {Android},
+    components: {},
     computed: {},
     watch: {},
 }
diff --git a/src/views/search/index.vue b/src/views/search/index.vue
index ff7a648..d6514af 100644
--- a/src/views/search/index.vue
+++ b/src/views/search/index.vue
@@ -98,7 +98,7 @@ export default {
         }
 
     },
-    components: {Android},
+    components: {},
     computed: {
         textHighlighting(textItem, searchText) {
             return (textItem, searchText) => {

From cde41558c7717c61d6494d0e089e30156059ce95 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 16 Jul 2024 10:44:53 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activity/detail.vue | 42 +++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue
index d8846ea..d3d59e6 100644
--- a/src/views/activity/detail.vue
+++ b/src/views/activity/detail.vue
@@ -47,7 +47,7 @@
                     <template #icon>
                         <img src="@/assets/images/icons/share.png" alt="" class="img_20">
                     </template> 转发</van-button>
-                <van-button type="info" size="small" :disabled="new Date(this.info.cutOffTime.replace(/-/g, '/')).getTime() < Date.now() || this.info.currentParticipants >= this.info.participants"  round @click="save" v-if="info.online === 1">立即报名</van-button>
+                <van-button type="info" size="small" :disabled="disabledRecord(info)"  round @click="save" v-if="info.online === 1">立即报名</van-button>
             </div>
         </div>
         <Share :show="showShare" @closeShare="showShare = false" />
@@ -124,29 +124,35 @@ export default {
             this.isPast = specifiedTimestamp < currentTimestamp;
         },
         async detail(id, delId) {
-            if (delId) {
-                this.signUp = this.signUp.filter(item => item.id != delId)
-            } else {
-                let res = await detail(id)
+            const handleResponse = (res) => {
                 if (res.code === 0) {
-                    this.info = res.data;
-                    if (res.data.recordList.length != 0) {
-                        this.signUp = res.data.recordList
-                    }
-                    if (res.data.cutOffTime) {
-                        this.checkIfPast()
-                    }
+                this.info = res.data;
+                this.info.participants = res.data.participants;
+                this.info.currentParticipants = res.data.currentParticipants;
+                if (res.data.recordList && res.data.recordList.length > 0) {
+                    this.signUp = res.data.recordList;
+                }
+                if (res.data.cutOffTime) {
+                    this.checkIfPast();
                 }
+                }
+            };
+            if (delId) {
+                this.signUp = this.signUp.filter(item => item.id != delId);
             }
+            
+            let res = await detail(id);
+            handleResponse(res);
         },
         handelAddResi() {
             this.signUp.push({ name: "", mobile: "", remark: "", })
         },
         handelDelResi(item, index) {
             if (item.id) {
+                let than = this
                 communityActivityApplicationRecordDelete([item.id]).then(res => {
                     if (res.code === 0) {
-                        this.detail(this.$route.query.id, item.id);
+                        than.detail(this.$route.query.id, item.id);
                     }
                 }).catch(err => {
                     console.log(err);
@@ -186,7 +192,15 @@ export default {
         },
     },
     components: { Share, registerDialog },
-    computed: {},
+    computed: {
+        disabledRecord() {
+            return (item) => {
+                if (!item.cutOffTime || item.online != 1) return true
+                let flag = new Date(item.cutOffTime.replace(/-/g, '/')).getTime() < Date.now() || item.currentParticipants >= item.participants  || item.currentParticipants >= item.participants;
+                return flag || false
+            }
+        },
+    },
     watch: {},
 }
 </script>

From a455e5243b3bc093fe91b555bfbf7d949a02d4c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 17 Jul 2024 14:27:35 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/errorPage/index.vue    | 1 +
 src/views/houseQR/index.vue      | 1 +
 src/views/login/index.vue        | 4 +++-
 src/views/message/index.vue      | 1 +
 src/views/register/index.vue     | 1 +
 src/views/selectAgency/index.vue | 1 +
 src/views/userInfo/index.vue     | 4 +++-
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/errorPage/index.vue b/src/views/errorPage/index.vue
index 407ba25..64524cd 100644
--- a/src/views/errorPage/index.vue
+++ b/src/views/errorPage/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <p>公众号尚未完成配置，请联系管理员！</p>
+    <Android></Android>
   </div>
 </template>
 
diff --git a/src/views/houseQR/index.vue b/src/views/houseQR/index.vue
index 6937739..1c12051 100644
--- a/src/views/houseQR/index.vue
+++ b/src/views/houseQR/index.vue
@@ -70,6 +70,7 @@
     <van-popup v-model="showLaunch" round>
           <launch-weapp v-if="showLaunch"></launch-weapp>
     </van-popup>
+    <Android></Android>
   </div>
 </template>
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 98c47ca..c00f05b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <div></div>
+  <div>
+    <Android></Android>
+  </div>
 </template>
 <script>
 import {wxId} from '@/config'
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index ebdf58d..28e3835 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -18,6 +18,7 @@
         </div>
       </div>
     </van-list>
+    <Android></Android>
   </div>
 </template>
 
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 5e121f7..ea9b487 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -28,6 +28,7 @@
         </div>
       </van-tab>
     </van-tabs>
+    <Android></Android>
   </div>
 </template>
 
diff --git a/src/views/selectAgency/index.vue b/src/views/selectAgency/index.vue
index cf3a006..2a91c0a 100644
--- a/src/views/selectAgency/index.vue
+++ b/src/views/selectAgency/index.vue
@@ -19,6 +19,7 @@
                     @click="handelClickAgency(item)"></van-cell>
             </van-list>
         </div>
+        <Android></Android>
     </div>
 </template>
 
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index fcd2b7f..809480d 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div>  <div class="container">
     <div class="block">
       <van-cell title="头像" required>
         <template>
@@ -77,6 +77,8 @@
     <Perfect v-if="type === 'edit'" />
     <van-button round block @click="submit" color="linear-gradient(to right, #81B5FB, #3E92FF)">提交</van-button>
   </div>
+  <Android></Android></div>
+
 </template>
 
 <script>

From 6513327881446b2108df83546785c5de2a5de6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 17 Jul 2024 18:11:39 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Android/index.vue         | 9 +++++----
 src/components/Map/index.vue             | 2 +-
 src/views/Enjoyableservices/detail.vue   | 2 +-
 src/views/activity/detail.vue            | 4 ++--
 src/views/appeal/index.less              | 2 +-
 src/views/communityPublicity/detail.vue  | 4 ++--
 src/views/discussion/discusionDetail.vue | 2 +-
 src/views/errorPage/index.vue            | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Android/index.vue b/src/components/Android/index.vue
index fe5127f..21021bd 100644
--- a/src/components/Android/index.vue
+++ b/src/components/Android/index.vue
@@ -1,10 +1,11 @@
 <template>
        <div class="footer" v-if="mobileModel!=='Phone'">
-            <div class="flex flex-x flex-end " style="width: 150px;"> 
-            <van-icon name="arrow-left"   @click="goToPreviousPage()"/>
+         <div class="flex flex-x flex-end flex-center1"  style="width: 150px;"> 
+            
+            <van-icon name="arrow-left" size="20px"   @click="goToPreviousPage()"/>
             <!-- <div class="" @click="goToPreviousPage()"><</div> -->
             <!-- <div class="AAA" @click="goToNextPage()">></div>           -->
-            <van-icon name="arrow" @click="goToNextPage()" />
+            <van-icon name="arrow" size="20px" @click="goToNextPage()" />
         </div>
           
     </div>
@@ -67,7 +68,7 @@
   .footer{
     background-color: white;
     width: 375px;
-    height: 8vh;
+    height: 6vh;
     display: flex;
     position: fixed;
     bottom: 0;
diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue
index 7ef4fe9..543b523 100644
--- a/src/components/Map/index.vue
+++ b/src/components/Map/index.vue
@@ -44,6 +44,6 @@ export default {
 
 <style scoped>
 .content {
-  height: 80vh;
+  height: 85vh;
 }
 </style>
diff --git a/src/views/Enjoyableservices/detail.vue b/src/views/Enjoyableservices/detail.vue
index 6fdecc9..dad18df 100644
--- a/src/views/Enjoyableservices/detail.vue
+++ b/src/views/Enjoyableservices/detail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="container" :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
+        <div class="container" :style="this.phone=='Phone'?'':'height: 85vh; overflow: auto;'">
             <div class="card">
                 <div class="font-size21 font-bold">{{ info.title }}</div>
                 <div class="flex flex-x  flex-center2 m-top10 m-bottom10">
diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue
index d3d59e6..ef1f591 100644
--- a/src/views/activity/detail.vue
+++ b/src/views/activity/detail.vue
@@ -1,6 +1,6 @@
 <template>
     <div> 
-        <div class='container m-bot50'   :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
+        <div class='container m-bot50'   :style="this.phone=='Phone'?'':'height: 85vh; overflow: auto;'">
         <div class="card">
             <img :src="info.coverPic" alt="" style="width: 100%;">
             <div class="m-top15 p0">
@@ -39,7 +39,7 @@
             </van-cell-group>
 
         </div>
-        <div class="bot_btn flex flex-center2  " :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:8vh;'">
+        <div class="bot_btn flex flex-center2  " :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:5vh;'">
             <div class="flex1 flex flex-center1 flex-center2">报名人数：<span class="orange font-size18">{{
                 info.currentParticipants || 0 }}</span> / {{ info.participants }}人</div>
             <div class="flex1 flex flex-center1 flex-center2">
diff --git a/src/views/appeal/index.less b/src/views/appeal/index.less
index c23c1f6..55a52be 100644
--- a/src/views/appeal/index.less
+++ b/src/views/appeal/index.less
@@ -43,7 +43,7 @@
 .no-data {
   font-size: 14px;
   width: 100%;
-  height: 80vh;
+  height: 85vh;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/src/views/communityPublicity/detail.vue b/src/views/communityPublicity/detail.vue
index f955689..04fe5c7 100644
--- a/src/views/communityPublicity/detail.vue
+++ b/src/views/communityPublicity/detail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-     <div class='container m-bot50' :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
+     <div class='container m-bot50' :style="this.phone=='Phone'?'':'height: 85vh; overflow: auto;'">
         <div class="card">
             <div class="m-top15 p0">
                 <h2 style="margin: 0; font-size: 21px;">{{ info.title }}</h2>
@@ -13,7 +13,7 @@
                 </div>
             </div>
         </div>
-        <div class="bot_btn flex flex-center2" :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:8vh;'">
+        <div class="bot_btn flex flex-center2" :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:5vh;'">
             <div class="flex1 flex flex-center1 flex-center2">
                 <van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'likes')">
                     <template #icon>
diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue
index fbaff05..f3a93f5 100644
--- a/src/views/discussion/discusionDetail.vue
+++ b/src/views/discussion/discusionDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-           <div class='container' style="height: 80vh; overflow: auto;">
+           <div class='container' style="height: 85vh; overflow: auto;">
         <div class="card flex flex-y ">
             <div class="m-bottom5">{{ ProblemDescription.eventContent }}</div>
             <div class="font-size13 gray">{{ ProblemDescription.happenTime }}</div>
diff --git a/src/views/errorPage/index.vue b/src/views/errorPage/index.vue
index 64524cd..d79ccea 100644
--- a/src/views/errorPage/index.vue
+++ b/src/views/errorPage/index.vue
@@ -17,7 +17,7 @@ p {
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 80vh;
+  height: 85vh;
   text-align: center;
 }
 </style>

From 3f8f634d53009084b67a21dd7fdbb405b92644d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 17 Jul 2024 18:39:44 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=98=AF=E7=BB=84=E7=BB=87=E4=B9=A6?=
 =?UTF-8?q?=E5=8A=A0pid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/selectAgency/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/selectAgency/index.vue b/src/views/selectAgency/index.vue
index 2a91c0a..9d44e11 100644
--- a/src/views/selectAgency/index.vue
+++ b/src/views/selectAgency/index.vue
@@ -88,7 +88,7 @@ export default {
             })
         },
         async getAgency(type) {
-            let res = await getAllOrgTreeList({ organizationName: this.district })
+            let res = await getAllOrgTreeList({ organizationName: this.district,pid:0 })
             if (res.code === 0) {
                 if (type) {
                     this.selfCity.push({ label: this.district, children: res.data })