From f1369caf3aac70fec72c1a03b6b05490fe5eb99e Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 24 Oct 2024 11:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JeepayBackground/JeepayBackground.vue     |  15 +-
 pageLineUp/index.vue                          |   2 +-
 pages/index/components/my-date-pickerview.vue | 448 ++++++++++++++++++
 pages/index/components/statistics.vue         | 214 +++++++++
 pages/index/index.vue                         | 245 ++++++----
 5 files changed, 817 insertions(+), 107 deletions(-)
 create mode 100644 pages/index/components/my-date-pickerview.vue
 create mode 100644 pages/index/components/statistics.vue

diff --git a/components/JeepayBackground/JeepayBackground.vue b/components/JeepayBackground/JeepayBackground.vue
index 5854673..b822b59 100644
--- a/components/JeepayBackground/JeepayBackground.vue
+++ b/components/JeepayBackground/JeepayBackground.vue
@@ -32,7 +32,9 @@
 	  <view class="bg-img-view" :style="vdata.bgImgStyle">
 		  
 		  <!-- 背景颜色view -->
-		  <view class="bg-color-view" :style="vdata.bgColorStyle">
+		  <view class="bg-color-view" :style="vdata.bgColorStyle" style="border-radius:0;background-color: #318AFE!important;">
+			  <view class="bgbottomStyle">
+			  </view>
 		  </view>
       <!-- 解决定位层级问题 -->
       <view class="bg-main">
@@ -93,7 +95,7 @@ onMounted(() => {
 			right: 0,
 			height: '550rpx',
 			borderRadius: '0 0 32rpx 32rpx',
-			background: 'linear-gradient(270deg, rgba(72, 192, 255, 1) 0%, rgba(51, 157, 255, 1) 100%)',
+			// background: 'linear-gradient(270deg, rgba(72, 192, 255, 1) 0%, rgba(51, 157, 255, 1) 100%)',
 		}
 		vdata.bgColorStyle = Object.assign(defStyle, props.bgColorStyle)
 	}
@@ -104,4 +106,13 @@ onMounted(() => {
   position: relative;
   z-index: 10;
 }
+.bgbottomStyle{
+	position: absolute;
+	bottom: -2rpx;
+	left: 0;
+	
+	width: 750rpx;
+	height: 74rpx;
+	background: linear-gradient( 180deg, rgba(195,215,235,0) 0%, #F9F9F9 100%);
+}
 </style>
diff --git a/pageLineUp/index.vue b/pageLineUp/index.vue
index 0d6b917..d8921eb 100644
--- a/pageLineUp/index.vue
+++ b/pageLineUp/index.vue
@@ -170,7 +170,7 @@
 			// value=2完成
 			callTableput({
 				shopId: uni.getStorageSync('shopId'),
-				state: 1,
+				state: 2,
 				callQueueId: datas.dialId
 			}).then((res) => {
 				getList()
diff --git a/pages/index/components/my-date-pickerview.vue b/pages/index/components/my-date-pickerview.vue
new file mode 100644
index 0000000..df67817
--- /dev/null
+++ b/pages/index/components/my-date-pickerview.vue
@@ -0,0 +1,448 @@
+<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="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>
+					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="item" v-for="(item,index) in minutes" :key="index">{{item}}分</view>
+				</picker-view-column>
+				<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>
+					<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="item" v-for="(item,index) in minutes" :key="index">{{item}}分</view>
+				</picker-view-column>
+				<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>
+
+</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'
+		}
+	])
+
+
+
+	function setPrveDay() {
+
+	}
+
+	function setNowMoneth() {
+
+	}
+
+	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 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,
+	])
+
+	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 close() {
+		show.value = false
+		emits('close', false)
+	}
+
+	function open() {
+		show.value = true
+		emits('open', true)
+	}
+
+	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 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 returnMonthStart(arr) {
+		return new Date(years[arr[0]], months[arr[1]] - 1, 1).getDate();
+	}
+
+	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 bindChange(e) {
+		value.value = e.detail.value
+		changeDays(false, e.detail.value)
+	}
+
+	function bindChange1(e) {
+		value1.value = e.detail.value
+		changeDays(true, e.detail.value)
+	}
+
+	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 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
+	})
+</script>
+
+<style lang="scss">
+	.fastTime {
+		.item {
+			background-color: rgb(247, 247, 247);
+			padding: 6rpx 40rpx;
+			border-radius: 6rpx;
+			font-size: 32rpx;
+		}
+	}
+
+	.top {
+		border-bottom: 1px solid #eee;
+	}
+
+	.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);
+
+		.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;
+	}
+
+	.picker-view {
+		width: 750rpx;
+		height: 300rpx;
+	}
+
+	.item {
+		line-height: 34px;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue
new file mode 100644
index 0000000..89414d2
--- /dev/null
+++ b/pages/index/components/statistics.vue
@@ -0,0 +1,214 @@
+<template>
+	<view class="statistics">
+		<view class="statisticsBox">
+
+			<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>
+
+			<ul class="payList">
+				<li v-for="item in list" :key="item.id">
+					<view class="">
+						{{item.payType}}
+					</view>
+					<view class="">
+						{{item.payAmount}}
+					</view>
+				</li>
+			</ul>
+		</view>
+	</view>
+	<datePickerview @confirm="datePickerConfirm" ref="datePicker" style="z-index: 999;"></datePickerview>
+</template>
+
+<script setup>
+	import {
+		summaryTrade,
+	} from '@/http/yskApi/requestAll.js';
+	import dayjs from 'dayjs' //时间格式库
+	import {
+		getCurrentInstance,
+		ref
+	} from 'vue';
+	import datePickerview from './my-date-pickerview.vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	let selected = ref('today')
+	let list = ref()
+	const emit = defineEmits(['totalRevenue'])
+	const timeList = [{
+			label: '今天',
+			value: 'today'
+		},
+		{
+			label: '昨天',
+			value: 'yesterday'
+		},
+		{
+			label: '本周',
+			value: 'circumference'
+		}, {
+			label: '本月',
+			value: 'moon'
+		},
+		{
+			label: '自定义',
+			value: 'custom'
+		}
+	]
+	const currentInstance = getCurrentInstance()
+	onLoad((options) => {
+		getlist()
+	});
+
+	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') {
+			startTime = start
+			endTime = end
+		}
+		summaryTrade({
+			shopId: uni.getStorageSync('shopId'),
+			startTime,
+			endTime,
+		}).then((res) => {
+			list.value = res.sale.payCount.slice(0, 4)
+			emit('totalRevenue',res.sale.incomeAmountAll)
+		})
+	}
+
+	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}`;
+	}
+	// 获取昨天时间
+	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) {
+		selected.value = e
+		if (e == 'custom') {
+			currentInstance.ctx.$refs.datePicker.toggle()
+		} else {
+			getlist()
+		}
+	}
+</script>
+<style scoped lang="less">
+	ul,
+	li {
+		list-style: none;
+		padding: 0;
+	}
+
+	.statistics {
+		padding: 0 28rpx;
+
+		.statisticsBox {
+			width: 694rpx;
+			height: 260rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+
+			.time-wrapper {
+				display: flex;
+				justify-content: space-around;
+				padding-bottom: 16rpx;
+				padding-top: 16rpx;
+				margin-top: 54rpx;
+
+				.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;
+				}
+			}
+
+			.payList {
+				display: flex;
+				// justify-content: space-around;
+				align-items: center;
+				flex-wrap: wrap;
+				margin-top: 32rpx;
+
+				>li {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+					width: 170rpx;
+
+					>view {
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dde1183..bda58f3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,18 +2,22 @@
 <template>
 	<JeepayBackground :bgColorStyle="{}">
 		<!-- 导航条 -->
-		<JeepayCustomNavbar title="首页" textColor="#fff"
-			bgDefaultColor="linear-gradient(270deg, rgba(72, 192, 255, 1) 0%, rgba(51, 157, 255, 1) 100%)" />
-
+		<JeepayCustomNavbar title="首页" textColor="#fff" bgDefaultColor="#318AFE" />
+		<view class="income">
+			<view>总收入</view>
+			<view>￥{{totalRevenuedata}}</view>
+			<view>后海&双屿</view>
+		</view>
 		<!-- 统计 or 快捷扫码 -->
-		<Stats ref="statsRef" />
-
+		<!-- <Stats ref="statsRef" /> -->
+		<statistics @totalRevenue="totalRevenue"></statistics>
 		<!-- 导航栅格 -->
 		<JeepayNavigation :navList="navList" type="grid" />
 	</JeepayBackground>
 </template>
 
 <script setup>
+	
 	import {
 		reactive,
 		ref,
@@ -34,7 +38,7 @@
 	import Stats from './components/Stats.vue';
 	import registerPush from '@/commons/utils/pushmsg/registerPush.js';
 	import pushMsgManage from '@/commons/utils/pushmsg/pushMsgManage.js';
-
+	import statistics from './components/statistics.vue'
 	import {
 		onPullDownRefresh,
 		onLoad
@@ -43,9 +47,16 @@
 	import {
 		$adList
 	} from '@/http/apiManager.js';
-	import {hasPermission} from '@/commons/utils/hasPermission.js'
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js'
 	uni.hideTabBar()
-	onLoad((options) => {});
+	onLoad((options) => {
+	});
+	let totalRevenuedata = ref()
+	let totalRevenue= (d)=>{
+		totalRevenuedata.value=d
+	}
 	// 导航列表
 	const navList = [
 		// {
@@ -62,9 +73,9 @@
 			title: '代客下单',
 			icon: '/static/indexImg/icon-substitute-ordering.svg',
 			pageUrl: 'PAGES_CREATE_ORDER',
-			clickFunc:()=>{
-				hasPermission('允许下单').then(res=>{
-					if(res){
+			clickFunc: () => {
+				hasPermission('允许下单').then(res => {
+					if (res) {
 						go.to('PAGES_CREATE_ORDER')
 					}
 				})
@@ -94,7 +105,7 @@
 			title: '会员管理',
 			icon: '/static/indexImg/icon-user.svg',
 			pageUrl: 'PAGES_USER_CONTROL',
-		},{
+		}, {
 			title: '员工管理',
 			icon: '/static/indexImg/icon-staff.svg',
 			pageUrl: 'PAGES_STAFF'
@@ -139,101 +150,101 @@
 			icon: '/static/indexImg/icon-cashier.svg',
 			pageUrl: 'PAGES_SHOP_SETUP',
 		},
-	// 	// // {
-	// 	// // 	title: '进销存',
-	// 	// // 	icon: '/static/indexImg/icon-invoicing.svg',
-	// 	// // 	pageUrl: 'PAGES_INVOICING_INDEX',
-	// 	// // },
-		
-	// 	// // {
-	// 	// // 	title: '预定座位',
-	// 	// // 	icon: '/static/indexImg/icon-yuyue-zuo.svg',
-	// 	// // 	pageUrl: 'PAGES_RESERVE_SEAT_INDEX',
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '预约管理',
-	// 	// // 	icon: '/static/indexImg/icon-yuyue.svg',
-	// 	// // 	pageUrl: 'PAGES_BOOKING_INDEX',
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '充值管理',
-	// 	// // 	icon: '/static/indexImg/icon-recharge.svg',
-	// 	// // 	pageUrl: 'PAGES_RECHARGE_INDEX',
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '存酒管理',
-	// 	// // 	icon: '/static/indexImg/icon-wine.svg',
-	// 	// // 	pageUrl: 'PAGES_STORING_WINE_INDEX',
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '进件管理',
-	// 	// // 	icon: '/static/indexImg/icon-passage.svg',
-	// 	// // 	pageUrl: 'PAGES_APPLYMENT',
-	// 	// // 	entId: 'ENT_MCH_APPLYMENT_LIST'
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '商户管理',
-	// 	// // 	icon: '/static/indexImg/business.svg',
-	// 	// // 	pageUrl: 'PAGES_APPLYMENT_BUSINESS',
-	// 	// // 	entId: 'ENT_MCH_APPLYMENT_LIST'
-	// 	// // },
-	// 	// // {
-	// 	// // 	title: '门店管理',
-	// 	// // 	icon: '/static/indexImg/icon-store.svg',
-	// 	// // 	pageUrl: 'PAGES_STORE',
-	// 	// // 	entId: 'ENT_MCH_STORE'
-	// 	// // },
-	// 	// {
-	// 	// 	title: '设备管理',
-	// 	// 	icon: '/static/indexImg/icon-calc.svg',
-	// 	// 	pageUrl: 'PAGES_DEVICE_MAIN',
-	// 	// 	entId: 'ENT_DEVICE'
-	// 	// },
-		
-	// 	{
-	// 		title: '数据中心',
-	// 		icon: '/static/indexImg/icon-pro.svg',
-	// 		pageUrl: 'PAGES_STAT',
-	// 		entId: 'ENT_ORDER_STATISTIC'
-	// 	},
-	// 	{
-	// 	  title: '商户应用',
-	// 	  icon: '/static/indexImg/icon-app.svg',
-	// 	  pageUrl: 'PAGES_APP',
-	// 	  entId: 'ENT_MCH_APP_LIST'
-	// 	},
-	// 	{
-	// 		title: '会员中心',
-	// 		icon: '/static/indexImg/icon-member.svg',
-	// 		pageUrl: 'PAGES_MEMBER_CENTER',
-	// 		entId: 'ENT_MCH_MEMBER'
-	// 	},
-	// 	{
-	// 		title: '广告管理',
-	// 		icon: '/static/indexImg/icon-ad.svg',
-	// 		pageUrl: 'PAGES_AD_LIST',
-	// 		entId: 'ENT_ADVERT_CONTROL'
-	// 	},
-	// 	{
-	// 		title: '营销红包',
-	// 		icon: '/static/indexImg/red-envelope.svg',
-	// 		pageUrl: 'PAGES_RED_INDEX',
-	// 		entId: 'ENT_MCH_MEMBER'
-	// 	},
-	
-	// 	{
-	// 		title: '优惠券',
-	// 		icon: '/static/indexImg/red-envelope.svg',
-	// 		pageUrl: 'PAGES_COUPON_INDEX'
-	// 	},
-		
+		// 	// // {
+		// 	// // 	title: '进销存',
+		// 	// // 	icon: '/static/indexImg/icon-invoicing.svg',
+		// 	// // 	pageUrl: 'PAGES_INVOICING_INDEX',
+		// 	// // },
+
+		// 	// // {
+		// 	// // 	title: '预定座位',
+		// 	// // 	icon: '/static/indexImg/icon-yuyue-zuo.svg',
+		// 	// // 	pageUrl: 'PAGES_RESERVE_SEAT_INDEX',
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '预约管理',
+		// 	// // 	icon: '/static/indexImg/icon-yuyue.svg',
+		// 	// // 	pageUrl: 'PAGES_BOOKING_INDEX',
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '充值管理',
+		// 	// // 	icon: '/static/indexImg/icon-recharge.svg',
+		// 	// // 	pageUrl: 'PAGES_RECHARGE_INDEX',
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '存酒管理',
+		// 	// // 	icon: '/static/indexImg/icon-wine.svg',
+		// 	// // 	pageUrl: 'PAGES_STORING_WINE_INDEX',
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '进件管理',
+		// 	// // 	icon: '/static/indexImg/icon-passage.svg',
+		// 	// // 	pageUrl: 'PAGES_APPLYMENT',
+		// 	// // 	entId: 'ENT_MCH_APPLYMENT_LIST'
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '商户管理',
+		// 	// // 	icon: '/static/indexImg/business.svg',
+		// 	// // 	pageUrl: 'PAGES_APPLYMENT_BUSINESS',
+		// 	// // 	entId: 'ENT_MCH_APPLYMENT_LIST'
+		// 	// // },
+		// 	// // {
+		// 	// // 	title: '门店管理',
+		// 	// // 	icon: '/static/indexImg/icon-store.svg',
+		// 	// // 	pageUrl: 'PAGES_STORE',
+		// 	// // 	entId: 'ENT_MCH_STORE'
+		// 	// // },
+		// 	// {
+		// 	// 	title: '设备管理',
+		// 	// 	icon: '/static/indexImg/icon-calc.svg',
+		// 	// 	pageUrl: 'PAGES_DEVICE_MAIN',
+		// 	// 	entId: 'ENT_DEVICE'
+		// 	// },
+
+		// 	{
+		// 		title: '数据中心',
+		// 		icon: '/static/indexImg/icon-pro.svg',
+		// 		pageUrl: 'PAGES_STAT',
+		// 		entId: 'ENT_ORDER_STATISTIC'
+		// 	},
+		// 	{
+		// 	  title: '商户应用',
+		// 	  icon: '/static/indexImg/icon-app.svg',
+		// 	  pageUrl: 'PAGES_APP',
+		// 	  entId: 'ENT_MCH_APP_LIST'
+		// 	},
+		// 	{
+		// 		title: '会员中心',
+		// 		icon: '/static/indexImg/icon-member.svg',
+		// 		pageUrl: 'PAGES_MEMBER_CENTER',
+		// 		entId: 'ENT_MCH_MEMBER'
+		// 	},
+		// 	{
+		// 		title: '广告管理',
+		// 		icon: '/static/indexImg/icon-ad.svg',
+		// 		pageUrl: 'PAGES_AD_LIST',
+		// 		entId: 'ENT_ADVERT_CONTROL'
+		// 	},
+		// 	{
+		// 		title: '营销红包',
+		// 		icon: '/static/indexImg/red-envelope.svg',
+		// 		pageUrl: 'PAGES_RED_INDEX',
+		// 		entId: 'ENT_MCH_MEMBER'
+		// 	},
+
+		// 	{
+		// 		title: '优惠券',
+		// 		icon: '/static/indexImg/red-envelope.svg',
+		// 		pageUrl: 'PAGES_COUPON_INDEX'
+		// 	},
+
 		{
 			title: '退出登录',
 			icon: '/static/indexImg/icon-login-out.svg',
 			pageUrl: 'PAGES_LOGIN',
-			clickFunc:()=>{
+			clickFunc: () => {
 				storageManage.cleanByLogout()
-				go.to('PAGES_LOGIN',{},'redirect')
+				go.to('PAGES_LOGIN', {}, 'redirect')
 			}
 		}
 
@@ -252,7 +263,7 @@
 		adList: [],
 		shareImgUrl: '' //分享图片
 	});
-
+	
 	// 公告的点击事件。
 	const listviewClickFunc = (isClickMore, record) => {
 		if (isClickMore) {
@@ -308,4 +319,30 @@
 	});
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+	.income {
+		>view {
+			text-align: center;
+			color: #FFFFFF;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+		}
+
+		>view:nth-child(1) {
+			font-weight: 400;
+			font-size: 28rpx;
+			margin-top: 84rpx;
+		}
+
+		>view:nth-child(2) {
+			margin-top: 20rpx;
+			font-weight: 500;
+			font-size: 64rpx;
+		}
+
+		>view:nth-child(3) {
+			font-weight: 400;
+			font-size: 28rpx;
+			margin-top: 50rpx;
+		}
+	}
+</style>
\ No newline at end of file