Merge branch 'feature/7月基础一异常冻结会员' into test
* feature/7月基础一异常冻结会员: (50 commits) 无用方法删除 UI 冻结解冻 新增字段 pageType 白名单 宽度 table-sticky iconfont文件提交 冻结方式 UI link 公共样式 引入注释 输入框 可清空 部分电脑 标题显示点点点的问题 异常会员 冻结会员 状态切换 全部选项删除,该选择可清空 冻结类型 bug 修复-列表进详情 返回刷新 导入文件大小限制,以及提示 需求变更-默认最小值更改 no message 生日 格式化 bug 修复 页面缓存 异常规则配置提交校验 ... # Conflicts: # src/components/allCustomers/index.js # src/components/axios/url.js
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/test/TestCom.vue
deleted
100644 → 0
src/test/card-list.vue
deleted
100644 → 0
src/test/gift-list.vue
deleted
100644 → 0
src/test/goods-tree.vue
deleted
100644 → 0
src/test/goods/assist/dom.js
deleted
100644 → 0
src/test/goods/assist/emitter.js
deleted
100644 → 0
src/test/goods/assist/popper.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/assist/util.js
deleted
100644 → 0
src/test/goods/cascader/casitem.vue
deleted
100644 → 0
src/test/goods/cascader/caspanel.vue
deleted
100644 → 0
src/test/goods/cascader/index.vue
deleted
100644 → 0
src/test/goods/complex-info.vue
deleted
100644 → 0
src/test/goods/complex-item.vue
deleted
100644 → 0
src/test/goods/config.js
deleted
100644 → 0
src/test/goods/good-filter-item.vue
deleted
100644 → 0
src/test/goods/goods-ategory.vue
deleted
100644 → 0
src/test/goods/goods-brand.vue
deleted
100644 → 0
src/test/goods/goods-collection.vue
deleted
100644 → 0
src/test/goods/goods-item.js
deleted
100644 → 0
src/test/goods/goods-properties.vue
deleted
100644 → 0
src/test/goods/goods-some.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/index.js
deleted
100644 → 0
src/test/goods/index.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/load-item.vue
deleted
100644 → 0
src/test/goods/load-select.vue
deleted
100644 → 0
src/test/goods/readme.md
deleted
100644 → 0
src/test/goods/sku-filter-table.vue
deleted
100644 → 0
src/test/goods/sku-item.vue
deleted
100644 → 0
src/test/goods/sku-left-item.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/spe-group.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/spes.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/style/brand.less
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/table-checkbox.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/tree/index.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/goods/tree/tree-node.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/linktool.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/linktools.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/linktoolspage.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/people.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/selector.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/test/upload-folder.vue
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/utils/table-sticky.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
test/unit/index.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
test/unit/karma.conf.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
test/unit/specs/TestCom.spec.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
test/unit/util.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment