From 429d9da0213f2d5434be0f74dea80a3c5fe8d41f Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Fri, 28 Aug 2020 11:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=B3=A8=E5=86=8C=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BA=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/order/order_detail.vue     | 10 +++++-----
 src/pages/user/user_info.vue              |  3 ++-
 src/pages/workbench/fwgl/cloud-detail.vue |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index bf37f09..44b69a3 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -222,11 +222,11 @@
             <span class="params_block_item_title">容器组：</span>
             <span class="params_block_item_val">{{ orderDetail.memory }}核</span>
           </div>
-          <div class="params_block_item_in">
+          <div v-if="orderDetail.disk_num != 0" class="params_block_item_in">
             <span class="params_block_item_title">数据盘：</span>
             <span
               class="params_block_item_val"
-            >{{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB</span>
+            >{{ orderDetail.disk_num }}块，每块{{orderDetail.disk_cap }}GB</span>
           </div>
         </div>
         <span class="params_block_title margin_top_20">单个容器组规格：</span>
@@ -239,10 +239,10 @@
             </p>
           </div>
           <div class="params_block_item_in">
-            <span class="params_block_item_title">CPU：</span>
+            <span class="params_block_item_title">内存：</span>
             <p class="params_block_item_val">
-              <span class="val_has_2">最高&nbsp;{{ orderDetail.one_memory_max }}核</span>
-              <span class="val_has_2">默认&nbsp;{{ orderDetail.one_memory_min }}核</span>
+              <span class="val_has_2">最高&nbsp;{{ orderDetail.one_memory_max }}GB</span>
+              <span class="val_has_2">默认&nbsp;{{ orderDetail.one_memory_min }}GB</span>
             </p>
           </div>
         </div>
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index d6d2f37..c75d559 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -284,7 +284,8 @@ export default {
       rules_user: {
         accountNo: [
           { required: true, message: "请输入账号", trigger: "blur" },
-          { max: 16, message: "长度请小于16个字符", trigger: "blur" },
+          { max: 16, message: "长度请不大于16个字符", trigger: "blur" },
+          { min: 3, message: "长度请不小于3个字符", trigger: "blur" },
           { validator: user_name_pass, trigger: "blur" },
         ],
         nickname: [
diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index c1dd92c..639d2f9 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -635,6 +635,7 @@ export default {
         } else if (this.apploy_msg.first_level != 0) {
           // 组织审批了
           this.tabShow = true;
+          this.list_arr.splice(0, 1);
         }
         this.activeName = "0";
       } else if (this.now_user == 2) {
@@ -672,6 +673,9 @@ export default {
           this.list_arr.splice(index, 1);
         }
       }
+      if (this.appList.length == 0) {
+        this.list_arr.splice(-2);
+      }
     },
     getCloudDetail() {
       let query = {
-- 
2.26.0