From 59dd9ab42ac510d8426dc8e4c24646d500e77faa Mon Sep 17 00:00:00 2001 From: chenbo <623659388@qq.com> Date: Tue, 29 Dec 2020 12:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=AF=AD=E6=B3=95=E6=A0=A1=E9=AA=8C=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + admin-ui/favicon.ico | Bin 67646 -> 4670 bytes admin-ui/src/api/order.js | 2 -- admin-ui/src/views/mall/brand.vue | 6 +++--- admin-ui/src/views/mall/order.vue | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) 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 7fc0eab364ce36daac2ca8e29addea2d3841df24..37e04ed2cf397f95b23ad40959868c16f897046c 100644 GIT binary patch literal 4670 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 AFaQ7m literal 67646 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 - + @@ -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 @@