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

src/components/menu.vue

@@ -291,7 +291,7 @@ export default {
   float: right;
   width: 185px;
   font-size: 16px;
-  height: 73px;
+  height:84px;
   text-align: center;
   cursor: pointer;
   position: relative;
@@ -305,7 +305,7 @@ export default {
   background-color: #e56600;
   border-radius: 3px;
   position: absolute;
-  bottom: 0px;
+  bottom: 10px;
   left: calc(50% - 12px);
 }
 .user_menu {

src/pages/workbench/fwgl/cloud-detail.vue

@@ -36,11 +36,15 @@
                 class="head_right_msg_item apply_wait"
               >待审批</span>
               <span
-                v-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 1"
+                v-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 0"
+                class="head_right_msg_item apply_wait"
+              >审批中</span>
+              <span
+                v-else-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 1"
                 class="head_right_msg_item apply_success"
               >审批通过</span>
               <span
-                v-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1)"
+                v-else-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1)"
                 class="head_right_msg_item apply_refuse"
               >审批未通过</span>
             </p>