Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

2026-03-23 14:34:53 +08:00 · 2021-06-23 16:58:22 +08:00
parent 8032f3bda1 752d967a50
commit ee5759c86a
57 changed files with 883 additions and 1141 deletions
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -113,23 +113,9 @@ export default {
          align: "left",
          render: (h, params) => {
            if (params.row.deleteFlag == 0) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "启用",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "green",},},"启用");
            } else if (params.row.deleteFlag == 1) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "禁用",
-                  },
-                }),
-              ]);
+              return h("Tag", {props: {color: "volcano",},},"禁用");
            }
          },
          filters: [