From 8163cc588218d6fbb48daec0019ed7966560ff71 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 28 May 2021 17:26:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?tab=E6=A0=8F=E5=88=86=E7=B1=BB=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/nav/cateNav.vue | 75 +++++++++++++--------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue index 9cdd66c6..e4fd092c 100644 --- a/buyer/src/components/nav/cateNav.vue +++ b/buyer/src/components/nav/cateNav.vue @@ -13,11 +13,12 @@ - +
-
+ +
    -
  • +
  • {{item.name}} / @@ -26,38 +27,35 @@
- -
-
- -
-
    -
  • - - {{ items.name }} - - -
    - {{ item.name }} -
    -
    • -
+ +
+
+
- +
    +
  • + + {{ items.name }} + + +
    + {{ item.name }} +
    +
    • +
+
@@ -86,12 +84,12 @@ export default { } }, computed: { - navList () { + navList () { // 导航列表 return JSON.parse(storage.getItem('navList')) || [] } }, methods: { - getCate () { + getCate () { // 获取分类数据 getCategory(0).then(res => { if (res.success) { this.cateList = res.result; @@ -99,7 +97,7 @@ export default { } }); }, - showDetail (index) { + showDetail (index) { // 展示全部分类 this.panel = true this.panelData = this.cateList[index].children }, @@ -245,9 +243,6 @@ export default { .nav-detail-item span:hover { background-color: $theme_color; } -.detail-item-panel ul { - list-style: none; -} .detail-item-panel li { line-height: 30px; // margin-left: 40px; From b9aa8336f9ef6ae5680daadad9f5fc59cb37932a Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 1 Jun 2021 08:53:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/member/list/memberDetail.vue | 15 ++++++++++++++- seller/src/views/order/order/orderList.vue | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue index e52aebca..ccdd938f 100644 --- a/manager/src/views/member/list/memberDetail.vue +++ b/manager/src/views/member/list/memberDetail.vue @@ -502,7 +502,20 @@ { title: "来源", key: "clientType", - width: 80, + width: 80,render: (h, params) => { + if (params.row.clientType == "H5") { + return h("div",{},"移动端"); + }else if(params.row.clientType == "PC") { + return h("div",{},"PC端"); + }else if(params.row.clientType == "WECHAT_MP") { + return h("div",{},"小程序端"); + }else if(params.row.clientType == "APP") { + return h("div",{},"移动应用端"); + } + else{ + return h("div",{},params.row.clientType); + } + }, }, { title: "订单状态", diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index da83e39b..fa3a2274 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -126,6 +126,20 @@ title: "订单来源", key: "clientType", width: 120, + render: (h, params) => { + if (params.row.clientType == "H5") { + return h("div",{},"移动端"); + }else if(params.row.clientType == "PC") { + return h("div",{},"PC端"); + }else if(params.row.clientType == "WECHAT_MP") { + return h("div",{},"小程序端"); + }else if(params.row.clientType == "APP") { + return h("div",{},"移动应用端"); + } + else{ + return h("div",{},params.row.clientType); + } + }, }, { title: "订单类型", From 0f1c7f39a7cd9992e3582ed4ae3214ad465238d5 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 1 Jun 2021 09:05:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=9D=A5=E6=BA=90=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/shop/shopDetail.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index ab3cb70a..cb765c69 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -591,6 +591,20 @@ title: "来源", key: "clientType", width: 80, + render: (h, params) => { + if (params.row.clientType == "H5") { + return h("div",{},"移动端"); + }else if(params.row.clientType == "PC") { + return h("div",{},"PC端"); + }else if(params.row.clientType == "WECHAT_MP") { + return h("div",{},"小程序端"); + }else if(params.row.clientType == "APP") { + return h("div",{},"移动应用端"); + } + else{ + return h("div",{},params.row.clientType); + } + }, }, { title: "订单状态", From 3b113e2039082db3b000ccda24121e787e0fb46c Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 10:33:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=AC=94=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/statistics/order.vue | 2 +- seller/src/views/statistics/order.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 308af93e..c86c8b56 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -52,7 +52,7 @@
付款笔数
-
{{overViewList.paymentsNum || 0}}
+
{{overViewList.paymentOrderNum || 0}}
付款金额
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue index ab431343..b899df8d 100644 --- a/seller/src/views/statistics/order.vue +++ b/seller/src/views/statistics/order.vue @@ -52,7 +52,7 @@
付款笔数
-
{{overViewList.paymentsNum || 0}}
+
{{overViewList.paymentOrderNum || 0}}
付款金额
From 7e634d7eb777349be8d2af99f0a2c9b42f528c79 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 11:27:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message-manage/memberMessageManager.vue | 4 ++-- manager/src/views/order/receipt/receipt.vue | 19 ------------------- manager/src/views/sys/message/sms.scss | 4 ---- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/manager/src/views/member/message-manage/memberMessageManager.vue b/manager/src/views/member/message-manage/memberMessageManager.vue index 990134d2..bf3a0720 100644 --- a/manager/src/views/member/message-manage/memberMessageManager.vue +++ b/manager/src/views/member/message-manage/memberMessageManager.vue @@ -267,7 +267,7 @@ import { getMessageData, editSmsMessageTemplate, - editNoticeMessageTemplate, + editNoticeMessage, wechatMessageSync, getWechatMessagePage, editWechatMessageTemplate, @@ -592,7 +592,7 @@ noticeFormDataEdit(){ this.$refs['noticeFormData'].validate((valid) => { if (valid) { - editNoticeMessageTemplate(this.messageTemplateId,this.noticeFormData).then(res => { + editNoticeMessage(this.messageTemplateId,this.noticeFormData).then(res => { if(res.message === 'success') { this.$Message.success('站内信修改成功'); this.noticeModal = false; diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue index 006dbcea..e2531c1e 100644 --- a/manager/src/views/order/receipt/receipt.vue +++ b/manager/src/views/order/receipt/receipt.vue @@ -281,25 +281,6 @@ this.total = this.data.length; this.loading = false; }, - //开发票 - invoicing(params){ - this.$Modal.confirm({ - title: "确认开票", - content: "您确认已经开具发票 ?", - loading: true, - onOk: () => { - API_Order.invoicing(params.id).then((res) => { - if (res.success) { - this.$Message.success("开票成功"); - } - this.$Modal.remove(); - this.getData(); - }); - - - } - }); - }, }, mounted() { this.init(); diff --git a/manager/src/views/sys/message/sms.scss b/manager/src/views/sys/message/sms.scss index 3688eaf9..5b4991e9 100644 --- a/manager/src/views/sys/message/sms.scss +++ b/manager/src/views/sys/message/sms.scss @@ -135,10 +135,6 @@ methodItem h4 { left: 7px; top: 0px; } -.ivu-tag-text { - line-height: 35px; - font-size: 14px; -} .message-title{ background-color: #fff5eb; From 79d57005045820c9f388bc75bfa5d83eddfbdcf6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 16:06:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/member.js | 13 ++++-- manager/src/views/home/home.vue | 71 ++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/manager/src/api/member.js b/manager/src/api/member.js index 8f07de09..fbce5ce1 100644 --- a/manager/src/api/member.js +++ b/manager/src/api/member.js @@ -98,11 +98,16 @@ export const getMemberStatistics = params => { }; - // 获取会员注册统计列表 export const getStatisticsList = params => { return getRequest("/statistics/view/list", params); }; + +// 获取会员历史流量 +export const historyMemberChartList = () => { + return getRequest("/statistics/view/online/history"); +} + //查询会员数量 export const getMemberNum = params => { return getRequest("/member/num", params); @@ -121,15 +126,15 @@ export const removeMemberAddress = (id) => { } //添加会员收货地址 export const addMemberAddress = (params) => { - return postRequest(`/member/address`,params) + return postRequest(`/member/address`, params) } //修改会员收货地址 export const editMemberAddress = (params) => { - return putRequest(`/member/address`,params) + return putRequest(`/member/address`, params) } //查询会员预存款 export const getMemberWallet = (params) => { - return getRequest(`/members/wallet`,params) + return getRequest(`/members/wallet`, params) } diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue index 2802c29e..3f340a8c 100644 --- a/manager/src/views/home/home.vue +++ b/manager/src/views/home/home.vue @@ -172,14 +172,22 @@
+ + +
+
+

最近48小时在线人数（整点为准）

+
+
+
-

流量统计

+

流量走势

-

交易统计

+

交易趋势

@@ -279,6 +287,7 @@ export default { homeData: "", // 首页数据 pvChart: "", // 流量统计 orderChart: "", // 订单统计 + historyMemberChart: "", // 最近会员流量统计 params: { // 请求参数 searchType: "LAST_SEVEN", }, @@ -308,13 +317,13 @@ export default { }, // top10热卖商品 async toHotGoods() { - let res = await hotGoods(); + let res = await hotGoods(this.params); res.success ? (this.topHotGoodsData = res.result) : ""; }, // top10热卖店铺 async topHotShops() { - let res = await hotShops(); + let res = await hotShops(this.params); res.success ? (this.topHotShopsData = res.result) : ""; }, // 今日待办 @@ -323,6 +332,7 @@ export default { res.success ? (this.awaitTodoData = res.result) : ""; }, + //首页统计数据 async getHomeData() { let res = await homeStatistics(); if (res.success) { @@ -358,6 +368,7 @@ export default { } }, + initOrderChart() { // 默认已经加载 legend-filter 交互 let data = this.chartList; @@ -393,6 +404,9 @@ export default { this.orderChart.render(); }, + + + // 浏览量统计图 initPvChart() { let uv = []; @@ -465,8 +479,54 @@ export default { this.initPvChart(); } }); - }, + }, // 实例化会员流量图表 + async initHistoryMemberChartList() { + const res = await API_Member.historyMemberChartList(); + if (res.success) { + this.chartList = res.result; + if (!this.historyMemberChart) { + this.historyMemberChart = new Chart({ + container: "historyMemberChart", + autoFit: true, + height: 500, + padding: [70, 35, 70, 35], + }); + } + + this.initHistoryMemberChart(); + } + }, + initHistoryMemberChart(){ + // 默认已经加载 legend-filter 交互 + let data = this.chartList; + + data.forEach((item) => { + item.title = "历史在线人数"; + }); + this.historyMemberChart.data(data); + + console.error(data) + this.historyMemberChart.tooltip({ + showCrosshairs: true, + shared: true, + }); + + this.historyMemberChart + .line() + .position("date*num") + .color("title",['#ffaa71']) + .shape("smooth") + ; + + this.historyMemberChart + .point() + .position("date*num") + .color("title",['#ffaa71']) + .shape("circle") + ; + this.historyMemberChart.render(); + }, // 初始化信息 init() { this.toHotGoods(); @@ -475,6 +535,7 @@ export default { this.getHomeData(); this.getPvChart(); this.initOrderChartList(); + this.initHistoryMemberChartList(); }, }, mounted() { From d86b5c609bd924533426949ac63ce6cbf2fc1d78 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 17:43:31 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=B7=B3=E8=BD=AC=E6=A0=B8=E5=AF=B9=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E8=B4=A6=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/shop/bill/accountStatementBill.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue index e944f432..6e62f342 100644 --- a/seller/src/views/shop/bill/accountStatementBill.vue +++ b/seller/src/views/shop/bill/accountStatementBill.vue @@ -225,7 +225,7 @@ }, getDataList() { this.loading = true; - this.searchForm.billStatus = "OUT" + this.searchForm.billStatus = "CHECK" API_Shop.getBillPage(this.searchForm).then((res) => { this.loading = false; if (res.success) {