Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/assets/css/index.css

@@ -677,7 +677,7 @@ border-radius:8px;
   padding: 0 20px;
 }
 .apaas_detail_container .main_contaner {
-  min-height: calc(100vh - 84px - 83px);
+  min-height: calc(100vh - 58px - 83px);
   flex-grow: 1;
   display: flex;
   flex-direction: column;
@@ -692,11 +692,11 @@ border-radius:8px;
   justify-content: space-between;
 }
 .apaas_detail_container .main_contaner.locked_height {
-  height: calc(100vh - 84px - 83px);
+  height: calc(100vh - 58px - 83px);
   min-height: 400px;
 }
 .apaas_detail_container .main_contaner.locked_height_900 {
-  height: calc(100vh - 84px - 83px);
+  height: calc(100vh - 58px - 83px);
   min-height: 900px;
 }
 .apaas_detail_container .detail_action {

src/components/apass-list.vue

@@ -250,7 +250,7 @@ export default {
   padding: 0 20px 15px;
   background-color: #fff;
   border-radius: 10px;
-  margin-bottom: 40px;
+  margin-bottom: 30px;
 }
 .header-container {
   padding-top: 20px;

src/components/menu.vue

 <template>
   <div class="menu">
     <img
-      @click="gotopage('/services_shop')"
       src="../assets/imgs/home_img_logo.png"
       alt
       class="logo"
@@ -250,14 +249,14 @@ export default {
 <style scoped>
 .menu {
   width: 100%;
-  height: 84px;
+  height: 58px;
   background-color: #0f2683;
   color: #8390ee;
-  line-height: 84px;
+  line-height: 58px;
 }
 .logo {
   float: left;
-  margin: 30px 0 0 40px;
+  margin: 15px 0 0 40px;
   cursor: pointer;
 }
 .user {
@@ -280,7 +279,7 @@ export default {
 .user_default {
   float: right;
   margin-right: 10px;
-  margin-top: 30px;
+  margin-top: 18px;
 }
 .car {
   float: right;
@@ -297,7 +296,7 @@ export default {
   height: 20px;
   text-align: center;
   left: 45px;
-  top: 31px;
+  top: 18px;
   z-index: 2;
 }
 .car_img {
@@ -308,7 +307,7 @@ export default {
   float: right;
   width: 185px;
   font-size: 16px;
-  height: 84px;
+  height: 58px;
   text-align: center;
   cursor: pointer;
   position: relative;
@@ -322,7 +321,7 @@ export default {
   background-color: #e56600;
   border-radius: 3px;
   position: absolute;
-  bottom: 10px;
+  bottom: 4px;
   left: calc(50% - 12px);
 }
 .user_menu {
@@ -331,7 +330,7 @@ export default {
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05);
   border-radius: 8px;
   position: absolute;
-  top: 70px;
+  top: 56px;
   left: -20px;
   overflow: hidden;
   font-size: 14px;
@@ -344,7 +343,7 @@ export default {
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05);
   border-radius: 8px;
   position: absolute;
-  top: 80px;
+  top: 56px;
   left: -20px;
   overflow: hidden;
   display: none;
@@ -384,7 +383,7 @@ export default {
   height: 16px;
   background-color: #fff;
   position: absolute;
-  top: 62px;
+  top: 50px;
   transform: rotate(45deg);
   display: none;
 }
@@ -393,7 +392,7 @@ export default {
   height: 16px;
   background-color: #fff;
   position: absolute;
-  top: 72px;
+  top: 50px;
   left: 20px;
   transform: rotate(45deg);
   display: none;
@@ -479,8 +478,8 @@ export default {
   border-radius: 50%;
   background-color: #e56600;
   position: absolute;
-  top: 23px;
-  left: 15px;
+  top: 15px;
+  left: 18px;
 }
 </style>
 <style>

src/components/service-list/service_shop_menu.vue

@@ -110,7 +110,7 @@ export default {
 .service_shop_menu {
   background-color: #0d1847;
   position: fixed;
-  top: 84px;
+  top: 58px;
   left: 0;
   width: 180px;
   height: 100%;

src/components/service-tabs/service-tabs.vue

@@ -106,7 +106,7 @@ export default {
 .service_info_tab {
   border: none;
   box-shadow: none;
-  margin-bottom: 40px;
+  margin-bottom: 30px;
 }
 .service_info {
   padding: 35px 40px 40px;

src/pages/authority/authority.vue

@@ -81,7 +81,7 @@ export default {
 
 <style scoped>
 .fwgl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/authority/menu/menus.vue

@@ -454,7 +454,7 @@ export default {
 </script>
 <style scoped>
 .cont {
-  height: calc(100vh - 140px);
+  height: calc(100vh - 122px);
   margin: 0 20px;
 }
 .row_height {

src/pages/authority/organization/organizationdetail.vue

@@ -299,7 +299,7 @@ export default {
 .detail_contain {
   width: 100%;
   padding: 0 20px;
-  height: calc(100% - 84px);
+  height: calc(100% - 58px);
   margin-bottom: 20px;
 }
 .info_contain {
@@ -322,7 +322,7 @@ export default {
   justify-content: flex-start;
   align-items: stretch;
   margin-top: 20px;
-  margin-bottom: 40px;
+  margin-bottom: 30px;
   width: 100%;
   min-height: calc(100% - 250px);
   background-color: #fff;

src/pages/data-analysis/data-analysis.vue

@@ -130,7 +130,7 @@ export default {
 
 <style scoped>
 .fwgl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/index.vue

@@ -30,7 +30,7 @@ export default {
 
 <style scoped>
 .index_container {
-  margin-top: 84px;
+  margin-top: 58px;
   min-height: 200px;
   /* overflow-x: hidden;
   overflow-y: auto; */

src/pages/message-management/message.vue

@@ -75,7 +75,7 @@ export default {
 
 <style scoped>
 .fwgl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/message-management/recommended/recommended-eidt.vue

@@ -264,7 +264,7 @@ export default {
   background-color: #f6f7fb;
   padding: 20px;
   padding-top: 0px;
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
 }
 .now_page_title {
   margin: 15px 0;

src/pages/service_shop/shop_list.vue

@@ -128,7 +128,7 @@ export default {
       color: #264dd9;
       font-size: 44px;
       font-weight: bold;
-      margin-bottom: 40px;
+      margin-bottom: 30px;
     }
     .default_msg {
       color: #58617a;

src/pages/technical-support/index.vue

@@ -41,7 +41,7 @@ export default {
     padding: 20px;
   }
   .default {
-    height: calc(100vh - 180px);
+    height: calc(100vh - 160px);
     display: flex;
     align-items: center;
     justify-content: center;

src/pages/user/notice/notice.vue

@@ -300,7 +300,7 @@ export default {
   padding: 25px 20px 20px;
   background-color: #fff;
   border-radius: 10px;
-  margin-bottom: 40px;
+  margin-bottom: 30px;
 }
 .notice_header {
   display: flex;

src/pages/user/user.vue

@@ -52,7 +52,7 @@ export default {
 
 <style scoped>
 .fwgl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/workbench/component-center/process-management/index.vue

@@ -50,7 +50,7 @@ export default {
 
 <style scoped>
 .process_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/workbench/fwgl/fwgl.vue

@@ -51,7 +51,7 @@ export default {
 
 <style scoped>
 .fwgl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;

src/pages/workbench/yygl/yygl.vue

@@ -53,7 +53,7 @@ export default {
 
 <style scoped>
 .yygl_container {
-  height: calc(100vh - 84px);
+  height: calc(100vh - 58px);
   display: flex;
   justify-content: flex-start;
   align-items: stretch;