diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 246b2aef01f7ceedbc59bf3d7a5c0b9cf4d3ae8f..99a3c1c5a2fed00d07badb2bb898558ffbf4d28d 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -416,7 +416,7 @@ export default { }) .then(response => { if (response.data.success == 1) { - let data = response.data.data; + let data = response.data.data || []; for (let i = 0; i < data.length; i++) { this.approval_arr1[i].result = data[i].apply_type_name; this.approval_arr1[i].arr[0].info = data[i].created; diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index 2cf05a7a2595ac82295a98ac1b4cc6e6f23fd5b7..5c5e5579d34e4f630e7fc668e3dc15c6de558643 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -57,12 +57,12 @@

当前用户类型:

升级为开发者 修改 + +
是否升级为开发者?
+ +
@@ -251,7 +263,7 @@ export default { newIpWhite: "", newIpBlack: "", diaPassWord: false, - couldUp: true + upLevelDia: false }; }, mounted() { @@ -269,7 +281,7 @@ export default { } }); }, - getUserInfo(id) { + getUserInfo() { this.$api.user.getUserDetail({ id: this.userId }).then(response => { if (response.data.success == 1) { let data = response.data.data; @@ -288,6 +300,7 @@ export default { : this.user_data.userType == 3 ? "普通用户" : "普通用户开发者"; + this.user_data.is_apply = data.is_apply; this.imgList = []; this.imgList.push(data.picture_path); this.formBusiness.businessSystemName = data.system_name; @@ -380,6 +393,26 @@ export default { } }); }, + cancelUpLevel() { + this.upLevelDia = false; + }, + submitUpLevel() { + this.upLevelDia = false; + this.$api.authority.updateLevel().then(response => { + if (response.data.success == 1) { + this.$message({ + message: "申请升级开发者成功", + type: "success" + }); + this.getUserInfo(); + } else { + this.$message({ + message: "申请升级开发者失败", + type: "error" + }); + } + }); + }, resetKey() { this.$confirm("此操作将重置您的密钥, 是否继续?", "提示", { confirmButtonText: "确定", @@ -413,22 +446,8 @@ export default { }); }); }, - upLevel() { - this.$api.authority.updateLevel().then(response => { - if (response.data.success == 1) { - this.$message({ - message: "申请升级开发者成功", - type: "success" - }); - this.couldUp = false; - this.getUserInfo(); - } else { - this.$message({ - message: "申请升级开发者失败", - type: "error" - }); - } - }); + showUpLevel() { + this.upLevelDia = true; }, copyKey() { const input = document.createElement("input"); diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 3c8e2348f8dea60c437882b5e3ca2602f714006e..e9f64b97ab1d7f77f69e924598b97ce77ea36905 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -16,7 +16,11 @@
- +
{{ cloudData.workplace }}
@@ -398,23 +402,23 @@ export default { appListHeaders: [ { label: "应用名称", - prop: "app_name", + prop: "deploy_name", align: "center", type: "href" }, { label: "应用类型", - prop: "app_name", + prop: "type_name", align: "center" }, { label: "应用版本号", - prop: "app_name", + prop: "app_version", align: "center" }, { label: "应用部署时间", - prop: "app_name", + prop: "created", align: "center" } ], @@ -745,6 +749,7 @@ export default { width: 144px; height: 144px; border-radius: 8px; + border: 4px #f4f7fc solid; } .head_right { width: calc(100% - 160px);