diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list.vue index 72f1abb8f2438bfb370f8b2091061db428b9f2ed..a2c4559cce6ba13f9d05cfae30f163e5a481546d 100644 --- a/src/components/service-list/commodity-list.vue +++ b/src/components/service-list/commodity-list.vue @@ -18,7 +18,7 @@
-
共 {{ pagination.total }} 个条目
+
共 {{ total }} 个条目
每页条数:
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue index 4f8467b509106cccaaa55402f60d50d248033949..3ce9e09ecc8fe27cacc43704b8ed121ccda16801 100644 --- a/src/components/service-list/service_list.vue +++ b/src/components/service-list/service_list.vue @@ -327,6 +327,7 @@ export default { this.$api.serviceShop.getServiceShopList(query).then(response => { if (response.data.success == "1") { this.lists = response.data.data; + this.total = response.data.total; } else { console.log(response.data.errMsg); } diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue index 3d9ea28ae0d2ecdf350c37b7c0f2d66dbde5dbc7..68253477c18f485f030885b80c5331bdd5ec9801 100644 --- a/src/pages/user/user.vue +++ b/src/pages/user/user.vue @@ -49,6 +49,10 @@ export default { let user_index = arr.findIndex(item => item.visit_url == "/user"); if (user_index != -1) { this.navList = arr[user_index].Child; + this.navList.forEach(item => { + item.name = item.menu_name; + item.path = item.visit_url; + }); } } }); diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue index d21e745c9e6357c38d911fd87014692a87150c9a..b22392ab55b34b05aa9c8b388c3bb2527b309d8d 100644 --- a/src/pages/workbench/app_build.vue +++ b/src/pages/workbench/app_build.vue @@ -72,7 +72,11 @@ > - + { this.orgs = response.data.data; }) .catch((error) => { console.log(error); - }); + }); */ + + this.$api.user.getNowUser().then(({ data }) => { + if (data.success == 1) { + this.orgs = [ + { + id: data.data.department_id, + name: data.data.department_name, + }, + ]; + this.app_info.org = data.data.department_id; + } else { + console.log(data.errMsg); + } + }); }, getNewList(file) { this.app_info.logo = file[0].url; @@ -649,14 +667,6 @@ export default { this.getTypes(); this.getOrgs(); - this.$api.user.getNowUser().then(({ data }) => { - if (data.success == 1) { - this.app_info.org = data.data.department_id; - } else { - console.log(data.errMsg); - } - }); - this.image_headers = [ { label: "镜像名称", diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue index fc1e39117e9e2f0b33ed6fab7c5ed8eaf5e1aeed..178958d711c40601700c04628e2979724bf50f38 100644 --- a/src/pages/workbench/yygl/app_debugger.vue +++ b/src/pages/workbench/yygl/app_debugger.vue @@ -323,11 +323,11 @@ export default { changePageSize(value) { this.pageSize = value; this.currentPage = 1; - + this.get_list_pod() }, changeCurrentPage(value) { this.currentPage = value; - + this.get_list_pod() }, } };