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

src/components/service-list/commodity-list.vue

@@ -18,7 +18,7 @@
     </div>
     <!-- 分页 -->
     <section class="com-pagination" v-if="paginationShow">
-      <div class="com_page_total">共 {{ pagination.total }} 个条目</div>
+      <div class="com_page_total">共 {{ total }} 个条目</div>
       <div class="com_page_item">
         <div class="com_page_num" v-if="pageSizeShow">
           <div>每页条数：</div>

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);
           }

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;
+            });
           }
         }
       });

src/pages/workbench/app_build.vue

@@ -72,7 +72,11 @@
             ></upload-file>
           </el-form-item>
           <el-form-item label="所属组织：" prop="org">
-            <el-select v-model="app_info.org" placeholder="请选择所属组织">
+            <el-select
+              v-model="app_info.org"
+              placeholder="请选择所属组织"
+              :disabled="true"
+            >
               <el-option
                 v-for="item in orgs"
                 :key="item.value"
@@ -428,14 +432,28 @@ export default {
         });
     },
     getOrgs() {
-      this.$http
+      /* this.$http
         .get("/apaas/hubApi/market/departments")
         .then((response) => {
           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: "镜像名称",

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()
     },
   }
 };