diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index bf37f099e89ed4c3d1149b303630939622382db9..44b69a3d9356199fe17daaad92deec8899ef55c8 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -222,11 +222,11 @@
容器组:
{{ orderDetail.memory }}核
-
+
数据盘:
{{ orderDetail.disk_num}}块,每块{{orderDetail.disk_cap }}GB
+ >{{ orderDetail.disk_num }}块,每块{{orderDetail.disk_cap }}GB
单个容器组规格:
@@ -239,10 +239,10 @@
-
CPU:
+
内存:
- 最高 {{ orderDetail.one_memory_max }}核
- 默认 {{ orderDetail.one_memory_min }}核
+ 最高 {{ orderDetail.one_memory_max }}GB
+ 默认 {{ orderDetail.one_memory_min }}GB
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index d6d2f37dedc76c5d7cc4f739a76d2aa6961a7b90..c75d559678341f48b1b3d7444b610295d537921f 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 c1dd92cfe388b4868dad7480ba1612c9ddd7a363..639d2f97c3e88d0022014a7996debe6047662fd6 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 = {