From 5fea3988c22457c1d5708c668e73c05465c24f85 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 5 Jun 2024 18:08:46 +0800
Subject: [PATCH] aaa

---
 page_user/shuju/index.vue | 12 ++++++------
 pages/income/index.vue    | 35 +++++++++++++++++++++++++----------
 pages/index/index.vue     |  2 +-
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/page_user/shuju/index.vue b/page_user/shuju/index.vue
index f69a01a..a901585 100644
--- a/page_user/shuju/index.vue
+++ b/page_user/shuju/index.vue
@@ -8,10 +8,10 @@
         			<image src="https://api.ccttiot.com/smartmeter/img/static/u5rNGPmNiFGOZmCmovYF" mode=""></image>
 					<text>流水分析</text>
         		</view>
-				<!-- <view class="lisy_val" @click="btnpage(2)">
+				<view class="lisy_val" @click="btnpage(2)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uYGHmiJ5O7hHLsiiUJAC" mode=""></image>
 					<text>门店流水</text>
-				</view> -->
+				</view>
 				<view class="lisy_val" @click="btnpage(3)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uquhtDd1oxIqYdAGF44t" mode=""></image>
 					<text>门店收益</text>
@@ -74,19 +74,19 @@
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 24rpx 24rpx;
 				display: flex;
-				// justify-content: space-between;
+				justify-content: space-between;
 				padding: 54rpx 78rpx;
 				box-sizing: border-box;
 				margin: auto;
 				.lisy_val{
 					width: 40%;
-					// text-align: center;
-					// margin-right: 60rpx;
+					text-align: center;
+					margin-right: 80rpx;
 					image{
 						width: 48rpx;
 						height: 48rpx;
 						display: block;
-						margin-left: 24rpx;
+						margin-left: 35rpx;
 						margin-bottom: 10rpx;
 						vertical-align: middle;
 					}
diff --git a/pages/income/index.vue b/pages/income/index.vue
index 8da83f0..b21d069 100644
--- a/pages/income/index.vue
+++ b/pages/income/index.vue
@@ -45,14 +45,8 @@
 					<view class="price">996</view>
 				</view>
 			</view>
-
 		</view>
 
-
-
-
-
-
 		<!-- 弹窗 -->
 		<view class="tanc" v-if="vipflag">
 			<view class="tit">{{textje}}</view>
@@ -81,18 +75,39 @@
 					second: false
 				},
 				show: false,
-				selector: '2024-4-9',
-				selectors: '2024-4-9',
+				selector: '',
+				selectors: '',
 				num: '',
 				vipflag: false,
 				textje: '请输入起始金额',
 				qishiprice: '起始金额',
 				jieshuprice: '结束金额',
-				jesum: 0,
-				jeflag: ''
+				jesum: '',
+				jeflag: '',
+				listarr:[]
 			}
 		},
+		onLoad() {
+			let today = new Date()
+			this.selector = this.formatDate(today)
+			this.selectors = this.formatDate(today)
+			this.getlist()
+		},
 		methods: {
+			getlist(){
+				this.$u.get('/agent/report/agent/storeRank?orderByColumn=' + 'income' + '&isAsc=' + 'desc' + '&startDate='+this.selector + '&endDate=' + this.selectors).then(res => {
+					if(res.code == 200){
+						this.listarr = res.data
+					}
+				})
+			},
+			
+			formatDate(date) {
+				let year = date.getFullYear();
+				let month = String(date.getMonth() + 1).padStart(2, '0');
+				let day = String(date.getDate()).padStart(2, '0');
+				return `${year}-${month}-${day}`;
+			},
 			btnks(num) {
 				this.show = true
 				if (num == 1) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c376e4d..634b30c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -362,7 +362,7 @@
 					}
 				}
 				const totalLength = chineseLength + englishLength * 2;
-				return -totalLength * 6.5
+				return -totalLength * 7
 			},
 
 			btnzujie() {