| @@ -13,7 +13,7 @@ | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="inquire">查询</div> | |||||
| <div class="inquire" @click="search()">查询</div> | |||||
| <div class="acounts"> | <div class="acounts"> | ||||
| <div class="title">收款总计(元)</div> | <div class="title">收款总计(元)</div> | ||||
| <div class="num">{{(sum_real_payment1+sum_real_payment2+sum_real_payment3)/100}}</div> | <div class="num">{{(sum_real_payment1+sum_real_payment2+sum_real_payment3)/100}}</div> | ||||
| @@ -38,7 +38,7 @@ | |||||
| <div class="content" v-for="(item,index) in list" :key="index"> | <div class="content" v-for="(item,index) in list" :key="index"> | ||||
| <div class="content_left"> | <div class="content_left"> | ||||
| <div class="customer">{{item.onickName}}</div> | <div class="customer">{{item.onickName}}</div> | ||||
| <div>{{setTiem(item.createDate,"YYYY-MM-DD HH:mm:ss")}}</div> | |||||
| <div style="font-size: 0.36rem;">{{setTiem(item.createDate,"YYYY-MM-DD HH:mm:ss")}}</div> | |||||
| </div> | </div> | ||||
| <div class="content_rigth"> | <div class="content_rigth"> | ||||
| <div class="price">{{`¥${item.deductionAmount/100}`}}</div> | <div class="price">{{`¥${item.deductionAmount/100}`}}</div> | ||||
| @@ -95,6 +95,13 @@ export default { | |||||
| ...mapState(['merchant_id']) | ...mapState(['merchant_id']) | ||||
| }, | }, | ||||
| methods: { | methods: { | ||||
| //根据时间查找 | |||||
| search(){ | |||||
| this.getCardPay(); | |||||
| this.payMum1(); | |||||
| this.payMum2(); | |||||
| this.payMum3(); | |||||
| }, | |||||
| //查询消费卡扫码记录列表 | //查询消费卡扫码记录列表 | ||||
| getCardPay() { | getCardPay() { | ||||
| this.$http.cardPayList({ | this.$http.cardPayList({ | ||||
| @@ -174,6 +181,7 @@ export default { | |||||
| const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") | const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") | ||||
| this.startTiem = tmepTime | this.startTiem = tmepTime | ||||
| this.startTiemShow = false | this.startTiemShow = false | ||||
| this.startdate = tmepTime +' 00:00:00' | |||||
| console.log(this.startTiem ,"????"); | console.log(this.startTiem ,"????"); | ||||
| }, | }, | ||||
| @@ -181,6 +189,7 @@ export default { | |||||
| const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") | const tmepTime = formatDate(new Date(date), "yyyy-MM-dd") | ||||
| this.endTiem = tmepTime | this.endTiem = tmepTime | ||||
| this.endTiemShow = false | this.endTiemShow = false | ||||
| this.enddate = tmepTime+' 23:59:59' | |||||
| console.log(this.endTiem ,"????"); | console.log(this.endTiem ,"????"); | ||||
| }, | }, | ||||
| //时间处理 | //时间处理 | ||||
| @@ -189,10 +198,7 @@ export default { | |||||
| } | } | ||||
| }, | }, | ||||
| mounted(){ | mounted(){ | ||||
| this.getCardPay(); | |||||
| this.payMum1(); | |||||
| this.payMum2(); | |||||
| this.payMum3(); | |||||
| this.search() | |||||
| } | } | ||||
| }; | }; | ||||
| </script> | </script> | ||||
| @@ -290,7 +296,10 @@ export default { | |||||
| font-weight: 500; | font-weight: 500; | ||||
| border-bottom: 0.01rem solid #f6f6f6; | border-bottom: 0.01rem solid #f6f6f6; | ||||
| color: rgba(153, 153, 153, 1); | 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 { | .content_left { | ||||
| width: 50%; | width: 50%; | ||||
| @@ -301,6 +310,7 @@ export default { | |||||
| .customer{ | .customer{ | ||||
| color: #000; | color: #000; | ||||
| font-size: 0.48rem; | font-size: 0.48rem; | ||||
| line-height: 0.48rem; | |||||
| } | } | ||||
| .content_rigth { | .content_rigth { | ||||
| width: 50%; | width: 50%; | ||||
| @@ -308,8 +318,7 @@ export default { | |||||
| text-indent: 1.2rem; | text-indent: 1.2rem; | ||||
| } | } | ||||
| .price { | .price { | ||||
| margin-top: 0.5rem; | |||||
| margin-bottom: 0.05rem; | |||||
| margin-bottom: 0.3rem; | |||||
| } | } | ||||
| .content_left_text { | .content_left_text { | ||||
| margin-top: 1rem; | margin-top: 1rem; | ||||