Merge branch 'dev-online' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-front into dev-online

src/pages/HomepageSearch/UserList.vue

@@ -99,6 +99,7 @@
   import {defaultValue, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api';
+  import {CONFIG} from "../../config";
 
   export default {
     name: "UserList",

src/style/main.scss

@@ -35,12 +35,11 @@ body {
 }
 
 html, body {
-  min-height: 100%;
+  height: 100%;
   margin: 0;
   padding: 0;
 }
 
-
 .el-notification .el-icon-info {
   color: rgb(112, 179, 255);
 }

tool4deploy/slider-type.js

@@ -1 +1 @@
-export const  slice_type = 0  // 0:online , 1:private
+export const  slice_type =  0 // 0:online , 1:private