diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue
index c7a4faf5f..635f93c98 100644
--- a/pos-uni/pages/index/index.vue
+++ b/pos-uni/pages/index/index.vue
@@ -66,6 +66,28 @@
您有新的交易日报生成，请点击查看
-->
+
+
+
+ 已支付
+ 已退款
+ 未支付
+
+
+
+ 订单号: {{item.orderNo}}
+
+ 油号:{{item.oilName}}
+ 升数:{{item.shengshu}}L
+ 下单时间:{{item.payTime}}
+
+ 应付:￥{{item.goodsMoney}}
+ 优惠:￥0.00
+
+
+
+ 实付:￥{{item.payMoney}}
+
@@ -83,16 +105,26 @@
List: [],
show: false,
status: 'loading',
+ orderList: [],
indexData: {
totalPayMoney: '0',
totalCount: '0',
totalRefund: '0',
- }
+ },
+ form: {
+ page: 1,
+ pageSize: 10,
+ status: '',
+ startTime: '',
+ endTime: '',
+ payType: ''
+ },
}
},
onShow() {
// this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束
+ this.getPageListByPos()
this.getIndexData();
},
onPullDownRefresh() {
@@ -110,6 +142,24 @@
tabbar
},
methods: {
+ getPageListByPos() {
+
+
+ request({
+ url: 'business/allOrderInfo/getPageListByPos',
+ method: 'get',
+ params: this.form
+ }).then((res) => {
+ if (res.code == 200) {
+ this.orderList = res.data.records;
+ } else {
+ uni.showToast({
+ title: res.data,
+ icon: "none"
+ })
+ }
+ })
+ },
goRecharge() {
uni.navigateTo({
url: "/pagesHome/MemberRecharge/MemberRecharge"
@@ -294,4 +344,122 @@
overflow: hidden;
margin-left: 10px;
}
+
+ .box_ {
+ width: 95%;
+ border-radius: 8px;
+ background: #fff;
+ box-sizing: border-box;
+ padding: 15px;
+ margin: 15px auto;
+
+ }
+
+ .b-bx {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 10px;
+ }
+
+ .title_ {
+ font-weight: bold;
+ font-size: 16px;
+ color: #333333;
+ }
+
+ .zt-size {
+ font-weight: bold;
+ font-size: 16px;
+ color: #FD504E;
+ }
+
+ .centne {
+ display: flex;
+ }
+
+ .touxiang {
+ width: 60px;
+ height: 60px;
+ border-radius: 50%;
+ background: #D9D9D9;
+ margin-right: 15px;
+ }
+
+ .right-centne {
+ width: 100%;
+ font-size: 14px;
+ }
+
+ .h_ {
+ width: 100%;
+ margin-bottom: 5px;
+ }
+
+ .end-box {
+ width: 100%;
+ text-align: right;
+ font-weight: bold;
+ font-size: 16px;
+ color: #0864E9;
+ }
+
+ .time {
+ font-weight: 500;
+ font-size: 14px;
+ color: #333333;
+ margin: 0px auto;
+ margin-top: 15px;
+ }
+
+ .time-bs {
+ width: 100%;
+ box-sizing: border-box;
+ background: #FFFFFF;
+ padding: 15px;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ }
+
+ .time-bs2 {
+ width: 100%;
+ box-sizing: border-box;
+ background: #FFFFFF;
+ padding: 30px;
+ // display: flex;
+ align-items: center;
+ justify-content: space-around;
+ }
+
+ .time-box {
+ border: 1px solid #0864E9;
+ box-sizing: border-box;
+ padding: 5px 15px;
+ border-radius: 8px;
+ font-size: 14px;
+ color: #333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .time-box2 {
+ border: 1px solid #0864E9;
+ box-sizing: border-box;
+ padding: 5px 15px;
+ border-radius: 8px;
+ font-size: 14px;
+ color: #333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .hao_ {
+ width: 30%;
+ font-weight: bold;
+ margin-right: 5px;
+ }
\ No newline at end of file
diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue
index 5dd6a4ae3..72f05cf5e 100644
--- a/pos-uni/pagesHome/orderList/orderList.vue
+++ b/pos-uni/pagesHome/orderList/orderList.vue
@@ -22,18 +22,15 @@
未支付
-
-
-
-
- 订单号:{{item.orderNo}}
- 油号:{{item.oilName}}
- 升数:{{item.shengshu}}L
- 下单时间:{{item.payTime}}
+ 订单号: {{item.orderNo}}
+
+ 油号:{{item.oilName}}
+ 升数:{{item.shengshu}}L
+ 下单时间:{{item.payTime}}
- 应付:￥{{item.goodsMoney}}
- 优惠:￥0.00
+ 应付:￥{{item.goodsMoney}}
+ 优惠:￥0.00
@@ -348,11 +345,12 @@
}
.right-centne {
- width: 70%;
+ width: 100%;
font-size: 14px;
}
.h_ {
+ width: 100%;
margin-bottom: 5px;
}
@@ -415,4 +413,10 @@
align-items: center;
justify-content: center;
}
+
+ .hao_ {
+ width: 30%;
+ font-weight: bold;
+ margin-right: 5px;
+ }
\ No newline at end of file