Merge branch 'xiaowang' into feature

# Conflicts:
#	src/main.js
#	src/views/activity/detail.vue
#	src/views/event/index.vue
#	src/views/messages/index.vue

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;

src/components/Map/index.vue

@@ -44,6 +44,6 @@ export default {
 
 <style scoped>
 .content {
-  height: 80vh;
+  height: 85vh;
 }
 </style>

src/main.js

@@ -13,10 +13,8 @@ import '@/assets/css/index.less'
 // 移动端适配
 import 'amfe-flexible'
 
-
 // icon
 import './assets/icons'
-
 import Android from '@/components/Android'
 Vue.component('Android', Android);
 Vue.config.productionTip = false

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">

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">
@@ -66,7 +66,6 @@ import registerDialog from '@/components/registerDialog';
 import { setConfig } from '@/utils/jweixin'
 
 
-
 export default {
     data() {
         return {

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;

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>

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>

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>

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'

src/views/messages/index.vue

@@ -29,6 +29,7 @@
 
         </van-list>
         <Android></Android>
+        <Android></Android>
     </div>
 </template>
 
@@ -37,7 +38,6 @@ import { querystaffmessage } from '@/api/message'
 import { eventDetail } from '@/api/event'
 
 
-
 export default {
     name: 'message',
     data() {
@@ -61,6 +61,7 @@ export default {
             pageSize: 10
         }
     },
+    components: { },
     mounted() {
         this.userId = this.$store.state.app.userInfo.id;
         this.querystaffmessage()

src/views/selectAgency/index.vue

@@ -96,7 +96,7 @@ export default {
             this.signWX()
         },
         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 })