From fcc75803ef8ab774bb648c94c515b398e6b9fc24 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 29 Nov 2023 09:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/order/index.vue     | 22 ++++++++++++++++++----
 pages/admin/orderList/index.vue |  6 +++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index 0d670c0..baf0509 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="padding-bottom: 30rpx;">
 		<view class="order-index" ref="container">
 			<view class="header acea-row">
 				<navigator class="item" :url="`/pages/admin/orderList/index?types=1&merId=${mer_id}`"
@@ -80,11 +80,11 @@
 					<view class="turnover">结算金额</view>
 				</view>
 				<view class="conter">
-					<view class="item acea-row row-between-wrapper" v-for="(item, index) in list" :key="index">
+					<view class="item acea-row row-between-wrapper" v-for="(item, index) in list" :key="index" @click="navToOrder(item)">
 						<view class="data">{{ item.day }}</view>
 						<view class="browse">{{ item.total }}</view>
 						<view class="turnover">{{ item.pay_price }}</view>
-						<view class="turnover">{{ item.pay_price }}</view>
+						<view class="turnover">{{ toFixed2(item.settlement_price) }}</view>
 					</view>
 				</view>
 			</view>
@@ -270,7 +270,21 @@
 					this.OrderList = res.data
 					// console.log(this.OrderList);
 				})
-			}
+			},
+      // 保留两位小数
+      toFixed2(num){
+        let str = num;
+        if(typeof num =='string'){
+          str = +str;
+          str = str.toFixed(2);
+        }else str = str.toFixed(2);
+        return str || '0.00';
+      },
+      navToOrder(item){
+        uni.navigateTo({
+          url: `/pages/admin/orderList/index?merId=${this.mer_id}&types=2&pay_time=${item.pay_time.split(' ')[0]}`
+        })
+      }
 		},
 		onReachBottom() {
 			this.getList(this.mer_id)
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 5319442..4e3f0e4 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -263,7 +263,8 @@
 					limit: 10,
 					status: 1,
 					search_info: '',
-					product_type: ''
+					product_type: '',
+          pay_time: null,
 				},
 				list: [],
 				loaded: false,
@@ -292,6 +293,9 @@
 			this.where.status = option.types
 			this.current = "";
 			this.merId = option.merId;
+      if(option.pay_time){
+        this.where.pay_time = option.pay_time;
+      }
 		
 			this.getIndex();
 		},