Merge branch 'dev-frontend' of http://gitlab.pubdata.cn/liangyibo/CameraMachine into dev-frontend

frontend/src/components/login/index.vue

@@ -100,8 +100,8 @@
         </el-form>
       </template>
       <template v-if="pageStatus === 2">
-
-        <div class="title__main mar-top-50">请选择企业身份</div>
+        <div class="company-select-box">
+        <div class="title__main">请选择企业身份</div>
         <div class="title_sub">您在以下企业均有任职，请问您想代表那个企业进行访问</div>
 
 
@@ -119,6 +119,7 @@
           确认
         </el-button>
         </div>
+      </div>
 <!--        <div class="bodyCompany">
           <div class="companyItem" :class="item.is_current == 1?'activeCompany':''" v-for="item, index in company" @click="selectnowCompany(item,index)">
             <div class="companyHeader">
@@ -273,7 +274,21 @@ const sendVerificationCode = () => {
 }
 
 </script>
-
+<style lang="scss">
+.login-dialog {
+  border-radius: 10px !important;
+    .el-dialog__header {
+      padding: 0;
+    }
+    .el-dialog__body {
+      padding-top: 10px;
+    }
+    .el-input-group__append{
+      background-color: #fff;
+      color: #2FB0FF;
+    }
+}
+</style>
 <style lang="scss" scoped>
 .login-box {
   width: 100%;
@@ -493,19 +508,10 @@ const sendVerificationCode = () => {
     }
   }
 }
-.login-box {
-    :deep(.login-dialog) {
-      border-radius: 10px;
-    }
-    :deep(.el-dialog__header) {
-      padding: 0;
-    }
-    :deep(.el-dialog__body) {
-      padding-top: 10px;
-    }
-    :deep(.el-input-group__append){
-      background-color: #fff;
-      color: #2FB0FF;
-    }
+.company-select-box{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-height: 404px;
 }
 </style>

frontend/src/views/Setting/index.vue

@@ -470,6 +470,6 @@ body {
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-bottom: 30px;
+  padding: 30px 0;
 }
 </style>