diff --git a/.beagle.yml b/.beagle.yml
index 1aff8a5ac4b74b6d9c8cfb45c438bd2d6e718c9c..e4c82a3ede70119240c1d77612606817a370fb81 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -47,7 +47,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
     settings: # 当前设置
       base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像
       dockerfile: .beagle/dockerfile
-      repo: gzga-jzapi/apaas-ui # 生成镜像的 分组/名称
+      repo: gzgajzapi/apaas-ui # 生成镜像的 分组/名称
       version: "v3.0.5" # 版本号
       channel: alpha # 后缀 example: alpha test fix-alpha fix等
       args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
@@ -56,73 +56,6 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         from_secret: REGISTRY_USER
       registry_password: # 密码
         from_secret: REGISTRY_PASSWORD
-  
-  - name: deploy-cloud
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
-    settings:
-      namespace: gzgajzapi
-      deployment: apaas-ui
-      container: apaas-ui
-      image: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha
-    environment:
-      KUBERNETES_SERVER:
-        from_secret: KUBERNETES_SERVER
-      KUBERNETES_TOKEN:
-        from_secret: KUBERNETES_TOKEN
-
-  - name: docker-arm64
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    settings:
-      base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
-      dockerfile: .beagle/dockerfile
-      repo: gzga-jzapi/apaas-ui
-      version: "v3.0.5"
-      channel: alpha-arm64
-      args: "TARGETOS=linux,TARGETARCH=arm64"
-      registry: hub.wodcloud.com
-      registry_user:
-        from_secret: REGISTRY_USER
-      registry_password:
-        from_secret: REGISTRY_PASSWORD
-
-  - name: docker-ppc64le
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    settings:
-      base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le
-      dockerfile: .beagle/dockerfile
-      repo: gzga-jzapi/apaas-ui
-      version: "v3.0.5"
-      channel: alpha-ppc64le
-      args: "TARGETOS=linux,TARGETARCH=ppc64le"
-      registry: hub.wodcloud.com
-      registry_user:
-        from_secret: REGISTRY_USER
-      registry_password:
-        from_secret: REGISTRY_PASSWORD
-
-  - name: docker-mips64le
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    settings:
-      base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.11-mips64le
-      dockerfile: .beagle/dockerfile
-      repo: gzga-jzapi/apaas-ui
-      version: "v3.0.5"
-      channel: alpha-mips64le
-      args: "TARGETOS=linux,TARGETARCH=mips64le"
-      registry: hub.wodcloud.com
-      registry_user:
-        from_secret: REGISTRY_USER
-      registry_password:
-        from_secret: REGISTRY_PASSWORD
 ---
 clone:
   disable: true
@@ -153,62 +86,8 @@ steps:
       REGISTRY_PASSWORD:
         from_secret: REGISTRY_PASSWORD
     settings:
-      source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha
-      target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5
-      registry: hub.wodcloud.com
-
-  - name: harbor-arm64
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    pull: always
-    environment:
-      http_proxy: http://10.11.92.33:1282
-      https_proxy: http://10.11.92.33:1282
-      REGISTRY_USER:
-        from_secret: REGISTRY_USER
-      REGISTRY_PASSWORD:
-        from_secret: REGISTRY_PASSWORD
-    settings:
-      source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-arm64
-      target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-arm64
-      registry: hub.wodcloud.com
-
-  - name: harbor-ppc64le
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    pull: always
-    environment: 
-      http_proxy: http://10.11.92.33:1282
-      https_proxy: http://10.11.92.33:1282
-      REGISTRY_USER:
-        from_secret: REGISTRY_USER
-      REGISTRY_PASSWORD:
-        from_secret: REGISTRY_PASSWORD
-    settings:
-      source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-ppc64le
-      target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-ppc64le
-      registry: hub.wodcloud.com
-
-  - name: harbor-mips64le
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
-    volumes:
-      - name: docker-sock
-        path: /var/run/docker.sock
-    pull: always
-    environment:
-      http_proxy: http://10.11.92.33:1282
-      https_proxy: http://10.11.92.33:1282
-      REGISTRY_USER:
-        from_secret: REGISTRY_USER
-      REGISTRY_PASSWORD:
-        from_secret: REGISTRY_PASSWORD
-    settings:
-      source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-mips64le
-      target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-mips64le
+      source: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.5-alpha
+      target: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.5
       registry: hub.wodcloud.com
 
 ##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------##
diff --git a/src/components/service-list/service_shop_menu_new.vue b/src/components/service-list/service_shop_menu_new.vue
index 0ebd00ebface84061752ef9d5ef62996c37d6225..4c4fa0d8b9cbef35aaf56a7d8f39ff6407fd2701 100644
--- a/src/components/service-list/service_shop_menu_new.vue
+++ b/src/components/service-list/service_shop_menu_new.vue
@@ -87,7 +87,7 @@ export default {
   top: 76px;
   left: calc(50% - 600px);
   width: 176px;
-  padding: 8px;
+  padding: 8px 16px;
 	background-color: #ffffff;
 	box-shadow: 0px 3px 6px 0px 
 		rgba(15, 19, 65, 0.04);
@@ -96,11 +96,12 @@ export default {
 .service_shop_menu_list > li {
   box-sizing: border-box;
   height: 40px;
-  padding: 8px 0 0 22px;
+  /* padding: 8px 0 0 22px; */
   margin-bottom: 16px;
   font-size: 15px;
-  line-height: 24px;
+  line-height: 40px;
   cursor: pointer;
+  text-align: center;
 }
 .service_shop_menu_list > li:nth-last-child(1) {
   margin-bottom: 0;
@@ -115,17 +116,13 @@ export default {
   margin-right: 6px;
 }
 .menu_item {
-  position: relative;
   font-weight: bold;
   font-size: 15px;
   color: #96a0c5;
-  top: -6px;
 }
 .menu_item_active {
-  position: relative;
   font-weight: bold;
   font-size: 15px;
   color: #515fe7;
-  top: -6px;
 }
 </style>
diff --git a/src/pages/service_shop/shop_list_new.vue b/src/pages/service_shop/shop_list_new.vue
index 4824a6543aedf67a3399cfcd36da29ef62a67198..1a3a4d6886ce748df151305bb0b7952c24aa2cbe 100644
--- a/src/pages/service_shop/shop_list_new.vue
+++ b/src/pages/service_shop/shop_list_new.vue
@@ -15,9 +15,8 @@
           :filterNames="filterNames"
           :name="name"
           :urlFilter="urlFilter"
-          v-show="showFlag"
         ></service-list>
-        <shop-cloud v-show="!showFlag" name="云资源服务"></shop-cloud>
+        <!-- <shop-cloud v-show="!showFlag" name="云资源服务"></shop-cloud> -->
       </el-main>
     </el-container>
   </div>
@@ -42,17 +41,17 @@ export default {
     filterNames: [],
     currentId: null,
     menuList: [],
-    otherlist: [
-      {
-        id: 'app',
-        name: "应用商店",
-      },
-      {
-        id: "cloud",
-        name: "云资源服务",
-      }
-    ],
-    showFlag: true
+    // otherlist: [
+    //   {
+    //     id: 'app',
+    //     name: "应用商店",
+    //   },
+    //   {
+    //     id: "cloud",
+    //     name: "云资源服务",
+    //   }
+    // ],
+    // showFlag: true
   }),
   mounted() {
     // this.getVal(this.$route.query);
@@ -61,23 +60,7 @@ export default {
   },
   methods: {
     getVal(val) {
-      console.log(val,'========')
-      if (val.indexOf('app') > -1) {
-        let obj = {
-          id: 'app',
-          name: "应用商店",
-        }
-        this.changeActive(obj)
-      }else if (val.indexOf('cloud') > -1) {
-        let obj = {
-          id: "cloud",
-          name: "云资源服务",
-        }
-        this.changeActive(obj)
-      }else {
-        this.changeActive(this.menuList[0])
-      }
-      
+      this.changeActive(this.menuList[0])
     },
     getShopMenu() {
       let obj = {}
@@ -86,29 +69,11 @@ export default {
           let arr = response.data.data;
           obj = arr[0] || {}
           this.menuList = arr;
-          this.menuList.push(...this.otherlist)
-          if (this.$route.params.id) {
-            this.currentId = this.$route.params.id
-            if (this.$route.params.id == 'app') {
-              this.showFlag = true
-              this.name = '应用商店'
-              this.urlFilter = this.$route.params.id.toString()
-              this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
-            }else if(this.$route.params.id == 'cloud') {
-              this.showFlag = false
-            }
-          }else {
-            this.currentId = obj.id
-            this.name = obj.name
-            this.urlFilter = obj.id.toString()
-            if (obj.id != 'app' && obj.id != 'cloud') {
-              this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
-            }else {
-              if (obj.id == 'app') {
-                this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
-              }
-            }
-          }
+          this.currentId = obj.id
+          this.name = obj.name
+          this.urlFilter = obj.id.toString()
+          this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
+          
         } else {
           console.log(response.data.errMsg);
         }
@@ -116,22 +81,9 @@ export default {
     },
     changeActive(item) {
       this.currentId = item.id
-      if (item.id !='cloud') {
-        if (item.id != 'app') {
-          this.$router.push('/shop/data_service_list')
-        }
-        this.showFlag = true
-        this.name = item.name
-        this.urlFilter = item.id.toString()
-        if (item.id != 'app') {
-          this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
-        }else {
-          this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
-        }
-      }else {
-        this.showFlag = false
-      }
-      console.log(this.showFlag)
+      this.name = item.name
+      this.urlFilter = item.id.toString()
+      this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
     }
   },
   watch: {
diff --git a/src/pages/workbench/product-type/class_edit.vue b/src/pages/workbench/product-type/class_edit.vue
index f8dd134240150ebaa1bfefd70fcc60505c067812..7319e7be0f441d15c723952e9cb7ba984cfcd4cd 100644
--- a/src/pages/workbench/product-type/class_edit.vue
+++ b/src/pages/workbench/product-type/class_edit.vue
@@ -19,6 +19,7 @@
           <el-select
             v-model="form.typeCode"
             placeholder="请选择"
+            :disabled="disabledFlag"
           >
             <el-option
               v-for="(e, idx) in classTypes"
@@ -40,6 +41,7 @@
           <el-select
             v-model="form.servTemplate"
             placeholder="请选择"
+            :disabled="disabledFlag"
           >
             <el-option
               v-for="(e, idx) in serviceTemplates"
@@ -54,6 +56,7 @@
           <el-select
             v-model="form.pId"
             placeholder="请选择"
+            :disabled="disabledFlag"
           >
             <el-option
               v-for="(e, idx) in pClassNames"
@@ -70,6 +73,7 @@
             type="textarea"
             placeholder="请输入分类描述"
             rows="5"
+            :disabled="disabledFlag"
           />
         </el-form-item>
         <el-form-item label="" prop="state">
@@ -115,6 +119,7 @@ export default {
         ],
         name: [
           { required: true, message: "请输入分类名称", trigger: "blur" },
+          { max: 8, message: "最大长度为8个字", trigger: "blur"}
         ],
         servTemplate: [
           { required: true, message: "请选择服务模版", trigger: "change" },
@@ -195,7 +200,8 @@ export default {
           label: "禁用",
           value: 0
         },
-      ] // 状态
+      ], // 状态
+      disabledFlag: false
     }
   },
   computed: {
@@ -224,6 +230,7 @@ export default {
             state: data.state,
             typeCode: data.type_code
           }
+          this.disabledFlag = data.can_delete == 0 ? true : false
         }else {
           this.$message.error(res.data.errMsg)
         }
diff --git a/src/pages/workbench/product-type/class_list.vue b/src/pages/workbench/product-type/class_list.vue
index 256884ddd4e3c9d2af99019e420e1b00e71f018b..47e9f34cc373e15aeb390db0964254f7474f4da5 100644
--- a/src/pages/workbench/product-type/class_list.vue
+++ b/src/pages/workbench/product-type/class_list.vue
@@ -147,7 +147,7 @@ export default {
             type: 'edit',
             disflag: true,
             disabledRule(item) {
-              return item.state != 1 && item.canDelete == 1;
+              return item.state != 1;
             },
             line: '|'
           },
@@ -253,12 +253,8 @@ export default {
       })
     }, // 启用/禁用分类
     editRow(row) {
-      if (row.canDelete == 0) {
+      if (row.state == 1) {
         return
-      }else {
-        if (row.state == 1) {
-          return
-        }
       }
       this.$router.push(`/productType/classList/edit/${row.id}`)
     }, // 编辑分类