Merge remote-tracking branch 'origin/master'

pos-uni/pages/index/index.vue

@@ -66,6 +66,28 @@
 				<u-icon name="bell" color="#E61D2A" size="18"></u-icon>
 				<view class="hy-size">您有新的交易日报生成，请点击查看</view>
 			</view> -->
+			<view class="box_" v-for="item,index in orderList" :key="index">
+				<view class="b-bx">
+					<!-- <view class="title_">京博加油站</view> -->
+					<view class="zt-size" v-if="item.orderStatus == 'paid'">已支付</view>
+					<view class="zt-size" v-if="item.orderStatus == 'refund'">已退款</view>
+					<view class="zt-size" v-if="item.orderStatus == 'unpaid'">未支付</view>
+				</view>
+				<view class="centne">
+					<view class="right-centne">
+						<view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
+						</view>
+						<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
+						<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
+						<view class="b-bx">
+							<view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
+							<view class=""><text class="hao_">优惠:</text>￥0.00</view>
+						</view>
+					</view>
+				</view>
+				<view class="end-box">实付:￥{{item.payMoney}}</view>
+			</view>
 		</view>
 		<tabbar :msg='msg'></tabbar>
 	</view>
@@ -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;
+	}
 </style>

pos-uni/pagesHome/orderList/orderList.vue

@@ -22,18 +22,15 @@
 					<view class="zt-size" v-if="item.orderStatus == 'unpaid'">未支付</view>
 				</view>
 				<view class="centne">
-					<view class="touxiang">
-						<!-- <u-avatar :src="src"></u-avatar> -->
-						<image class="touxiang" :src="baseUrl+item.avatar"></image>
-					</view>
 					<view class="right-centne">
-						<view class="h_">订单号:{{item.orderNo}}</view>
+						<view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
-						<view class="h_">油号:{{item.oilName}}</view>
+						</view>
-						<view class="h_">升数:{{item.shengshu}}L</view>
+						<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
-						<view class="h_">下单时间:{{item.payTime}}</view>
+						<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
 						<view class="b-bx">
-							<view class="">应付:￥{{item.goodsMoney}}</view>
+							<view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
-							<view class="">优惠:￥0.00</view>
+							<view class=""><text class="hao_">优惠:</text>￥0.00</view>
 						</view>
 					</view>
 				</view>
@@ -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;
+	}
 </style>