From d79ddf798b4c4ad2874b5f94ddfff666ab1d5993 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 12 Dec 2019 19:26:23 +0800 Subject: [PATCH] =?UTF-8?q?1.4.3=E7=89=88=E6=9C=AC=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=96=B0=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=B4=A6=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E6=B0=B4,=E5=90=8E=E5=8F=B0=E6=A8=A1=E5=9D=97=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E6=8B=86=E5=88=86,=E7=89=A9=E6=B5=81=E5=BF=AB?= =?UTF-8?q?=E9=80=92=E5=8D=95=E7=8B=AC=E7=AE=A1=E7=90=86,=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=80=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +- src/api/yxExpress.js | 26 ++++ src/api/yxStoreOrder.js | 7 + src/icons/svg/Sign.svg | 1 + src/icons/svg/article.svg | 1 + src/icons/svg/banner.svg | 1 + src/icons/svg/button.svg | 1 + src/icons/svg/comment.svg | 1 + src/icons/svg/configure.svg | 1 + src/icons/svg/coupon.svg | 1 + src/icons/svg/coupon2.svg | 1 + src/icons/svg/dengji.svg | 1 + src/icons/svg/express.svg | 1 + src/icons/svg/fenxiao.svg | 1 + src/icons/svg/ic-yesterday.svg | 1 + src/icons/svg/list.svg | 1 + src/icons/svg/money.svg | 1 + src/icons/svg/monthlyview.svg | 1 + src/icons/svg/news.svg | 1 + src/icons/svg/order.svg | 1 + src/icons/svg/points.svg | 1 + src/icons/svg/pt.svg | 1 + src/icons/svg/reply.svg | 1 + src/icons/svg/search.svg | 2 +- src/icons/svg/seven.svg | 1 + src/icons/svg/shop.svg | 1 + src/icons/svg/sign2.svg | 1 + src/icons/svg/task manege.svg | 1 + src/icons/svg/tixian.svg | 1 + src/icons/svg/today.svg | 1 + src/icons/svg/wechat.svg | 1 + src/icons/svg/wxapp.svg | 1 + src/icons/svg/wxpay.svg | 1 + src/icons/svg/yingxiao.svg | 1 + src/views/dashboard/PanelGroup.vue | 8 +- src/views/dashboard/PanelGroupT.vue | 8 +- src/views/shop/express/form.vue | 103 ++++++++++++++ src/views/shop/express/index.vue | 118 +++++++++++++++ src/views/shop/order/form.vue | 21 +-- src/views/shop/user/bill.vue | 213 ++++++++++++++++++++++++++++ 40 files changed, 528 insertions(+), 20 deletions(-) create mode 100644 src/api/yxExpress.js create mode 100644 src/icons/svg/Sign.svg create mode 100644 src/icons/svg/article.svg create mode 100644 src/icons/svg/banner.svg create mode 100644 src/icons/svg/button.svg create mode 100644 src/icons/svg/comment.svg create mode 100644 src/icons/svg/configure.svg create mode 100644 src/icons/svg/coupon.svg create mode 100644 src/icons/svg/coupon2.svg create mode 100644 src/icons/svg/dengji.svg create mode 100644 src/icons/svg/express.svg create mode 100644 src/icons/svg/fenxiao.svg create mode 100644 src/icons/svg/ic-yesterday.svg create mode 100644 src/icons/svg/list.svg create mode 100644 src/icons/svg/money.svg create mode 100644 src/icons/svg/monthlyview.svg create mode 100644 src/icons/svg/news.svg create mode 100644 src/icons/svg/order.svg create mode 100644 src/icons/svg/points.svg create mode 100644 src/icons/svg/pt.svg create mode 100644 src/icons/svg/reply.svg create mode 100644 src/icons/svg/seven.svg create mode 100644 src/icons/svg/shop.svg create mode 100644 src/icons/svg/sign2.svg create mode 100644 src/icons/svg/task manege.svg create mode 100644 src/icons/svg/tixian.svg create mode 100644 src/icons/svg/today.svg create mode 100644 src/icons/svg/wechat.svg create mode 100644 src/icons/svg/wxapp.svg create mode 100644 src/icons/svg/wxpay.svg create mode 100644 src/icons/svg/yingxiao.svg create mode 100644 src/views/shop/express/form.vue create mode 100644 src/views/shop/express/index.vue create mode 100644 src/views/shop/user/bill.vue diff --git a/README.md b/README.md index 7273a5e..726a254 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ #### 项目简介 -yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2+Jpa+MybatisPlus+SpringSecurity+jwt+redis+Vue的前后端分离的商城系统， 包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销等功能，更适合企业或个人二次开发；； +yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2+Jpa+MybatisPlus+SpringSecurity+jwt+redis+Vue的前后端分离的商城系统， 包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销、会员等功能，更适合企业或个人二次开发；； **开发文档** 【[查看文档](https://gitee.com/guchengwuyue/yshopmall/wikis/%E5%BC%80%E5%8F%91%E7%8E%AF%E5%A2%83?sort_id=1718722)】 @@ -58,10 +58,11 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - yshop-api 公众号(H5)API模块 - yshop-mp 微信相关模块 - yshop-common 公共模块 -- yshop-system 商城系统模块 +- yshop-system 后台模块 - yshop-logging 日志模块 - yshop-tools 第三方工具模块 - yshop-generator 代码生成模块 +- yshop-shop 商城模块 #### 系统预览 @@ -84,7 +85,7 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2
- + @@ -140,6 +141,11 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - 1.6、修复拼团出现undefined - 1.7、会员后台新增余额调整 - 1.8、修复新增配置数据有时候不成功问题等 +- 1.4.1个人中心新增账单流水 +- yshop1.4.2 发布更新如下： + -1.商品新增多图评价 + -2.订单新增快递查询 +-1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql #### 反馈交流 diff --git a/src/api/yxExpress.js b/src/api/yxExpress.js new file mode 100644 index 0000000..d01e44a --- /dev/null +++ b/src/api/yxExpress.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/yxExpress', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/yxExpress/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/yxExpress', + method: 'put', + data + }) +} + + diff --git a/src/api/yxStoreOrder.js b/src/api/yxStoreOrder.js index 43ee9cb..e012ef8 100644 --- a/src/api/yxStoreOrder.js +++ b/src/api/yxStoreOrder.js @@ -30,3 +30,10 @@ export function refund(data) { data }) } + +export function get() { + return request({ + url: 'api/yxExpress', + method: 'get', + }) +} diff --git a/src/icons/svg/Sign.svg b/src/icons/svg/Sign.svg new file mode 100644 index 0000000..59c9e6f --- /dev/null +++ b/src/icons/svg/Sign.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/article.svg b/src/icons/svg/article.svg new file mode 100644 index 0000000..2df901d --- /dev/null +++ b/src/icons/svg/article.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/banner.svg b/src/icons/svg/banner.svg new file mode 100644 index 0000000..dc9b7c0 --- /dev/null +++ b/src/icons/svg/banner.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/button.svg b/src/icons/svg/button.svg new file mode 100644 index 0000000..972e263 --- /dev/null +++ b/src/icons/svg/button.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/comment.svg b/src/icons/svg/comment.svg new file mode 100644 index 0000000..fad4b67 --- /dev/null +++ b/src/icons/svg/comment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/configure.svg b/src/icons/svg/configure.svg new file mode 100644 index 0000000..0b0591d --- /dev/null +++ b/src/icons/svg/configure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/coupon.svg b/src/icons/svg/coupon.svg new file mode 100644 index 0000000..5a02565 --- /dev/null +++ b/src/icons/svg/coupon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/coupon2.svg b/src/icons/svg/coupon2.svg new file mode 100644 index 0000000..b3a003e --- /dev/null +++ b/src/icons/svg/coupon2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/dengji.svg b/src/icons/svg/dengji.svg new file mode 100644 index 0000000..e2cd8cf --- /dev/null +++ b/src/icons/svg/dengji.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/express.svg b/src/icons/svg/express.svg new file mode 100644 index 0000000..667528e --- /dev/null +++ b/src/icons/svg/express.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/fenxiao.svg b/src/icons/svg/fenxiao.svg new file mode 100644 index 0000000..943263d --- /dev/null +++ b/src/icons/svg/fenxiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ic-yesterday.svg b/src/icons/svg/ic-yesterday.svg new file mode 100644 index 0000000..fae35c2 --- /dev/null +++ b/src/icons/svg/ic-yesterday.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/list.svg b/src/icons/svg/list.svg new file mode 100644 index 0000000..9853581 --- /dev/null +++ b/src/icons/svg/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/money.svg b/src/icons/svg/money.svg new file mode 100644 index 0000000..3e70b0b --- /dev/null +++ b/src/icons/svg/money.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/monthlyview.svg b/src/icons/svg/monthlyview.svg new file mode 100644 index 0000000..8657dd5 --- /dev/null +++ b/src/icons/svg/monthlyview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/news.svg b/src/icons/svg/news.svg new file mode 100644 index 0000000..b26e1e3 --- /dev/null +++ b/src/icons/svg/news.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/order.svg b/src/icons/svg/order.svg new file mode 100644 index 0000000..df06451 --- /dev/null +++ b/src/icons/svg/order.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/points.svg b/src/icons/svg/points.svg new file mode 100644 index 0000000..7c450d5 --- /dev/null +++ b/src/icons/svg/points.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/pt.svg b/src/icons/svg/pt.svg new file mode 100644 index 0000000..d357865 --- /dev/null +++ b/src/icons/svg/pt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/reply.svg b/src/icons/svg/reply.svg new file mode 100644 index 0000000..3be88d4 --- /dev/null +++ b/src/icons/svg/reply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/search.svg b/src/icons/svg/search.svg index 84233dd..f615eec 100644 --- a/src/icons/svg/search.svg +++ b/src/icons/svg/search.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/svg/seven.svg b/src/icons/svg/seven.svg new file mode 100644 index 0000000..d2df729 --- /dev/null +++ b/src/icons/svg/seven.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/shop.svg b/src/icons/svg/shop.svg new file mode 100644 index 0000000..7e644c6 --- /dev/null +++ b/src/icons/svg/shop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/sign2.svg b/src/icons/svg/sign2.svg new file mode 100644 index 0000000..73e6106 --- /dev/null +++ b/src/icons/svg/sign2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/task manege.svg b/src/icons/svg/task manege.svg new file mode 100644 index 0000000..91c986a --- /dev/null +++ b/src/icons/svg/task manege.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/tixian.svg b/src/icons/svg/tixian.svg new file mode 100644 index 0000000..9363bd9 --- /dev/null +++ b/src/icons/svg/tixian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/today.svg b/src/icons/svg/today.svg new file mode 100644 index 0000000..11dcd8d --- /dev/null +++ b/src/icons/svg/today.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/wechat.svg b/src/icons/svg/wechat.svg new file mode 100644 index 0000000..ef48940 --- /dev/null +++ b/src/icons/svg/wechat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/wxapp.svg b/src/icons/svg/wxapp.svg new file mode 100644 index 0000000..8d3af3a --- /dev/null +++ b/src/icons/svg/wxapp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/wxpay.svg b/src/icons/svg/wxpay.svg new file mode 100644 index 0000000..d3e4d16 --- /dev/null +++ b/src/icons/svg/wxpay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/yingxiao.svg b/src/icons/svg/yingxiao.svg new file mode 100644 index 0000000..8b7d1f1 --- /dev/null +++ b/src/icons/svg/yingxiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index e3a86f7..afc069f 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -3,7 +3,7 @@
- +
今日成交额
@@ -14,7 +14,7 @@
- +
昨日成交额
@@ -25,7 +25,7 @@
- +
近七天成交额
@@ -36,7 +36,7 @@
- +
本月成交额
diff --git a/src/views/dashboard/PanelGroupT.vue b/src/views/dashboard/PanelGroupT.vue index 48cbfbe..1fe3dcf 100644 --- a/src/views/dashboard/PanelGroupT.vue +++ b/src/views/dashboard/PanelGroupT.vue @@ -3,7 +3,7 @@
- +
今日订单数
@@ -14,7 +14,7 @@
- +
昨日订单数
@@ -25,7 +25,7 @@
- +
近七天订单数
@@ -36,7 +36,7 @@
- +
本月订单数
diff --git a/src/views/shop/express/form.vue b/src/views/shop/express/form.vue new file mode 100644 index 0000000..86ac229 --- /dev/null +++ b/src/views/shop/express/form.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/views/shop/express/index.vue b/src/views/shop/express/index.vue new file mode 100644 index 0000000..7e3fca0 --- /dev/null +++ b/src/views/shop/express/index.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/shop/order/form.vue b/src/views/shop/order/form.vue index 02c4e85..6f185a4 100644 --- a/src/views/shop/order/form.vue +++ b/src/views/shop/order/form.vue @@ -5,9 +5,9 @@ @@ -24,15 +24,12 @@ + +