diff --git a/src/assets/imgs/tool_yingyong.png b/src/assets/imgs/tool_yingyong.png
new file mode 100644
index 0000000000000000000000000000000000000000..422bd2d82fa0347fbc8bda64065a878d5d914e65
Binary files /dev/null and b/src/assets/imgs/tool_yingyong.png differ
diff --git a/src/components/app-card.vue b/src/components/app-card.vue
index c1b1ce2092f059e0716cf60e99a64dd2f3433340..b3b899c225023978102dd7231cde849e8aeb8689 100644
--- a/src/components/app-card.vue
+++ b/src/components/app-card.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app_card">
-    <a class="remove_btn" @click.prevent="deleteApp">
+    <a class="remove_btn" @click.prevent="deleteAction">
       <i class="el-icon-close"></i>
     </a>
     <div class="app_card-icon">
@@ -10,18 +10,18 @@
       <p class="app_card-name text_clip" v-text="data.name"></p>
       <p class="app_card-version text_clip" v-text="data.version"></p>
     </div>
-    <div class="app_card-action">
+    <div class="app_card-action" v-if="cardType == 0">
       <el-button type="primary" plain @click="deploymentAction">
         一键部署
       </el-button>
     </div>
-    <!-- <p class="app_card-text">
+    <p class="app_card-text" v-if="cardType == 1">
       <span>
         <i class="el-icon-time"></i>
         <span>上线时间：</span>
       </span>
       <span class="text_clip" v-text="data.time"></span>
-    </p> -->
+    </p>
   </div>
 </template>
 
@@ -32,13 +32,17 @@ export default {
       type: Object,
       default: {},
     },
+    cardType: {
+      type: [String, Number],
+      default: 0,
+    },
   },
   methods: {
     deploymentAction() {
-      console.log("一键部署 --- " + this.data.id);
+      this.$emit("deployment-action", this.data);
     },
-    deleteApp() {
-      console.log("删除应用 --- " + this.data.id);
+    deleteAction() {
+      this.$emit("delete-action", this.data);
     },
   },
 };
diff --git a/src/components/app-list.vue b/src/components/app-list.vue
index 15344f2dfde519f0c5072d3f43e5d55b0bcffdb5..5aa020de8a775b72a7d7d41eae919573dbd42d80 100644
--- a/src/components/app-list.vue
+++ b/src/components/app-list.vue
@@ -4,6 +4,9 @@
       v-for="(item, index) in data"
       :key="'app_card_' + index"
       :data="item"
+      :card-type="cardType"
+      @deployment-action="deploymentAction"
+      @delete-action="deleteAction"
     ></app-card>
   </div>
 </template>
@@ -20,6 +23,18 @@ export default {
       type: Array,
       default: [],
     },
+    cardType: {
+      type: [String, Number],
+      default: 0,
+    },
+  },
+  methods: {
+    deploymentAction(item) {
+      this.$emit("deployment-action", item);
+    },
+    deleteAction(item) {
+      this.$emit("delete-action", item);
+    },
   },
 };
 </script>
diff --git a/src/components/side-nav-bar.vue b/src/components/side-nav-bar.vue
index c4af1a35c4bec8286dbb9f64ecc1253739d8d9e8..bb839a5d560dfdd984f1111ba2d4c5a7b010faca 100644
--- a/src/components/side-nav-bar.vue
+++ b/src/components/side-nav-bar.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="side_nav_bar">
     <h3 class="side_nav_bar_title" @click="titleAction">
-      <img
-        :src="require('../assets/imgs/tool_fuwu.png')"
-        width="20"
-        style="margin-right: 10px;"
-      />
+      <img :src="titleIcon" width="20" style="margin-right: 10px;" />
       <span v-text="title"></span>
     </h3>
     <ul class="side_nav_bar_list">
@@ -31,6 +27,10 @@ export default {
       type: String,
       default: () => "我的服务",
     },
+    titleIcon: {
+      type: String,
+      default: () => require("../assets/imgs/tool_fuwu.png"),
+    },
     titlePath: {
       type: String,
       default: () => "",
diff --git a/src/components/table-um.vue b/src/components/table-um.vue
index cd56f7b7326a48d2f6d6fc3a9a67b08cbbc5161c..b20155a10365b19d05aa3b9131fd7e6d83de4c27 100644
--- a/src/components/table-um.vue
+++ b/src/components/table-um.vue
@@ -30,18 +30,17 @@
           prefix-icon="el-icon-search"
           v-if="searchShow"
           v-model="search"
-          placeholder="请输入账号、中文名"
-          style="max-width:220px;"
-          size="mini"
+          :placeholder="inputPlaceholder"
+          style="width:180px;"
           @input="searchVal"
           class="ces_toolbar_inp"
         ></el-input>
       </div>
-      <v-apaas-table-filter 
-      :show="showFliterList" 
-      :filter-list="filterList"
-      @filter-change="filterChange"
-    ></v-apaas-table-filter>
+      <v-apaas-table-filter
+        :show="showFliterList"
+        :filter-list="filterList"
+        @filter-change="filterChange"
+      ></v-apaas-table-filter>
       <el-table
         :data="selectedTabsPage"
         :size="size"
@@ -104,6 +103,28 @@
                   </em>
                 </em>
 
+                <em v-if="btn.type == 'goods-shelf'">
+                  <em
+                    v-if="scope.row.state == 0"
+                    class="cur_pointer"
+                    style="color: #0f2683"
+                    @click="handleClick(btn.type, scope.row)"
+                  >
+                    上架
+                  </em>
+                  <em
+                    v-if="scope.row.state == 1"
+                    class="cur_pointer"
+                    style="color: #0f2683"
+                    @click="handleClick(btn.type, scope.row)"
+                  >
+                    下架
+                  </em>
+                  <em v-if="scope.row.state == 2">
+                    下架
+                  </em>
+                </em>
+
                 <em
                   class="cur_pointer"
                   v-else-if="btn.label == '删除' && btn.local"
@@ -237,7 +258,7 @@ export default {
     "v-apaas-table-select": tableSelect,
     "v-apaas-table-umhref": tableUmhref,
     "d-confirm": DConfirm,
-    "v-apaas-table-filter": tableFilter
+    "v-apaas-table-filter": tableFilter,
   },
   props: {
     // 表格型号：mini,medium,small
@@ -264,6 +285,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    inputPlaceholder: {
+      type: String,
+      default: "请输入账号、中文名",
+    },
     url: {
       type: String,
       default: "",
@@ -515,7 +540,7 @@ export default {
     },
     filterChange(filter) {
       console.log(filter);
-    }
+    },
   },
 };
 </script>
@@ -669,9 +694,6 @@ em {
 .ces_toolbar .ces_toolbar_btn {
   margin-right: 10px;
 }
-.ces_toolbar .ces_toolbar_inp {
-  margin-right: 10px;
-}
 .ces-pagination {
   margin-top: 20px;
   padding-bottom: 20px;
diff --git a/src/pages/fwglList.vue b/src/pages/fwglList.vue
index 4c21276f51da606ccf44b6c083ec90aaae374cca..5b29afdf5d6abf5e1097bdd4a29b5a04631a7bcc 100644
--- a/src/pages/fwglList.vue
+++ b/src/pages/fwglList.vue
@@ -392,10 +392,9 @@ export default {
           },
         ];
       }
-
+      
       // Error
       else {
-        this.headers = [];
         throw Error("The page doesn't exist");
       }
     },
diff --git a/src/pages/yygl.vue b/src/pages/yygl.vue
index 3e94daac94e1ea29a749fc4c680d9011dcd2890e..d11411402e6e7a8e7ef322396c770bed60f27e1e 100644
--- a/src/pages/yygl.vue
+++ b/src/pages/yygl.vue
@@ -2,6 +2,8 @@
   <div class="yygl_container">
     <side-nav-bar
       :nav-list="navList"
+      title="我的应用"
+      :title-icon="require('../assets/imgs/tool_yingyong.png')"
       :title-path="navList[0] && navList[0].path"
     ></side-nav-bar>
     <div class="main_container">
diff --git a/src/pages/yyglList.vue b/src/pages/yyglList.vue
index c65a9ee6254c7a128d352511dc32e0d55eb2c690..c5fbfeb36c8173eb13fb81626f949cd826c3deec 100644
--- a/src/pages/yyglList.vue
+++ b/src/pages/yyglList.vue
@@ -6,21 +6,31 @@
         <el-breadcrumb-item>{{ pathName }}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
-    <div class="main_container">
+    <div class="main_container card" v-if="listType == 'card'">
       <div class="filter_contaner">
-        <el-button
-          v-if="filterList && filterList.length"
-          size="small"
-          @click="showFliterList = !showFliterList"
-        >
-          {{ showFliterList ? "收起" : "筛选" }}
-          <i
-            class="el-icon--right"
-            :class="
-              showFliterList ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
-            "
-          ></i>
-        </el-button>
+        <div class="filter_action">
+          <el-button
+            v-if="filterList && filterList.length"
+            size="small"
+            @click="showFliterList = !showFliterList"
+          >
+            {{ showFliterList ? "收起" : "筛选" }}
+            <i
+              class="el-icon--right"
+              :class="
+                showFliterList ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
+              "
+            ></i>
+          </el-button>
+          <el-input
+            v-model="search"
+            prefix-icon="el-icon-search"
+            placeholder="请输入应用名称"
+            style="width:180px;"
+            @input="searchChange"
+            class="ces_toolbar_inp"
+          ></el-input>
+        </div>
         <table-filter
           :show="showFliterList"
           :filter-list="filterList"
@@ -28,7 +38,13 @@
           style="margin-top: 5px;"
         ></table-filter>
       </div>
-      <app-list :data="appList"></app-list>
+      <app-list
+        :data="appList"
+        :card-type="cardType"
+        @deployment-action="deploymentAction"
+        @delete-action="deleteAction"
+      ></app-list>
+      <div class="flex_grow"></div>
       <comments-pagination
         :total="100"
         :page-sizes="pageSizes"
@@ -38,13 +54,41 @@
         @current-change="changeCurrentPage"
       ></comments-pagination>
     </div>
+    <div class="main_container" v-if="listType == 'table'">
+      <ces-table
+        class="r_yhgl_table"
+        size="mini"
+        url="tableData"
+        input-placeholder="请输入应用名称"
+        empty-text="暂时没数据"
+        :detailsUrl="detailsUrl"
+        :border="false"
+        :headers="headers"
+        :searchShow="true"
+        :autoAdd="false"
+        :stripe="true"
+        :pageSizeShow="true"
+        :filterList="filterList"
+        :isIndex="false"
+        @action-approval="approvalItem"
+        @action-delete="deleteItem"
+        @action-edit="editItem"
+        @off-line="offLine"
+        @goods-shelf="goodsShelf"
+        style="margin-top: 44px;"
+      ></ces-table>
+    </div>
+    <dialog-action
+      ref="myConfirm"
+      :confirm-options="confirmOptions"
+    ></dialog-action>
   </div>
 </template>
 
 <script>
 import tableFilter from "@/components/table-filter";
 import appList from "@/components/app-list";
-import tableUm from "@/components/table-um";
+import cesTable from "@/components/table-um";
 import dialogAction from "@/components/dialog-action";
 import commentsPagination from "@/components/comments-pagination";
 import { mapState } from "vuex";
@@ -53,13 +97,15 @@ export default {
   components: {
     tableFilter,
     appList,
-    tableUm,
+    cesTable,
     dialogAction,
     commentsPagination,
   },
   data: () => ({
     level: 0, // 用户等级
     type: 0, // 访问的页面
+    listType: "",
+    cardType: "",
     showFliterList: false,
     filterList: [
       {
@@ -172,9 +218,17 @@ export default {
         time: "2019-04-11 12:50:30",
       },
     ],
+    search: "",
     pageSizes: [10, 50, 100],
     pageSize: 10,
     currentPage: 1,
+    confirmOptions: {
+      title: "",
+      message: "",
+      btnCancelText: "",
+      btnSubmitText: "",
+      item: null,
+    },
   }),
   computed: {
     ...mapState({
@@ -183,11 +237,53 @@ export default {
     pathName() {
       return this.yyglNav[this.level][this.type];
     },
+    detailsUrl() {
+      let url = "";
+
+      if (this.level == 0 && this.type == 1) {
+        url = `/fwgl/${this.level}/${this.type}/applyserviceedit/`;
+      } else {
+        url = `/fwgl/${this.level}/${this.type}/servicedetail/`;
+      }
+
+      return url;
+    },
   },
   methods: {
+    searchChange(value) {
+      console.log(value);
+    },
     filterChange(filter) {
       console.log(filter);
     },
+    deploymentAction(item) {
+      console.log("deployment " + item.name);
+    },
+    deleteAction(item) {
+      if (this.cardType === 0) {
+        this.confirmOptions.title = "删除提示";
+        this.confirmOptions.message =
+          "您需要先进行应用商店下架申请，应用处于下架状态时才能进行删除操作。";
+        this.confirmOptions.btnCancelText = "";
+        this.confirmOptions.btnSubmitText = "";
+        this.confirmOptions.confirmSubmit = () => {
+          console.log("deleteItem - " + item.name);
+          this.$refs.myConfirm.hideModel();
+        };
+      } else if (this.cardType === 1) {
+        this.confirmOptions.title = "是否删除部署的应用";
+        this.confirmOptions.message =
+          "该操作会导致正在调用该应用的用户被迫终止对应用的调用，删除前需向正在调用该应用的用户发送通知，自通知发送之日起，2日后应用将被删除。";
+        this.confirmOptions.btnCancelText = "";
+        this.confirmOptions.btnSubmitText = "发送通知";
+        this.confirmOptions.confirmSubmit = () => {
+          console.log("deleteItem - " + item.name);
+          this.$refs.myConfirm.hideModel();
+        };
+      }
+
+      this.$refs.myConfirm.showModel();
+    },
     changePageSize(value) {
       this.pageSize = value;
       this.currentPage = 1;
@@ -195,16 +291,249 @@ export default {
     changeCurrentPage(value) {
       this.currentPage = value;
     },
+    approvalItem(item) {
+      console.log("approval --- " + item.id);
+    },
+    deleteItem(item) {
+      console.log("delete --- " + item.id);
+    },
+    editItem(item) {
+      console.log("edit --- " + item.id);
+      /* this.$router.push(
+        `/fwgl/${this.level}/${this.type}/serviceedit/${item.id}`
+      ); */
+    },
+    offLine(item) {
+      console.log("off line --- " + item.id);
+    },
+    goodsShelf(item) {
+      console.log("goods shelf", item.state);
+    },
   },
   created() {
     this.level = parseInt(this.$route.params.level);
     this.type = parseInt(this.$route.params.type);
+
+    let level = this.level;
+    let type = this.type;
+
+    // 普通用户 --- 应用仓库 card列表形式
+    if (level === 0 && type === 0) {
+      this.listType = "card";
+      this.cardType = 0;
+    }
+    // 普通用户 --- 我部署的应用
+    else if (level === 0 && type === 1) {
+      this.listType = "card";
+      this.cardType = 1;
+    }
+    // 普通用户 --- 申请的应用 card列表形式
+    else if (level === 0 && type === 2) {
+      this.listType = "table";
+
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线区域", prop: "address", type: "", align: "center" },
+        { label: "申请类型", prop: "address", type: "", align: "center" },
+        { label: "申请时间", prop: "address", type: "", align: "center" },
+        { label: "申请状态", prop: "address", type: "", align: "center" },
+      ];
+    }
+    // 普通用户 --- 审批的应用
+    else if (level === 0 && type === 3) {
+      this.listType = "table";
+
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线区域", prop: "address", type: "", align: "center" },
+        { label: "申请类型", prop: "address", type: "", align: "center" },
+        { label: "审批时间", prop: "address", type: "", align: "center" },
+        { label: "审批状态", prop: "address", type: "", align: "center" },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 160,
+          btnList: [
+            {
+              type: "action-approval",
+              label: "审批",
+              line: "|",
+            },
+            {
+              type: "action-delete",
+              label: "删除",
+            },
+          ],
+        },
+      ];
+    }
+
+    // 组织管理员 --- 应用仓库管理
+    else if (level === 1 && type === 0) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线状态", prop: "address", type: "", align: "center" },
+        { label: "创建时间", prop: "address", type: "", align: "center" },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 160,
+          btnList: [
+            {
+              type: "goods-shelf",
+            },
+          ],
+        },
+      ];
+    }
+    // 组织管理员 --- 部署的应用
+    else if (level === 1 && type === 1) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "上架区域", prop: "address", type: "", align: "center" },
+        { label: "部署时间", prop: "address", type: "", align: "center" },
+        { label: "部署区域", prop: "address", type: "", align: "center" },
+      ];
+    }
+    // 组织管理员 --- 应用审批管理
+    else if (level === 1 && type === 2) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线区域", prop: "address", type: "", align: "center" },
+        { label: "申请类型", prop: "address", type: "", align: "center" },
+        { label: "审批时间", prop: "address", type: "", align: "center" },
+        { label: "申请状态", prop: "address", type: "", align: "center" },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 160,
+          btnList: [
+            {
+              type: "action-approval",
+              label: "审批",
+              line: "|",
+            },
+            {
+              type: "action-delete",
+              label: "删除",
+            },
+          ],
+        },
+      ];
+    }
+
+    // 超级管理员 --- 平台应用管理
+    else if (level === 2 && type === 0) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线状态", prop: "address", type: "", align: "center" },
+        { label: "所属组织", prop: "address", type: "", align: "center" },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 240,
+          btnList: [
+            {
+              type: "action-edit",
+              label: "编辑",
+              line: "|",
+            },
+            {
+              type: "off-line",
+              label: "下线",
+              line: "|",
+            },
+            {
+              type: "action-delete",
+              label: "删除",
+            },
+          ],
+        },
+      ];
+    }
+    // 超级管理员 --- 应用部署管理
+    else if (level === 2 && type === 1) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "href", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "上架区域", prop: "address", type: "", align: "center" },
+        { label: "所属组织", prop: "address", type: "", align: "center" },
+        { label: "部署时间", prop: "address", type: "", align: "center" },
+        { label: "部署区域", prop: "address", type: "", align: "center" },
+      ];
+    }
+    // 超级管理员 --- 应用审批管理
+    else if (level === 2 && type === 2) {
+      this.listType = "table";
+      this.headers = [
+        { label: "应用名称", prop: "name", type: "", align: "left" },
+        { label: "应用版本", prop: "date", type: "", align: "center" },
+        { label: "应用类型", prop: "address", type: "", align: "center" },
+        { label: "业务领域", prop: "address", type: "", align: "center" },
+        { label: "在线区域", prop: "address", type: "", align: "center" },
+        { label: "申请类型", prop: "address", type: "", align: "center" },
+        { label: "审批时间", prop: "address", type: "", align: "center" },
+        { label: "申请状态", prop: "address", type: "", align: "center" },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 160,
+          btnList: [
+            {
+              type: "action-approval",
+              label: "审批",
+              line: "|",
+            },
+            {
+              type: "action-delete",
+              label: "删除",
+            },
+          ],
+        },
+      ];
+    }
+
+    // Error
+    else {
+      throw Error("The page doesn't exist");
+    }
   },
 };
 </script>
 
 <style scoped>
 .list_container {
+  height: 100%;
   padding: 0 20px;
 }
 .main_container {
@@ -214,7 +543,18 @@ export default {
   overflow: hidden;
   background-color: #fff;
 }
-.main_container .ces-table-page {
-  margin-top: 18px;
+.main_container.card {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: stretch;
+}
+.flex_grow {
+  flex-grow: 1;
+}
+.filter_action {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 </style>
diff --git a/static/data.json b/static/data.json
index a8f30d57902271f6673e2d6b6ba1704f886e08ed..19410caa3ab4706b40be70a14a1a2220ae0c6bfb 100644
--- a/static/data.json
+++ b/static/data.json
@@ -27,7 +27,7 @@
         "name": "王小虎",
         "address": "0",
         "id": "ssss22",
-        "state": 0
+        "state": 2
       }
     ],
     "tableData1": [