Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

# Conflicts:
#	src/components/peopleList/index.vue

src/components/peopleList/index.vue

@@ -15,7 +15,6 @@
         <van-col span="24">
           <!-- <van-search v-model="searchVal" placeholder="请输入搜索关键词" /> -->
           <form action="/">
-
             <van-search v-model="searchVal" placeholder="请输入搜索关键词" clearable @input="onSearch" />
           </form>
         </van-col>
@@ -30,6 +29,7 @@
                   <van-checkbox :name="item.id" />
                 </template>
               </van-cell>
+            
             </van-cell-group>
           </van-checkbox-group>
         </van-col>
@@ -127,8 +127,8 @@ export default {
 
   methods: {
     // 弹框关闭动画
-    closedHandler(){
-        this.searchVal=''
+    closedHandler() {
+      this.searchVal = ''
     },
     onLoad() {},
     getpeople() {
@@ -200,17 +200,19 @@ export default {
 .bottomdiv {
   width: 100%;
   bottom: 0%;
-  position: fixed;
+  position: absolute;
+  margin-top: 20px;
   z-index: 2000;
-
 }
-.rowclss{
-  margin-bottom: 100px;
+.rowclss {
+  height: 1050px;
+  overflow: scroll;
+  
 }
 .bigsheetbox {
-  height: calc(100vh - 100px);
+   height: calc(100vh - 100px);
 }
-.van-field__control{
+.van-field__control {
   padding-right: 20px;
 }
 .line {