diff --git a/page_user/shuju/index.vue b/page_user/shuju/index.vue
index c9a972c..f69a01a 100644
--- a/page_user/shuju/index.vue
+++ b/page_user/shuju/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="维修申报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="数据分析" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='58'></u-navbar>
         <view class="box">
         	<view class="list">
diff --git a/page_user/shuju/lsfx.vue b/page_user/shuju/lsfx.vue
index 16e16e4..8118b08 100644
--- a/page_user/shuju/lsfx.vue
+++ b/page_user/shuju/lsfx.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="维修申报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="流水分析" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='58'></u-navbar>
 		<view class="box">
 			<view class="date">
@@ -10,15 +10,15 @@
 			<view class="zongls">
 				<view class="hz">
 					<view class="">总流水</view>
-					<view class="" style="color: #4C97E7;">589</view>
+					<view class="" style="color: #4C97E7;">{{syobj.flow}}</view>
 				</view>
 				<view class="hz">
 					<view class="">总收益</view>
-					<view class="" style="color: #25CE88;">589</view>
+					<view class="" style="color: #25CE88;">{{syobj.income}}</view>
 				</view>
 				<view class="hz">
 					<view class="">总订单</view>
-					<view class="" style="color: #FF8157;">589</view>
+					<view class="" style="color: #FF8157;">{{syobj.order}}</view>
 				</view>
 			</view>
 			<view style="width: 750rpx;height: 1px;background-color: #F0F0F0;"></view>
@@ -26,13 +26,16 @@
 				<view class="">日期</view>
 				<view class="ls" @click="shows = true">{{tit}} <u-icon name="arrow-down"></u-icon> </view>
 			</view>
-			<view class="list" v-for="(item,index) in 6" :key="index">
-				<view class="">04/05</view>
-				<view class="ls">115 元</view>
+			<view class="list" v-for="(item,index) in listarr" :key="index">
+				<view class="">{{item.year +'-' + item.month + '-' + item.day}}</view>
+				<view class="ls" v-if="titvalue == 1">{{item.flow}}元</view>
+				<view class="ls" v-if="titvalue == 2">{{item.income}}元</view>
+				<view class="ls" v-if="titvalue == 3">{{item.order}}单</view>
 			</view>
 		</view>
 
 		<u-select v-model="shows" :list="list" @confirm="confirms"></u-select>
+		<u-picker v-model="show" mode="time" @confirm="confirmtime"></u-picker>
 	</view>
 </template>
 
@@ -70,18 +73,38 @@
 						label: '订单'
 					}
 				],
+				listarr:[],
+				titvalue:1,
+				syobj:{}
 			}
 		},
 		onLoad() {
-			let today = new Date();
-			this.firsTime = this.formatDate(today);
-			this.lasTime = this.formatDate(today);
+			let today = new Date()
+			this.firsTime = this.formatDate(today)
+			this.lasTime = this.formatDate(today)
+			this.getshouyi()
+			this.getlist()
 		},
 		methods: {
-			confirms(e){
-				this.tit = e[0].label
+			getlist(){
+				this.$u.get('/agent/report/agent/analysis?startDate=' + this.firsTime + '&endDate=' + this.lasTime).then(res => {
+					if(res.code == 200){
+						this.listarr = res.data
+					}
+				})
+			},
+			getshouyi(){
+				this.$u.get('/agent/report/agent/total').then(res => {
+					if(res.code == 200){
+						this.syobj = res.data
+					}
+				})
 			},
 			
+			confirms(e){
+				this.tit = e[0].label
+				this.titvalue = e[0].value
+			},
 			formatDate(date) {
 				let year = date.getFullYear();
 				let month = String(date.getMonth() + 1).padStart(2, '0');
@@ -96,11 +119,13 @@
 					this.num = 2
 				}
 			},
-			confirm(e) {
+			confirmtime(e) {
 				if (this.num == 1) {
 					this.firsTime = e.year + '-' + e.month + '-' + e.day
+					this.getlist()
 				} else {
 					this.lasTime = e.year + '-' + e.month + '-' + e.day
+					this.getlist()
 				}
 			},
 		}
@@ -118,13 +143,13 @@
 
 	.page {
 		width: 750rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
+		// position: fixed;
+		// top: 0;
+		// left: 0;
 
 		.box {
 			width: 750rpx;
-			height: 1440rpx;
+			height:100%;
 			background: #F4F5F7;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 
diff --git a/pages/agentpages/shopguanli/setupshop/index.vue b/pages/agentpages/shopguanli/setupshop/index.vue
index 2536265..4cc24f4 100644
--- a/pages/agentpages/shopguanli/setupshop/index.vue
+++ b/pages/agentpages/shopguanli/setupshop/index.vue
@@ -16,7 +16,7 @@
 				<view class="listval">
 					<view class="tit"> 营业时间</view>
 					<view class="but"
-						style="display: flex;justify-content: space-between;padding: 15rpx 10rpx;box-sizing: border-box;">
+						style="display: flex;justify-content: space-between;padding: 15rpx 20rpx;box-sizing: border-box;">
 						<!-- <input type="text" placeholder="请输入营业时间" v-model="yetime" /> -->
 						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(1)">{{ksyy}}</view>
 						--
@@ -79,7 +79,7 @@
 			<!-- 选择省市区 -->
 			<u-picker v-model="regionshow" mode="region" @confirm="btnregions"></u-picker>
 			<!-- 营业时间 -->
-			<u-picker mode="time" v-model="show" :params="params" @confirm="btnyy"></u-picker>
+			<u-picker mode="time" v-model="show" default-time="00:00" :params="params" @confirm="btnyy"></u-picker>
 
 		</view>
 	</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cfcefdb..c376e4d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -886,10 +886,10 @@
 			.tubiao {
 				display: flex;
 				justify-content: space-between;
-				padding: 0 50rpx;
+				padding: 24rpx 50rpx;
 				box-sizing: border-box;
-				padding-top: 20rpx;
-				padding-bottom: 24rpx;
+				// padding-top: 20rpx;
+				// padding-bottom: 24rpx;
 
 				.gr {
 					text-align: center;