From 679207521de8f216787dcc7be743c362a8d46bc4 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 24 Nov 2025 15:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/edit-discount.vue    | 384 +++++----
 data/index.js                                 |  33 +
 http/api/account/tableOrderStatistic.js       |  13 +
 http/api/order/summary.js                     |  23 +
 http/http.js                                  |   4 +-
 main.js                                       |   3 +
 pageBwc/index/index.vue                       |   5 +-
 pageMarket/distribution/components/config.vue |   2 +-
 pageMarket/distribution/level-list.vue        |   8 +-
 pageMarket/newUserDiscount/index.vue          |   7 +-
 .../components/my-date-pickerview.vue         | 807 ++++++++---------
 pageSalesSummary/index.vue                    | 749 ++++++++--------
 pageSalesSummary/productSalesRanking.vue      | 269 +++---
 pageSalesSummary/table.vue                    | 346 ++++++++
 pages.json                                    |  11 +-
 pages/appliccation/marketing.vue              |   2 +-
 pages/index/components/Stats.vue              | 546 ++++++------
 pages/index/components/my-date-pickerview.vue | 810 +++++++++---------
 pages/index/components/statistics.vue         | 720 ++++++++--------
 pages/login/index.vue                         |   2 +
 20 files changed, 2610 insertions(+), 2134 deletions(-)
 create mode 100644 data/index.js
 create mode 100644 http/api/account/tableOrderStatistic.js
 create mode 100644 http/api/order/summary.js
 create mode 100644 pageSalesSummary/table.vue

diff --git a/components/my-components/edit-discount.vue b/components/my-components/edit-discount.vue
index c34851f..bd8614e 100644
--- a/components/my-components/edit-discount.vue
+++ b/components/my-components/edit-discount.vue
@@ -1,201 +1,223 @@
 <template>
-	<my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
-		<template #desc>
-			<view class="u-text-left u-p-30 color-666">
-				<view class="u-m-t-32 u-flex ">
-					<view>应付金额</view>
-					<view class="u-m-l-32">
-						{{form.price}}
-					</view>
-				</view>
-				<view class="u-m-t-40 u-flex ">
-					<view>实收金额</view>
-					<view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
-						<uni-easyinput type="number"  @input="currentPriceInput" @change="currentPriceChange" paddingNone :inputBorder="false" 
-						v-model="form.currentPrice"
-							placeholder="输入实际金额"></uni-easyinput>
-					</view>
-				</view>
-				<view class="u-m-t-54 u-flex ">
-					<view>优惠折扣</view>
-					<view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
-						<view class="u-flex-1">
-							<uni-easyinput type="number" @input="discountInput"  @change="discountChange" paddingNone :inputBorder="false" 
-							v-model="form.discount"
-								placeholder="输入折扣"></uni-easyinput>
-						</view>
-						<view class="u-font-32 color-333">%</view>
-					</view>
-					
-				</view>
-			</view>
-		</template>
-		<template #btn>
-			<view class="u-p-30">
-				<view class="u-m-t-10">
-					<my-button @tap="confirm" shape="circle" fontWeight="700" >修改</my-button>
-					<view class="">
-						<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
-					</view>
-				</view>
-			</view>
-		</template>
-	</my-model>
+  <my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
+    <template #desc>
+      <view class="u-text-left u-p-30 color-666">
+        <view class="u-m-t-32 u-flex">
+          <view>应付金额</view>
+          <view class="u-m-l-32">
+            {{ form.price }}
+          </view>
+        </view>
+        <view class="u-m-t-40 u-flex">
+          <view>实收金额</view>
+          <view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
+            <uni-easyinput
+              type="number"
+              @input="currentPriceInput"
+              @change="currentPriceChange"
+              paddingNone
+              :inputBorder="false"
+              v-model="form.currentPrice"
+              placeholder="输入实际金额"
+            ></uni-easyinput>
+          </view>
+        </view>
+        <view class="u-m-t-54 u-flex">
+          <view>优惠折扣</view>
+          <view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
+            <view class="u-flex-1">
+              <uni-easyinput
+                type="number"
+                @input="discountInput"
+                @change="discountChange"
+                paddingNone
+                :inputBorder="false"
+                v-model="form.discount"
+                placeholder="输入折扣"
+              ></uni-easyinput>
+            </view>
+            <view class="u-font-32 color-333">%</view>
+          </view>
+        </view>
+      </view>
+    </template>
+    <template #btn>
+      <view class="u-p-30">
+        <view class="u-m-t-10">
+          <my-button @tap="confirm" shape="circle" fontWeight="700"
+            >修改</my-button
+          >
+          <view class="">
+            <my-button @tap="close" type="cancel" bgColor="#fff"
+              >取消</my-button
+            >
+          </view>
+        </view>
+      </view>
+    </template>
+  </my-model>
 </template>
 
 <script setup>
-	import { reactive, nextTick, ref,watch } from 'vue';
-	import myModel from '@/components/my-components/my-model.vue'
-	import myButton from '@/components/my-components/my-button.vue'
-	import infoBox from '@/commons/utils/infoBox.js'
-	const props = defineProps({
-		title: {
-			type: String,
-			default: ''
-		},
-		discount:{
-			type: [Number,String],
-			default:100
-		},
-		price: {
-			type: [Number,String],
-			default: 0
-		},
-		
-	})
-	function currentPriceInput(newval){
-		form.discount = (newval*100/form.price).toFixed(2)
-	}
-	function discountInput(newval){
-		form.currentPrice= uni.$utils.isMoney(form.price*newval/100).toFixed(2)
-	}
-	function currentPriceChange(newval){
-		if(newval<0){
-			form.currentPrice = '0.00'
-			form.discount=100
-			return infoBox.showToast('实收金额不能小于0')
-		}
-		console.log(props.price)
-		console.log(newval)
-		if(newval > props.price){
-			form.currentPrice = (uni.$utils.isMoney(props.price)*1).toFixed(2)
-			form.discount=0
-			return infoBox.showToast('实收金额不能大于应付金额')
-		}
-	}
-	function discountChange(newval){
-		if(newval<0){
-			form.currentPrice=props.price
-			form.discount=0
-			return infoBox.showToast('优惠折扣不能小于0')
-		}
-		if(newval>100){
-			form.discount=100
-			form.currentPrice=0
-			return infoBox.showToast('优惠折扣不能大于100')
-		}
-	}
-	
-	const $form = {
-		price: props.price,
-		currentPrice: props.price,
-		discount: 100
-	}
-	const form = reactive({
-		...$form
-	})
-	watch(()=>props.price,(newval)=>{
-		form.price = (newval*1).toFixed(2)
-		form.currentPrice=newval
-	})
-	function resetForm() {
-		Object.assign(form, {
-			...$form
-		})
-	}
+import { reactive, nextTick, ref, watch } from "vue";
+import myModel from "@/components/my-components/my-model.vue";
+import myButton from "@/components/my-components/my-button.vue";
+import infoBox from "@/commons/utils/infoBox.js";
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  discount: {
+    type: [Number, String],
+    default: 100,
+  },
+  price: {
+    type: [Number, String],
+    default: 0,
+  },
+});
+function currentPriceInput(newval) {
+  form.discount = ((newval * 100) / form.price).toFixed(2);
+}
+function discountInput(newval) {
+  const currentPrice = uni.$utils.isMoney((form.price * newval) / 100) * 1;
+  form.currentPrice = currentPrice.toFixed(2);
+}
+function currentPriceChange(newval) {
+  if (newval < 0) {
+    form.currentPrice = "0.00";
+    form.discount = 100;
+    return infoBox.showToast("实收金额不能小于0");
+  }
+  console.log(props.price);
+  console.log(newval);
+  if (newval > props.price) {
+    const currentPrice = uni.$utils.isMoney(props.price * 1);
+    form.currentPrice = currentPrice.toFixed(2);
+    form.discount = 0;
+    return infoBox.showToast("实收金额不能大于应付金额");
+  }
+}
+function discountChange(newval) {
+  if (newval < 0) {
+    form.currentPrice = props.price;
+    form.discount = 0;
+    return infoBox.showToast("优惠折扣不能小于0");
+  }
+  if (newval > 100) {
+    form.discount = 100;
+    form.currentPrice = 0;
+    return infoBox.showToast("优惠折扣不能大于100");
+  }
+}
 
-	const model = ref(null)
+const $form = {
+  price: props.price,
+  currentPrice: props.price,
+  discount: 100,
+};
+const form = reactive({
+  ...$form,
+});
+watch(
+  () => props.price,
+  (newval) => {
+    form.price = (newval * 1).toFixed(2);
+    form.currentPrice = newval;
+  }
+);
+function resetForm() {
+  Object.assign(form, {
+    ...$form,
+  });
+}
 
-	function open() {
-		model.value.open()
-		form.price= (props.price*1).toFixed(2)
-		form.discount=props.discount
-		form.currentPrice=(props.discount*props.price/100).toFixed(2)
-		console.log(form)
-	}
+const model = ref(null);
 
-	function close() {
-		model.value.close()
-	}
-	const emits = defineEmits(['confirm'])
+function open() {
+  model.value.open();
+  form.price = (props.price * 1).toFixed(2);
+  form.discount = props.discount;
+  form.currentPrice = ((props.discount * props.price) / 100).toFixed(2);
+  console.log(form);
+}
 
-	function confirm() {
-		emits('confirm',{...form,currentPrice:Number(form.currentPrice).toFixed(2)})
-		close()
-	}
-	defineExpose({
-		open,
-		close
-	})
+function close() {
+  model.value.close();
+}
+const emits = defineEmits(["confirm"]);
+
+function confirm() {
+  emits("confirm", {
+    ...form,
+    currentPrice: Number(form.currentPrice).toFixed(2),
+  });
+  close();
+}
+defineExpose({
+  open,
+  close,
+});
 </script>
 
 <style lang="scss" scoped>
-	.border{
-		border-radius: 8rpx;
-		overflow: hidden;
-		border-color: #999;
-	}
-	.lh34 {
-		line-height: 34rpx;
-	}
+.border {
+  border-radius: 8rpx;
+  overflow: hidden;
+  border-color: #999;
+}
+.lh34 {
+  line-height: 34rpx;
+}
 
-	.tag {
-		background-color: #fff;
-		border: 1px solid #E5E5E5;
-		line-height: inherit;
-		font-size: 24rpx;
-		color: #666666;
-		padding: 6rpx 20rpx;
-		border-radius: 8rpx;
+.tag {
+  background-color: #fff;
+  border: 1px solid #e5e5e5;
+  line-height: inherit;
+  font-size: 24rpx;
+  color: #666666;
+  padding: 6rpx 20rpx;
+  border-radius: 8rpx;
 
-		&.active {
-			border-color: #E6F0FF;
-			color: $my-main-color;
-		}
-	}
+  &.active {
+    border-color: #e6f0ff;
+    color: $my-main-color;
+  }
+}
 
-	.hover-class {
-		background-color: #E5E5E5;
-	}
+.hover-class {
+  background-color: #e5e5e5;
+}
 
-	.discount {
-		.u-absolute {
-			top: 0;
-			bottom: 0;
-			right: 0;
-		}
-	}
+.discount {
+  .u-absolute {
+    top: 0;
+    bottom: 0;
+    right: 0;
+  }
+}
 
-	.bg1 {
-		background: #F7F7FA;
-	}
+.bg1 {
+  background: #f7f7fa;
+}
 
-	.tab {
-		padding: 0 80rpx;
-	}
+.tab {
+  padding: 0 80rpx;
+}
 
-	.border {
-		border: 1px solid #E5E5E5;
-		border-radius: 4rpx;
-	}
+.border {
+  border: 1px solid #e5e5e5;
+  border-radius: 4rpx;
+}
 
-	.input-box {
-		padding: 22rpx 32rpx;
-		font-size: 28rpx;
-		color: #666;
-	}
+.input-box {
+  padding: 22rpx 32rpx;
+  font-size: 28rpx;
+  color: #666;
+}
 
-	.placeholder-class {
-		font-size: 28rpx;
-	}
-</style>
\ No newline at end of file
+.placeholder-class {
+  font-size: 28rpx;
+}
+</style>
diff --git a/data/index.js b/data/index.js
new file mode 100644
index 0000000..f80dc5b
--- /dev/null
+++ b/data/index.js
@@ -0,0 +1,33 @@
+import dayjs from "dayjs";
+export const timeList = [
+  {
+    label: "今天",
+    value: "today",
+    beginDate: dayjs().format("YYYY-MM-DD"),
+    endDate: dayjs().format("YYYY-MM-DD"),
+  },
+  {
+    label: "昨天",
+    value: "yesterday",
+    beginDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+    endDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+  },
+  {
+    label: "本周",
+    value: "this_week",
+    beginDate: dayjs().startOf("week").format("YYYY-MM-DD"),
+    endDate: dayjs().endOf("week").format("YYYY-MM-DD"),
+  },
+  {
+    label: "本月",
+    value: "this_month",
+    beginDate: dayjs().startOf("month").format("YYYY-MM-DD"),
+    endDate: dayjs().endOf("month").format("YYYY-MM-DD"),
+  },
+  {
+    label: "自定义",
+    value: "custom",
+    beginDate: "",
+    endDate: "",
+  },
+];
diff --git a/http/api/account/tableOrderStatistic.js b/http/api/account/tableOrderStatistic.js
new file mode 100644
index 0000000..1f1e882
--- /dev/null
+++ b/http/api/account/tableOrderStatistic.js
@@ -0,0 +1,13 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "account";
+
+export function tableOrderStatistic(data) {
+  return request({
+    url: `${urlType}/admin/tableOrderStatistic`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
+}
\ No newline at end of file
diff --git a/http/api/order/summary.js b/http/api/order/summary.js
new file mode 100644
index 0000000..285125a
--- /dev/null
+++ b/http/api/order/summary.js
@@ -0,0 +1,23 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "order";
+
+export function tableSummaryList(data) {
+  return request({
+    url: `${urlType}/admin/table/summary/list`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
+}
+
+export function saleSummaryPage(data) {
+    return request({
+      url: `${urlType}/admin/sale/summary/page`,
+      method: "GET",
+      data: {
+        ...data,
+      },
+    });
+  }
\ No newline at end of file
diff --git a/http/http.js b/http/http.js
index 3059424..6fceecc 100644
--- a/http/http.js
+++ b/http/http.js
@@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js";
 import go from "@/commons/utils/go.js";
 import { reject } from "lodash";
 // 设置node环境
-// envConfig.changeEnv(storageManage.env('production'))
-envConfig.changeEnv(storageManage.env("development"));
+// envConfig.changeEnv(storageManage.env('production')) //正式
+envConfig.changeEnv(storageManage.env("development")); //测试
 
 // 测试服
 // #ifdef H5
diff --git a/main.js b/main.js
index ccd5728..2ac4d0a 100644
--- a/main.js
+++ b/main.js
@@ -10,6 +10,9 @@ import * as Pinia from 'pinia';
 import {
 	createUnistorage
 } from "pinia-plugin-unistorage";
+
+uni.$utils=utils
+
 // 设置node环境
 envConfig.changeEnv(storageManage.env())
 
diff --git a/pageBwc/index/index.vue b/pageBwc/index/index.vue
index 968b9b6..ae13880 100644
--- a/pageBwc/index/index.vue
+++ b/pageBwc/index/index.vue
@@ -7,7 +7,10 @@
 					<view class="color-333 font-bold">霸王餐</view>
 					<view class="color-666 u-m-t-4 u-font-24">设置充值消费的N倍，当前订单立即免单</view>
 				</view>
-				<up-switch v-model="form.enable" size="18"></up-switch>
+				<up-switch v-model="form.enable" size="18" 
+        :active-value="1"
+        :inactive-value="0"
+        ></up-switch>
 			</view>
 		</view>
 		<view class="boxconstantbox"
diff --git a/pageMarket/distribution/components/config.vue b/pageMarket/distribution/components/config.vue
index 1cde388..ba6ba35 100644
--- a/pageMarket/distribution/components/config.vue
+++ b/pageMarket/distribution/components/config.vue
@@ -66,7 +66,7 @@
               class="number-box"
               placeholder="请输入"
               placeholder-class="color-999 u-font-28"
-              type="number"
+              type="digit"
               
               v-model="form.payAmount"
             />
diff --git a/pageMarket/distribution/level-list.vue b/pageMarket/distribution/level-list.vue
index 2a61107..3c47c5b 100644
--- a/pageMarket/distribution/level-list.vue
+++ b/pageMarket/distribution/level-list.vue
@@ -271,7 +271,13 @@ function cancel(){
 }
 onLoad(()=>{
     showDetailListSwitch.value=distributionStore.config.levelConfigList.map(()=>true)
-    form.levelConfigList=[...distributionStore.config.levelConfigList||[]]
+    const levelConfigList=[...distributionStore.config.levelConfigList||[]]
+    form.levelConfigList=levelConfigList.length?levelConfigList:[
+    {   name:'',
+        levelOneCommission:'',
+        inviteCount:'',
+        costAmount:''}
+    ]
     form.upgradeType=distributionStore.config.upgradeType
 })
 </script>
diff --git a/pageMarket/newUserDiscount/index.vue b/pageMarket/newUserDiscount/index.vue
index 6233117..8f0bb2b 100644
--- a/pageMarket/newUserDiscount/index.vue
+++ b/pageMarket/newUserDiscount/index.vue
@@ -157,7 +157,7 @@
 <script setup>
 import Modal from "@/pageMarket/components/modal.vue";
 
-import { ref, reactive, computed, watch, onMounted } from "vue";
+import { ref, reactive, computed, watch, onMounted ,nextTick} from "vue";
 import { useNewUserDiscountStore } from "@/store/market.js";
 
 const isLoading = ref(false);
@@ -299,7 +299,10 @@ async function init() {
   };
   console.log(data);
   Object.assign(form, data);
-  isLoading.value = false;
+  nextTick(() => {
+    isLoading.value = false;
+
+  })
 }
 
 onMounted(() => {
diff --git a/pageSalesSummary/components/my-date-pickerview.vue b/pageSalesSummary/components/my-date-pickerview.vue
index e8718c2..af1370b 100644
--- a/pageSalesSummary/components/my-date-pickerview.vue
+++ b/pageSalesSummary/components/my-date-pickerview.vue
@@ -1,30 +1,40 @@
 <template>
-	<view class="mask" v-if="show" @tap="close">
-		<view class="box" @tap.stop="nullFunction">
-			<view class="u-flex u-relative u-row-center u-p-30 top">
-				<view class="font-bold u-font-32">筛选日期时间</view>
-				<view class="close" @tap="close">
-					<uni-icons type="closeempty" size="24"></uni-icons>
-				</view>
-
-			</view>
-			<!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
+  <view class="mask" v-if="show" @tap="close">
+    <view class="box" @tap.stop="nullFunction">
+      <view class="u-flex u-relative u-row-center u-p-30 top">
+        <view class="font-bold u-font-32">筛选日期时间</view>
+        <view class="close" @tap="close">
+          <uni-icons type="closeempty" size="24"></uni-icons>
+        </view>
+      </view>
+      <!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
 					<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
 						{{item.title}}
 					</view>
 				</view> -->
-			<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
-				</picker-view-column>
-	<!-- 			<picker-view-column>
+      <picker-view
+        :immediate-change="true"
+        @pickend="pickend"
+        :value="value"
+        @change="bindChange"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 			<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -33,20 +43,31 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-			<view class="u-text-center color-999">至</view>
-			<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
-				</picker-view-column>
-		<!-- 		<picker-view-column>
+      </picker-view>
+      <view class="u-text-center color-999">至</view>
+      <picker-view
+        :immediate-change="true"
+        :value="value1"
+        @pickend="pickend1"
+        @change="bindChange1"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days1" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 		<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -55,394 +76,402 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-
-			<!-- 站位 -->
-			<view style="height: 80px;"></view>
-			<view class="fixed_b">
-				<my-button shape="circle" @tap="confirm">确定</my-button>
-			</view>
-		</view>
-
-	</view>
+      </picker-view>
 
+      <!-- 站位 -->
+      <view style="height: 80px"></view>
+      <view class="fixed_b">
+        <my-button shape="circle" @tap="confirm">确定</my-button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import myButton from "@/components/my-components/my-button.vue"
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	const $nowDate = new Date()
-	const nowDate = {
-		year: $nowDate.getFullYear(),
-		month: $nowDate.getMonth() + 1,
-		day: $nowDate.getDate(),
-		hours: $nowDate.getHours(),
-		minutes: $nowDate.getMinutes(),
-		seconds: $nowDate.getSeconds()
-	}
-	const yearsLen = 30
-	const years = new Array(yearsLen).fill(1).map((v, index) => {
-		return nowDate.year - index
-	}).reverse()
-	const months = new Array(12).fill(1).map((v, index) => {
-		return index + 1
-	})
-	const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const hours = new Array(24).fill(1).map((v, index) => {
-		return index
-	})
-	const minutes = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const seconds = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const fastTime = reactive([{
-			title: '今日',
-			key: 'now'
-		},
-		{
-			title: '昨日',
-			key: 'prve'
-		},
-		{
-			title: '本月',
-			key: 'nowMonth'
-		},
-		{
-			title: '上月',
-			key: 'prveMonth'
-		}
-	])
+import dayjs from "dayjs";
+import myButton from "@/components/my-components/my-button.vue";
+import { reactive, ref } from "vue";
+const $nowDate = new Date();
+const nowDate = {
+  year: $nowDate.getFullYear(),
+  month: $nowDate.getMonth() + 1,
+  day: $nowDate.getDate(),
+  hours: $nowDate.getHours(),
+  minutes: $nowDate.getMinutes(),
+  seconds: $nowDate.getSeconds(),
+};
+const yearsLen = 30;
+const years = new Array(yearsLen)
+  .fill(1)
+  .map((v, index) => {
+    return nowDate.year - index;
+  })
+  .reverse();
+const months = new Array(12).fill(1).map((v, index) => {
+  return index + 1;
+});
+const days = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const days1 = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const hours = new Array(24).fill(1).map((v, index) => {
+  return index;
+});
+const minutes = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const seconds = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const fastTime = reactive([
+  {
+    title: "今日",
+    key: "now",
+  },
+  {
+    title: "昨日",
+    key: "prve",
+  },
+  {
+    title: "本月",
+    key: "nowMonth",
+  },
+  {
+    title: "上月",
+    key: "prveMonth",
+  },
+]);
 
+function setPrveDay() {}
 
+function setNowMoneth() {}
 
-	function setPrveDay() {
+function setprveMoneth() {}
 
-	}
+function setDay(start, end) {
+  value.value = [start.year, start.month, start.day, 0, 0, 0];
+  value1.value = [end.year, end.month, end.day, 23, 59, 59];
+}
 
-	function setNowMoneth() {
+function changeTime(key) {
+  const yearIndex = years.findIndex((v) => v == nowDate.year);
+  const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
+  const nowMonthIndex = nowDate.month - 1;
+  const nowDayIndex = nowDate.day - 1;
+  const dataMap = {
+    now: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+      };
+    },
+    prve: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
+          oneDay
+      );
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+      };
+    },
+    nowMonth: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: 0,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
+        },
+      };
+    },
+    prveMonth: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
+      );
+      console.log(date.getMonth());
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: 0,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: date.getDate(),
+        },
+      };
+    },
+  };
+  const data = dataMap[key]();
+  setDay(data.start, data.end);
+  changeDays(false, value.value);
+  changeDays(true, value1.value);
 
-	}
+  console.log(value1.value);
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
 
-	function setprveMoneth() {
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
+let value = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  0,
+  0,
+  0,
+]);
+let value1 = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  23,
+  59,
+  59,
+]);
 
-	}
+let show = ref(false);
+const emits = defineEmits("close", "open", "confirm");
 
+function toggle() {
+  show.value = !show.value;
+  if (show.value) {
+    emits("open", true);
+  } else {
+    emits("close", false);
+  }
+}
 
-	function setDay(start, end) {
-		value.value = [
-			start.year,
-			start.month,
-			start.day,
-			0,
-			0,
-			0,
-		]
-		value1.value = [
-			end.year,
-			end.month,
-			end.day,
-			23,
-			59,
-			59,
-		]
-	}
+function close() {
+  show.value = false;
+  emits("close", false);
+}
 
-	function changeTime(key) {
-		const yearIndex = years.findIndex(v => v == nowDate.year)
-		const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
-		const nowMonthIndex = nowDate.month - 1
-		const nowDayIndex = nowDate.day - 1
-		const dataMap = {
-			now: function() {
-				return {
-					start: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					},
-					end: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					}
-				}
-			},
-			prve: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay) 
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					}
-				}
-			},
-			nowMonth: function() {
-				return {
-					start: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day: 0
-					},
-					end: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
-					}
-				}
-			},
-			prveMonth: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay) 
-				console.log(date.getMonth());
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: 0
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: date.getDate()
-					}
-				}
-			}
-		}
-		const data = dataMap[key]()
-		setDay(data.start, data.end)
-		changeDays(false,value.value)
-		changeDays(true,value1.value)
-		
-		console.log(value1.value);
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
-	let value = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		0,
-		0,
-		0,
-	])
-	let value1 = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		23,
-		59,
-		59,
-	])
+function open() {
+  show.value = true;
+  emits("open", true);
+}
 
-	let show = ref(false)
-	const emits = defineEmits('close', 'open', 'confirm')
+function returnDateString(arr) {
+  const year = years[arr[0]];
+  const month = ("0" + (arr[1] + 1)).slice(-2);
+  const day = ("0" + (arr[2] + 1)).slice(-2);
+  const hour = ("0" + arr[3]).slice(-2);
+  const min = ("0" + arr[4]).slice(-2);
+  const sen = ("0" + arr[5]).slice(-2);
 
-	function toggle() {
-		show.value = !show.value
-		if (show.value) {
-			emits('open', true)
-		} else {
-			emits('close', false)
-		}
-	}
+  return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
+}
 
-	function close() {
-		show.value = false
-		emits('close', false)
-	}
+function confirm(e) {
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
+  console.log(start);
+  console.log(end);
+  //如果结尾时间小于开始时间
+  if (new Date(start).getTime() > new Date(end).getTime()) {
+    return uni.showToast({
+      title: "结束时间不能小于开始时间",
+      icon: "none",
+    });
+  }
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
 
-	function open() {
-		show.value = true
-		emits('open', true)
-	}
+function returnMonthStart(arr) {
+  return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+}
 
-	function returnDateString(arr) {
-		const year = years[arr[0]]
-		const month = arr[1] + 1
-		const day = arr[2] + 1
-		const hour = ('0' + arr[3]).slice(-2)
-		const min = ('0' + arr[4]).slice(-2)
-		const sen = ('0' + arr[5]).slice(-2)
-		return `${year}-${month}-${day} ${hour}:${min}:${sen}`
-	}
+function returnMonthEnd(arr) {
+  return new Date(years[arr[0]], months[arr[1]], 0).getDate();
+}
 
+function changeDays(isDays1, arr) {
+  const end = returnMonthEnd(arr);
+  if (end) {
+    if (isDays1) {
+      days1.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    } else {
+      days.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    }
+  }
+}
 
-	function confirm(e) {
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		console.log(start);
-		console.log(end);
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
+function bindChange(e) {
+  value.value = e.detail.value;
+  changeDays(false, e.detail.value);
+}
 
-	function returnMonthStart(arr) {
-		return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
-	}
+function bindChange1(e) {
+  value1.value = e.detail.value;
+  changeDays(true, e.detail.value);
+}
 
-	function returnMonthEnd(arr) {
-		return new Date(years[arr[0]], months[arr[1]], 0).getDate();
-	}
-	
-	function changeDays(isDays1,arr){
-		const end = returnMonthEnd(arr)
-		if (end) {
-			if(isDays1){
-				days1.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}else{
-				days.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}
-			
-		}
-	}
+function getDayDate(date = new Date(), type) {
+  const now = date;
+  if (type === "start") {
+    const startOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    return startOfDay;
+  }
+  if (type === "end") {
+    const endOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59,
+      999
+    );
+    return endOfDay;
+  }
+}
 
-	function bindChange(e) {
-		value.value = e.detail.value
-		changeDays(false, e.detail.value)
-	}
+function getMonthArea(date = new Date(), type) {
+  let now = date;
+  let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  let currentMonthEnd = new Date(
+    now.getFullYear(),
+    now.getMonth() + 1,
+    0,
+    23,
+    59,
+    59,
+    999
+  );
+  if (type === "start") {
+    return currentMonthStart;
+  }
+  if (type === "end") {
+    return currentMonthEnd;
+  }
+  return {
+    start: currentMonthStart,
+    end: currentMonthEnd,
+  };
+}
 
-	function bindChange1(e) {
-		value1.value = e.detail.value
-		changeDays(true, e.detail.value)
-	}
+function nullFunction() {}
 
-	function getDayDate(date = new Date(), type) {
-		const now = date
-		if (type === 'start') {
-			const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-			return startOfDay
-		}
-		if (type === 'end') {
-			const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
-			return endOfDay;
-		}
-	}
+function pickend(e) {
+  console.log(e);
+}
 
-	function getMonthArea(date = new Date(), type) {
-		let now = date
-		let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
-		let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
-		if (type === 'start') {
-			return currentMonthStart
-		}
-		if (type === 'end') {
-			return currentMonthEnd;
-		}
-		return {
-			start: currentMonthStart,
-			end: currentMonthEnd
-		};
-	}
-
-	function nullFunction() {
-
-	}
-
-	function pickend(e) {
-		console.log(e);
-	}
-
-	function pickend1(e) {
-		console.log(e);
-	}
-	defineExpose({
-		close,
-		open,
-		confirm,
-		toggle
-	})
+function pickend1(e) {
+  console.log(e);
+}
+defineExpose({
+  close,
+  open,
+  confirm,
+  toggle,
+});
 </script>
 
 <style lang="scss">
-	.fastTime {
-		.item {
-			background-color: rgb(247, 247, 247);
-			padding: 6rpx 40rpx;
-			border-radius: 6rpx;
-			font-size: 32rpx;
-		}
-	}
+.fastTime {
+  .item {
+    background-color: rgb(247, 247, 247);
+    padding: 6rpx 40rpx;
+    border-radius: 6rpx;
+    font-size: 32rpx;
+  }
+}
 
-	.top {
-		border-bottom: 1px solid #eee;
-	}
+.top {
+  border-bottom: 1px solid #eee;
+}
 
-	.close {
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		right: 30rpx;
-	}
+.close {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 30rpx;
+}
 
-	.mask {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		top: 0;
-		background-color: rgba(0, 0, 0, .7);
+.mask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.7);
 
-		.box {
-			position: absolute;
-			background-color: #fff;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			border-radius: 16rpx 16rpx 0 0;
-		}
-	}
+  .box {
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 16rpx 16rpx 0 0;
+  }
+}
 
-	.fixed_b {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 30rpx;
-		z-index: 100;
-		background-color: #fff;
-	}
+.fixed_b {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30rpx;
+  z-index: 100;
+  background-color: #fff;
+}
 
-	.picker-view {
-		width: 750rpx;
-		height: 300rpx;
-	}
+.picker-view {
+  width: 750rpx;
+  height: 300rpx;
+}
 
-	.item {
-		line-height: 34px;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
+.item {
+  line-height: 34px;
+  text-align: center;
+}
+</style>
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index d2b9dee..98c9620 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -1,426 +1,401 @@
 <template>
-	<view class="time-wrapper">
-		<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
-			<view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }">
-				{{v.label}}
-			</view>
-			<view class="xian" v-if="v.value==selected "> </view>
-		</view>
-	</view>
+  <view class="time-wrapper">
+    <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+      <view
+        class="time-item"
+        @tap="changeTime(v.value)"
+        :class="[v.value == selected ? 'time-selected' : '']"
+      >
+        {{ v.label }}
+      </view>
+      <view class="xian" v-if="v.value == selected"> </view>
+    </view>
+  </view>
 
-	<view class="pageSalesSummaryContent">
-		<view class="">
-			<view class=""> 实收金额(元) </view>
-			<view class=""> {{list.saleAmount?list.saleAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 优惠金额(元) </view>
-			<view class=""> {{list.discountAmount?list.discountAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 客单价(元) </view>
-			<view class=""> {{list.customerUnitPrice?list.customerUnitPrice:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 会员消费(元) </view>
-			<view class=""> {{list.memberPayAmount?list.memberPayAmount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 新增会员(人) </view>
-			<view class=""> {{list.newMemberCount?list.newMemberCount:0}} </view>
-		</view>
-		<view class="">
-			<view class=""> 翻台率(%) </view>
-			<view class=""> {{list.tableTurnoverRate?list.tableTurnoverRate:0}} </view>
-		</view>
-	</view>
-	<view class="table-scroll">
-		<template>
-			<view class="color-333 u-font-28   bg-gray default-box-padding" style="padding-top:80px;">
-				<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
-					<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
-						<view class="constantbox">
-							<view class="constantboxitem">
-								<view class="head">商品名称</view>
-								<view class="head">总数量</view>
-								<view class="head">金额</view>
-							</view>
-							<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
-								@click="toDetail(item)">
-								<view class="head" style="padding-left: 16rpx;">
-									<image v-if="index==0" src="../pageTable/index/images/1.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									<image v-else-if="index==1" src="../pageTable/index/images/2.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									<image v-else-if="index==2" src="../pageTable/index/images/3.png"
-										style="width: 22rpx;height: 30rpx;" mode=""></image>
-									&nbsp;&nbsp;{{item.productName}}
-								</view>
-								<view class="head">{{item.number}}</view>
-								<view class="head">{{item.amount || '无'}}</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</template>
-	</view>
-	<view class="bottombtn" @tap="toUrl">
-		更多 <uni-icons type="right" size="16"></uni-icons>
-	</view>
-	<datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview>
+  <view class="pageSalesSummaryContent">
+    <view class="">
+      <view class=""> 实收金额(元) </view>
+      <view class=""> {{ list.saleAmount ? list.saleAmount : 0 }} </view>
+    </view>
+    <view class="">
+      <view class=""> 优惠金额(元) </view>
+      <view class="">
+        {{ list.discountAmount ? list.discountAmount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 客单价(元) </view>
+      <view class="">
+        {{ list.customerUnitPrice ? list.customerUnitPrice : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 会员消费(元) </view>
+      <view class="">
+        {{ list.memberPayAmount ? list.memberPayAmount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 新增会员(人) </view>
+      <view class="">
+        {{ list.newMemberCount ? list.newMemberCount : 0 }}
+      </view>
+    </view>
+    <view class="">
+      <view class=""> 翻台率(%) </view>
+      <view class="">
+        {{ list.tableTurnoverRate ? list.tableTurnoverRate : 0 }}
+      </view>
+    </view>
+  </view>
+  <view class="table-scroll">
+    <view class="color-333 u-font-28 bg-gray default-box-padding">
+      <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+        <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+          <view class="constantbox">
+            <view class="constantboxitem">
+              <view class="head">商品名称</view>
+              <view class="head">总数量</view>
+              <view class="head">金额</view>
+            </view>
+            <view
+              class="constantboxitem"
+              v-for="(item, index) in tableList"
+              :key="index"
+              @click="toDetail(item)"
+            >
+              <view class="head" style="padding-left: 16rpx">
+                <image
+                  v-if="index == 0"
+                  src="../pageTable/index/images/1.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 1"
+                  src="../pageTable/index/images/2.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 2"
+                  src="../pageTable/index/images/3.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                &nbsp;&nbsp;{{ item.productName }}
+              </view>
+              <view class="head">{{ item.saleCount || 0 }}</view>
+              <view class="head">{{ item.saleAmount || 0 }}</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  <view class="bottombtn" @tap="toUrl">
+    更多 <uni-icons type="right" size="16"></uni-icons>
+  </view>
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+  ></datePickerview>
 </template>
 
 <script setup>
-	import { onMounted, ref } from 'vue';
-	import datePickerview from './components/my-date-pickerview.vue'
-	import dayjs from 'dayjs' //时间格式库
-	import go from '@/commons/utils/go.js'
-	import { getTrade, productSaleDate } from '@/http/api/summary.js'
-	
-	const datePicker=ref()
-	const timeList = [{
-			label: '今天',
-			value: 'today'
-		},
-		{
-			label: '昨天',
-			value: 'yesterday'
-		},
-		{
-			label: '本周',
-			value: 'circumference'
-		}, {
-			label: '本月',
-			value: 'moon'
-		},
-		{
-			label: '自定义',
-			value: 'custom'
-		}
-	]
-	let selected = ref('today')
-	let list = ref({})
-	let tableList = ref([])
-	let day = ref(1)
-	onMounted(() => {
-		getlist()
-		gettableData()
-	})
-	
-	/**
-	 * 获取营业数据
-	 * @param {Object} start
-	 * @param {Object} end
-	 */
-	function getlist(start, end) {
-		let startTime, endTime;
-		if (selected.value == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (selected.value == 'circumference') {
-			var now = new Date();
-			var nowTime = now.getTime();
-			var day = now.getDay();
-			var oneDayTime = 24 * 60 * 60 * 1000;
-			//显示周一
-			var MondayTime = nowTime - (day - 1) * oneDayTime;
-			//显示周日
-			var SundayTime = nowTime + (7 - day) * oneDayTime;
-			startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
-		} else if (selected.value == 'moon') {
-			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'custom') {
-			let s = start.substring(0, start.indexOf(' '))
-			let e = end.substring(0, end.indexOf(' '))
-			startTime = s + ' 00:00:00'
-			endTime = e + ' 23:59:59'
-		}
-		getTrade({
-			beginDate: startTime,
-			endDate: endTime,
-		}).then((res) => {
-			list.value = res
-		})
-	}
-	
-	/**
-	 * 获取销售数据
-	 */
-	function gettableData() {
-		if (selected.value == 'today') {
-			day.value = 1
-		} else if (selected.value == 'yesterday') {
-			day.value = 1
-		} else if (selected.value == 'circumference') {
-			day.value = 7
-		} else if (selected.value == 'moon') {
-			day.value = 30
-		} else if (selected.value == 'custom') {
-			day.value = 30
-		}
-		productSaleDate({
-			day: day.value,
-			page: 1,
-			size: 5
-		}).then((res) => {
-			tableList.value = res.records
-		})
-	
-	}
-	
-	/**
-	 * 获取当前时间
-	 */
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
-	
-	/**
-	 * 获取昨天时间
-	 */
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
-	
-	/**
-	 * 时间切换
-	 * @param {Object} e
-	 */
-	function changeTime(e) {
-		selected.value = e
-		if (e == 'custom') {
-			datePicker.value.toggle()
-		} else {
-			getlist()
-			gettableData()
-		}
-	}
-	
-	/**
-	 * 自定义确认
-	 * @param {Object} e
-	 */
-	function datePickerConfirm(e) {
-		console.log(e)
-		getlist(e.start, e.end)
-		gettableData()
-	}
-	
-	/**
-	 * 更多
-	 */
-	function toUrl() {
-		go.to('PAGES_PRODUCT_SALES_RANKING', {
-			day: day.value
-		})
-	}
+import { onMounted, ref } from "vue";
+import datePickerview from "./components/my-date-pickerview.vue";
+import dayjs from "dayjs"; //时间格式库
+import go from "@/commons/utils/go.js";
+import { getTrade } from "@/http/api/summary.js";
+import { saleSummaryPage } from "@/http/api/order/summary.js";
+import { timeList } from "@/data/index.js";
 
+const datePicker = ref();
 
+let selected = ref("today");
+let list = ref({});
+let tableList = ref([]);
+let day = ref(1);
+onMounted(() => {
+  getData();
+});
+
+/**
+ * 获取营业数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function getlist(beginDate, endDate) {
+  getTrade({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    list.value = res;
+  });
+}
+
+/**
+ * 获取销售数据
+ * @param {Object} beginDate
+ * @param {Object} endDate
+ */
+function gettableData(beginDate, endDate) {
+  saleSummaryPage({
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    tableList.value = (res || []).slice(0, 5);
+  });
+}
+
+/**
+ * 时间切换
+ * @param {Object} e
+ */
+function changeTime(e) {
+  selected.value = e;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    getData();
+  }
+}
+
+const datePickerData = ref({
+  beginDate: "",
+  endDate: "",
+});
+/**
+ * 自定义确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  datePickerData.value.beginDate = e.start;
+  datePickerData.value.endDate = e.end;
+  getData(e.start, e.end);
+}
+function getData(start, end) {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = start.substring(0, start.indexOf(" "));
+    endDate = end.substring(0, end.indexOf(" "));
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  getlist(beginDate, endDate);
+  gettableData(beginDate, endDate);
+}
+/**
+ * 更多
+ */
+function toUrl() {
+  let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = datePickerData.value.beginDate.substring(
+      0,
+      datePickerData.value.beginDate.indexOf(" ")
+    );
+    endDate = datePickerData.value.endDate.substring(
+      0,
+      datePickerData.value.endDate.indexOf(" ")
+    );
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  go.to("PAGES_PRODUCT_SALES_RANKING", {
+    beginDate,
+    endDate,
+    rangeType: selected.value,
+  });
+}
 </script>
 <style>
-	page {
-		background: #f6f6f6;
-	}
+page {
+  background: #f6f6f6;
+}
 </style>
 <style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
 
-	.fixed-top {
-		padding: 32rpx 28rpx;
-		z-index: 100;
-	}
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
 
-	.bottom {
-		background-color: transparent;
-		bottom: 84rpx;
-		left: 28rpx;
-		right: 28rpx;
-	}
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
 
-	.table {
-		border-radius: 12rpx 12rpx 0rpx 0rpx;
-		overflow: hidden;
-		font-size: 24rpx;
+  .constantbox {
+    .constantboxitem {
+      display: flex;
 
-		.constantbox {
-			.constantboxitem {
-				display: flex;
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-				.head {
-					width: 220rpx;
-					padding: 32rpx 24rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap; //溢出不换行
-				}
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
 
-				.head:nth-child(4) {
-					width: 300rpx;
-				}
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
 
-				.head:nth-child(5) {
-					width: 300rpx;
-				}
-			}
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
 
-			.constantboxitem:nth-child(even) {
-				background: #fff;
-			}
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
 
-			.constantboxitem:nth-child(odd) {
-				background: #F7F6FB;
-			}
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
 
-			.constantboxitem:nth-child(1) {
-				background: #AEBAD2;
-				color: #fff;
-				font-size: 24rpx;
-			}
-		}
-
-		.item:nth-of-type(2n+1) {
-			background-color: rgb(249, 249, 249);
-		}
-	}
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
 </style>
 
 <style scoped lang="less">
-	.time-wrapper {
-		display: flex;
-		justify-content: space-around;
-		padding-bottom: 16rpx;
-		padding-top: 16rpx;
-		background-color: #fff;
+.time-wrapper {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 16rpx;
+  padding-top: 16rpx;
+  background-color: #fff;
 
-		.timelistbox {
-			position: relative;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
+  .timelistbox {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-			.time-item {
-				font-size: 28rpx;
-				text-align: center;
-				padding-bottom: 10rpx;
-			}
+    .time-item {
+      font-size: 28rpx;
+      text-align: center;
+      padding-bottom: 10rpx;
+    }
 
-			.xian {
-				width: 40rpx;
-				height: 3rpx;
-				background-color: #318AFE;
-				// position: absolute;
-				// left: 16rpx;
-				// bottom: 0;
-			}
-		}
+    .xian {
+      width: 40rpx;
+      height: 3rpx;
+      background-color: #318afe;
+      // position: absolute;
+      // left: 16rpx;
+      // bottom: 0;
+    }
+  }
 
-		.time-selected {
-			color: #318afe;
-			font-size: 32rpx !important;
-		}
-	}
+  .time-selected {
+    color: #318afe;
+    font-size: 32rpx !important;
+  }
+}
 
-	.pageSalesSummaryContent {
-		height: 320rpx;
-		margin: 20rpx 28rpx;
-		background-image: url('./svg/bgimg.svg');
-		background-size: 694rpx 320rpx;
-		padding: 48rpx 28rpx;
-		.df;
-		justify-content: space-between;
-		flex-wrap: wrap;
+.pageSalesSummaryContent {
+  height: 320rpx;
+  margin: 20rpx 28rpx;
+  background-image: url("./svg/bgimg.svg");
+  background-size: 694rpx 320rpx;
+  padding: 48rpx 28rpx;
+  .df;
+  justify-content: space-between;
+  flex-wrap: wrap;
 
-		>view {
-			padding-right: 52rpx;
-			color: #fff;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 28rpx;
-		}
-	}
+  > view {
+    padding-right: 52rpx;
+    color: #fff;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+}
 
-	// 表格
-	.table-scroll {
-		// width: calc(100% - 5px);
-		overflow-x: scroll;
-		white-space: nowrap;
-		margin: 32rpx 28rpx;
-		margin-right: 30rpx;
-		border-radius: 30rpx 30rpx 0 0;
+// 表格
+.table-scroll {
+  // width: calc(100% - 5px);
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
 
-	}
+.table-scroll .table {
+  table-layout: fixed;
+  // width: calc(100% - 10rpx);
+}
 
-	.table-scroll .table {
-		table-layout: fixed;
-		// width: calc(100% - 10rpx);
-	}
+.table-scroll .thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
 
-	.table-scroll .thead {
-		display: table-row;
-		background-color: bisque;
-		font-size: 24rpx;
-	}
+.table-scroll .tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  // width: 1040rpx;
+  width: 100%;
+  // width: calc(100% );
+}
 
-	.table-scroll .tbody {
-		overflow-y: scroll;
-		overflow-x: hidden;
-		display: block;
-		// width: 1040rpx;
-		width: 100%;
-		// width: calc(100% );
-	}
+// .table-scroll th,
+// td {
+// 	height: 82rpx;
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	width: 250rpx;
+// 	// border: 0.7rpx solid red;
+// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+// }
 
-	// .table-scroll th,
-	// td {
-	// 	height: 82rpx;
-	// 	overflow: hidden;
-	// 	text-overflow: ellipsis;
-	// 	width: 250rpx;
-	// 	// border: 0.7rpx solid red;
-	// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
-	// }
+.bottombtn {
+  width: 694rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin: 0rpx auto;
+  background: #f1f1f1;
+  font-size: 24rpx;
+  border-radius: 0rpx 0rpx 28rpx 28rpx;
+}
 
-	.bottombtn {
-		width: 694rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		text-align: center;
-		margin: 0rpx auto;
-		background: #F1F1F1;
-		font-size: 24rpx;
-		border-radius: 0rpx 0rpx 28rpx 28rpx;
-	}
-
-	.df() {
-		display: flex;
-		align-items: center;
-	}
+.df() {
+  display: flex;
+  align-items: center;
+}
 </style>
 <style>
-	.min-page{
-		height: 20vh;
-	}
-</style>
\ No newline at end of file
+.min-page {
+  height: 20vh;
+}
+</style>
diff --git a/pageSalesSummary/productSalesRanking.vue b/pageSalesSummary/productSalesRanking.vue
index 46e07bc..867af9f 100644
--- a/pageSalesSummary/productSalesRanking.vue
+++ b/pageSalesSummary/productSalesRanking.vue
@@ -1,153 +1,156 @@
 <template>
-	<template>
-		<view class="color-333 u-font-28   bg-gray default-box-padding"  >
-			<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
-				<view class="bg-fff border-r-12  u-flex no-wrap u-col-top">
-					<view class="constantbox">
-						<view class="constantboxitem">
-							<view class="head">商品名称</view>
-							<view class="head">总数量</view>
-							<view class="head">金额</view>
-						</view>
-						<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
-							@click="toDetail(item)">
-							<view class="head">{{item.productName}}</view>
-							<view class="head">{{item.number}}</view>
-							<view class="head">{{item.amount || '无'}}</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-	</template>
+  <view class="color-333 u-font-28 bg-gray default-box-padding">
+    <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+      <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+        <view class="constantbox">
+          <view class="constantboxitem">
+            <view class="head">商品名称</view>
+            <view class="head">总数量</view>
+            <view class="head">金额</view>
+          </view>
+          <view
+            class="constantboxitem"
+            v-for="(item, index) in tableList"
+            :key="index"
+            @click="toDetail(item)"
+          >
+            <view class="head">{{ item.productName }}</view>
+			<view class="head">{{ item.saleCount || 0 }}</view>
+			<view class="head">{{ item.saleAmount || 0 }}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
 </template>
 
 <script setup>
-	import { onMounted, ref } from 'vue';
-	import { productSaleDate } from '@/http/api/summary.js'
-	
-	let tableList = ref([])
-	let props = defineProps({
-		day: {
-			type: Number
-		}
-	})
-	
-	onMounted(() => {
-		gettableData()
-	})
-	
-	/**
-	 * 获取销售数据
-	 */
-	function gettableData() {
-		productSaleDate({
-			day: props.day,
-			page: 1,
-			size: 50
-		}).then((res) => {
-			tableList.value = res.records
-		})
-	}
+import { onLoad } from "@dcloudio/uni-app";
+import { onMounted, reactive, ref } from "vue";
+import { saleSummaryPage } from "@/http/api/order/summary.js";
+
+let tableList = ref([]);
+let props = defineProps({
+  day: {
+    type: Number,
+  },
+});
+const options = reactive({
+  beginDate: "",
+  endDate: "",
+  rangeType: "",
+});
+onLoad((opt) => {
+	console.log(opt);
+  Object.assign(options, opt);
+  gettableData();
+});
+
+/**
+ * 获取销售数据
+ */
+function gettableData() {
+  saleSummaryPage(options).then((res) => {
+    tableList.value = res || [];
+  });
+}
 </script>
 
 <style>
-	.table-scroll {
-		overflow-x: scroll;
-		white-space: nowrap;
-		margin: 32rpx 28rpx;
-		margin-right: 30rpx;
-		border-radius: 30rpx 30rpx 0 0;
-	
-	}
-	
-	.table-scroll table {
-		table-layout: fixed;
-	}
-	
-	.table-scroll thead {
-		display: table-row;
-		background-color: bisque;
-		font-size: 24rpx;
-	}
-	
-	.table-scroll tbody {
-		overflow-y: scroll;
-		overflow-x: hidden;
-		display: block;
-		width: 100%;
-	}
-	
-	.table-scroll th,
-	td {
-		height: 82rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		width: 250rpx;
-		border: 0.7rpx solid rgba(126, 155, 212, 0.27);
-	}
+.table-scroll {
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.table-scroll table {
+  table-layout: fixed;
+}
+
+.table-scroll thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
+
+.table-scroll tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  width: 100%;
+}
+
+.table-scroll th,
+td {
+  height: 82rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 250rpx;
+  border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+}
 </style>
 <style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
 
-	.fixed-top {
-		padding: 32rpx 28rpx;
-		z-index: 100;
-	}
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
 
-	.bottom {
-		background-color: transparent;
-		bottom: 84rpx;
-		left: 28rpx;
-		right: 28rpx;
-	}
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
 
-	.table {
-		border-radius: 12rpx 12rpx 0rpx 0rpx;
-		overflow: hidden;
-		font-size: 24rpx;
+  .constantbox {
+    .constantboxitem {
+      display: flex;
 
-		.constantbox {
-			.constantboxitem {
-				display: flex;
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-				.head {
-					width: 220rpx;
-					padding: 32rpx 24rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap; //溢出不换行
-				}
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
 
-				.head:nth-child(4) {
-					width: 300rpx;
-				}
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
 
-				.head:nth-child(5) {
-					width: 300rpx;
-				}
-			}
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
 
-			.constantboxitem:nth-child(even) {
-				background: #fff;
-			}
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
 
-			.constantboxitem:nth-child(odd) {
-				background: #F7F6FB;
-			}
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
 
-			.constantboxitem:nth-child(1) {
-				background: #AEBAD2;
-				color: #fff;
-				font-size: 24rpx;
-			}
-		}
-
-		.item:nth-of-type(2n+1) {
-			background-color: rgb(249, 249, 249);
-		}
-	}
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
 </style>
diff --git a/pageSalesSummary/table.vue b/pageSalesSummary/table.vue
new file mode 100644
index 0000000..a1b5b44
--- /dev/null
+++ b/pageSalesSummary/table.vue
@@ -0,0 +1,346 @@
+<template>
+  <view class="time-wrapper">
+    <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+      <view
+        class="time-item"
+        @tap="changeTime(v.value)"
+        :class="[v.value == selected ? 'time-selected' : '']"
+      >
+        {{ v.label }}
+      </view>
+      <view class="xian" v-if="v.value == selected"> </view>
+    </view>
+  </view>
+
+  <view class="table-scroll">
+    <view class="color-333 u-font-28 bg-gray">
+      <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
+        <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
+          <view class="constantbox">
+            <view class="constantboxitem">
+              <view class="head">区域名称</view>
+              <view class="head">台桌号</view>
+              <view class="head">订单数量</view>
+              <view class="head">订单金额</view>
+            </view>
+            <view
+              class="constantboxitem"
+              v-for="(item, index) in tableList"
+              :key="index"
+              @click="toDetail(item)"
+            >
+              <view class="head" style="padding-left: 16rpx">
+                <image
+                  v-if="index == 0"
+                  src="../pageTable/index/images/1.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 1"
+                  src="../pageTable/index/images/2.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="index == 2"
+                  src="../pageTable/index/images/3.png"
+                  style="width: 22rpx; height: 30rpx"
+                  mode=""
+                ></image>
+                &nbsp;&nbsp;{{ item.areaName }}
+              </view>
+              <view class="head">{{ item.tableName || "" }}</view>
+              <view class="head">{{ item.orderCount || 0 }}</view>
+              <view class="head">{{ item.orderAmount || 0 }}</view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+
+  <view style="height: 80rpx;"></view>
+  <!-- <view class="bottombtn" @tap="toUrl">
+    更多 <uni-icons type="right" size="16"></uni-icons>
+  </view> -->
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+  ></datePickerview>
+</template>
+
+<script setup>
+import { onMounted, ref } from "vue";
+import datePickerview from "./components/my-date-pickerview.vue";
+import dayjs from "dayjs"; //时间格式库
+import go from "@/commons/utils/go.js";
+import { getTrade, productSaleDate } from "@/http/api/summary.js";
+import { timeList } from "@/data/index.js";
+import { tableSummaryList } from "@/http/api/order/summary.js";
+
+const datePicker = ref();
+
+let selected = ref("today");
+let list = ref({});
+let tableList = ref([]);
+let day = ref(1);
+onMounted(() => {
+  gettableData();
+});
+
+
+
+/**
+ * 获取销售数据
+ */
+function gettableData(start, end) {
+    let beginDate, endDate;
+  if (selected.value == "custom") {
+    beginDate = start.substring(0, start.indexOf(" "));
+    endDate = end.substring(0, end.indexOf(" "));
+  } else {
+    beginDate = timeList.find((item) => item.value == selected.value).beginDate;
+    endDate = timeList.find((item) => item.value == selected.value).endDate;
+  }
+  tableSummaryList({
+    beginDate: beginDate,
+    endDate: endDate,
+    rangeType: selected.value,
+  }).then((res) => {
+    tableList.value = res || [];
+  });
+}
+
+/**
+ * 获取当前时间
+ */
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
+
+
+
+/**
+ * 时间切换
+ * @param {Object} e
+ */
+function changeTime(e) {
+  selected.value = e;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    gettableData();
+  }
+}
+
+/**
+ * 自定义确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  console.log(e);
+  gettableData(e.start, e.end);
+}
+
+/**
+ * 更多
+ */
+function toUrl() {
+  go.to("PAGES_PRODUCT_SALES_RANKING", {
+    day: day.value,
+  });
+}
+</script>
+<style>
+page {
+  background: #f6f6f6;
+}
+</style>
+<style lang="scss" scoped>
+.fixed-top {
+  padding: 32rpx 28rpx;
+  z-index: 100;
+}
+
+.bottom {
+  background-color: transparent;
+  bottom: 84rpx;
+  left: 28rpx;
+  right: 28rpx;
+}
+
+.table {
+  border-radius: 12rpx 12rpx 0rpx 0rpx;
+  overflow: hidden;
+  font-size: 24rpx;
+
+  .constantbox {
+    .constantboxitem {
+      display: flex;
+
+      .head {
+        width: 220rpx;
+        padding: 32rpx 24rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
+
+      .head:nth-child(4) {
+        width: 300rpx;
+      }
+
+      .head:nth-child(5) {
+        width: 300rpx;
+      }
+    }
+
+    .constantboxitem:nth-child(even) {
+      background: #fff;
+    }
+
+    .constantboxitem:nth-child(odd) {
+      background: #f7f6fb;
+    }
+
+    .constantboxitem:nth-child(1) {
+      background: #aebad2;
+      color: #fff;
+      font-size: 24rpx;
+    }
+  }
+
+  .item:nth-of-type(2n + 1) {
+    background-color: rgb(249, 249, 249);
+  }
+}
+</style>
+
+<style scoped lang="less">
+.time-wrapper {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 16rpx;
+  padding-top: 16rpx;
+  background-color: #fff;
+
+  .timelistbox {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .time-item {
+      font-size: 28rpx;
+      text-align: center;
+      padding-bottom: 10rpx;
+    }
+
+    .xian {
+      width: 40rpx;
+      height: 3rpx;
+      background-color: #318afe;
+      // position: absolute;
+      // left: 16rpx;
+      // bottom: 0;
+    }
+  }
+
+  .time-selected {
+    color: #318afe;
+    font-size: 32rpx !important;
+  }
+}
+
+.pageSalesSummaryContent {
+  height: 320rpx;
+  margin: 20rpx 28rpx;
+  background-image: url("./svg/bgimg.svg");
+  background-size: 694rpx 320rpx;
+  padding: 48rpx 28rpx;
+  .df;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+  > view {
+    padding-right: 52rpx;
+    color: #fff;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+}
+
+// 表格
+.table-scroll {
+  // width: calc(100% - 5px);
+  overflow-x: scroll;
+  white-space: nowrap;
+  margin: 32rpx 28rpx;
+  margin-right: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.table-scroll .table {
+  table-layout: fixed;
+  // width: calc(100% - 10rpx);
+}
+
+.table-scroll .thead {
+  display: table-row;
+  background-color: bisque;
+  font-size: 24rpx;
+}
+
+.table-scroll .tbody {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: block;
+  // width: 1040rpx;
+  width: 100%;
+  // width: calc(100% );
+}
+
+// .table-scroll th,
+// td {
+// 	height: 82rpx;
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	width: 250rpx;
+// 	// border: 0.7rpx solid red;
+// 	border: 0.7rpx solid rgba(126, 155, 212, 0.27);
+// }
+
+.bottombtn {
+  width: 694rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  text-align: center;
+  margin: 0rpx auto;
+  background: #f1f1f1;
+  font-size: 24rpx;
+  border-radius: 0rpx 0rpx 28rpx 28rpx;
+}
+
+.df() {
+  display: flex;
+  align-items: center;
+}
+</style>
+<style>
+.min-page {
+  height: 20vh;
+}
+</style>
diff --git a/pages.json b/pages.json
index 6f9db8b..e0e95d8 100644
--- a/pages.json
+++ b/pages.json
@@ -401,7 +401,16 @@
 				"style": {
 					"navigationBarTitleText": "商品销售排行"
 				}
-			}]
+			},
+			{
+				"pageId": "PAGES_TABLE_SALES_RANKING",
+				"path": "table",
+				"style": {
+					"navigationBarTitleText": "桌台统计"
+				}
+			}
+			
+		]
 		},
 		{
 			"root": "pageLineUp",
diff --git a/pages/appliccation/marketing.vue b/pages/appliccation/marketing.vue
index e15262a..ea60459 100644
--- a/pages/appliccation/marketing.vue
+++ b/pages/appliccation/marketing.vue
@@ -58,7 +58,7 @@ const menuList = ref([
 			{
 				title: '新客立减',
 				icon: '',
-				pageUrl: 'PAGES_ORDER_INDEX',
+				pageUrl: 'PAGES_MARKET_NEW_USER_DISCOUNT',
 				intro: '首单下单减免金额'
 			},
 			{
diff --git a/pages/index/components/Stats.vue b/pages/index/components/Stats.vue
index 0537364..a7983af 100644
--- a/pages/index/components/Stats.vue
+++ b/pages/index/components/Stats.vue
@@ -1,302 +1,294 @@
 <template>
-	<view class="index-header" @tap="go.to('PAGES_STAT')">
-		<view class="index-selected">
-			<view class="index-time">
-				<block v-for="v in timeList" :key="v.value">
-					<view class="time-item flex-center" :class="{ 'time-active': vdata.timeSelected == v.value }"
-						@tap.stop="changeTimeFunc(v.value)">
-						{{ v.title }}
-					</view>
-				</block>
-			</view>
-			<view class="index-scan flex-center" @click.stop="scanFunc">
-				<image src="/static/iconImg/icon-scan-index.svg" mode="scaleToFill" />
-			</view>
-		</view>
-		<view class="receipts-money">
-			<text class="money-title">成交金额 (元)</text>
-			<view class="money-num">{{ list?list.sale.incomeAmountAll:0}}</view>
-		</view>
-		<view class="money-list">
-			<view class="money-item">
-				<text class="money-title">消费笔数</text>
-				<view class="money-num">{{ list?list.vip.useNum:0 }}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">退款金额 (元)</text>
-				<view class="money-num">{{ list?list.sale.outAmount:0}}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">消费金额</text>
-				<view class="money-num">{{ list?list.vip.useAmount:0 }}</view>
-			</view>
-		</view>
-		<view class="money-list" v-if="vdata.memberIsShow">
-			<view class="money-item">
-				<text class="money-title">会员充值(元)</text>
-				<view class="money-num">{{ cal.cert2Dollar(memberData.payAmount) }}</view>
-			</view>
-			<view class="money-item">
-				<text class="money-title">会员消费(元)</text>
-				<view class="money-num">{{ cal.cert2Dollar(Math.abs(memberData.changeAmount)) }}</view>
-			</view>
+  <view class="index-header" @tap="go.to('PAGES_STAT')">
+    <view class="index-selected">
+      <view class="index-time">
+        <block v-for="v in timeList" :key="v.value">
+          <view
+            class="time-item flex-center"
+            :class="{ 'time-active': vdata.timeSelected == v.value }"
+            @tap.stop="changeTimeFunc(v.value)"
+          >
+            {{ v.title }}
+          </view>
+        </block>
+      </view>
+      <view class="index-scan flex-center" @click.stop="scanFunc">
+        <image src="/static/iconImg/icon-scan-index.svg" mode="scaleToFill" />
+      </view>
+    </view>
+    <view class="receipts-money">
+      <text class="money-title">成交金额 (元)</text>
+      <view class="money-num">{{ list ? list.sale.incomeAmountAll : 0 }}</view>
+    </view>
+    <view class="money-list">
+      <view class="money-item">
+        <text class="money-title">消费笔数</text>
+        <view class="money-num">{{ list ? list.vip.useNum : 0 }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">退款金额 (元)</text>
+        <view class="money-num">{{ list ? list.sale.outAmount : 0 }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">消费金额</text>
+        <view class="money-num">{{ list ? list.vip.useAmount : 0 }}</view>
+      </view>
+    </view>
+    <view class="money-list" v-if="vdata.memberIsShow">
+      <view class="money-item">
+        <text class="money-title">会员充值(元)</text>
+        <view class="money-num">{{
+          cal.cert2Dollar(memberData.payAmount)
+        }}</view>
+      </view>
+      <view class="money-item">
+        <text class="money-title">会员消费(元)</text>
+        <view class="money-num">{{
+          cal.cert2Dollar(Math.abs(memberData.changeAmount))
+        }}</view>
+      </view>
 
-			<view class="money-item">
-				<text class="money-title">会员消费笔数</text>
-				<view class="money-num">{{ memberData.changeCount }}</view>
-			</view>
-		</view>
-		<view>
-			<!-- <text class="money-title">展开全部</text> -->
-		</view>
-	</view>
+      <view class="money-item">
+        <text class="money-title">会员消费笔数</text>
+        <view class="money-num">{{ memberData.changeCount }}</view>
+      </view>
+    </view>
+    <view>
+      <!-- <text class="money-title">展开全部</text> -->
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted } from "vue";
 
-	import cal from '@/commons/utils/cal.js';
-	import go from '@/commons/utils/go.js';
-	import ent from '@/commons/utils/ent.js';
-	import unionScan from '@/commons/utils/unionScan.js';
-	import storageManage from '@/commons/utils/storageManage.js';
-	import dayjs from 'dayjs' //时间格式库
+import cal from "@/commons/utils/cal.js";
+import go from "@/commons/utils/go.js";
+import ent from "@/commons/utils/ent.js";
+import unionScan from "@/commons/utils/unionScan.js";
+import storageManage from "@/commons/utils/storageManage.js";
+import dayjs from "dayjs"; //时间格式库
+import { timeList } from '@/data/index.js'
 
-	import { getTrade } from '@/http/api/summary.js'
-	onMounted(() => {
-		vdata.memberIsShow = ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt;
-		if (ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt) {
-			getMemberData();
-		}
-		getList()
-	});
-	const emits = defineEmits(['click']);
-	const timeList = [{
-			title: '今天',
-			value: 'today'
-		},
-		{
-			title: '昨天',
-			value: 'yesterday'
-		},
-		{
-			title: '近7天',
-			value: 'circumference'
-		},
-		{
-			title: '近30天',
-			value: 'moon'
-		}
-	];
-	let list = ref()
-	const vdata = reactive({
-		timeSelected: 'today', // 当前时间选择器的
-		payAmount: -1, // 实收金额
-		payCount: -1, // 交易笔数
-		refundAmount: -1, // 退款金额
-		refundCount: -1, // 退款笔数
-		memberIsShow: false //是否开启会员模块
-	});
-	const memberData = reactive({});
+import { getTrade } from "@/http/api/summary.js";
+onMounted(() => {
+  vdata.memberIsShow =
+    ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt;
+  if (ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt) {
+    getMemberData();
+  }
+  getList();
+});
+const emits = defineEmits(["click"]);
+let list = ref();
+const vdata = reactive({
+  timeSelected: "today", // 当前时间选择器的
+  payAmount: -1, // 实收金额
+  payCount: -1, // 交易笔数
+  refundAmount: -1, // 退款金额
+  refundCount: -1, // 退款笔数
+  memberIsShow: false, //是否开启会员模块
+});
+const memberData = reactive({});
 
-	function getList() {
-		let startTime, endTime;
-		if (vdata.timeSelected == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (vdata.timeSelected == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (vdata.timeSelected == 'circumference') {
-			startTime = dayjs().add(-7, 'day').format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-		} else if (vdata.timeSelected == 'moon') {
-			startTime = dayjs().add(-30, 'day').format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-		} else if (vdata.timeSelected == 'custom') {
-			startTime = start
-			endTime = end
-		}
-		getTrade({
-			shopId: uni.getStorageSync('shopId'),
-			startTime,
-			endTime,
-		}).then((res) => {
-			list.value = res
-		})
-	}
-	// 切换 时间卡片
-	function changeTimeFunc(val) {
-		vdata.timeSelected = val;
-		getList()
-		// refData();
-		// if (vdata.memberIsShow) {
-		// 	getMemberData();
-		// }
-	}
-	// 根据选择请求数据
-	function refData() {
-		// 获取 统计数据
-		// $indexStatistics(vdata.timeSelected).then(({
-		// 	bizData
-		// }) => {
-		// 	vdata.payAmount = bizData.totalSuccAmt;
-		// 	vdata.payCount = bizData.totalSuccNum;
-		// 	vdata.refundAmount = bizData.totalRefundAmt;
-		// 	vdata.refundCount = bizData.totalRefundNum;
-		// });
-	}
+function getList() {
+  let startTime, endTime;
+  if (vdata.timeSelected == "today") {
+    startTime = dayjs().format("YYYY-MM-DD") + " 00:00:00";
+    endTime = dayjs().format("YYYY-MM-DD") + " 23:59:59";
+  } else if (vdata.timeSelected == "yesterday") {
+    startTime = formatTime() + " 00:00:00";
+    endTime = formatTime() + " 23:59:59";
+  } else if (vdata.timeSelected == "circumference") {
+    startTime = dayjs().add(-7, "day").format("YYYY-MM-DD 00:00:00");
+    endTime = dayjs().format("YYYY-MM-DD 23:59:59");
+  } else if (vdata.timeSelected == "moon") {
+    startTime = dayjs().add(-30, "day").format("YYYY-MM-DD 00:00:00");
+    endTime = dayjs().format("YYYY-MM-DD 23:59:59");
+  } else if (vdata.timeSelected == "custom") {
+    startTime = start;
+    endTime = end;
+  }
+  getTrade({
+    shopId: uni.getStorageSync("shopId"),
+    startTime,
+    endTime,
+  }).then((res) => {
+    list.value = res;
+  });
+}
+// 切换 时间卡片
+function changeTimeFunc(val) {
+  vdata.timeSelected = val;
+  getList();
+  // refData();
+  // if (vdata.memberIsShow) {
+  // 	getMemberData();
+  // }
+}
+// 根据选择请求数据
+function refData() {
+  // 获取 统计数据
+  // $indexStatistics(vdata.timeSelected).then(({
+  // 	bizData
+  // }) => {
+  // 	vdata.payAmount = bizData.totalSuccAmt;
+  // 	vdata.payCount = bizData.totalSuccNum;
+  // 	vdata.refundAmount = bizData.totalRefundAmt;
+  // 	vdata.refundCount = bizData.totalRefundNum;
+  // });
+}
 
-	// 扫码动作
-	function scanFunc() {
-		unionScan.scan(true).then((res) => {
-			// 登录类型
-			if (res.type == unionScan.QR_TYPE_LOGIN) {
-				return go.to('PAGES_SCAN_LOGIN', {
-					qrcodeNo: res.originQrVal
-				});
-			}
+// 扫码动作
+function scanFunc() {
+  unionScan.scan(true).then((res) => {
+    // 登录类型
+    if (res.type == unionScan.QR_TYPE_LOGIN) {
+      return go.to("PAGES_SCAN_LOGIN", {
+        qrcodeNo: res.originQrVal,
+      });
+    }
 
-			// 二维码
-			if (res.type == unionScan.QR_TYPE_QRC) {
-				return go.to('PAGES_APP_CODE_BIND', {
-					qrcId: res.bizValue
-				});
-			}
-		});
-	}
-	// 获取当前时间
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
-	// 获取昨天时间
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
-	const getMemberData = () => {
-		// $memberInfoCount({
-		// 	queryDateRange: vdata.timeSelected
-		// }).then(({
-		// 	bizData
-		// }) => {
-		// 	Object.assign(memberData, bizData);
-		// });
-	};
-	defineExpose({
-		refData
-	});
+    // 二维码
+    if (res.type == unionScan.QR_TYPE_QRC) {
+      return go.to("PAGES_APP_CODE_BIND", {
+        qrcId: res.bizValue,
+      });
+    }
+  });
+}
+// 获取当前时间
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
+// 获取昨天时间
+const formatTime = () => {
+  let strDate = getdate();
+  let dateFormat = new Date(strDate);
+  dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
+  dateFormat = new Date(dateFormat);
+  let y = dateFormat.getFullYear();
+  let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
+  let d = dateFormat.getDate().toString().padStart(2, "0");
+  return `${y}-${m}-${d}`;
+};
+const getMemberData = () => {
+  // $memberInfoCount({
+  // 	queryDateRange: vdata.timeSelected
+  // }).then(({
+  // 	bizData
+  // }) => {
+  // 	Object.assign(memberData, bizData);
+  // });
+};
+defineExpose({
+  refData,
+});
 </script>
 
 <style lang="scss" scoped>
-	.index-header {
-		width: 680rpx;
-		margin: 0 auto;
-		transform: translateY(30rpx);
-		margin-bottom: 25rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
-		border-radius: $J-b-r32;
-		background: $jeepay-bg-primary;
-		backdrop-filter: blur(20rpx);
-		box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
+.index-header {
+  width: 680rpx;
+  margin: 0 auto;
+  transform: translateY(30rpx);
+  margin-bottom: 25rpx;
+  padding: 20rpx;
+  box-sizing: border-box;
+  border-radius: $J-b-r32;
+  background: $jeepay-bg-primary;
+  backdrop-filter: blur(20rpx);
+  box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
 
-		.index-selected {
-			display: flex;
-			justify-content: space-between;
+  .index-selected {
+    display: flex;
+    justify-content: space-between;
 
-			.index-time {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				width: 490rpx;
-				height: 90rpx;
-				border-radius: 20rpx;
-				padding: 10rpx;
-				background-color: rgba($color: #fff, $alpha: 0.1);
+    .index-time {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 490rpx;
+      height: 90rpx;
+      border-radius: 20rpx;
+      padding: 10rpx;
+      background-color: rgba($color: #fff, $alpha: 0.1);
 
-				.time-item {
-					flex: 1;
-					// width: 120rpx;
-					height: 100%;
-					font-size: 32rpx;
-					font-weight: 500;
-					color: rgba(255, 255, 255, 0.75);
-				}
+      .time-item {
+        flex: 1;
+        // width: 120rpx;
+        height: 100%;
+        font-size: 32rpx;
+        font-weight: 500;
+        color: rgba(255, 255, 255, 0.75);
+      }
 
-				.time-active {
-					background-color: $J-bg-ff;
-					color: $J-color-t21;
-					border-radius: 12rpx;
-				}
-			}
+      .time-active {
+        background-color: $J-bg-ff;
+        color: $J-color-t21;
+        border-radius: 12rpx;
+      }
+    }
 
-			.index-scan {
-				width: 110rpx;
-				height: 110rpx;
-				border-radius: 20rpx;
-				background-color: rgba($color: #fff, $alpha: 0.1);
+    .index-scan {
+      width: 110rpx;
+      height: 110rpx;
+      border-radius: 20rpx;
+      background-color: rgba($color: #fff, $alpha: 0.1);
 
-				image {
-					width: 41rpx;
-					height: 35rpx;
-				}
-			}
-		}
+      image {
+        width: 41rpx;
+        height: 35rpx;
+      }
+    }
+  }
 
-		.receipts-money {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin: 30rpx 0;
-			color: $J-color-tff;
+  .receipts-money {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 30rpx 0;
+    color: $J-color-tff;
 
-			.money-num {
-				font-size: 70rpx;
-				font-weight: 500;
-			}
-		}
+    .money-num {
+      font-size: 70rpx;
+      font-weight: 500;
+    }
+  }
 
-		.money-list {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 72rpx;
-			margin-bottom: 50rpx;
-			text-align: center;
-			color: $J-color-tff;
+  .money-list {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 72rpx;
+    margin-bottom: 50rpx;
+    text-align: center;
+    color: $J-color-tff;
 
-			.money-item {
-				.money-num {
-					font-size: 32rpx;
-					font-weight: 500;
-				}
-			}
-		}
+    .money-item {
+      .money-num {
+        font-size: 32rpx;
+        font-weight: 500;
+      }
+    }
+  }
 
-		.money-title {
-			margin-bottom: 10rpx;
-			font-size: 26rpx;
-			font-weight: 400;
-			color: $J-color-tSff;
-		}
+  .money-title {
+    margin-bottom: 10rpx;
+    font-size: 26rpx;
+    font-weight: 400;
+    color: $J-color-tSff;
+  }
 
-		.quick-money {
-			height: 110rpx;
-			border-radius: 20rpx;
-			color: $J-color-t29;
-		}
-	}
-</style>
\ No newline at end of file
+  .quick-money {
+    height: 110rpx;
+    border-radius: 20rpx;
+    color: $J-color-t29;
+  }
+}
+</style>
diff --git a/pages/index/components/my-date-pickerview.vue b/pages/index/components/my-date-pickerview.vue
index 1e8085d..af81cb9 100644
--- a/pages/index/components/my-date-pickerview.vue
+++ b/pages/index/components/my-date-pickerview.vue
@@ -1,30 +1,40 @@
 <template>
-	<view class="mask" v-if="show" @tap="close">
-		<view class="box" @tap.stop="nullFunction">
-			<view class="u-flex u-relative u-row-center u-p-30 top">
-				<view class="font-bold u-font-32">筛选日期时间</view>
-				<view class="close" @tap="close">
-					<uni-icons type="closeempty" size="24"></uni-icons>
-				</view>
-
-			</view>
-			<!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
+  <view class="mask" v-if="show" @tap="close">
+    <view class="box" @tap.stop="nullFunction">
+      <view class="u-flex u-relative u-row-center u-p-30 top">
+        <view class="font-bold u-font-32">筛选日期时间</view>
+        <view class="close" @tap="close">
+          <uni-icons type="closeempty" size="24"></uni-icons>
+        </view>
+      </view>
+      <!-- 	<view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
 					<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
 						{{item.title}}
 					</view>
 				</view> -->
-			<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
-				</picker-view-column>
-		<!-- 		<picker-view-column>
+      <picker-view
+        :immediate-change="true"
+        @pickend="pickend"
+        :value="value"
+        @change="bindChange"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 		<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -33,20 +43,31 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-			<view class="u-text-center color-999">至</view>
-			<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
-				class="picker-view">
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
-				</picker-view-column>
-				<picker-view-column>
-					<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
-				</picker-view-column>
-<!-- 				<picker-view-column>
+      </picker-view>
+      <view class="u-text-center color-999">至</view>
+      <picker-view
+        :immediate-change="true"
+        :value="value1"
+        @pickend="pickend1"
+        @change="bindChange1"
+        class="picker-view"
+      >
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in years" :key="index"
+            >{{ item }}年</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in months" :key="index"
+            >{{ item }}月</view
+          >
+        </picker-view-column>
+        <picker-view-column>
+          <view class="item" v-for="(item, index) in days1" :key="index"
+            >{{ item }}日</view
+          >
+        </picker-view-column>
+        <!-- 				<picker-view-column>
 					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 				<picker-view-column>
@@ -55,394 +76,403 @@
 				<picker-view-column>
 					<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
 				</picker-view-column> -->
-			</picker-view>
-
-			<!-- 站位 -->
-			<view style="height: 80px;"></view>
-			<view class="fixed_b">
-				<my-button shape="circle" @tap="confirm">确定</my-button>
-			</view>
-		</view>
-
-	</view>
+      </picker-view>
 
+      <!-- 站位 -->
+      <view style="height: 80px"></view>
+      <view class="fixed_b">
+        <my-button shape="circle" @tap="confirm">确定</my-button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import myButton from "@/components/my-components/my-button.vue"
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	const $nowDate = new Date()
-	const nowDate = {
-		year: $nowDate.getFullYear(),
-		month: $nowDate.getMonth() + 1,
-		day: $nowDate.getDate(),
-		hours: $nowDate.getHours(),
-		minutes: $nowDate.getMinutes(),
-		seconds: $nowDate.getSeconds()
-	}
-	const yearsLen = 30
-	const years = new Array(yearsLen).fill(1).map((v, index) => {
-		return nowDate.year - index
-	}).reverse()
-	const months = new Array(12).fill(1).map((v, index) => {
-		return index + 1
-	})
-	const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
-		return index + 1
-	}))
-	const hours = new Array(24).fill(1).map((v, index) => {
-		return index
-	})
-	const minutes = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const seconds = new Array(60).fill(1).map((v, index) => {
-		return index
-	})
-	const fastTime = reactive([{
-			title: '今日',
-			key: 'now'
-		},
-		{
-			title: '昨日',
-			key: 'prve'
-		},
-		{
-			title: '本月',
-			key: 'nowMonth'
-		},
-		{
-			title: '上月',
-			key: 'prveMonth'
-		}
-	])
+import myButton from "@/components/my-components/my-button.vue";
+import { reactive, ref } from "vue";
+const $nowDate = new Date();
+const nowDate = {
+  year: $nowDate.getFullYear(),
+  month: $nowDate.getMonth() + 1,
+  day: $nowDate.getDate(),
+  hours: $nowDate.getHours(),
+  minutes: $nowDate.getMinutes(),
+  seconds: $nowDate.getSeconds(),
+};
+const yearsLen = 30;
+const years = new Array(yearsLen)
+  .fill(1)
+  .map((v, index) => {
+    return nowDate.year - index;
+  })
+  .reverse();
+const months = new Array(12).fill(1).map((v, index) => {
+  return index + 1;
+});
+const days = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const days1 = ref(
+  new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
+    return index + 1;
+  })
+);
+const hours = new Array(24).fill(1).map((v, index) => {
+  return index;
+});
+const minutes = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const seconds = new Array(60).fill(1).map((v, index) => {
+  return index;
+});
+const fastTime = reactive([
+  {
+    title: "今日",
+    key: "now",
+  },
+  {
+    title: "昨日",
+    key: "prve",
+  },
+  {
+    title: "本月",
+    key: "nowMonth",
+  },
+  {
+    title: "上月",
+    key: "prveMonth",
+  },
+]);
 
+function setPrveDay() {}
 
+function setNowMoneth() {}
 
-	function setPrveDay() {
+function setprveMoneth() {}
 
-	}
+function setDay(start, end) {
+  value.value = [start.year, start.month, start.day, 0, 0, 0];
+  value1.value = [end.year, end.month, end.day, 23, 59, 59];
+}
 
-	function setNowMoneth() {
+function changeTime(key) {
+  const yearIndex = years.findIndex((v) => v == nowDate.year);
+  const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
+  const nowMonthIndex = nowDate.month - 1;
+  const nowDayIndex = nowDate.day - 1;
+  const dataMap = {
+    now: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: nowDayIndex,
+        },
+      };
+    },
+    prve: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
+          oneDay
+      );
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
+          day: date.getDate() - 1,
+        },
+      };
+    },
+    nowMonth: function () {
+      return {
+        start: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: 0,
+        },
+        end: {
+          year: yearIndex,
+          month: nowMonthIndex,
+          day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
+        },
+      };
+    },
+    prveMonth: function () {
+      const oneDay = 1000 * 60 * 60 * 24;
+      const date = new Date(
+        new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
+      );
+      console.log(date.getMonth());
+      return {
+        start: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: 0,
+        },
+        end: {
+          year: years.findIndex((v) => v == date.getFullYear()),
+          month: date.getMonth(),
+          day: date.getDate(),
+        },
+      };
+    },
+  };
+  const data = dataMap[key]();
+  setDay(data.start, data.end);
+  changeDays(false, value.value);
+  changeDays(true, value1.value);
 
-	}
+  console.log(value1.value);
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
 
-	function setprveMoneth() {
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
+let value = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  0,
+  0,
+  0,
+]);
+let value1 = ref([
+  years.length - 1,
+  nowDate.month - 1,
+  nowDate.day - 1,
+  23,
+  59,
+  59,
+]);
 
-	}
+let show = ref(false);
+const emits = defineEmits("close", "open", "confirm");
 
+function toggle() {
+  show.value = !show.value;
+  if (show.value) {
+    emits("open", true);
+  } else {
+    emits("close", false);
+  }
+}
 
-	function setDay(start, end) {
-		value.value = [
-			start.year,
-			start.month,
-			start.day,
-			0,
-			0,
-			0,
-		]
-		value1.value = [
-			end.year,
-			end.month,
-			end.day,
-			23,
-			59,
-			59,
-		]
-	}
+function close() {
+  show.value = false;
+  emits("close", false);
+}
 
-	function changeTime(key) {
-		const yearIndex = years.findIndex(v => v == nowDate.year)
-		const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
-		const nowMonthIndex = nowDate.month - 1
-		const nowDayIndex = nowDate.day - 1
-		const dataMap = {
-			now: function() {
-				return {
-					start: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					},
-					end: {
-						year: yearIndex,
-						month: nowMonthIndex,
-						day: nowDayIndex
-					}
-				}
-			},
-			prve: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay) 
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth()-1<0?11:date.getMonth()-1,
-						day: date.getDate()-1
-					}
-				}
-			},
-			nowMonth: function() {
-				return {
-					start: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day: 0
-					},
-					end: {
-						year:yearIndex,
-						month:nowMonthIndex,
-						day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
-					}
-				}
-			},
-			prveMonth: function() {
-				const oneDay=1000*60*60*24
-				const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay) 
-				console.log(date.getMonth());
-				return {
-					start: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: 0
-					},
-					end: {
-						year:years.findIndex(v=>v==date.getFullYear()),
-						month:date.getMonth(),
-						day: date.getDate()
-					}
-				}
-			}
-		}
-		const data = dataMap[key]()
-		setDay(data.start, data.end)
-		changeDays(false,value.value)
-		changeDays(true,value1.value)
-		
-		console.log(value1.value);
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
-	let value = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		0,
-		0,
-		0,
-	])
-	let value1 = ref([
-		years.length - 1,
-		nowDate.month - 1,
-		nowDate.day - 1,
-		23,
-		59,
-		59,
-	])
+function open() {
+  show.value = true;
+  emits("open", true);
+}
 
-	let show = ref(false)
-	const emits = defineEmits('close', 'open', 'confirm')
+function returnDateString(arr) {
+  const year = years[arr[0]];
+  const month = ("0" + (arr[1] + 1)).slice(-2);
+  const day = ("0" + (arr[2] + 1)).slice(-2);
+  const hour = ("0" + arr[3]).slice(-2);
+  const min = ("0" + arr[4]).slice(-2);
+  const sen = ("0" + arr[5]).slice(-2);
 
-	function toggle() {
-		show.value = !show.value
-		if (show.value) {
-			emits('open', true)
-		} else {
-			emits('close', false)
-		}
-	}
+  return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
+}
 
-	function close() {
-		show.value = false
-		emits('close', false)
-	}
+function confirm(e) {
+  const start = returnDateString(value.value);
+  const end = returnDateString(value1.value);
+  console.log(start);
+  console.log(end);
+  //如果结尾时间小于开始时间
+  if (new Date(start).getTime() > new Date(end).getTime()) {
+    return uni.showToast({
+      title: "结束时间不能小于开始时间",
+      icon: "none",
+    });
+  }
+  console.log(start);
+  console.log(end);
+  emits("confirm", {
+    text: `${start}——${end}`,
+    start,
+    end,
+  });
+  close();
+}
 
-	function open() {
-		show.value = true
-		emits('open', true)
-	}
+function returnMonthStart(arr) {
+  return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+}
 
-	function returnDateString(arr) {
-		const year = years[arr[0]]
-		const month = arr[1] + 1
-		const day = arr[2] + 1
-		const hour = ('0' + arr[3]).slice(-2)
-		const min = ('0' + arr[4]).slice(-2)
-		const sen = ('0' + arr[5]).slice(-2)
-		return `${year}-${month}-${day} ${hour}:${min}:${sen}`
-	}
+function returnMonthEnd(arr) {
+  return new Date(years[arr[0]], months[arr[1]], 0).getDate();
+}
 
+function changeDays(isDays1, arr) {
+  const end = returnMonthEnd(arr);
+  if (end) {
+    if (isDays1) {
+      days1.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    } else {
+      days.value = new Array(end).fill(1).map((v, index) => {
+        return index + 1;
+      });
+    }
+  }
+}
 
-	function confirm(e) {
-		const start = returnDateString(value.value)
-		const end = returnDateString(value1.value)
-		console.log(start);
-		console.log(end);
-		emits('confirm', {
-			text: `${start}——${end}`,
-			start,
-			end
-		})
-		close()
-	}
+function bindChange(e) {
+  value.value = e.detail.value;
+  changeDays(false, e.detail.value);
+}
 
-	function returnMonthStart(arr) {
-		return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
-	}
+function bindChange1(e) {
+  value1.value = e.detail.value;
+  changeDays(true, e.detail.value);
+}
 
-	function returnMonthEnd(arr) {
-		return new Date(years[arr[0]], months[arr[1]], 0).getDate();
-	}
-	
-	function changeDays(isDays1,arr){
-		const end = returnMonthEnd(arr)
-		if (end) {
-			if(isDays1){
-				days1.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}else{
-				days.value= new Array(end).fill(1).map((v,
-					index) => {
-					return index + 1
-				})
-			}
-			
-		}
-	}
+function getDayDate(date = new Date(), type) {
+  const now = date;
+  if (type === "start") {
+    const startOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    return startOfDay;
+  }
+  if (type === "end") {
+    const endOfDay = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59,
+      999
+    );
+    return endOfDay;
+  }
+}
 
-	function bindChange(e) {
-		value.value = e.detail.value
-		changeDays(false, e.detail.value)
-	}
+function getMonthArea(date = new Date(), type) {
+  let now = date;
+  let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  let currentMonthEnd = new Date(
+    now.getFullYear(),
+    now.getMonth() + 1,
+    0,
+    23,
+    59,
+    59,
+    999
+  );
+  if (type === "start") {
+    return currentMonthStart;
+  }
+  if (type === "end") {
+    return currentMonthEnd;
+  }
+  return {
+    start: currentMonthStart,
+    end: currentMonthEnd,
+  };
+}
 
-	function bindChange1(e) {
-		value1.value = e.detail.value
-		changeDays(true, e.detail.value)
-	}
+function nullFunction() {}
 
-	function getDayDate(date = new Date(), type) {
-		const now = date
-		if (type === 'start') {
-			const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-			return startOfDay
-		}
-		if (type === 'end') {
-			const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
-			return endOfDay;
-		}
-	}
+function pickend(e) {
+  console.log(e);
+}
 
-	function getMonthArea(date = new Date(), type) {
-		let now = date
-		let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
-		let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
-		if (type === 'start') {
-			return currentMonthStart
-		}
-		if (type === 'end') {
-			return currentMonthEnd;
-		}
-		return {
-			start: currentMonthStart,
-			end: currentMonthEnd
-		};
-	}
-
-	function nullFunction() {
-
-	}
-
-	function pickend(e) {
-		console.log(e);
-	}
-
-	function pickend1(e) {
-		console.log(e);
-	}
-	defineExpose({
-		close,
-		open,
-		confirm,
-		toggle
-	})
+function pickend1(e) {
+  console.log(e);
+}
+defineExpose({
+  close,
+  open,
+  confirm,
+  toggle,
+});
 </script>
 
 <style lang="scss">
-	.fastTime {
-		.item {
-			background-color: rgb(247, 247, 247);
-			padding: 6rpx 40rpx;
-			border-radius: 6rpx;
-			font-size: 32rpx;
-		}
-	}
+.fastTime {
+  .item {
+    background-color: rgb(247, 247, 247);
+    padding: 6rpx 40rpx;
+    border-radius: 6rpx;
+    font-size: 32rpx;
+  }
+}
 
-	.top {
-		border-bottom: 1px solid #eee;
-	}
+.top {
+  border-bottom: 1px solid #eee;
+}
 
-	.close {
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		right: 30rpx;
-	}
+.close {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 30rpx;
+}
 
-	.mask {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		top: 0;
-		background-color: rgba(0, 0, 0, .7);
-		z-index: 100;
-		.box {
-			position: absolute;
-			background-color: #fff;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			border-radius: 16rpx 16rpx 0 0;
-		}
-	}
+.mask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.7);
+  z-index: 100;
+  .box {
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 16rpx 16rpx 0 0;
+  }
+}
 
-	.fixed_b {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 30rpx;
-		z-index: 100;
-		background-color: #fff;
-	}
+.fixed_b {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30rpx;
+  z-index: 100;
+  background-color: #fff;
+}
 
-	.picker-view {
-		width: 750rpx;
-		height: 300rpx;
-	}
+.picker-view {
+  width: 750rpx;
+  height: 300rpx;
+}
 
-	.item {
-		line-height: 34px;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
+.item {
+  line-height: 34px;
+  text-align: center;
+}
+</style>
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
index baf17ce..4c08745 100644
--- a/pages/index/components/statistics.vue
+++ b/pages/index/components/statistics.vue
@@ -1,59 +1,82 @@
 <template>
-	<view class="statistics">
-		<view class="title">
-			<text>数据统计</text>
-		</view>
-		<view class="statisticsBox">
-			<view class="time-wrapper u-m-l-10 u-m-r-10">
-				<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
-					<view class="time-item" @tap="changeTime(v.value,i)" :class="{ 'time-selected':v.value==selected }">
-						{{v.label}}
-					</view>
-					<!-- <view class="xian" v-if="v.value==selected "> </view> -->
-				</view>
-			</view>
-			<view class="time_bootom_line">
-				<view class="block" :style="{
-					transform:'translateX('+comBlockX+'rpx) rotate(45deg) '
-				}"></view>
-			</view>
-			<view class="bottom"></view>
-			<div class="u-flex u-row-between u-font-28 color-333 ">
-				<div class="  u-flex-1 ">
+  <view class="statistics">
+    <view class="title">
+      <text>数据统计</text>
+    </view>
+    <view class="statisticsBox">
+      <view class="time-wrapper u-m-l-10 u-m-r-10">
+        <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
+          <view
+            class="time-item"
+            @tap="changeTime(v.value, i)"
+            :class="[v.value == selected ? 'time-selected' : '']"
+          >
+            {{ v.label }}
+          </view>
+          <!-- <view class="xian" v-if="v.value==selected "> </view> -->
+        </view>
+      </view>
+      <view class="time_bootom_line">
+        <view
+          class="block"
+          :style="{
+            transform: 'translateX(' + comBlockX + 'rpx) rotate(45deg) ',
+          }"
+        ></view>
+      </view>
+      <view class="bottom"></view>
+      <div class="u-flex u-row-between u-font-28 color-333">
+        <div class="u-flex-1">
+          <view class="u-m-t-32">
+            <view class="">营业额</view>
+            <view class="u-m-t-16">
+              <up-text
+                bold
+                color="#318AFE"
+                size="20"
+                mode="price"
+                :text="yingyeE"
+              ></up-text>
+            </view>
+          </view>
+          <view class="u-m-t-20">
+            <view class="">退款</view>
+            <view class="u-m-t-14">
+              <up-text
+                color="#333"
+                size="14"
+                bold
+                mode="price"
+                :text="refundCount"
+              ></up-text>
+            </view>
+          </view>
+        </div>
+        <view class="line"></view>
+        <view class="payList u-flex-1 u-p-l-40">
+          <view
+            class="li w-full u-flex u-row-between u-font-24 color-333"
+            v-for="(item, index) in list"
+            :key="index"
+          >
+            <view class="u-flex">
+              <view
+                :style="returnColorStyle(item, index)"
+                class="circle"
+              ></view>
+              <view class="u-m-l-8">
+                {{ item.payType }}
+              </view>
+            </view>
 
-					<view class="u-m-t-32">
-						<view class="">营业额</view>
-						<view class="u-m-t-16">
-							<up-text bold color="#318AFE" size="20" mode="price" :text="yingyeE"></up-text>
-						</view>
-					</view>
-					<view class="u-m-t-20">
-						<view class="">退款</view>
-						<view class="u-m-t-14">
-							<up-text color="#333" size="14" bold mode="price" :text="refundCount"></up-text>
-						</view>
-					</view>
-				</div>
-				<view class="line"></view>
-				<view class="payList u-flex-1 u-p-l-40">
-					<view class="li w-full u-flex u-row-between u-font-24 color-333" v-for="(item,index) in list"
-						:key="index">
-						<view class="u-flex">
-							<view :style="returnColorStyle(item,index)" class="circle"></view>
-							<view class="u-m-l-8">
-								{{item.payType}}
-							</view>
-						</view>
+            <view style="text-align: center" class="u-m-t-6">
+              {{ item.payAmount }}
+            </view>
+          </view>
+        </view>
+      </div>
 
-						<view style="text-align: center;" class="u-m-t-6">
-							{{item.payAmount}}
-						</view>
-					</view>
-				</view>
-			</div>
-
-
-			<!-- <view class="u-m-t-8 u-flex u-row-center u-font-24 u-col-center color-666">
+      <!-- <view class="u-m-t-8 u-flex u-row-center u-font-24 u-col-center color-666">
 				<view class="u-flex" @click="toggleShowAll">
 					<view>{{!showAll?'展开全部':'收起全部' }}</view>
 					<view class="u-flex  u-col-center u-m-t-4 tranistion-2" :class="{rotate:showAll}">
@@ -61,355 +84,316 @@
 					</view>
 				</view>
 			</view> -->
-		</view>
-	</view>
-	<datePickerview @confirm="datePickerConfirm" ref="datePicker" style="z-index: 999;"></datePickerview>
+    </view>
+  </view>
+  <datePickerview
+    @confirm="datePickerConfirm"
+    ref="datePicker"
+    style="z-index: 999"
+  ></datePickerview>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		computed
-	} from 'vue';
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
+import { ref, reactive, computed } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import { timeList } from "@/data/index.js";
+import dayjs from "dayjs"; //时间格式库
+import datePickerview from "./my-date-pickerview.vue";
 
-	import dayjs from 'dayjs' //时间格式库
-	import datePickerview from './my-date-pickerview.vue'
+import { getTrade } from "@/http/api/summary.js";
 
-	import {
-		getTrade
-	} from '@/http/api/summary.js'
+let selected = ref("today");
+let showAll = ref(false);
+let list = ref();
+const pageData = reactive({
+  list: [
+    {
+      payType: "微信小程序",
+      key: "wechatPayAmount",
+      payAmount: 0,
+      bgcolor: "#5AA25F",
+    },
+    {
+      payType: "支付宝小程序",
+      key: "aliPayAmount",
+      payAmount: 0,
+      bgcolor: "#31ACFE",
+    },
+    {
+      payType: "主扫收款",
+      key: "scanPayAmount",
+      payAmount: 0,
+      bgcolor: "#FF5C6D",
+    },
+    {
+      payType: "现金",
+      key: "cashPayAmount",
+      payAmount: 0,
+      bgcolor: "#FC843F",
+    },
+    {
+      payType: "充值",
+      key: "rechargeAmount",
+      payAmount: 0,
+      bgcolor: "#9090FF",
+    },
+    {
+      payType: "挂账",
+      key: "creditPayAmount",
+      payAmount: 0,
+      bgcolor: "#7BA7A4",
+    },
+    // {payType: '收款码收款', key:'', payAmount: 0,bgcolor:'#5AA25F'},
+  ],
+});
 
-	let selected = ref('today')
-	let showAll = ref(false);
-	let list = ref()
-	const pageData = reactive({
-		list: [{
-				payType: '微信小程序',
-				key: 'wechatPayAmount',
-				payAmount: 0,
-				bgcolor: '#5AA25F'
-			},
-			{
-				payType: '支付宝小程序',
-				key: 'aliPayAmount',
-				payAmount: 0,
-				bgcolor: '#31ACFE'
-			},
-			{
-				payType: '主扫收款',
-				key: 'scanPayAmount',
-				payAmount: 0,
-				bgcolor: '#FF5C6D'
-			},
-			{
-				payType: '现金',
-				key: 'cashPayAmount',
-				payAmount: 0,
-				bgcolor: '#FC843F'
-			},
-			{
-				payType: '充值',
-				key: 'rechargeAmount',
-				payAmount: 0,
-				bgcolor: '#9090FF'
-			},
-			{
-				payType: '挂账',
-				key: 'creditPayAmount',
-				payAmount: 0,
-				bgcolor: '#7BA7A4'
-			},
-			// {payType: '收款码收款', key:'', payAmount: 0,bgcolor:'#5AA25F'},
-		],
-	})
+function returnColorStyle(item) {
+  return {
+    backgroundColor: item.bgcolor,
+  };
+}
 
-	function returnColorStyle(item) {
-		return {
-			backgroundColor: item.bgcolor
-		}
-	}
+function toggleShowAll() {
+  showAll.value = !showAll.value;
+  setList();
+}
 
-	function toggleShowAll() {
-		showAll.value = !showAll.value
-		setList()
-	}
+function setList() {
+  // list.value = showAll.value ? pageData.list : pageData.list.slice(0, 4)
+  list.value = pageData.list;
+}
 
-	function setList() {
-		// list.value = showAll.value ? pageData.list : pageData.list.slice(0, 4)
-		list.value = pageData.list
-	}
+const emit = defineEmits(["totalRevenue"]);
 
+const timeSleIndex = ref(0);
 
-	const emit = defineEmits(['totalRevenue'])
-	const timeList = [{
-			label: '今天',
-			value: 'today'
-		},
-		{
-			label: '昨天',
-			value: 'yesterday'
-		},
-		{
-			label: '本周',
-			value: 'circumference'
-		}, {
-			label: '本月',
-			value: 'moon'
-		},
-		{
-			label: '自定义',
-			value: 'custom'
-		}
-	]
-	const datePicker = ref()
-	onShow((options) => {
-		let iToken = uni.getStorageSync('iToken').tokenValue
-		if (iToken) {
-			getlist()
-		} else {
-			uni.redirectTo({
-				url: '/pages/login/index'
-			})
-		}
-	});
+const datePicker = ref();
+onShow((options) => {
+  let iToken = uni.getStorageSync("iToken").tokenValue;
+  if (iToken) {
+    getlist();
+  } else {
+    uni.redirectTo({
+      url: "/pages/login/index",
+    });
+  }
+});
 
-	const yingyeE = ref(0)
-	const refundCount = ref(0)
-	/**
-	 * 获取统计数据
-	 * @param {Object} start
-	 * @param {Object} end
-	 */
-	function getlist(start, end) {
-		let startTime, endTime;
-		if (selected.value == 'today') {
-			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'yesterday') {
-			startTime = formatTime() + ' 00:00:00'
-			endTime = formatTime() + ' 23:59:59'
-		} else if (selected.value == 'circumference') {
-			var now = new Date();
-			var nowTime = now.getTime();
-			var day = now.getDay();
-			var oneDayTime = 24 * 60 * 60 * 1000;
-			//显示周一
-			var MondayTime = nowTime - (day - 1) * oneDayTime;
-			//显示周日
-			var SundayTime = nowTime + (7 - day) * oneDayTime;
-			startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
-			endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
-		} else if (selected.value == 'moon') {
-			startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
-			endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
-		} else if (selected.value == 'custom') {
-			let s = start.substring(0, start.indexOf(' '))
-			let e = end.substring(0, end.indexOf(' '))
-			startTime = s + ' 00:00:00'
-			endTime = e + ' 23:59:59'
-		}
-		getTrade({
-			beginDate: startTime,
-			endDate: endTime,
-		}).then((res) => {
-			refundCount.value = res.refundCount
-			for (var key in res) {
-				pageData.list.map(item => {
-					if (item.key == key) {
-						item.payAmount = res[key]
-					}
-				})
-			}
-			setList()
-			let incomeAmountAll = 0;
-			pageData.list.map(item => {
-				incomeAmountAll += (item.payAmount || 0)
-			})
+const yingyeE = ref(0);
+const refundCount = ref(0);
+/**
+ * 获取统计数据
+ * @param {Object} start
+ * @param {Object} end
+ */
+function getlist(start, end) {
+  let beginDate, endDate;
+  const rangeType = timeList[timeSleIndex.value].value;
+  if(rangeType == "custom"){
+    beginDate = start.split(" ")[0];
+    endDate = end.split(" ")[0];
+  }else{
+	beginDate = timeList[timeSleIndex.value].beginDate;
+	endDate = timeList[timeSleIndex.value].endDate;
+  }
+  getTrade({
+    beginDate: beginDate,
+    endDate: endDate,
+    shopId: uni.getStorageSync("shopId"),
+    rangeType: rangeType,
+  }).then((res) => {
+    refundCount.value = res.refundCount;
+    for (var key in res) {
+      pageData.list.map((item) => {
+        if (item.key == key) {
+          item.payAmount = res[key];
+        }
+      });
+    }
+    setList();
+    let incomeAmountAll = 0;
+    pageData.list.map((item) => {
+      incomeAmountAll += item.payAmount || 0;
+    });
 
-			yingyeE.value = incomeAmountAll
-			emit('totalRevenue', incomeAmountAll)
-		})
-	}
+    yingyeE.value = incomeAmountAll;
+    emit("totalRevenue", incomeAmountAll);
+  });
+}
 
+/**
+ * 日期筛选确认
+ * @param {Object} e
+ */
+function datePickerConfirm(e) {
+  getlist(e.start, e.end);
+}
 
-	/**
-	 * 日期筛选确认
-	 * @param {Object} e
-	 */
-	function datePickerConfirm(e) {
-		getlist(e.start, e.end)
-	}
+// 获取当前时间
+function getdate() {
+  const dt = new Date();
+  const y = dt.getFullYear();
+  const m = (dt.getMonth() + 1 + "").padStart(2, "0");
+  const d = (dt.getDate() + "").padStart(2, "0");
+  const hh = (dt.getHours() + "").padStart(2, "0");
+  const mm = (dt.getMinutes() + "").padStart(2, "0");
+  const ss = (dt.getSeconds() + "").padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
 
-	// 获取当前时间
-	function getdate() {
-		const dt = new Date();
-		const y = dt.getFullYear();
-		const m = (dt.getMonth() + 1 + "").padStart(2, "0");
-		const d = (dt.getDate() + "").padStart(2, "0");
-		const hh = (dt.getHours() + "").padStart(2, "0");
-		const mm = (dt.getMinutes() + "").padStart(2, "0");
-		const ss = (dt.getSeconds() + "").padStart(2, "0");
-		return `${y}-${m}-${d}`;
-	}
+// 获取昨天时间
+const formatTime = () => {
+  let strDate = getdate();
+  let dateFormat = new Date(strDate);
+  dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
+  dateFormat = new Date(dateFormat);
+  let y = dateFormat.getFullYear();
+  let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
+  let d = dateFormat.getDate().toString().padStart(2, "0");
+  return `${y}-${m}-${d}`;
+};
 
-	// 获取昨天时间
-	const formatTime = () => {
-		let strDate = getdate()
-		let dateFormat = new Date(strDate);
-		dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
-		dateFormat = new Date(dateFormat);
-		let y = dateFormat.getFullYear()
-		let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
-		let d = dateFormat.getDate().toString().padStart(2, '0')
-		return `${y}-${m}-${d}`
-	}
+function changeTime(e, index) {
+  selected.value = e;
+  timeSleIndex.value = index;
+  if (e == "custom") {
+    datePicker.value.toggle();
+  } else {
+    getlist();
+  }
+}
 
-	const timeSleIndex = ref(0)
-
-	function changeTime(e, index) {
-		selected.value = e
-		timeSleIndex.value = index
-		if (e == 'custom') {
-			datePicker.value.toggle()
-		} else {
-			getlist()
-		}
-	}
-	
-	const xArr=[0,134,262,390,532]
-	const comBlockX = computed(() => {
-		return xArr[ timeSleIndex.value]
-	})
+const xArr = [0, 134, 262, 390, 532];
+const comBlockX = computed(() => {
+  return xArr[timeSleIndex.value];
+});
 </script>
 <style scoped lang="less">
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
-	}
+ul,
+li {
+  list-style: none;
+  padding: 0;
+}
 
-	.rotate {
-		transform: rotate(180deg);
-	}
+.rotate {
+  transform: rotate(180deg);
+}
 
-	.statistics {
-		padding: 0 28rpx;
-		margin-top: 50rpx;
-		position: relative;
+.statistics {
+  padding: 0 28rpx;
+  margin-top: 50rpx;
+  position: relative;
 
-		.title {
-			position: absolute;
-			width: 170rpx;
-			left: 18rpx;
-			height: 50rpx;
-			line-height: 50rpx;
-			font-weight: 700;
-			font-size: 26rpx;
-			color: #fff;
-			text-align: center;
-			background: linear-gradient(109deg, #70B9FF 0%, #629FFA 100%);
-			border-radius: 12rpx 12rpx 12rpx 0rpx;
-			top: -16px;
-		}
+  .title {
+    position: absolute;
+    width: 170rpx;
+    left: 18rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    font-weight: 700;
+    font-size: 26rpx;
+    color: #fff;
+    text-align: center;
+    background: linear-gradient(109deg, #70b9ff 0%, #629ffa 100%);
+    border-radius: 12rpx 12rpx 12rpx 0rpx;
+    top: -16px;
+  }
 
-		.statisticsBox {
-			width: 694rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			padding: 48rpx 32rpx 32rpx;
-			box-sizing: border-box;
-			margin-top: 54rpx;
+  .statisticsBox {
+    width: 694rpx;
+    background: #ffffff;
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    padding: 48rpx 32rpx 32rpx;
+    box-sizing: border-box;
+    margin-top: 54rpx;
 
-			.bottom {}
+    .bottom {
+    }
 
-			.time-wrapper {
-				display: flex;
-				justify-content: space-between;
+    .time-wrapper {
+      display: flex;
+      justify-content: space-between;
 
-				.timelistbox {
-					position: relative;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+      .timelistbox {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
 
-					.time-item {
-						font-size: 28rpx;
-						text-align: center;
-						padding-bottom: 10rpx;
-					}
+        .time-item {
+          font-size: 28rpx;
+          text-align: center;
+          padding-bottom: 10rpx;
+        }
 
-					.xian {
-						width: 40rpx;
-						height: 3rpx;
-						background-color: #318AFE;
-						// position: absolute;
-						// left: 16rpx;
-						// bottom: 0;
-					}
-				}
+        .xian {
+          width: 40rpx;
+          height: 3rpx;
+          background-color: #318afe;
+          // position: absolute;
+          // left: 16rpx;
+          // bottom: 0;
+        }
+      }
 
-				.time-selected {
-					color: #318afe;
-					font-size: 32rpx !important;
-					font-weight: bold;
-				}
-			}
+      .time-selected {
+        color: #318afe;
+        font-size: 32rpx !important;
+        font-weight: bold;
+      }
+    }
 
-			.line {
-				width: 0rpx;
-				height: 170rpx;
-				border: 2rpx solid #EEE8E8;
-			}
+    .line {
+      width: 0rpx;
+      height: 170rpx;
+      border: 2rpx solid #eee8e8;
+    }
 
-			.payList {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				flex-wrap: wrap;
+    .payList {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      flex-wrap: wrap;
 
-				.li {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					white-space: nowrap;
-					margin-top: 12rpx;
+      .li {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        white-space: nowrap;
+        margin-top: 12rpx;
 
-					>view {
-						text-align: center;
-					}
-				}
-			}
-		}
-	}
+        > view {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
 
-	.circle {
-		width: 8rpx;
-		height: 8rpx;
-		border-radius: 8rpx;
-	}
+.circle {
+  width: 8rpx;
+  height: 8rpx;
+  border-radius: 8rpx;
+}
 
-	.time_bootom_line {
-		height: 16rpx;
-		position: relative;
-		border-bottom: 1px solid #629FFA;
+.time_bootom_line {
+  height: 16rpx;
+  position: relative;
+  border-bottom: 1px solid #629ffa;
 
-		.block {
-			width: 18rpx;
-			height: 18rpx;
-			box-sizing: border-box;
-			background: #fff;
-			position: absolute;
-			border-top: 0.5rpx solid #629FFA;
-			border-left: 0.5rpx solid #629FFA;
-			left: 30rpx;
-			top: 6rpx;
-			transform: rotate(45deg);
-			transform-origin: center;
-			transition: all .2s linear;
-		}
-	}
-</style>
\ No newline at end of file
+  .block {
+    width: 18rpx;
+    height: 18rpx;
+    box-sizing: border-box;
+    background: #fff;
+    position: absolute;
+    border-top: 0.5rpx solid #629ffa;
+    border-left: 0.5rpx solid #629ffa;
+    left: 30rpx;
+    top: 6rpx;
+    transform: rotate(45deg);
+    transform-origin: center;
+    transition: all 0.2s linear;
+  }
+}
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 90e55f9..296ac27 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -273,9 +273,11 @@
 	 */
 	async function loginFinishFunc(loginBizData) {
 		// 保存 token
+		console.log('loginBizData',loginBizData)
 		storageManage.setLogin(loginBizData)
 		storageManage.token(loginBizData.tokenInfo)
 		uni.setStorageSync("promission",loginBizData.promissionList)
+		uni.setStorageSync("shopId",loginBizData.shopInfo.id)
 		
 		// var time1 = new Date();
 		// var time2 = new Date(loginBizData.expireDate);