diff --git a/.gitignore b/.gitignore index e553a78..4ce2af5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dts-dao/dts-dao.iml /dts-wx-api/dts-wx-api.iml /logs/ +/admin-ui/node_modules/ diff --git a/admin-ui/favicon.ico b/admin-ui/favicon.ico index 7fc0eab..37e04ed 100644 Binary files a/admin-ui/favicon.ico and b/admin-ui/favicon.ico differ diff --git a/admin-ui/src/api/order.js b/admin-ui/src/api/order.js index cec9d57..1a508f4 100644 --- a/admin-ui/src/api/order.js +++ b/admin-ui/src/api/order.js @@ -50,5 +50,3 @@ export function listShipChannel() { method: 'get' }) } - - diff --git a/admin-ui/src/views/mall/brand.vue b/admin-ui/src/views/mall/brand.vue index 95426f8..c4796c6 100644 --- a/admin-ui/src/views/mall/brand.vue +++ b/admin-ui/src/views/mall/brand.vue @@ -46,7 +46,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -158,7 +158,7 @@ export default { textMap: { update: '编辑', create: '创建', - shareUrl: '店铺推广码' + shareUrl: '店铺推广码' }, rules: { name: [ diff --git a/admin-ui/src/views/mall/order.vue b/admin-ui/src/views/mall/order.vue index 4c88b8f..f6f6da4 100644 --- a/admin-ui/src/views/mall/order.vue +++ b/admin-ui/src/views/mall/order.vue @@ -146,7 +146,7 @@