From d8045fa5d3b96379ff75f259148ff8cd925a8854 Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Thu, 22 Oct 2020 18:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=8C=E5=96=84=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E5=8D=A1=E6=94=B6=E6=AC=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/navigation/consume/current.vue | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/views/navigation/consume/current.vue b/src/views/navigation/consume/current.vue index b071fea..bb3e980 100644 --- a/src/views/navigation/consume/current.vue +++ b/src/views/navigation/consume/current.vue @@ -13,7 +13,7 @@ -
查询
+
查询
收款总计(元)
{{(sum_real_payment1+sum_real_payment2+sum_real_payment3)/100}}
@@ -38,7 +38,7 @@
{{item.onickName}}
-
{{setTiem(item.createDate,"YYYY-MM-DD HH:mm:ss")}}
+
{{setTiem(item.createDate,"YYYY-MM-DD HH:mm:ss")}}
{{`¥${item.deductionAmount/100}`}}
@@ -95,6 +95,13 @@ export default { ...mapState(['merchant_id']) }, methods: { + //根据时间查找 + search(){ + this.getCardPay(); + this.payMum1(); + this.payMum2(); + this.payMum3(); + }, //查询消费卡扫码记录列表 getCardPay() { this.$http.cardPayList({ @@ -174,6 +181,7 @@ export default { const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") this.startTiem = tmepTime this.startTiemShow = false + this.startdate = tmepTime +' 00:00:00' console.log(this.startTiem ,"????"); }, @@ -181,6 +189,7 @@ export default { const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") this.endTiem = tmepTime this.endTiemShow = false + this.enddate = tmepTime+' 23:59:59' console.log(this.endTiem ,"????"); }, //时间处理 @@ -189,10 +198,7 @@ export default { } }, mounted(){ - this.getCardPay(); - this.payMum1(); - this.payMum2(); - this.payMum3(); + this.search() } }; @@ -290,7 +296,10 @@ export default { font-weight: 500; border-bottom: 0.01rem solid #f6f6f6; color: rgba(153, 153, 153, 1); - padding-top: 0.5rem; + padding: 0.46rem; + width: 90%; + margin: 0.5rem 5%; + border-radius: 0.2rem; } .content_left { width: 50%; @@ -301,6 +310,7 @@ export default { .customer{ color: #000; font-size: 0.48rem; + line-height: 0.48rem; } .content_rigth { width: 50%; @@ -308,8 +318,7 @@ export default { text-indent: 1.2rem; } .price { - margin-top: 0.5rem; - margin-bottom: 0.05rem; + margin-bottom: 0.3rem; } .content_left_text { margin-top: 1rem;