From aaf7881a73ec9e1f8c33f191a6695b97fdb11302 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Thu, 1 Feb 2024 20:57:18 +0800
Subject: [PATCH] update

---
 pages.json                                    |   26 +
 pages/index/index.vue                         |    9 +-
 pages/map/index.vue                           |   20 +-
 pages/nationalPage/components/CarAnalysis.vue |  613 +++++++++
 .../components/CustomerAnalysis.vue           |  317 +++++
 .../components/ServiceRevenuePie.vue          |  115 ++
 .../components/anhuiYestodayRevenueData.js    |  361 +++++
 pages/nationalPage/nationalServerpart.vue     | 1179 +++++++++++++++++
 pages/nationalPage/rankPage.vue               |  985 ++++++++++++++
 pages/nationalPage/springTravel.vue           |  943 +++++++++----
 pages/nationalPage/testPage.vue               |  302 +++++
 11 files changed, 4637 insertions(+), 233 deletions(-)
 create mode 100644 pages/nationalPage/components/CarAnalysis.vue
 create mode 100644 pages/nationalPage/components/CustomerAnalysis.vue
 create mode 100644 pages/nationalPage/components/ServiceRevenuePie.vue
 create mode 100644 pages/nationalPage/components/anhuiYestodayRevenueData.js
 create mode 100644 pages/nationalPage/nationalServerpart.vue
 create mode 100644 pages/nationalPage/rankPage.vue
 create mode 100644 pages/nationalPage/testPage.vue

diff --git a/pages.json b/pages.json
index b21be31..02cb06c 100644
--- a/pages.json
+++ b/pages.json
@@ -138,6 +138,32 @@
                         "navigationBarTitleText": "",
                         "navigationStyle": "custom"
                     }
+                },
+                {
+                    "path": "nationalServerpart",
+                    "style":
+                    {
+                        "navigationBarTitleText": "服务区每日营收",
+                        "enablePullDownRefresh": false
+                    }
+                },
+                {
+                    "path": "rankPage",
+                    "style":
+                    {
+                        "navigationBarTitleText": "服务区排名",
+                        "enablePullDownRefresh": false,
+                        "disableScroll": true
+                    }
+                },
+                {
+                    "path": "testPage",
+                    "style":
+                    {
+                        "navigationBarTitleText": "测试页面",
+                        "enablePullDownRefresh": false,
+                        "disableScroll": true
+                    }
                 }
             ]
         },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 177cd3a..ca087f7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -53,7 +53,7 @@
                     <view class="topTop">
                       <view class="statistics" @click="goToRevenueStatic">
                         <image class="staticImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg"/>
-                        <text class="staticTitle">{{ `${selectMonth || '-'}月对客营收` }}</text>
+                        <text class="staticTitle">{{ `${selectMonth || '-'}月对客销售` }}</text>
                         <span class="staticUnit">/万元</span>
                         <view class="moreIcon" @click.stop="changeShowRealBox">
                           <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
@@ -106,7 +106,7 @@
                           <view class="smallDetailItem" style="margin-right: 14px">
                             <view class="messageTop">
                               <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
-                              <text class="typeTitle">自营收入</text>
+                              <text class="typeTitle">驿达自营</text>
                               <!--                            <text class="unit">/万元</text>-->
                             </view>
                             <view class="middle" v-if="typeList && typeList.length>0">
@@ -122,7 +122,7 @@
                           <view class="smallDetailItem">
                             <view class="messageTop">
                               <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>
-                              <text class="typeTitle">外租收入</text>
+                              <text class="typeTitle">商铺租赁</text>
                               <!--                            <text class="unit">/万元</text>-->
                             </view>
                             <view class="middle">
@@ -148,7 +148,7 @@
                           <view class="rightBox">
                             <view class="noticeItem">
                               <view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
-                              <view class="noticeText">驿达入账</view>
+                              <view class="noticeText">营业收入</view>
                               <!--                            <span class="noticeSmallText">/万元</span>-->
                               <text class="noticeMoney">{{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}}</text>
                             </view>
@@ -1656,6 +1656,7 @@ export default {
     // 隐藏掉小程序本身自带的 tabbar 让自定义的tabbar出现
     uni.hideTabBar()
     this.selectVersion = 1
+    uni.removeStorageSync('springService')
   },
   onHide(){
     // 离开页面投诉建议的悬浮框隐藏掉
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 0454280..6d74254 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -281,14 +281,18 @@ export default {
               latitude:'31.832905',
             }
             uni.setStorageSync('currentService',res) //当前选中服务区信息
-            if (this.chartType){
-                uni.navigateBack({
-                  delta: 1
-                })
+            if(this.type==='springTravel'){
+
             }else{
+              if (this.chartType){
                 uni.navigateBack({
                   delta: 1
                 })
+              }else{
+                uni.navigateBack({
+                  delta: 1
+                })
+              }
             }
           }else{
             this.getListData()
@@ -319,7 +323,13 @@ export default {
             let pageList = getCurrentPages()
           if (this.type==='index'){
             this.$util.toNextRoute('navigateTo', `/pages/summaryOfPortraits/index?index=0`)
-          }else{
+          }else if(this.type==='springTravel'){
+            uni.setStorageSync('springService',res) //当前选中服务区信息
+            uni.navigateBack({
+              delta: 1
+            })
+          }
+          else{
             if (this.chartType){
               uni.navigateBack({
                 delta: 1
diff --git a/pages/nationalPage/components/CarAnalysis.vue b/pages/nationalPage/components/CarAnalysis.vue
new file mode 100644
index 0000000..a6cd503
--- /dev/null
+++ b/pages/nationalPage/components/CarAnalysis.vue
@@ -0,0 +1,613 @@
+<template>
+	<view v-show="show">
+		<div class="" v-show="!loading && pageEmpty">
+			<noFound :nodata="true" :text="'抱歉，服务区采集样本数据过小，无法分析。'" />
+		</div>
+		<div v-show="!loading && !pageEmpty">
+			<div class="customer-content">
+				<div class="tab-btn" v-if="topData.length>1" @tap="tabChange(canvasTab==1?0:1,opt)">
+					查看{{topData[canvasTab?0:1].Serverpart_Region}}区数据</div>
+				<div class="customer-title">入区车流分析</div>
+				<div class="uni-flex jc-between">
+					<div style="flex:1;" class="tab-unit">
+						<div class="tab-title">车流量</div>
+						<div class="tab-number">{{topData[canvasTab].Vehicle_Count}}</div>
+						<div class="tab-rate"><span class="tab-desc">日</span> <span
+								:style="topData[canvasTab].Vehicle_GrowthRate>0? 'color: #2CC260;' : 'color: #F54850;'">{{topData[canvasTab].Vehicle_GrowthRate}}%</span>
+						</div>
+					</div>
+					<div style="flex:1;" class="tab-unit">
+						<div class="tab-title">入区率</div>
+						<div class="tab-number">{{topData[canvasTab].Entry_Rate}}%</div>
+						<div class="tab-rate"><span class="tab-desc">日</span> <span
+								:style="topData[canvasTab].Entry_GrowthRate>0? 'color: #2CC260;' : 'color: #F54850;'">{{topData[canvasTab].Entry_GrowthRate}}%</span>
+						</div>
+					</div>
+				</div>
+
+			</div>
+			<!-- <canvas canvas-id="sexCate" id="sexCate" class="operation-cate-content"></canvas> -->
+			<div class="customer-content">
+				<div class="customer-title">各车停留时间</div>
+				<div v-if="chartdata.stayChart[canvasTab] && chartdata.stayChart[canvasTab].data.length>0">
+					<canvas canvas-id="carStay" id="carStay" class="operation-stock-content" @touchend="tap"></canvas>
+				</div>
+				<noFound :nodata="true" :text="'抱歉，服务区采集样本数据过小，无法分析。'" v-else />
+			</div>
+			<div class="customer-content">
+				<div class="customer-title">车辆归属地</div>
+				<div v-if="chartdata.countChart[canvasTab] && !lodingDetail">
+					<view class="operation-pie-content">
+						<!-- <uni-ec-canvas
+							class="operation-stock-content"
+							id="carBelong"
+							ref="carBelong"
+							canvas-id="carBelong"
+							:ec="ec"
+						></uni-ec-canvas> -->
+						<!-- @inited="inited" -->
+						<canvas canvas-id="carBelong" id="carBelong" class="operation-pie-content"
+							@touchend="tap"></canvas>
+						<!-- <qiun-data-charts
+						type="radar"
+						:chartData="radarData"
+						:opts="radaropts"
+						background="none"
+						loadingType="2"
+					  /> -->
+					</view>
+					<view class="operation-pie-content">
+						<canvas canvas-id="carFunnel" id="carFunnel" class="operation-pie-content"
+							@touchend="tap"></canvas>
+						<!-- <qiun-data-charts
+						type="funnel"
+						:chartData="funnelData"
+						background="none"
+						:opts="funnelopts"
+						loadingType="0"
+					  /> -->
+					</view>
+				</div>
+				<noFound :nodata="true" :text="'抱歉，服务区采集样本数据过小，无法分析。'" v-else />
+				<!-- 	<div class="analysis-text" v-if="proportionList[canvasTab]">
+					<span class="key-text">分析</span><span>{{proportionList[canvasTab][1]}}</span>
+				</div> -->
+			</div>
+		</div>
+	</view>
+</template>
+
+<script>
+	import uCharts from '@/components/u-charts.js';
+	import uniEcCanvas from './uni-ec-canvas/uni-ec-canvas.vue';
+	// import uCharts from '@/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js';
+	let rincanvas = {}
+
+	export default {
+		props: {
+			pieId: String,
+			barId: String,
+			show: Boolean
+		},
+		data() {
+			return {
+				funnelData: null,
+
+				radarData: [],
+				topData: [],
+				canvasTab: 0,
+				chartdata: {
+					"stayChart": [],
+					"countChart": []
+				},
+				opt: null,
+				pageEmpty: false,
+				loading: true,
+				lodingDetail: true,
+			}
+		},
+
+		methods: {
+			refreshData(data) {
+				// 刷新数据
+				rincanvas['carStay'].updateData({
+					series: data.data,
+					categories: data.categories
+				});
+				this.$forceUpdate()
+			},
+			tabChange(name, opt) {
+				this.canvasTab = name
+
+				if (!this.chartdata.stayChart[name]) {
+					this.lodingDetail = true
+					this.getProportion(name, opt) // 获取 各车型停留时间
+					this.getAnalysisDesc(name, opt)
+				} else {
+					if (this.chartdata.countChart[name]) {
+						// 车辆归属地
+						const list = this.chartdata.countChart[name]
+
+						this.showClounm({
+							id: 'carBelong',
+							data: [{
+								name: '归属城市',
+								data: list.OwnerCityList.map(n => {
+									return parseInt(n.value)
+								}),
+								textColor: '#747474',
+								textSize: uni.upx2px(20),
+								formatter: (val) => {
+
+									return parseInt(val)+'辆'
+								}
+							}],
+							categories: list.OwnerCity
+						})
+						//
+						this.showPie({
+							id: 'carFunnel',
+							data: list.OwnerProvinceList.map(n => {
+								return {
+									...n,
+									data: parseFloat(n.value)
+								}
+							}),
+							categories: list.OwnerProvince,
+						})
+					}
+					if (this.chartdata.stayChart[name]) {
+						// 车辆停留时间
+						const {
+							data,
+							categories
+						} = this.chartdata.stayChart[name]
+						this.showMix({
+							id: 'carStay', //+type,
+							data: data,
+							categories: categories
+						})
+						console.log('data123123',data)
+
+					}
+
+				}
+			},
+			// 获取 各车型停留时间
+			async getProportion(type, params) {
+				let _this = this
+				_this.opt = params
+				const data = await this.$request.$webGet('CommercialApi/Revenue/GetBayonetSTAList', {
+					Serverpart_Region: this.topData[type].Serverpart_Region,
+					...params
+				})
+				if (data.Result_Code === 100 && data.Result_Data.List.length > 0) {
+					const [list] = data.Result_Data.List
+
+					const showData = [{
+							name: '车型',
+							type: "column",
+							index: 0,
+							data: list.VehicleCountList.map(n => n.value)
+						},
+						{
+							name: '停留时间(分钟)',
+							type: "line",
+							index: 1,
+							"style": "curve",
+							dataPointShape: true,
+
+							data: list.StayTimesList.map(n => parseInt(n.value) + ''),
+						}
+					]
+					_this.showMix({
+						id: 'carStay', //+type,
+						data: showData,
+						categories: list.Vehicle_Type
+					})
+					this.chartdata.stayChart[type] = {
+						data: showData,
+						categories: list.Vehicle_Type
+					}
+					this.$forceUpdate()
+
+				} else {
+					this.chartdata.stayChart[type] = null
+				}
+			},
+			async getAnalysisDesc(type, params) {
+				let _this = this
+				const data = await this.$request.$webGet('CommercialApi/Revenue/GetBayonetOAList', {
+					Serverpart_Region: this.topData[type].Serverpart_Region,
+					statisticsMonth: this.$util.cutDate(params.StatisticsDate, 'YYYYMM'),
+					...params
+				})
+
+
+				if (data.Result_Code === 100 && data.Result_Data.List.length > 0) {
+					const [list] = data.Result_Data.List
+					this.chartdata.countChart[type] = list
+					this.showClounm({
+						id: 'carBelong',
+						data: [{
+							name: '归属城市',
+							data: list.OwnerCityList.map(n => {
+								return parseInt(n.value)
+							}),
+							textColor: '#747474',
+							textSize: uni.upx2px(20),
+							formatter: (val) => {
+
+								return parseInt(val)+'辆'
+							}
+						}],
+						categories: list.OwnerCity
+					})
+
+					this.showPie({
+						id: 'carFunnel',
+						data: list.OwnerProvinceList.map(n => {
+							return {
+								...n,
+								data: parseFloat(n.value)
+							}
+						}),
+						categories: list.OwnerProvince,
+					})
+
+					this.$forceUpdate()
+				} else {
+					this.chartdata.countChart[type] = null
+				}
+				this.lodingDetail = false
+			},
+			// 加载头部信息
+			async getTopData(params) {
+				const data = await this.$request.$webGet('CommercialApi/Revenue/GetBayonetEntryList', {
+					...params
+				})
+				this.loading = false
+				if (data.Result_Data.TotalCount == 0) {
+					this.pageEmpty = true
+					return
+				}
+				this.topData = data.Result_Data.List
+				this.lodingDetail = true
+				this.getProportion(this.canvasTab, params)
+				this.getAnalysisDesc(this.canvasTab, params)
+			},
+
+			tap(e) {
+				rincanvas[e.target.id].touchLegend(e);
+				rincanvas[e.target.id].showToolTip(e);
+			},
+			showPie(obj) {
+				let data = {
+					series: []
+				}
+				data.series = data.series.concat(obj.data)
+				const ctx = uni.createCanvasContext(obj.id, this);
+				rincanvas[obj.id] = new uCharts({
+					// padding: [5,5,5,5],
+					context: ctx,
+					color: ['#6B96F8', '#F6B760', '#677798', '#6BDBAB', '#7a67f8'],
+					type: 'rose',
+					fontSize: 12,
+					legend: {
+						show: true,
+						position: 'bottom',
+						padding: 5,
+						lineHeight: 12,
+						fontSize: uni.upx2px(24),
+						margin: 0,
+					},
+					legendShape: 'square',
+					background: '#FFFFFF',
+					pixelRatio: 1,
+					series: data.series,
+					animation: true,
+					width: uni.upx2px(686),
+					height: uni.upx2px(500),
+					dataLabel: true,
+					extra: {
+						rose: {
+							type: "area",
+							minRadius: 70,
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							// offsetAngle: 0,
+							labelWidth: 15,
+							border: false,
+							borderWidth: 2,
+							borderColor: "#FFFFFF"
+						}
+					},
+				});
+			},
+			showClounm(obj) {
+				const ctx = uni.createCanvasContext(obj.id, this);
+				rincanvas[obj.id] = new uCharts({
+					context: ctx,
+					type: "bar",
+					legend: {
+						show: false
+					},
+					color: ['#6B96F8'],
+					fontSize: 12,
+					background: '#FFFFFF',
+					padding: [30, 24, 12, 12],
+					animation: true,
+					categories: obj.categories,
+					series: obj.data,
+					enableScroll: false, //开启图表拖拽功能
+					xAxis: {
+						boundaryGap: "justify",
+						axisLine: false,
+						// disableGrid: false,
+						min: 0,
+						// axisLine: false,
+						max: 400,
+						// axisLineColor: "#eee"
+						fontSize: uni.upx2px(24),
+						fontColor: '#777777',
+						gridColor: '#eee'
+					},
+					subtitle: {
+						name: '归属城市',
+						color: '#e6e6e6',
+					},
+					yAxis: {
+						data: [{
+							title: '归属城市',
+							position: "left",
+							type:'categories',
+							titleFontSize: uni.upx2px(22),
+							titleFontColor: '#BABABA',
+							// titleOffsetX:  uni.upx2px(-40),
+							titleOffsetY:  uni.upx2px(-20),
+							fontSize: uni.upx2px(24),
+							fontColor: '#777777',
+
+						}],
+						showTitle:true,
+						axisLineColor: "#eee",
+						fontSize: uni.upx2px(24),
+					},
+					dataLabel: true,
+					width: uni.upx2px(686),
+					height: uni.upx2px(500),
+					extra: {
+						bar: {
+							type: 'group',
+							width: uni.upx2px(48),
+							meterBorde: 1,
+							seriesGap: 4,
+							// meterFillColor: "#FFFFFF",
+							// activeBgColor: "#000000",
+							// activeBgOpacity: 0.08,
+							categoryGap: 4
+						}
+					}
+				});
+			},
+			showMix(obj) {
+				let data = {
+					series: []
+				}
+				console.log('obj21123',obj)
+				const ctx = uni.createCanvasContext(obj.id, this);
+				data.series = data.series.concat(obj.data)
+				rincanvas[obj.id] = new uCharts({
+					context: ctx,
+					// canvasId: obj.id,
+					type: 'mix',
+					legend: {
+						show: true,
+						position: 'bottom',
+						// float: 'right',
+						fontSize: 11,
+						lineHeight: 20,
+						margin: 5
+					},
+					color: ['#667ED5', '#FFAB35'],
+					fontSize: 12,
+					background: '#FFFFFF',
+					padding: [30, 12, 12, 12],
+					animation: true,
+					categories: obj.categories,
+					series: data.series,
+					enableScroll: false, //开启图表拖拽功能
+					xAxis: {
+						disabled: false,
+						disableGrid: true,
+						axisLine: false,
+						fontColor: '#777777',
+						labelCount: 5,
+					},
+					yAxis: {
+						data: [{
+								position: "left",
+								title: '车流量(辆)',
+								disabled: false,
+								axisLine: false,
+								titleFontSize: uni.upx2px(22),
+								titleFontColor: '#BABABA',
+								// titleOffsetX:  uni.upx2px(-40),
+								titleOffsetY:  uni.upx2px(-20),
+								fontSize: uni.upx2px(24),
+								fontColor: '#777777',
+								min: 0,
+								formatter: (val) => {
+									return parseInt(val)
+								},
+							},
+							{
+								title: '(分钟)',
+								position: "right",
+								disabled: false,
+								axisLine: false,
+								min: 0,
+								titleFontSize: uni.upx2px(22),
+								titleFontColor: '#BABABA',
+								// titleOffsetX:  uni.upx2px(-40),
+								titleOffsetY:  uni.upx2px(-20),
+								fontSize: uni.upx2px(24),
+								fontColor: '#777777',
+								formatter: (val) => {
+									return parseInt(val)
+								}
+							}
+						],
+						showTitle:true,
+						gridType: 'dash',
+						gridColor: '#eee',
+						dashLength: 2,
+						// splitNumber: 3,
+					},
+					dataLabel: false,
+					width: uni.upx2px(686),
+					height: uni.upx2px(480),
+					showBox: true,
+					extra: {
+						mix: {
+							column: {
+								type: 'group',
+								width: uni.upx2px(50),
+								dataLabel: true,
+							},
+							line: {
+								dataPointShapeType: 'hollow',
+								dataPointShape: true,
+							}
+						}
+
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.customer-content {
+		margin: 0 30rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 10rpx 0 rgba(230, 230, 230, 0.49);
+		background-color: #fff;
+		position: relative;
+		margin-bottom: 48rpx;
+		padding-bottom: 40rpx;
+	}
+
+	.customer-title {
+		padding: 0 40rpx;
+		line-height: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.operation-cate-content {
+		height: 480rpx;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.charts-box {
+		width: 100%;
+		height: 330rpx;
+	}
+
+	.operation-stock-content {
+		height: 440rpx;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.operation-pie-content {
+		height: 500rpx;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.tab-btn {
+		position: absolute;
+		color: #fff;
+		font-size: 24rpx;
+		width: 241rpx;
+		height: 52rpx;
+		line-height: 52rpx;
+		right: 0;
+		top: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: url(../../../static/images/revenue/tab-bg.png) no-repeat right;
+		background-size: contain;
+	}
+
+	.tab-btn::before {
+		content: '';
+		background: url(../../../static/images/revenue/next.png) no-repeat center;
+		background-size: contain;
+		width: 40rpx;
+		height: 16rpx;
+	}
+
+	.analysis-text {
+		color: #9498A4;
+		display: flex;
+		align-items: flex-start;
+		font-size: 24rpx;
+		margin: 0 30rpx 0 30rpx;
+	}
+
+	.key-text {
+		min-width: 50rpx;
+		background: #EA7F56;
+		font-size: 22rpx;
+		text-align: center;
+		color: #ffffff;
+		background: #ea7f56;
+		border-radius: 5rpx;
+		margin-right: 16rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		margin-top: 4rpx;
+	}
+
+	.tab-unit {
+		padding-left: 40rpx;
+		position: relative;
+	}
+
+	.tab-unit+.tab-unit::before {
+		content: '';
+		height: 77rpx;
+		width: 2rpx;
+		background-color: #E6E6E6;
+		display: block;
+		position: absolute;
+		top: 65rpx;
+		left: -10rpx;
+
+	}
+
+	.tab-title {
+		margin-bottom: 20rpx;
+		font-size: 26rpx;
+	}
+
+	.tab-number {
+		font-size: 30rpx;
+	}
+
+	.tab-title,
+	.tab-desc {
+		color: #ADADAD;
+		margin-right: 16rpx;
+	}
+
+	.tab-desc,
+	.tab-rate {
+		font-size: 24rpx;
+	}
+</style>
diff --git a/pages/nationalPage/components/CustomerAnalysis.vue b/pages/nationalPage/components/CustomerAnalysis.vue
new file mode 100644
index 0000000..717693d
--- /dev/null
+++ b/pages/nationalPage/components/CustomerAnalysis.vue
@@ -0,0 +1,317 @@
+<template>
+	<view class="customer-content" v-show="show">
+		<div class="" v-show="!loading && pageEmpty">
+			<noFound :nodata="true" :text="'抱歉，服务区采集样本数据过小，无法分析。'"/>
+		</div>
+			<div v-show="!loading  && !pageEmpty">
+			<div class="tab-btn" @tap="tabChange(canvasTab==1?2:1,opt)">{{canvasTab==1 ? '消费能力分析' : '消费人群分析'}}</div>
+			<div class="customer-title">{{canvasTab==1? '消费人群': '消费能力'}}占比</div>
+			<canvas canvas-id="sexCate" id="sexCate" class="operation-cate-content" @touchend="tap"></canvas>
+			<div class="customer-title">年龄层占比</div>
+			<canvas canvas-id="stockShare1" id="stockShare1" class="operation-stock-content" v-show="canvasTab==1" @touchend="tap"></canvas>
+			<canvas canvas-id="stockShare2" id="stockShare2" class="operation-stock-content" v-show="canvasTab==2" @touchend="tap"></canvas>
+			<div class="analysis-text" v-if="proportionList[canvasTab]">
+				<span class="key-text">分析</span><span>{{proportionList[canvasTab][1]}}</span>
+			</div>
+		</div>
+	</view>
+</template>
+
+<script>
+	import uCharts from '@/components/u-charts.js';
+	let rincanvas = {}
+	
+	export default {
+		props: {
+			pieId: String,
+			barId: String,
+			show: Boolean
+		},
+		data() {
+			return {
+				tab: [
+					{id:1,name:'消费人群分析'},
+					{id:2,name:'消费能力分析'},
+				],
+				canvasTab: 1,
+				proportionList: {
+					1: [],
+					2: []
+				},
+				opt: null,
+				pageEmpty: false,
+				loading: true
+			}
+		},
+	
+		methods: {
+			refreshData(data) {
+				// 刷新数据
+				rincanvas['sexCate'].updateData({series:data[0]});
+				this.$forceUpdate()
+			},
+			tabChange(name,opt) {
+				this.canvasTab= name
+				
+				if (this.proportionList[name].length == 0) {
+					
+					this.getProportion(name, opt)
+				} else {
+					
+					this.refreshData(this.proportionList[name])
+				}
+			},
+			async getProportion(type, params) {
+				let _this = this
+				_this.opt = params
+				const data = await this.$request.$webGet('Customer/GetCustomerRatio', {
+					statisticsType: type,
+					...params
+				})
+				_this.loading = false
+				if (data.Result_Code === 100 && data.Result_Data.List.length > 0) {
+					
+					const list = data.Result_Data.List
+					
+					let pieSerise = [{
+							name: list[0].name,
+							data: list[0].data[0],
+							formatter: function(arg) {
+								
+								if (typeof arg === 'number') {
+									return [list[0].name, (arg * 100).toFixed(2) + '%']
+								} else {
+									return [arg.name, (arg._proportion_ * 100).toFixed(2) + '%']
+								}
+								// return [list[0].name, (arg * 100).toFixed(2) + '%']
+							}
+						},
+						{
+							name: list[1].name,
+							data: list[1].data[0],
+							formatter: function(arg) {
+								if (typeof arg === 'number') {
+									return [list[1].name, (arg * 100).toFixed(2) + '%']
+								} else {
+									return [arg.name, (arg._proportion_ * 100).toFixed(2) + '%']
+								}
+								
+							}
+						}
+					]
+					let clounm =  [{
+						name: list[2].name,
+						data: ([]).concat(list[2].data),
+						formatter: function(arg) {
+							return [ arg  + '%']
+						}
+					}]
+					
+					_this.proportionList[type] = [
+						pieSerise, await _this.getAnalysisDesc(type,params)
+					]
+					
+					_this.showPie({
+						id: 'sexCate',
+						data: pieSerise
+					})
+					_this.showClounm({
+						id: 'stockShare'+type,
+						data: clounm,
+						categories: ['00后', '90后', '80后', '70后'],
+					})
+						
+					
+				this.$forceUpdate()
+					
+				} else {
+					this.pageEmpty = true
+				}
+			},
+			async getAnalysisDesc(analysisType, params) {
+				let _this = this
+
+				const data = await this.$request.$webGet('Customer/GetAnalysisDescDetail', {
+					statisticsType: analysisType,
+					...params
+				})
+
+				return data.Result_Data.Analysis_Content || ''
+			},
+			tap(e) {
+				rincanvas[e.target.id].touchLegend(e);
+				rincanvas[e.target.id].showToolTip(e);
+			},
+			showPie(obj) {
+				let data = {
+					series: []
+				}
+				const ctx = uni.createCanvasContext(obj.id, this);
+				data.series = data.series.concat(obj.data)
+				rincanvas[obj.id] = new uCharts({
+					// $this: this,
+					// canvasId: obj.id,
+					context: ctx,
+					color: ['#667ED5', '#F6B760'],
+					type: 'ring',
+					fontSize: 12,
+					// padding: [15, 15, 25, 15],
+					legend: {
+						show: false,
+						padding: 5,
+						lineHeight: 11,
+						margin: 0,
+					},
+					background: '#FFFFFF',
+					pixelRatio: 1,
+					series: obj.data,
+					animation: false,
+					width: uni.upx2px(666),
+					height: uni.upx2px(480),
+					dataLabel: true,
+					extra: {
+						ring: {
+							ringWidth: 40,
+							labelWidth: 20,
+							border: true,
+							borderWidth: 1,
+							color: '#777',
+							borderColor: '#fff'
+						}
+					},
+				});
+
+			},
+			showClounm(obj) {
+
+				let data = {
+					series: []
+				}
+				const ctx = uni.createCanvasContext(obj.id, this);
+				data.series = data.series.concat(obj.data)
+				rincanvas[obj.id] = new uCharts({
+					// $this: this,
+					// canvasId: obj.id,
+					context: ctx,
+					type: 'column',
+					legend: {
+						show: false
+					},
+					color: ['#78BFB4'],
+					fontSize: 12,
+					background: '#FFFFFF',
+					padding: [30, 12, 12, 12],
+					animation: true,
+					categories: obj.categories,
+					series: data.series,
+					enableScroll: false, //开启图表拖拽功能
+					xAxis: {
+						disabled: false,
+						disableGrid: true,
+						axisLine: false,
+						fontColor: '#777777',
+						labelCount: 5,
+
+					},
+					yAxis: {
+						data: [{
+							disabled: false,
+							axisLine: false,
+							fontColor: '#777777',
+							formatter: (val) => {
+								return parseInt(val) + '%'
+							}
+						}],
+
+						gridType: 'dash',
+						gridColor: '#eee',
+						dashLength: 2,
+						splitNumber: 3,
+					},
+					dataLabel: true,
+					width: uni.upx2px(686),
+					height: uni.upx2px(420),
+					extra: {
+						column: {
+							type: 'group',
+							width: uni.upx2px(50)
+						}
+					}
+				});
+			},
+		}
+
+	}
+</script>
+
+<style scoped>
+	.customer-content {
+		margin: 0 30rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 10rpx 0 rgba(230, 230, 230, 0.49);
+		background-color: #fff;
+		position: relative;
+		margin-bottom: 48rpx;
+		padding-bottom: 50rpx;
+	}
+
+	.customer-title {
+		padding: 0 20rpx;
+		line-height: 80rpx;
+		font-size: 26rpx;
+	}
+
+	.operation-cate-content {
+		height: 480rpx;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+	.operation-stock-content {
+		height: 440rpx;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+	.tab-btn {
+		position: absolute;
+		color: #fff;
+		font-size: 24rpx;
+		width: 241rpx;
+		height: 52rpx;
+		line-height: 52rpx;
+		right: 0;
+		top: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: url(../../../static/images/revenue/tab-bg.png)  no-repeat right;
+		background-size: contain;
+	}
+	.tab-btn::before {
+		content: '';
+		background: url(../../../static/images/revenue/next.png) no-repeat center;
+		background-size: contain;
+		width: 40rpx;
+		height: 16rpx;
+	}
+	.analysis-text {
+		color: #9498A4;
+		display: flex;
+		align-items: flex-start;
+		font-size: 24rpx;
+		margin: 0 30rpx 0 30rpx;
+	}
+
+	.key-text {
+		min-width: 50rpx;
+		background: #EA7F56;
+		font-size: 22rpx;
+		text-align: center;
+		color: #ffffff;
+		background: #ea7f56;
+		border-radius: 5rpx;
+		margin-right: 16rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		margin-top: 4rpx;
+	}
+</style>
diff --git a/pages/nationalPage/components/ServiceRevenuePie.vue b/pages/nationalPage/components/ServiceRevenuePie.vue
new file mode 100644
index 0000000..bbe8acf
--- /dev/null
+++ b/pages/nationalPage/components/ServiceRevenuePie.vue
@@ -0,0 +1,115 @@
+<template>
+	<uni-ec-canvas
+	   class="uni-ec-canvas"
+	   id="revenuecharts"
+	   ref="revenuecharts"
+	   canvas-id="revenuecharts"
+	   :ec="ec"
+	   @inited="inited"
+	></uni-ec-canvas>
+</template>
+
+<script>
+	import uniEcCanvas from './uni-ec-canvas/uni-ec-canvas.vue';
+	export default {
+		props:['data'],
+		components:{
+		    uniEcCanvas
+		},
+		computed:{
+			ec(){
+				if(this.data){
+					return {
+						option:{
+							tooltip: {
+								trigger: 'item',
+								formatter: '{b}: {c} ({d}%)'
+							},
+							series: [
+								{
+									name: '业态',
+									type: 'pie',
+									selectedMode: 'single',
+									radius: [0, '32%'],
+									center: ['50%','50%'],
+									 startAngle: 40,
+									label: {
+										// position: 'inner',
+										formatter: '{b} \n {d}%  ',
+										fontSize: 13,
+										color: '#D1D1D1',
+										// show: false,
+									},
+									 startAngle: 115,
+									labelLine: {
+										// show: false,
+										length: 62,
+										length2: 12,
+										smooth: true,
+										lineStyle:{
+											color: '#D1D1D1'
+										},
+
+									},
+									data: [
+										...this.data[0]
+									],
+									color:['#FEA427','#7786E3','#75B7AD','#9BC9F8','#FFAC37',]
+								},
+								{
+									name: '业态',
+									type: 'pie',
+									radius: ['48%', '72%'],
+									center: ['50%','50%'],
+									labelLine: {
+										length: 30,
+									},
+									label: {
+										show:false,
+									},
+
+									color: this.data[1].length> 7 ? ['#FFC3CD','#F4A4B2','#FE6582','#FFE7C0','#FEDA9D','#FEC057','#F9C8A0','#FAB176','#ffa25b','#E1C9F7','#CDA6F1',
+									'#E0E2F6','#C5CDF9','#9AA6EF','#D8ECEA','#8FE5B2','#70D599','#ADE5EE'] :
+									  ['#70D599', '#FFE7C0', '#ADE5EE','#C5CDF9','#e0e3f7', '#AFB7E6',  '#F3B1C9' ],
+
+									 data: [
+										...this.data[1]
+									]
+								}
+							]
+						}
+
+					}
+				}
+			}
+		},
+		methods:{
+			inited(chart){
+				let _this =this
+				// console.log('图表初始化完毕')
+				// console.log('chart实例', this.ec)
+
+				chart.on('click',function(params){
+					if(params.componentIndex==0){
+						_this.$emit('selectCate',params.dataIndex+1)
+					}
+					// console.log(params)
+				})
+			},
+
+		},
+	}
+</script>
+
+<style scoped>
+	/* page {
+			background-color: #fff;
+		} */
+	.uni-ec-canvas{
+	    width: 690rpx;
+	    height: 526rpx;
+		margin-top: 40rpx;
+	    display:block;
+	}
+
+</style>
diff --git a/pages/nationalPage/components/anhuiYestodayRevenueData.js b/pages/nationalPage/components/anhuiYestodayRevenueData.js
new file mode 100644
index 0000000..8df324a
--- /dev/null
+++ b/pages/nationalPage/components/anhuiYestodayRevenueData.js
@@ -0,0 +1,361 @@
+import request from '@/util/index.js'
+const methods = {
+	async getData(obj,isServerPartDetail) { //  获取远程数据
+		let _this = this
+		/* ts 数据类型声明
+			type serverpartRegion = {
+				serverpartname:string,
+				cashpay: string
+			}
+			tyepy reginListModel = {
+				name:string,
+				cashpay:number,
+				child: serverpartRegion[]
+			}
+		*/
+		// let regionList = [] // 营收上传列表 reginListModel[]
+		this.groupType =  obj.GroupType
+		const requestParamas = {
+			Statistics_Date: obj.time ,
+			Statistics_Month: obj.month ,
+			Province_Code: obj.ProvinceCode ,
+			pushProvinceCode: obj.ProvinceCode ,
+			Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '',
+			SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '',
+			// Revenue_Include: 1
+		}
+		const requestParamasBudget = {
+			Statistics_Date: obj.time ,
+			Statistics_Month: obj.month ,
+			Province_Code: obj.ProvinceCode ,
+			pushProvinceCode: obj.ProvinceCode ,
+			Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : ''
+		}
+		this.provinceCode = obj.ProvinceCode
+		// 营收数据
+		const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
+		if (data.Result_Code != 100) return
+
+		// 在营门店数量统计
+		const busniessCounts = await request.$webGet('CommercialApi/BaseInfo/GetShopCountList', requestParamas)
+		if (busniessCounts.Result_Code != 100) return
+
+		// 业态关系
+		const tradeData = await request.$webGet('CommercialApi/BaseInfo/GetBusinessTradeList', requestParamas)
+		if (tradeData.Result_Code != 100) return
+
+		// 计划营收金额
+		const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget)
+		if (budgetAmount.Result_Code != 100) return
+
+		// 移动支付分账数据
+		const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas)
+		if (mobileShare.Result_Code != 100) return
+
+		// 万佳商城配送数据
+		const mallDeliver = await request.$webGet('CommercialApi/Revenue/GetMallDeliver', requestParamas)
+		if (mallDeliver.Result_Code != 100) return
+
+		// 片区车流量
+		const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
+		if (bayonetCount.Result_Code != 100) return
+
+		if (isServerPartDetail) { // 是服务区营收推送页面
+			return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
+				tradeData.Result_Data.List, budgetAmount.Result_Data.List)
+		}
+		return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
+			tradeData.Result_Data.List, budgetAmount.Result_Data.List,
+			bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data)
+		// [reginList, totalData, busniessTypePie, busniessTradePie]
+
+	},
+	getTotalShowData(newData, oldData,index) {
+		// <TotalModel>
+		/*
+		type TotalModel = {
+			ticketCount: number // 客单数量 ,
+			totalCount: number// 总数量 ,
+			totalOffAmount: number// 优惠金额 ,
+			mobilePayment: number// 移动支付金额 ,
+			cashPay: number// 实收金额 ,
+			different_Price_Less: number// 短款金额 ,
+			different_Price_More: number// 长款金额 ,
+		}
+		*/
+
+		if (index>0) {
+			oldData.ticketCount +=  newData.TicketCount
+			oldData.totalCount +=  newData.TotalCount
+			oldData.totalOffAmount +=  newData.TotalOffAmount
+			oldData.mobilePayment +=  newData.MobilePayment
+			oldData.cashPay +=  newData.CashPay
+			oldData.diffLessPrice +=  newData.Different_Price_Less
+			oldData.diffMorePrice +=  newData.Different_Price_More
+			if(newData.BusinessType==1000){ // 商超
+
+				oldData.scCount =  oldData.scCount ? oldData.scCount + 1 : 1
+				oldData.scCashPay = oldData.scCashPay ? oldData.scCashPay + newData.CashPay : newData.CashPay
+			}
+			if(newData.BusinessType==3000){ // 餐饮
+				oldData.cyCount = oldData.cyCount ? oldData.cyCount + 1 : 1
+				oldData.cyCashPay  = oldData.cyCashPay ? oldData.cyCashPay + newData.CashPay : newData.CashPay
+			}
+		} else {
+			oldData.ticketCount = newData.TicketCount
+			oldData.totalCount = newData.TotalCount
+			oldData.totalOffAmount = newData.TotalOffAmount
+			oldData.mobilePayment = newData.MobilePayment
+			oldData.cashPay = newData.CashPay
+			oldData.diffLessPrice = newData.Different_Price_Less
+			oldData.diffMorePrice = newData.Different_Price_More
+
+			if(newData.BusinessType==1000){ // 商超
+
+				oldData.scCount = 1
+				oldData.scCashPay = newData.CashPay
+			}
+			if(newData.BusinessType==3000){ // 餐饮
+
+				oldData.cyCount = 1
+				oldData.cyCashPay = newData.CashPay
+			}
+
+		}
+		return {...oldData}
+	},
+	getBusniessPie(typeName, item, list) { // 经营模式数据
+
+		const oldData = list.find(m => m.name === item[typeName])
+		if (oldData) {
+			oldData.data = Number((oldData.data+ item.CashPay).toFixed(2))
+			oldData.value = Number((oldData.value+ item.CashPay).toFixed(2))
+		} else {
+			list.push({
+				name: item[typeName],
+				data: item.CashPay,
+				value: item.CashPay,
+			})
+		}
+
+		return [...list]
+	},
+	getBayonetPie(typeName, item, list) { // 车流量数据
+		const regionData = list.find(n => n.name === item["SPRegionType_Name"])
+		if (regionData) {
+			const oldData = regionData.spList.find(m => m.name === item[typeName])
+			if (oldData) {
+				oldData.Vehicle_Count = Number((oldData.Vehicle_Count + item.Vehicle_Count).toFixed(2))
+				oldData.SectionFlow_Count = Number((oldData.SectionFlow_Count + item.SectionFlow_Count).toFixed(2))
+				oldData.MinVehicle_Count = Number((oldData.MinVehicle_Count + item.MinVehicle_Count).toFixed(2))
+				oldData.MediumVehicle_Count = Number((oldData.MediumVehicle_Count + item.MediumVehicle_Count).toFixed(2))
+				oldData.LargeVehicle_Count = Number((oldData.LargeVehicle_Count + item.LargeVehicle_Count).toFixed(2))
+
+				const oldRegion = oldData.regionList.find(o => o.name === item["Serverpart_Region"])
+				if (oldRegion) {
+					oldRegion.Vehicle_Count = Number((oldRegion.Vehicle_Count + item.Vehicle_Count).toFixed(2))
+					oldRegion.SectionFlow_Count = Number((oldRegion.SectionFlow_Count + item.SectionFlow_Count).toFixed(2))
+					oldRegion.MinVehicle_Count = Number((oldRegion.MinVehicle_Count + item.MinVehicle_Count).toFixed(2))
+					oldRegion.MediumVehicle_Count = Number((oldRegion.MediumVehicle_Count + item.MediumVehicle_Count).toFixed(2))
+					oldRegion.LargeVehicle_Count = Number((oldRegion.LargeVehicle_Count + item.LargeVehicle_Count).toFixed(2))
+				}
+				else{
+					oldData.regionList.push({
+						name: item["Serverpart_Region"],
+						Vehicle_Count: item.Vehicle_Count,
+						SectionFlow_Count: item.SectionFlow_Count,
+						MinVehicle_Count: item.MinVehicle_Count,
+						MediumVehicle_Count: item.MediumVehicle_Count,
+						LargeVehicle_Count: item.LargeVehicle_Count,
+					})
+				}
+			} else {
+				regionData.spList.push({
+					name: item[typeName],
+					Vehicle_Count: item.Vehicle_Count,
+					SectionFlow_Count: item.SectionFlow_Count,
+					MinVehicle_Count: item.MinVehicle_Count,
+					MediumVehicle_Count: item.MediumVehicle_Count,
+					LargeVehicle_Count: item.LargeVehicle_Count,
+					regionList: [{
+						name: item["Serverpart_Region"],
+						Vehicle_Count: item.Vehicle_Count,
+						SectionFlow_Count: item.SectionFlow_Count,
+						MinVehicle_Count: item.MinVehicle_Count,
+						MediumVehicle_Count: item.MediumVehicle_Count,
+						LargeVehicle_Count: item.LargeVehicle_Count,
+					}]
+				})
+			}
+		} else {
+			list.push({
+				name: item["SPRegionType_Name"],
+				index: item["SPRegionType_Index"],
+				spList: [{
+					name: item[typeName],
+					Vehicle_Count: item.Vehicle_Count,
+					SectionFlow_Count: item.SectionFlow_Count,
+					MinVehicle_Count: item.MinVehicle_Count,
+					MediumVehicle_Count: item.MediumVehicle_Count,
+					LargeVehicle_Count: item.LargeVehicle_Count,
+					regionList: [{
+						name: item["Serverpart_Region"],
+						Vehicle_Count: item.Vehicle_Count,
+						SectionFlow_Count: item.SectionFlow_Count,
+						MinVehicle_Count: item.MinVehicle_Count,
+						MediumVehicle_Count: item.MediumVehicle_Count,
+						LargeVehicle_Count: item.LargeVehicle_Count,
+					}],
+				}]
+			})
+		}
+
+		return [...list]
+	},
+	getSeverpartReginList(data, shopCountList,tradeList,budgetAmount){
+		let _this = this
+		let totalShow = {} // 总营收数据统计
+		let list = [] // 上传营收列表数据
+		let busniessTypePie = [] // 经营模式饼图统计数据
+		let busniessTradePie = [] // 经营业态饼图统计数据
+		let busniessTradeFathPie = [] // 区域经营饼图统计数据
+
+		data.map(async (n, index) => {
+			n.show = false
+			totalShow = _this.getTotalShowData(n, totalShow,index); // 总营收数据统计
+			// 寻找门店父业态
+			let trade =	tradeList.find(t=>t.BUSINESSTRADE_NAME==n.BusinessTrade_Name)
+			if(trade && trade.BUSINESSTRADE_PNAME && trade.BUSINESSTRADE_PNAME.indexOf('其他')==-1 ) {
+				n.tradename = trade.BUSINESSTRADE_PNAME
+
+			}else{
+				n.tradename = '其他'
+			}
+
+			busniessTypePie = _this.getBusniessPie('Business_TypeName', n, busniessTypePie)
+			busniessTradePie = _this.getBusniessPie('BusinessTrade_Name', n, busniessTradePie)
+			busniessTradeFathPie = _this.getBusniessPie('tradename', n, busniessTradeFathPie)
+		})
+		totalShow.serverpartname = data[0].Serverpart_Name
+		totalShow.uploadState = data.length+'/'+ (shopCountList.length ? shopCountList[0].SHOP_BUSINESSCOUNT: 0)
+		totalShow.uploadCount =  data.filter(n=>n.Revenue_Upload>0).length
+		totalShow.totalUploadCount = shopCountList.length ? shopCountList[0].SHOP_BUSINESSCOUNT: 0
+		totalShow.budgetAmount = 0
+		if(budgetAmount.length){
+			totalShow.budgetAmount = budgetAmount[0].BUDGET_AMOUNT
+		}
+		return [ totalShow, busniessTypePie, busniessTradePie,busniessTradeFathPie ]
+	},
+	getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare, mallDeliver) {
+
+		let _this = this
+		let totalShow = {} // 总营收数据统计
+		let list = [] // 上传营收列表数据
+		let busniessTypePie = [] // 经营模式饼图统计数据
+		let busniessTradePie = [] // 经营业态饼图统计数据
+		let busniessAreaPie = [] // 区域经营饼图统计数据
+		let bayonetPie = [] // 区域车流饼图统计数据
+		let totalUploadCount = 0
+		data.map(async (n, index) => {
+			n.show = false
+
+			// 寻找门店父业态
+			let trade =	tradeList.find(t=>t.BUSINESSTRADE_NAME==n.BusinessTrade_Name)
+			if(trade && trade.BUSINESSTRADE_PNAME && trade.BUSINESSTRADE_PNAME.indexOf('其他')==-1 ) {
+				n.tradename = trade.BUSINESSTRADE_PNAME
+
+			}else{
+				n.tradename = _this.provinceCode==340000?  '其他' : (n.BusinessTrade_Name || '其他')
+			}
+			// 上传营收情况
+			let regin = list.find(m => m.name === n.SPRegionType_Name)
+			let [reginShopCount, serverpartShopCount] = [0, 0]
+			shopCountList.forEach(shop => {
+				if (shop.SPREGIONTYPE_NAME == n.SPRegionType_Name) {
+					reginShopCount += shop.SHOP_BUSINESSCOUNT
+				}
+				if (shop.SERVERPART_ID == n.Serverpart_ID) {
+					serverpartShopCount = shop.SHOP_BUSINESSCOUNT
+				}
+			})
+
+			if (!regin) {
+				totalUploadCount += reginShopCount
+				list.push({
+					name: n.SPRegionType_Name, // 区域名称
+					cashpay: n.CashPay,
+					uploadcount: n.Revenue_Upload>0 ? 1: 0, // 区域上传数量
+					totalcount: reginShopCount,
+					child: [{
+						serverpart_Id: n.Serverpart_ID,
+						serverpart_Name: n.Serverpart_Name,
+						cashpay: n.CashPay,
+						uploadcount: n.Revenue_Upload>0 ? 1: 0,
+						totalcount: serverpartShopCount
+					}]
+				})
+			} else {
+				regin.cashpay += n.CashPay
+				regin.uploadcount += n.Revenue_Upload>0 ? 1: 0
+				let serverpart = regin.child.find(m => m.serverpart_Name === n.Serverpart_Name)
+				if (serverpart) {
+					serverpart.cashpay += n.CashPay
+					serverpart.uploadcount += n.Revenue_Upload>0 ? 1: 0
+
+				} else {
+					regin.child.push({
+						serverpart_Id: n.Serverpart_ID,
+						serverpart_Name: n.Serverpart_Name,
+						cashpay: n.CashPay,
+						uploadcount: n.Revenue_Upload>0 ? 1: 0,
+						totalcount: serverpartShopCount
+					})
+				}
+
+				regin.child.sort((a, b) => b.cashpay - a.cashpay)
+			}
+			totalShow = _this.getTotalShowData(n, totalShow,index); // 总营收数据统计
+
+			busniessTypePie = _this.getBusniessPie('Business_TypeName', n, busniessTypePie)
+			busniessTradePie = _this.getBusniessPie('tradename', n, busniessTradePie)
+			if (this.groupType == 1000){
+				busniessAreaPie =  _this.getBusniessPie('SPRegionType_Name', n, busniessAreaPie)
+			}
+		})
+		list.sort((a, b) => b.cashpay - a.cashpay)
+		if (this.groupType == 1000 && _this.provinceCode == 340000) {
+			// 获取移动支付分账数据
+			if (mobileShare) {
+				totalShow.shareShopCount = mobileShare.ShareShop_Count
+				totalShow.royaltyPrice = mobileShare.Royalty_Price
+				totalShow.subRoyaltyPrice = mobileShare.SubRoyalty_Price
+				totalShow.ticketFee = mobileShare.Ticket_Fee
+			}
+			// 获取移动支付分账数据
+			if (mallDeliver) {
+				totalShow.deliverBillCount = mallDeliver.DeliverBill_Count
+				totalShow.deliverPrice = mallDeliver.Deliver_Price
+				totalShow.deliverRate = mallDeliver.Deliver_Rate
+			}
+			// 片区车流量数据
+			bayonetCount.map(async (n, index) => {
+				bayonetPie = _this.getBayonetPie('Serverpart_Name', n, bayonetPie)
+			})
+		}
+
+		totalShow.uploadState = data.filter(n=>n.Revenue_Upload>0).length+'/'+totalUploadCount
+		totalShow.budgetAmount = 0
+		if(_this.provinceCode==620000){
+			const ele = list.find(n=>n.name=="通美公司")
+			totalShow.tmCrashPay = ele ? ele.cashpay :'0.00'
+		}
+		if(budgetAmount.length){
+			totalShow.budgetAmount = budgetAmount[0].BUDGET_AMOUNT
+		}
+		console.log('list',list)
+		return [list, totalShow, busniessTypePie, busniessTradePie,busniessAreaPie,bayonetPie]
+	}
+}
+
+export default methods ;
+
diff --git a/pages/nationalPage/nationalServerpart.vue b/pages/nationalPage/nationalServerpart.vue
new file mode 100644
index 0000000..cf9ea43
--- /dev/null
+++ b/pages/nationalPage/nationalServerpart.vue
@@ -0,0 +1,1179 @@
+<template>
+  <view :style="showUnUpLoad ? 'overflow:hideen;height:100vh;':'height:100%;width:750rpx;'" class="page-body"
+        scroll-with-animation v-if="showPage">
+    <div class="box-card" :style="'opacity:'+(1-opacity)+';'">
+      <div class="box-top-title">
+        <span class="box-center-title">{{sMsg.serverpartname}}</span>
+        <picker mode="date" @change="bindDateChange" :value="theRequest&&theRequest.time" :start="startTime" :end="endTime"
+                class="title-clock">
+          <view>{{searchDate}} <text class="uni-icon uni-icon-arrowdown"></text></view>
+        </picker>
+
+      </div>
+      <view class="top-card">
+        <div class="box-center-box">
+          <div class="uni-flex ai-center jc-between">
+            <div class="main-amount-title">对客营收(元)</div>
+            <div class="tab-unit" @tap="showPop">
+              <span>上传门店：</span>
+              <span class="tab-unit-num"
+                    :class="{'priceRed':sMsg.uploadCount!==sMsg.totalUploadCount}">{{sMsg.uploadCount}}</span>
+              <span class="tab-unit-num "
+                    :class="{'more-btn':sMsg.uploadCount!==sMsg.totalUploadCount}">{{sMsg.totalUploadCount}}</span>
+            </div>
+          </div>
+          <div class="uni-flex ai-base jc-between">
+            <span class="center-num">{{sMsg.totalMoneyShow}}</span>
+            <span class="budgetamount">
+							<text class="budget-title">计划营收(元):</text>
+							<text :class="sMsg.budgetAmount< sMsg.cashPay ? 'up-text-title':'down-text-title'">
+								{{sMsg.budgetamoutShow}}
+								<span style="font-size: 24rpx;margin-left: 12rpx;">{{sMsg.diffBili}}%</span>
+							</text>
+						</span>
+          </div>
+        </div>
+        <div class="uni-flex jc-between box-center-box">
+
+          <div class="check-unit">
+            <text>长款金额</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.diffMorePrice,2)}} <text>元</text></div>
+          </div>
+          <div class="check-unit">
+            <text>短款金额</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.diffLessPrice,2)}} <text>元</text></div>
+          </div>
+          <div class="check-unit">
+            <text>客单交易</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.ticketCount,0)}} <text>笔</text></div>
+          </div>
+          <div class="check-unit">
+            <text>客单均价</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.tickave,2)}} <text>元</text></div>
+          </div>
+        </div>
+        <div class="uni-flex jc-between box-center-box mt8">
+          <div class="check-unit">
+            <text>优惠金额</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.totalOffAmount,2)}} <text>元</text></div>
+          </div>
+          <div class="check-unit">
+            <text>移动支付</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.mobilePayment,2)}} <text>元</text></div>
+          </div>
+          <div class="check-unit">
+            <text>商品出售</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.totalCount,0)}} <text>件</text></div>
+          </div>
+          <div class="check-unit">
+            <text>商品均价</text>
+            <div class="check-price-color">{{$util.fmoney(sMsg.countave,2)}} <text>元</text></div>
+          </div>
+        </div>
+      </view>
+    </div>
+    <cover-view class="fixed-box page-title" :style="'transform: translateY('+fixedY+'px);opacity:'+opacity+';'">
+      <cover-view>{{sMsg.serverpartname || ''}}</cover-view>
+      <cover-view class="price-text" style="width: 200rpx;text-align: right;">¥ {{sMsg.totalMoneyShow}}
+      </cover-view>
+    </cover-view>
+
+    <template v-if="cateBrandList.length">
+
+      <view>
+        <!-- 品牌列表 -->
+        <div class="shop-box">
+          <scroll-view scroll-x class="tab-shop" scroll-with-animation :scroll-left="scrollLeft">
+            <div v-for="(n,i) in cateBrandList" :key="i" :id="`tabNum${i}`" class="cate-name"
+                 :class="{'active': nowShop==i}" @click="selectCate(i)">{{n.Bussiness_Name}}</div>
+          </scroll-view>
+          <div class="tab-content" v-if="cateBrandList.length">
+            <div class="shop-card" v-for="(m,i) in cateBrandList[nowShop].listBrandModel" :key="i" @click="toBrandPage(m,i)">
+              <div>
+                <image v-if="m.Brand_ICO" :src="m.Brand_ICO" mode="aspectFit"></image>
+                <image v-else src="/static/images/revenue/home.png" mode="aspectFit"></image>
+              </div>
+              <div class="shop-name">{{m.Brand_Name}}</div>
+              <div class="price-num">¥ {{m.Revenue_Amount ? $util.fmoney(m.Revenue_Amount,2) : '0.00'}}
+              </div>
+            </div>
+          </div>
+        </div>
+      </view>
+    </template>
+
+    <view style="height: 350rpx;" v-else>
+      <noFound :nodata="'true'" :text="noDataText" />
+    </view>
+
+    <cover-view class="uni-mask" :style="showUnUpLoad ? ' display:block;':'opacity:0; display: none;'"
+                @click="closePop" :catchtouchmove="showUnUpLoad? 'return':''"></cover-view>
+    <cover-view class="uni-popup uni-popup-middle" :style="showUnUpLoad ? 'display:flex;':'display: none;'"
+                :catchtouchmove="showUnUpLoad? 'return':''">
+
+      <cover-view class="header-top" v-if="unUploadList.length>0">{{sMsg.serverpartname}}未上传门店</cover-view>
+      <cover-view class="pop-body">
+        <cover-view class="uni-flex pop-row" v-for="(c,i)  in unUploadList" :key="i">
+          <cover-view class="uni-flex ai-center">
+            <cover-view class="pop-index">{{i>8 ? i+1 :'0'+(i+1)}}</cover-view>
+            <cover-view class="inline-item">{{c.ServerpartShop_Name}}</cover-view>
+          </cover-view>
+          <cover-view class="pop-row-bottom"></cover-view>
+        </cover-view>
+      </cover-view>
+
+    </cover-view>
+
+  </view>
+</template>
+
+<script>
+import uCharts from '@/components/u-charts.js';
+import anhuiYestodayRevenueData from './components/anhuiYestodayRevenueData.js'
+let rincanvas = {}
+var _self;
+export default {
+  data() {
+    const lastDay = this.$util.cutDate(new Date(), 'YYYY/MM/DD ', -1)
+
+    return {
+      lastDay: lastDay + '23:59:59', // 该页面的最近有效日期
+      noDataText: '抱歉,该服务区暂无品牌分析数据',
+      scrollLeft: 0,
+      theRequest: {},
+      showAll: false,
+      showHeight: uni.upx2px(484) + 'px',
+      searchDate: '',
+      sellData: [],
+      scrollTop: 0,
+      pageData: {},
+      cateBrandList: [],
+      // ringColor: ['#FFAC37', '#d8ece9', '#e0e3f7', '#f7f5f6', '#b2b7e3'],
+      nowShop: 0,
+      showPage: false,
+      fixedY: -68,
+      opacity: 0,
+      sMsg: null, // 头部数据
+      showUnUpLoad: false, //未上传门店弹出框
+      upcouts: null, // 上传门店数量
+      unUploadList: [], // 未上传门店列表
+      todayUpList: [], // 未上传门店列表
+      ServiceRevenueData: [],
+      nowTab: 1,
+      operationModel: [], // 安徽经营模式
+      startTime:'',//开始时间
+      endTime:'',//结束时间
+    }
+  },
+  onLoad(option) {
+    console.log(option)
+    _self = this
+    uni.showLoading({
+      title: '正在加载...'
+    })
+
+    if (option.ProvinceCode) {
+      // this.nowTab = option.ProvinceCode == 340000 ? 3 : 1
+      option.time = this.$util.cutDate(option.time, 'YYYY-MM-DD')
+      option.month = this.$util.cutDate(option.time, 'YYYYMM')
+      this.searchDate = this.$util.cutDate(option.time, 'MM月DD日')
+      this.theRequest = option
+      this.initData(option)
+      this.getData(option)
+    }
+    let startTime // 开始时间
+    const date = new Date()
+    let y = date.getFullYear()
+    let m = date.getMonth() + 1
+    let d = date.getDate() - 1
+    if (d - 8 < 0){
+      let num = 8 - d
+      m = m - 1
+      let changeMonth = m
+      if (changeMonth<10){
+        changeMonth = '0' + changeMonth
+      }
+      let thisMonthDay = this.$util.getThisMonthDay(`${y}-${changeMonth}`)
+      if (m < 10){
+        m = '0' + m
+      }
+      startTime = `${y}-${m}-${thisMonthDay - num}`//真实的日期
+    }else{
+      if (m < 10){
+        m = '0' + m
+      }
+      let day
+      day = d - 8
+      startTime = `${y}-${m}-${day}`
+    }
+    this.startTime = startTime
+    this.endTime = `${y}-${m}-${d}`
+
+
+  },
+  methods: {
+    changeTab(value) {
+      this.nowTab = value
+      if (value == 2) {
+
+        let opt = this.theRequest
+        const params = {
+          serverpartId: opt.ServerpartIds,
+          pushprovinceCode: opt.ProvinceCode,
+          statisticsMonth: this.$util.cutDate(opt.time, 'YYYYMM', -30)
+        }
+        this.$refs['customerAna'].tabChange(1, params)
+      }
+      if (value == 4) {
+        let opt = this.theRequest
+        const params = {
+          serverpart_Id: opt.ServerpartIds,
+          pushprovinceCode: opt.ProvinceCode,
+          StatisticsDate: opt.time
+        }
+        this.$refs['carAna'].getTopData(params)
+      }
+
+    },
+    closePop() {
+      this.showUnUpLoad = false
+    },
+
+    bindDateChange(e) {
+      let values = e.detail.value
+      let selectT = new Date(e.detail.value)
+      this.unUploadList = []
+      if (selectT <= new Date(this.lastDay)) {
+        let opt = this.theRequest
+        opt.time = values
+        opt.month = this.$util.cutDate(opt.time, 'YYYYMM')
+        this.searchDate = this.$util.cutDate(values, 'MM月DD日')
+        this.changeTab(this.nowTab)
+        uni.showLoading({
+          title: '正在加载'
+        })
+        this.initData(opt)
+        this.getData(opt)
+        this.$forceUpdate()
+      } else {
+        uni.showToast({
+          title: '请选择有效日期',
+          icon: 'none',
+        })
+      }
+    },
+
+    showFixed(options) {
+
+      this.scrollTop = options.scrollTop
+      let selfHeight = uni.upx2px(396)
+
+      if (options.scrollTop > selfHeight) {
+        if (this.fixedY !== 0) {
+          // console.log( 0)
+          this.fixedY = 0
+          this.opacity = 1
+          this.$forceUpdate()
+        }
+      } else {
+        if (this.fixedY !== -selfHeight) {
+          this.fixedY = 0 - selfHeight
+          this.opacity = 0
+          this.$forceUpdate()
+        }
+      }
+
+    },
+    toBrandPage(item, index) {
+      let theRequest = this.theRequest
+      let nowShop = this.nowShop
+
+      let btid = this.cateBrandList[nowShop].Business_Trade
+
+      let pages = `/pages/everdayRenven/serviceDetail?bid=${item.Brand_Id}&shopid=${item.ServerpartShop_Id}&id=${theRequest.ServerpartIds}&time=${theRequest.time}&provinceId=${theRequest.ProvinceCode}&btid=${item.Business_Trade}`
+      this.$util.toNextRoute('navigateTo', pages)
+    },
+    async selectCate(index) {
+
+      if (index == this.nowShop) return
+      this.nowShop = index
+      this.showAll = false
+      let leftWidthSum = 0;
+      for (var i = 0; i <= index; i++) {
+        let nowElement = await this.getWidth('tabNum' + i)
+        leftWidthSum = leftWidthSum + nowElement.width
+      }
+      let winWidth = uni.getSystemInfoSync().windowWidth
+      winWidth = (winWidth - 60) / 1.5
+      this.scrollLeft = leftWidthSum > winWidth ? (leftWidthSum - winWidth) : 0
+
+      this.$forceUpdate()
+    },
+    getWidth(id) { //得到元素的宽高
+      return new Promise((res, rej) => {
+        uni.createSelectorQuery().select("#" + id).fields({
+          size: true,
+          scrollOffset: true
+        }, (data) => {
+          res(data)
+          // console.log(data)
+        }).exec()
+      })
+    },
+    operationFn() { //昨日营收占比
+      let _this = this;
+
+      // 业态营收占比
+      let colors1 = ['#FFAC37', '#d8ece9', '#e0e3f7', '#f7f5f6', '#b2b7e3'];
+      let list = []
+      let list2 = []
+      _this.pageData.listBusinessModel.map((m, i) => {
+        if (m.Revenue_Amount != 0) {
+          let n = {
+            name: m.Bussiness_Name,
+            data: m.Revenue_Amount
+          }
+          let n2 = {
+            name: m.Bussiness_Name,
+            value: m.Revenue_Amount
+          }
+          list2.push(n2)
+          n.textColor = '#D1D1D1'
+
+          n.textSize = uni.upx2px(26)
+          n.formatter = function(arg) {
+            if (typeof arg === 'number') {
+              return [n.name, (arg * 100).toFixed(2) + '%']
+            } else {
+              return [arg.name, (arg._proportion_ * 100).toFixed(2) + '%']
+            }
+
+          }
+          list.push(n)
+        }
+
+      })
+      if (list2.length > 0) {
+        _this.ServiceRevenueData.push(list2)
+        _this.sellData = list
+
+      }
+      if (_this.pageData.listCurBusinessModel && _this.pageData.listCurBusinessModel.length > 0) {
+        let list = []
+        _this.pageData.listCurBusinessModel.map(m => {
+          if (m.Revenue_Amount != 0) {
+            let n = {
+              name: m.Bussiness_Name,
+              value: m.Revenue_Amount
+            }
+            list.push(n)
+          }
+        })
+        _this.ServiceRevenueData.push(list)
+      }
+      if (list.length > 0) {
+        _this.showPie({
+          id: 'sellCate',
+          data: list,
+          colors: colors1,
+        });
+      }
+    },
+    operationBusniess(arr, data) { // 生成业态营收占比数据
+      var _data1 = [];
+      var _data2 = [];
+      let _this = this
+      arr.forEach((n, i) => {
+        if (data[n[0]] > 0) {
+          let num = Number(data[n[0]])
+          _data1.push({
+            name: n[1],
+            textColor: '#999',
+            data: data[n[0]], //+Number(data2[n[0]])
+            formatter: function(arg) {
+              if(typeof arg==='number'){
+                return [n[1],(arg * 100).toFixed(2) + '%']
+              }else{
+                return [arg.name,(arg._proportion_ * 100).toFixed(2) + '%']
+              }
+              // return [n[1], (arg * 100).toFixed(2) + '%']
+            }
+          });
+        }
+      });
+      _data1.sort(function(a, b) {
+        return b.data - a.data
+      })
+
+      return _data1;
+    },
+    showPie(obj) {
+      let data = {
+        series: []
+      }
+      const ctx = uni.createCanvasContext(obj.id, this);
+      data.series = data.series.concat(obj.data)
+      rincanvas[obj.id] = new uCharts({
+        // $this: _self,
+        // canvasId: obj.id,
+        context: ctx,
+        color: obj.colors,
+        type: 'ring',
+        padding: obj.id != 'modelCount' ? [15, 15, 25, 0] : '',
+        legend: {
+          show: false,
+        },
+        title: {
+          name: data.series[0].name,
+          fontSize: uni.upx2px(26),
+          color: '#666666',
+          // offsetY: uni.upx2px(-16),
+        },
+        animation: false,
+        subtitle: {
+          name: '¥' + this.$util.fmoney(data.series[0].data, 2),
+          color: '#666666',
+          fontSize: uni.upx2px(30),
+          offsetX: uni.upx2px(16),
+        },
+        fontSize: 12,
+        background: '#FFFFFF',
+        pixelRatio: 1,
+        series: data.series,
+        animation: true,
+        width: obj.id != 'modelCount' ? uni.upx2px(720) : uni.upx2px(666),
+        height: obj.id != 'modelCount' ? uni.upx2px(586) : uni.upx2px(480),
+        dataLabel: true,
+        disablePieStroke: true,
+        dataPointShape: false,
+        extra: {
+          ring: {
+            ringWidth: obj.id != 'modelCount' ? uni.upx2px(90) : 40,
+            labelWidth: uni.upx2px(40),
+            activeOpacity: 1,
+            activeRadius: 10
+          },
+          tooltip: {
+            showBox: false,
+            bgColor: '#000',
+            bgOpacity: 0.4,
+          }
+        },
+      });
+
+    },
+    touchPie(e, id, opt) {
+
+      let touches = null
+      if (id == "modelCount" && e.currentTarget.offsetTop < 100) {
+        e.currentTarget.offsetTop = e.currentTarget.offsetTop + uni.upx2px(620)
+      }
+      let index = rincanvas[id].getCurrentDataIndex(e)
+      if (index == -1) return
+      let item = id != "modelCount" ? this.sellData[index] : this.operationModel[index]
+      if (id != "modelCount") {
+        this.sellData.map(n => {
+          n.textColor = "#d1d1d1"
+        })
+        item.textColor = "#999"
+        this.nowShop = index + 1
+
+      }
+      let showData = {
+        title: {
+          name: item.name,
+          fontSize: uni.upx2px(26),
+          color: '#666666',
+          offsetY: uni.upx2px(-16),
+        },
+        series: id != "modelCount" ? this.sellData : this.operationModel,
+        animation: false,
+        subtitle: {
+          name: '￥' + this.$util.fmoney(item.data, 2),
+          color: '#666666',
+          fontSize: uni.upx2px(30),
+          offsetY: uni.upx2px(-16),
+        },
+      }
+      rincanvas[id].updateData(showData);
+      rincanvas[id].showToolTip(e);
+    },
+    showPop() {
+      let list = this.unUploadList
+      if (list.length || this.todayUpList.length) {
+        this.showUnUpLoad = true
+        this.$forceUpdate()
+      }
+    },
+    getData(theRequest) {
+      let _this = this
+      this.$request.$webGet('CommercialApi/Revenue/GetServerpartBrand', {
+        Serverpart_Id: theRequest.ServerpartIds,
+        statictics_Time: theRequest.time,
+        pushProvinceCode: theRequest.ProvinceCode
+      }).then(res => {
+        if (res.Result_Code != 100) return
+
+        _this.pageData = res.Result_Data
+        if (res.Result_Data.listBusinessModel) {
+          let list = JSON.parse(JSON.stringify(res.Result_Data.listBusinessModel))
+          console.log('list',list)
+          if (list.length > 0) {
+            let all = {
+              Bussiness_Name: '全部',
+              listBrandModel: []
+            }
+            list.map(n => {
+              all.listBrandModel.push(...n.listBrandModel)
+            })
+            all.listBrandModel.sort((a, b) => {
+              if (a.Revenue_Amount < b.Revenue_Amount) {
+                return 1
+              } else {
+                return -1
+              }
+            })
+            _this.cateBrandList = [all, ...list]
+            _this.operationFn()
+            return
+          }
+          return
+        }
+        _this.cateBrandList = []
+      })
+    },
+    // 获取头部卡片 展示信息
+
+    async initData(theRequest) {
+      let _this = this
+      const [totalData, busniessTypePie, busniessTradePie, busniessTradeFathPie] =
+          await anhuiYestodayRevenueData.getData(theRequest, true)
+
+      totalData.tickave = totalData.ticketCount > 0 ? this.$util.fmoney(totalData.cashPay / totalData
+          .ticketCount, 2) : 0
+      totalData.countave = totalData.totalCount > 0 ? this.$util.fmoney(totalData.cashPay / totalData
+          .totalCount, 2) : 0
+
+      totalData.totalMoneyShow = this.$util.fmoney(totalData.cashPay)
+      // totalData.dayOfShow = this.$util.cutDate(theRequest.time, 'MM月DD日')
+      totalData.budgetamoutShow = totalData.budgetAmount ? _this.$util.fmoney(totalData.budgetAmount) : 0.00
+      totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - totalData.cashPay)
+      totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney((totalData.diffBudgetTotal /
+          totalData.budgetAmount) * 100, 2) : '100'
+
+      this.sMsg = totalData
+      // 饼图分析及数据条形分析
+      const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
+
+      this.operationModel = progressList
+      // 经营类型分析
+      var colors1 = ['#FFAC37', '#6B75B8'];
+      this.showPie({
+        id: 'modelCount',
+        data: pieList,
+        colors: colors1,
+      });
+      // 经营业态
+      // this.ServiceRevenueData = []
+      this.ServiceRevenueData = [busniessTradeFathPie, busniessTradePie]
+      if (totalData.uploadCount !== totalData.totalUploadCount) {
+        this.getUnUpLoadShops(theRequest)
+
+      }
+      this.showPage = true
+      uni.hideLoading()
+    },
+    getProgressData(data, total) {
+      var _data1 = [];
+      var _data2 = [];
+      let _this = this
+      data.forEach((n, i) => {
+        _data1.push({
+          ...n,
+          textColor: '#999',
+          formatter: function(arg) {
+            if(typeof arg==='number'){
+              return [n.name,(arg * 100).toFixed(2) + '%']
+            }else{
+              return [arg.name,(arg._proportion_ * 100).toFixed(2) + '%']
+            }
+
+          }
+        });
+
+        _data2.push({
+          name: n.name,
+          num: n.data,
+          data: _this.$util.fmoney(n.data, 2), //+Number(data2[n[0]])
+          bili: _this.$util.fmoney((n.data / total) * 100, 2)
+        });
+
+      });
+      _data1.sort(function(a, b) {
+        return b.data - a.data
+      })
+      _data2.sort(function(a, b) {
+        return b.num - a.num
+      })
+      return [_data2, _data1];
+    },
+    getUnUpLoadShops(theRequest) {
+      let _this = this
+      _this.$request.$webGet('CommercialApi/Revenue/GetUnUpLoadShops', {
+        Statistics_Date: theRequest.time,
+        pushProvinceCode: theRequest.ProvinceCode,
+        Serverpart_ID: theRequest.ServerpartIds
+      }).then(res => {
+        //
+        if (res.Result_Code != 100) {
+          return false
+        }
+        let _data = res.Result_Data
+        _this.unUploadList = _data.List
+      })
+    },
+  },
+  onPageScroll(e) {
+    this.showFixed(e)
+  }
+}
+</script>
+
+<style scoped>
+.page-body {
+  background-color: #fff;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+  -webkit-overflow-scrolling: touch;
+}
+
+.mt8 {
+  margin-top: 16rpx;
+}
+
+cover-view.page-title {
+  color: #fff;
+}
+
+.page-title {
+  background-color: #fcfcfc;
+  display: flex;
+  align-items: center;
+  height: 110rpx;
+  padding: 0 24rpx;
+  justify-content: space-between;
+
+  color: #000;
+  font-size: 30rpx;
+}
+
+.page-title text:last-child {
+  color: #383838;
+}
+
+.fixed-box {
+  background-color: #686D8F;
+  /* background: linear-gradient(to right, #686D8F, #A1ACC6); */
+  transition: all .2s;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  z-index: 999;
+  box-sizing: border-box;
+  color: #fff;
+}
+
+/* 业态 */
+.operation-cate-content {
+  height: 585rpx;
+  width: 690rpx;
+  margin: 0 auto;
+}
+
+.operation-model-content {
+  height: 480rpx;
+  width: 690rpx;
+  margin: 0 auto;
+}
+
+/* 门店 */
+.shop-box {
+  margin: 32rpx 20rpx;
+  border-radius: 8rpx;
+  background-color: #F6F8FA;
+  padding: 36rpx 20rpx;
+
+}
+
+.tab-shop {
+
+  color: #999999;
+  white-space: nowrap;
+}
+
+.tab-shop .cate-name {
+  padding-right: 16rpx;
+  font-size: 26rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.tab-shop .cate-name+.cate-name::before {
+  content: '|';
+  color: #eeeeee;
+  padding-right: 16rpx;
+}
+
+.tab-shop .cate-name.active {
+  color: #000;
+  font-size: 28rpx;
+  font-weight: 600;
+
+}
+
+.tab-content {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 24rpx;
+  transition: all 0.5s cubic-bezier(0, 1, 0.5, 1);
+  margin: 24rpx auto 0 auto;
+  overflow: hidden;
+  height: inherit;
+  width: inherit;
+}
+
+.pie-content {
+  margin: 0 30rpx;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 10rpx 0 rgba(230, 230, 230, 0.49);
+  background-color: #fff;
+  position: relative;
+  margin-bottom: 48rpx;
+  padding-top: 32rpx;
+  padding-bottom: 30rpx;
+}
+
+.pie-title {
+  padding: 0 20rpx;
+  line-height: 80rpx;
+  font-size: 26rpx;
+}
+
+/* 门店卡片 */
+.shop-card {
+  width: 210rpx;
+  height: 227rpx;
+  border-radius: 8rpx;
+  color: #fff;
+  text-align: center;
+  padding-top: 20rpx;
+  box-sizing: border-box;
+  margin-top: 16rpx;
+}
+
+.shop-card:nth-child(6n-5) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #ed7c77, #d6524c);
+  background-size: contain;
+}
+
+.shop-card:nth-child(6n-4) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #d1bea8, #ba9d7b);
+  margin-left: 18rpx;
+  background-size: contain;
+}
+
+.shop-card:nth-child(6n-3) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #929cc0, #aab3d0);
+  margin-left: 18rpx;
+  background-size: contain;
+}
+
+.shop-card:nth-child(6n-2) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #779cb1, #a3bbc9);
+  background-size: contain;
+  margin-left: 0rpx;
+}
+
+.shop-card:nth-child(6n-1) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #c08d80, #e8cbc7);
+  margin-left: 18rpx;
+  background-size: contain;
+}
+
+.shop-card:nth-child(6n) {
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/shop-card.png') no-repeat center 50%, linear-gradient(-35deg, #5cbe9c, #95d5bf);
+  margin-left: 18rpx;
+  background-size: contain;
+  margin-left: 18rpx;
+}
+
+.shop-card .shop-name {
+  font-size: 24rpx;
+  text-shadow: 0 2rpx 2rpx #A9a5a0;
+  line-height: 1.4;
+  max-height: 62rpx;
+  overflow: hidden;
+}
+
+.shop-card image {
+  border-radius: 50%;
+  border: 2rpx solid #fff;
+  background-color: #FFFFFF;
+  width: 62rpx;
+  height: 62rpx;
+}
+
+.shop-card .price-num {
+
+  font-size: 38rpx;
+  font-family: Bahnschrift Regular;
+}
+
+.box-card {
+  padding: 24upx 24upx 0;
+  background-color: #fff;
+  width: 100%;
+  box-sizing: border-box;
+  transition: all .2s;
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/effective/bg-top.png') no-repeat center;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: top center;
+
+}
+
+.top-card {
+  background: linear-gradient(to top, #989fb9, #686d8f);
+  margin-top: 24upx;
+  padding: 32upx 0 32rpx 0;
+  border-radius: 8rpx;
+}
+
+.budgetamount {
+  margin-left: 14rpx;
+  color: #fff;
+  font-family: 'Bahnschrift Regular';
+}
+
+.budget-title {
+  color: #DEE1F1;
+  padding: 4rpx 6rpx 2rpx 6rpx;
+  border-radius: 2rpx;
+  margin-right: 4rpx;
+}
+
+.up-text-title,
+.down-text-title {
+  font-size: 32rpx;
+  font-family: 'Bahnschrift Regular';
+  /* line-height: 1.2; */
+}
+
+.up-text-title:after {
+  content: "";
+  margin-left: 6rpx;
+  width: 16rpx;
+  height: 18rpx;
+  display: inline-block;
+  background: url('/static/images/revenue/up-arrow.png') no-repeat center;
+  background-size: contain;
+
+}
+
+.down-text-title:after {
+  content: "";
+  margin-left: 6rpx;
+  width: 16rpx;
+  height: 18rpx;
+  display: inline-block;
+  background: url('/static/images/revenue/down-arrow.png') no-repeat center;
+  background-size: contain;
+
+}
+
+.box-top-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.title-clock {
+  color: #999;
+  font-size: 24upx;
+  text-align: right;
+}
+
+/*
+.more-btn,.weisc-ico {
+  display: flex;
+  align-items: center;
+  margin-left: 8upx;
+  color: #dd7575;
+  font-size: 30upx;
+} */
+.more-btn:after {
+  content: '';
+  display: inline-block;
+  margin-left: 8upx;
+  width: 10upx;
+  height: 20upx;
+  background: url(../../static/images/effective/sj.png) no-repeat center;
+  background-size: contain;
+}
+
+.box-center-title {
+  font-size: 24upx;
+  color: #010101;
+  border-radius: 24upx;
+  padding: 0 16upx;
+  background-color: #DEDEDE;
+  text-align: center;
+
+}
+
+.uni-icon-arrowdown {
+  font-size: 24rpx;
+}
+
+.box-center-box {
+  /* margin-bottom: 16rpx; */
+  padding: 0 24rpx;
+}
+
+.center-title {
+  color: #DEDEDE;
+  font-size: 24rpx;
+}
+
+.center-num {
+  font-size: 64rpx;
+  color: #fff;
+  font-family: Bahnschrift Regular;
+}
+
+.check-unit,
+.budgetamount {
+  font-size: 24rpx;
+  color: #DEE1F1;
+  text-align: center;
+}
+
+.main-amount-title {
+
+  color: #DEE1F1;
+  font-size: 24rpx;
+  /* flex: 1; */
+}
+
+.tab-unit {
+  background-color: #3A3E5B;
+  border-radius: 24rpx 0 0 24rpx;
+  color: #fff;
+  font-size: 24rpx;
+  position: relative;
+  right: -12px;
+  padding: 0 20rpx;
+}
+
+.check-price-color {
+  color: #fff;
+  font-size: 34rpx;
+  font-family: Bahnschrift Regular;
+  line-height: 1.2;
+}
+
+.check-price-color text {
+  font-size: 22rpx;
+}
+
+.tab-icon2 {
+  font-size: 26rpx;
+  color: #DEDEDE;
+  flex: 1;
+}
+
+.tab-unit-num {
+  font-size: 24rpx;
+  color: #fff;
+}
+
+.tab-unit-num+.tab-unit-num:before {
+  content: '/';
+  margin: 0 4rpx;
+  color: #fff;
+}
+
+.priceGreen,
+.priceGreen.tab-unit-num {
+  color: #7CB9A5;
+  /* font-size: 28rpx; */
+}
+
+.priceRed,
+.tab-unit-num.priceRed {
+  color: #DD7575;
+  /* font-size: 28rpx; */
+}
+
+/* 弹出内容 */
+.uni-mask {
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: #000;
+  height: calc(100vh);
+  width: 750rpx;
+  opacity: 0.6;
+}
+
+.uni-popup {
+  position: fixed;
+  z-index: 999;
+  background: #ffffff;
+  box-shadow: 0 0 30upx rgba(0, 0, 0, .1);
+}
+
+.uni-popup-middle {
+  /* overflow: hidden; */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 400upx;
+  min-height: 400upx;
+  border-radius: 16upx;
+  top: 30%;
+  left: 50%;
+  transform: translate(-50%, -20%);
+  justify-content: flex-start;
+  padding: 0 30upx 30upx 30upx;
+}
+
+.header-top {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  text-align: left;
+  width: 100%;
+  padding: 32rpx 0;
+  background-color: #fff;
+}
+
+.pop-body {
+  width: 600rpx;
+  max-height: 600rpx;
+  overflow-y: auto;
+  background-color: #fff;
+  padding-bottom: 8rpx;
+}
+
+.pop-row {
+  padding: 24rpx 10rpx 24rpx 0;
+  font-size: 24rpx;
+  align-items: center;
+  justify-content: space-between;
+
+  box-sizing: border-box;
+  position: relative;
+}
+
+.pop-row .pop-row-bottom {
+
+  position: absolute;
+  height: 2rpx;
+  width: 100%;
+  background-color: #efefef;
+  bottom: 0;
+  left: 0;
+}
+
+.pop-index {
+  color: #DF7F42;
+  border: 1rpx solid #DF7F42;
+  border-radius: 8rpx;
+  padding: 2rpx 12rpx 0 12rpx;
+  margin-right: 12rpx;
+  font-size: 24rpx;
+  line-height: 30rpx;
+  height: 30rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+/* 	.customer-title {
+  color: #525280;
+  font-size: 32rpx;
+  font-weight: 600;
+  background: url(../../static/images/revenue/customer-bg.png) no-repeat center;
+  background-size: contain;
+  border-radius: 12rpx;
+  margin-top: 24rpx;
+  height: 104rpx;
+  line-height: 104rpx;
+  padding: 0 32rpx;
+  font-family: 'FZZhengHeiS-DB-GB Regular', 'FZZhengHeiS-DB-GB Regular-Regular';
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+} */
+.uni-icon-arrowright {
+  border: 1rpx solid #606060;
+  border-radius: 50%;
+  color: #606060;
+  font-size: 32rpx;
+}
+
+.analysis-tabs {
+  margin: 24rpx auto;
+  width: 708rpx;
+  overflow: hidden;
+  /* color: #777777; */
+  border: 1rpx solid #647bd1;
+  border-radius: 39rpx;
+  display: flex;
+}
+
+.tab {
+  text-align: center;
+  flex: 1;
+  height: 76rpx;
+  line-height: 76rpx;
+}
+
+.tab.active {
+  background: #f2f4f9;
+  color: #647BD1;
+}
+
+// 经营模式占比
+.model-busniess {
+  margin: 12rpx 30rpx;
+  font-family: 'Bahnschrift Regular';
+
+}
+
+.model-busniess view {
+  font-size: 26rpx;
+}
+
+.model-busniess .progress-content {
+  width: 100%;
+  height: 28rpx;
+  border-radius: 2rpx;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 30rpx;
+  margin-bottom: 4rpx;
+  overflow: hidden;
+}
+
+.model-busniess .progress-left {
+  background-color: #667ED5;
+}
+.model-busniess .progress-right {
+  background-color: #F3AF50;
+}
+</style>
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
new file mode 100644
index 0000000..60dd03c
--- /dev/null
+++ b/pages/nationalPage/rankPage.vue
@@ -0,0 +1,985 @@
+<template>
+  <div class="main">
+    <div class="contentPage">
+      <div class="revenueDetail">
+        <div class="revenueDetailTitleBox">
+          <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png"/>
+          <img class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailIcon.png"/>
+<!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
+          <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
+        </div>
+        <div class="revenueContent">
+          <div class="navBigList">
+            <div class="allBox">
+              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>
+            </div>
+            <scroll-view scroll-x="true" class="navList" :scrollIntoView="currentScroll" :scroll-with-animation="true">
+              <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
+            </scroll-view>
+          </div>
+          <!--            <span class="dateText">{{selectDateText || ''}}</span>-->
+          <div class="modalBox">
+            <div class="modalTitleBox">
+              <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
+                <div class="modalIndex"></div>
+                <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
+                <text class="modalUnit">{{type===3?'/万辆':'/万元'}}</text>
+              </div>
+            </div>
+
+            <view class="sortBox">
+              <view class="sortItem" @click="handleChangeSortName(1)">
+                <text class="sortText">{{ `24年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>
+                <view class="sortIconBox">
+                  <image class="upIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image class="bottomIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                </view>
+              </view>
+
+              <view class="sortItem" @click="handleChangeSortName(2)">
+                <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>
+                <view class="sortIconBox">
+                  <image class="upIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image class="bottomIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                </view>
+              </view>
+
+              <view class="sortItem" @click="handleChangeSortName(3)">
+                <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增长` }}</text>
+                <view class="sortIconBox">
+                  <image class="upIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image class="bottomIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                </view>
+              </view>
+
+              <view class="sortItem" @click="handleChangeSortName(4)">
+                <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增幅` }}</text>
+                <view class="sortIconBox">
+                  <image class="upIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image class="bottomIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                </view>
+              </view>
+
+            </view>
+
+
+            <div class="modalDetail">
+<!--              <div class="modalDetailTitle">-->
+<!--                <div class="titleItem"  :style="{width: 'calc(100% - 440rpx)',textAlign:'left'}">服务区</div>-->
+<!--                <div class="titleItem"  style="width: 110rpx">2024年</div>-->
+<!--                <div class="titleItem"  style="width: 110rpx">2023年</div>-->
+<!--                <div class="titleItem"  style="width: 110rpx">增长</div>-->
+<!--                <div class="titleItem"  style="width: 110rpx">增幅</div>-->
+<!--              </div>-->
+              <scroll-view :scroll-y="true"  class="typeFirst" >
+                <div class="listItem" v-for="(item,index) in dataList" :key="index">
+                  <div class="itemLeft" >
+                    <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"/>
+                    <view class="nameBox">
+                      <text class="serviceName">{{item.ServerpartName ? item.ServerpartName.split('服务区')[0]:''}}</text>
+                      <text class="serviceLabel">服务区</text>
+                    </view>
+                  </div>
+                  <div class="contentRight">
+                    <div class="rightTop">
+                      <view class="rightTopLeft">
+                        <view class="indexBox" :style="{backgroundImage:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'})`}">{{index+1}}</view>
+                      </view>
+                      <view class="rightTopRight">
+                        <text class="entryRateLabel">增幅</text>
+                        <div class="entryRateValue">
+                          <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
+                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?item.AccountINC.increaseRate>0?'+':'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}
+                    </span>
+                          <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
+                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :
+                              type===2?item.AccountINC.increaseRate?item.AccountINC.increaseRate:'-' :
+                                  type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%
+                    </span>
+                        </div>
+                      </view>
+                    </div>
+                    <div class="rightBottom">
+                      <view class="rightBottomItem">
+                        <text class="itemLabel">{{curYear}}</text>
+                        <text class="itemValue">
+                          {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':
+                            type===2?item.AccountINC.curYearData?$util.getMoney(item.AccountINC.curYearData / 10000):'0.00':
+                                type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}
+                        </text>
+                      </view>
+                      <view class="rightBottomItem">
+                        <text class="itemLabel">{{ compareYear }}</text>
+                        <text class="itemValue">
+                          {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':
+                            type===2?item.AccountINC.lYearData?$util.getMoney(item.AccountINC.lYearData / 10000):'0.00':
+                                type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}
+                        </text>
+                      </view>
+                      <view class="rightBottomItem">
+                        <text class="itemLabel">增长</text>
+                        <text class="itemValue">
+                          {{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':
+                            type===2?item.RevenueINC.AccountINC?$util.getMoney(item.AccountINC.increaseData / 10000):'0.00':
+                                type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}
+                        </text>
+                      </view>
+                    </div>
+
+                    <div class="rightBottom" v-if="type!==3">
+                      <view class="rightBottomItem">
+                        <text class="itemValue">
+                          {{item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00'}}
+                        </text>
+                      </view>
+                      <view class="rightBottomItem">
+                        <text class="itemValue">
+                          {{item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00'}}
+                        </text>
+                      </view>
+                      <view class="rightBottomItem">
+                        <text class="itemValue">
+                          {{item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00'}}
+                        </text>
+                      </view>
+                    </div>
+                  </div>
+                </div>
+<!--                <div class="row" v-for="(item,index) in dataList" :key="index">-->
+<!--                  <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">{{item.ServerpartName.split('服务区')[0]}}</div>-->
+<!--                  <div class="compareItem" style="width: 110rpx">-->
+<!--                    {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':-->
+<!--                      type===2?'':-->
+<!--                      type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}-->
+<!--                  </div>-->
+<!--                  <div class="compareItem" style="width: 110rpx">-->
+<!--                    {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':-->
+<!--                      type===2?'':-->
+<!--                      type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}-->
+<!--                  </div>-->
+<!--                  <div class="compareItem" style="width: 110rpx">-->
+<!--                    <span>{{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':-->
+<!--                        type===2?'':-->
+<!--                        type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}</span>-->
+<!--                  </div>-->
+<!--                  <div class="addItem" style="width: 110rpx">-->
+<!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
+<!--                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}-->
+<!--                    </span>-->
+<!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
+<!--                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :-->
+<!--                        type===2?'':-->
+<!--                        type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%-->
+<!--                    </span>-->
+<!--                  </div>-->
+<!--                </div>-->
+              </scroll-view>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import request from '@/util/index.js'
+export default {
+  name: "rankPage",
+  data(){
+    return {
+      scrollList:[],
+      selectDateText:'',
+      currentScroll:'',
+      lastDay:'',
+      allDateDay:'',
+      dataList:[],
+      type: 0,
+      useInfo:{},
+      curYear:'',
+      compareYear:'',
+      ServerpartIds:'',
+      sortType: 1,// 正序降序 0正序  1降序
+      sortName: 4,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
+    }
+  },
+  onLoad(query){
+    if (query.type){
+      this.type = Number(query.type)
+    }
+    this.lastDay = uni.getStorageSync('lastDay')
+    if (query.time){
+      this.currentScroll = 'item'+ query.time
+    }else{
+      this.currentScroll = 'item'+ this.lastDay
+    }
+
+    this.ServerpartIds = query.ServerpartIds
+
+    // 获取用户信息
+    let userInfo = uni.getStorageSync('vuex')
+    userInfo = JSON.parse(userInfo)
+    this.useInfo = JSON.parse(JSON.stringify(userInfo))
+    // 拿到是春运开始的第几天
+    let dayNumber = 0
+    const lastDate = new Date(this.lastDay)
+    let y = lastDate.getFullYear()
+    this.curYear = y
+    this.compareYear = y - 1
+    let lastMonth =  lastDate.getMonth() + 1
+    let lastDays = lastDate.getDate()
+    this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日`
+    // 24年春运开始时间为 1.26
+    if (lastMonth === 1){
+      dayNumber = lastDays - 26 + 1
+    }else{
+      dayNumber = 6 + lastDays + 1
+    }
+    this.howDayNumber = dayNumber
+    let dateList = []
+    for (let i = 1;i<=dayNumber;i++){
+      if (i<7){
+        dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
+      }else{
+        dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
+      }
+    }
+    this.scrollList = dateList
+    this.selectDateText = dateList[dayNumber-1].value
+
+    this.handleGetData()
+  },
+  methods:{
+    // 点击了累计还是选择了日期
+    handleChangeTime(date){
+      if (date==='all'){
+        this.currentScroll = 'all'
+        const time = new Date(this.lastDay)
+        let m = time.getMonth()+1
+        let d = time.getDate()
+        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
+      }else{
+        this.currentScroll = 'item'+ date
+        const time = new Date(date)
+        let m = time.getMonth()+1
+        let d = time.getDate()
+        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
+      }
+
+      this.handleGetData(date)
+
+    },
+    // 获取排名信息
+    async handleGetData(date){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      let time = date?date==='all'?this.lastDay:this.currentScroll.split('item')[1]:this.currentScroll.split('item')[1]
+      const req = {
+        calcType:this.currentScroll==='all'?1:2,
+        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+        curYear: this.curYear,
+        compareYear: this.compareYear,
+        HolidayType:2,
+        StatisticsDate:time,
+        businessRegion:1,
+        SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
+      }
+      // this.dataList
+      const data = await request.$webGet('CommercialApi/Revenue/GetServerpartINCAnalysis',req)
+      console.log('data',data)
+      this.dataList = this.handleGetSort(data.Result_Data.List)
+      uni.hideLoading()
+    },
+    // 修改排序字段
+    handleChangeSortName(value){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      if (value===this.sortName){
+        if (this.sortType===1){
+          this.sortType=0
+        }else{
+          this.sortType=1
+        }
+      }else{
+        this.sortName = value
+        this.sortType=1
+      }
+      let list = this.handleGetSort(this.dataList)
+      this.dataList = list
+      this.$forceUpdate()
+      uni.hideLoading()
+    },
+    // 排序方法
+    handleGetSort(list){
+      var len = list.length;
+
+      for (var i = 0; i < len - 1; i++) {
+        for (var j = 0; j < len - 1 - i; j++) {
+          // 判断按照那个排序
+          if (this.type===1){
+            // 正序
+            if (this.sortType===0){
+              // 24年营收
+              if (this.sortName===1){
+                if (list[j].RevenueINC.curYearData > list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].RevenueINC.lYearData > list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].RevenueINC.increaseData > list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].RevenueINC.increaseRate  > list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+            else{
+              // 降序
+              // 24年营收
+              if (this.sortName===1){
+                if (list[j].RevenueINC.curYearData < list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].RevenueINC.lYearData < list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].RevenueINC.increaseData < list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].RevenueINC.increaseRate  < list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+          }
+          else if(this.type===2){
+            // 正序
+            if (this.sortType===0){
+              // 24年营收
+              if (this.sortName===1){
+                if (list[j].AccountINC.curYearData > list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].AccountINC.lYearData  > list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].AccountINC.increaseData  > list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].AccountINC.increaseRate   > list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+            // 降序
+            else{
+              // 24年营收
+              if (this.sortName===1){
+                if (list[j].AccountINC.curYearData < list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].AccountINC.lYearData  < list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].AccountINC.increaseData  < list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].AccountINC.increaseRate   < list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+          }
+          else if(this.type===3){
+            // 正序
+            if (this.sortType===0){
+              // 24年车流
+              if (this.sortName===1){
+                if (list[j].BayonetINC.curYearData > list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].BayonetINC.lYearData  > list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].BayonetINC.increaseData   > list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].BayonetINC.increaseRate > list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }else{
+              // 降序
+              // 24年车流
+              if (this.sortName===1){
+                if (list[j].BayonetINC.curYearData < list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              }else if(this.sortName===2){
+                if (list[j].BayonetINC.lYearData  < list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              }else if(this.sortName===3){
+                if (list[j].BayonetINC.increaseData  < list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              }else if(this.sortName===4){
+                if (list[j].BayonetINC.increaseRate < list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+          }
+        }
+      }
+      return list;
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+.main{
+  width: 100%;
+  .contentPage{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 32rpx;
+    .revenueDetail{
+      width: 100%;
+      background: #fff;
+      border-radius: 16rpx;
+      box-sizing: border-box;
+      padding: 2rpx;
+      margin-top: 24rpx;
+      .revenueDetailTitleBox{
+        width: 100%;
+        height: 90rpx;
+        background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FEDEDD 100%);
+        border-radius: 14rpx 14rpx 0rpx 0rpx;
+        box-sizing: border-box;
+        padding: 22rpx;
+        position: relative;
+        .detailLogo{
+          width: 144rpx;
+          height: 74rpx;
+        }
+        .detailIcon{
+          width: 104rpx;
+          height: 104rpx;
+          position: absolute;
+          right: 22rpx;
+          top: 22rpx;
+        }
+        .modalUnit{
+          font-size: 24rpx;
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          color: #9A9A9A;
+          line-height: 36rpx;
+          position: absolute;
+          left: 170rpx;
+          top: 26rpx;
+        }
+      }
+      .revenueContent{
+        width: 100%;
+        box-sizing: border-box;
+        padding: 0 22rpx 24rpx;
+        .navBigList{
+          width: 100%;
+          height: 40rpx;
+          display: flex;
+          align-items: center;
+          .allBox{
+            width: 70rpx;
+            height: 100%;
+            .scrollItem{
+              font-size: 28rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #A69E9F;
+              line-height: 40rpx;
+            }
+            .selectItem{
+              font-size: 28rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 600;
+              color: #ED3E48;
+              line-height: 40rpx;
+            }
+
+          }
+          .navList{
+            width: calc(100% - 80rpx);
+            height: 40rpx;
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            padding-bottom: 12rpx;
+            border-bottom: 1px solid #F5F4F4;
+            .scrollItem{
+              font-size: 28rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #A69E9F;
+              line-height: 40rpx;
+              margin-right: 32rpx;
+              display: inline-block;
+            }
+            .selectItem{
+              font-size: 28rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 600;
+              color: #ED3E48;
+              line-height: 40rpx;
+            }
+          }
+        }
+        .dateText{
+          font-size: 24rpx;
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          color: #A69E9F;
+          margin: 16rpx 0;
+          display: inline-block;
+        }
+
+        .modalBox{
+          margin-top: 40rpx;
+          .modalTitleBox{
+            width: 100%;
+            box-sizing: border-box;
+            padding: 0 24rpx;
+            margin-bottom: 16rpx;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .modalTitleItem{
+              display: flex;
+              align-items: center;
+              .modalIndex{
+                width: 12rpx;
+                height: 12rpx;
+                background: #DB6465;
+                border-radius: 50%;
+                margin-right: 12rpx;
+              }
+              .modalText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 600;
+                color: #160002;
+                line-height: 40rpx;
+                margin-right: 4rpx;
+              }
+              .modalUnit{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #9A9A9A;
+                line-height: 36rpx;
+              }
+            }
+            .moreBox{
+              display: flex;
+              align-items: center;
+              .moreText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #9A9A9A;
+                line-height: 36rpx;
+              }
+              .moreIcon{
+                width: 24rpx;
+                height: 36rpx;
+                margin-left: 4rpx;
+              }
+            }
+            .modalTitleItem1{
+              font-size: 24rpx;
+              text-align: center;
+            }
+          }
+          .sortBox{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin-bottom: 16rpx;
+            .sortItem{
+              display: flex;
+              align-items: center;
+              .sortText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #9A9A9A;
+                line-height: 36rpx;
+              }
+              .sortIconBox{
+                display: flex;
+                flex-direction: column;
+                margin-left: 16rpx;
+                .upIcon{
+                  width: 16rpx;
+                  height: 12rpx;
+                  margin-bottom: 4rpx;
+                }
+                .bottomIcon{
+                  width: 16rpx;
+                  height: 12rpx;
+                }
+              }
+            }
+          }
+
+          .modalDetail{
+            width: 100%;
+            box-sizing: border-box;
+            .modalDetailTitle{
+              display: flex;
+              align-items: center;
+              padding: 8rpx 0;
+              .titleItem{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #9A9A9A;
+                line-height: 32rpx;
+                text-align: center;
+              }
+            }
+            .typeFirst{
+              height: calc(100vh - 200px);
+              .row{
+                margin-top: 32rpx;
+                display: flex;
+                align-items: center;
+                margin-top: 32rpx;
+                .valueItem{
+                  font-size: 24rpx;
+                  font-family: PingFangSC, PingFang SC;
+                  font-weight: 400;
+                  color: #160002;
+                  line-height: 40rpx;
+                  text-align: center;
+                  text-indent: 8rpx;
+                }
+                .bigFather{
+                  position: relative;
+                  font-weight: 600;
+                }
+                .bigFather:before{
+                  position: absolute;
+                  top: 50%;
+                  left: -8rpx;
+                  transform: translateY(-50%);
+                  content:'';
+                  display: inline-block;
+                  width: 8rpx;
+                  height: 8rpx;
+                  border-radius: 50%;
+                  background: #DB6465;
+                }
+                .father{
+                  position: relative;
+                  font-weight: 600;
+                }
+                .father:before{
+                  position: absolute;
+                  top: 50%;
+                  left: -8rpx;
+                  transform: translateY(-50%);
+                  content:'';
+                  display: inline-block;
+                  width: 8rpx;
+                  height: 8rpx;
+                  border-radius: 50%;
+                  background: #3188FF;
+                }
+
+                .son{
+                  position: relative;
+                }
+                .son:before{
+                  position: absolute;
+                  top: 50%;
+                  left: -8rpx;
+                  transform: translateY(-50%);
+                  content:'';
+                  display: inline-block;
+                  width: 8rpx;
+                  height: 8rpx;
+                  border-radius: 50%;
+                  background: orangered;
+                }
+                .compareItem{
+                  font-size: 24rpx;
+                  font-family: DINAlternate, DINAlternate;
+                  color: #160002;
+                  line-height: 40rpx;
+                  text-align: center;
+                }
+                .addItem{
+                  font-size: 24rpx;
+                  font-family: DINAlternate, DINAlternate;
+                  color: #E83944;
+                  line-height: 40rpx;
+                  text-align: center;
+                }
+              }
+              .listItem{
+                width:100%;
+                padding: 24rpx;
+                box-sizing: border-box;
+                border-radius: 16rpx;
+                background: #F7F7F7;
+                margin-bottom: 24rpx;
+                display: flex;
+                .itemLeft{
+                  width: 160rpx;
+                  height: 160rpx;
+                  border-radius: 16rpx;
+                  //border: 2rpx solid #E6E6E6;
+                  position: relative;
+                  background-repeat: no-repeat;
+                  background-size: cover;
+                  .bg{
+                    position: absolute;
+                    width: 160rpx;
+                    height: 160rpx;
+                    top: 0;left: 0;
+                    z-index: 1;
+                  }
+                  .statueBox{
+                    position: absolute;
+                    z-index: 2;
+                    top: 0;right: 0;
+                    width: 76rpx;
+                    height: 32rpx;
+                    font-size: 20rpx;
+                    font-family: PingFangSC, PingFang SC;
+                    font-weight: 400;
+                    color: #FFFFFF;
+                    line-height: 28rpx;
+                    background-repeat: no-repeat;
+                    background-size: 100% 100%;
+                    text-align: center;
+                  }
+                  .nameBox{
+                    position: absolute;
+                    z-index: 2;
+                    top: 32rpx;
+                    left: 20rpx;
+                    display: flex;
+                    flex-direction: column;
+                    .serviceName{
+                      font-size: 30rpx;
+                      font-family: PingFangSC, PingFang SC;
+                      font-weight: 500;
+                      color: #7F020B;
+                      line-height: 30rpx;
+                    }
+                    .serviceLabel{
+                      font-size: 20rpx;
+                      font-family: PingFangSC, PingFang SC;
+                      font-weight: 500;
+                      color: #7F020B;
+                      line-height: 20rpx;
+                    }
+                  }
+                }
+                .contentRight{
+                  width: calc(100% - 176rpx);
+                  margin-left: 16rpx;
+                  display: flex;
+                  flex-direction: column;
+                  justify-content: space-between;
+                  .rightTop{
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    .rightTopLeft{
+                      display: flex;
+                      align-items: center;
+                      .indexBox{
+                        width: 36rpx;
+                        height: 32rpx;
+                        font-size: 24rpx;
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        color: #FEFFFF;
+                        line-height: 28rpx;
+                        text-align: center;
+                        background-repeat: no-repeat;
+                        background-size: 100% 100%;
+                      }
+                      .areaName{
+                        font-size: 28rpx;
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        color: #160002;
+                        line-height: 40rpx;
+                        margin-left: 8rpx;
+                      }
+                    }
+                    .rightTopRight{
+                      display: flex;
+                      align-items: center;
+                      .entryRateLabel{
+                        font-size: 24rpx;
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        color: #9A9A9A;
+                        line-height: 32rpx;
+                      }
+                      .entryRateValue{
+                        font-size: 28rpx;
+                        font-family: DINAlternate, DINAlternate;
+                        font-weight: bold;
+                        color: #E83944;
+                        line-height: 32rpx;
+                        margin-left: 4rpx;
+                      }
+                    }
+                  }
+                  .rightBottom{
+                    display: flex;
+                    justify-content: space-between;
+                    .rightBottomItem{
+                      display: flex;
+                      flex-direction: column;
+                      align-items: center;
+                      .itemLabel{
+                        font-size: 24rpx;
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        color: #9A9A9A;
+                        line-height: 36rpx;
+                      }
+                      .itemValue{
+                        font-size: 28rpx;
+                        font-family: DINAlternate, DINAlternate;
+                        font-weight: bold;
+                        color: #160002;
+                        line-height: 32rpx;
+                        margin-top: 8rpx;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            .typeSecond{
+              .listValueBox{
+                width: 100%;
+                .row{
+                  width: 100%;
+                  display: flex;
+                  margin-top: 32rpx;
+                  .rowItem{
+                    text-align: center;
+                    font-size: 24rpx;
+                    font-family: DINAlternate, DINAlternate;
+                    color: #160002;
+                    line-height: 40rpx;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+
+    }
+  }
+}
+</style>
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 23ef8a8..f44203d 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -3,7 +3,25 @@
     <div class="top">
       <div class="header" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
         <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
-        <img class="pageTitle" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageTitle.png"/>
+<!--        <img class="pageTitle" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageTitle.png"/>-->
+        <div v-if="showSpring" class="picker" @click="handleGoMap">
+          <div class="selectService">
+            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+            <view class="select">
+              <view class="content">
+                <view class="uni-input">{{springService.SERVERPART_NAME}}</view>
+                <p class="area" v-if="springService.Serverpart_ID">{{springService.SPREGIONTYPE_NAME}}</p>
+                <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+              </view>
+            </view>
+          </div>
+        </div>
+
+        <view v-else class="seachBox" :style="{height: menu.height + 'px'}" @click="handleGoMap">
+          <image class="searchIcon" src="/static/images/seach/searchIcon.svg"/>
+          <text class="searchText">请输入想看的服务区</text>
+        </view>
+
       </div>
     </div>
 
@@ -15,24 +33,42 @@
             <div class="titleBox">
               <div class="titleBoxLeft">
                 <img class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png" />
-                <text class="titleNotice">{{`/统计到${allDateDay}`}}</text>
+                <text class="titleNotice" v-if="!isShowWarningTime">{{`/统计到${allDateDay}`}}</text>
               </div>
-              <div class="typeChangeBox">
-                <div :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">按模块</div>
-                <div :class="pageType===2?'normal select':'normal'" @click="handleChangeType(2)">按片区</div>
+              <div class="typeChangeBox" v-if="!showSpring">
+                <div :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">经营板块</div>
+                <div :class="pageType===2?'normal select':'normal'" @click="handleChangeType(2)">经营片区</div>
+              </div>
+              <div style="display: flex;align-items: center">
+                <div class="searchAllBox" style="margin-right: 16rpx" v-if="showSpring" @click="handleSearchAll">返回驿达</div>
+                <div class="searchAllBox" v-if="showSpring" @click="handleGoShopDetail">门店明细</div>
               </div>
             </div>
-            <div class="contentTitleBox">
-              <text class="contentTitle">对客销售</text>
-              <div class="YOYBox">
-                <text class="YOYBoxText">同比去年</text>
-                <text class="YOYBoxValue">
-                  {{`${revenueAdd>0?'+':''}${revenueAdd?revenueAdd:'-'}%`}}
-                </text>
-              </div>
+
+            <div class="waringText" v-if="isShowWarningTime">
+              <span style="display: block">{{`${allDateDay}营收数据需等待现场管理员校验完成...`}}</span>
+              <span>{{`预计早上10点，请稍等...`}}</span>
             </div>
           </div>
           <div class="overAllDataBottom">
+            <div class="contentTitleBox" style="margin-bottom: 16rpx">
+              <text class="contentTitle">对客销售</text>
+              <div style="display: flex;align-items: center">
+                <div class="YOYNumber">
+                  <text class="YOYNumberText">增长</text>
+                  <div class="YOYNumberValue">
+                    <span style="color: #A69E9F">{{revenueNumber>0?'+':revenueNumber<0?'':''}}</span>
+                    <span style="color: #A69E9F">{{`${revenueNumber || '-'}`}}</span>
+                  </div>
+                </div>
+                <div class="YOYBox">
+                  <text class="YOYBoxText">增幅</text>
+                  <text class="YOYBoxValue">
+                    {{`${revenueAdd>0?'+':''}${revenueAdd?revenueAdd:'-'}%`}}
+                  </text>
+                </div>
+              </div>
+            </div>
             <div class="pkBox">
               <div class="leftBox">
                 <text class="value">{{pageData.curYearRevenue.data?$util.getMoney(pageData.curYearRevenue.data / 10000):'0.00'}}</text>
@@ -45,11 +81,11 @@
               <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png"/>
             </div>
 
-            <div class="otherListBox">
-              <div class="listType" v-if="isShowToCustomers">
-                <div class="downBox" @click="handleChangeToCustomers">
-                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
-                </div>
+            <div class="otherListBox" v-if="isShowAllDetail">
+              <div class="listType">
+<!--                <div class="downBox" @click="handleChangeToCustomers">-->
+<!--                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>-->
+<!--                </div>-->
                 <div class="moduleBox" v-if="pageType===1">
                   <div class="listTitleBox">
                     <div class="titleItem" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">类别</div>
@@ -88,7 +124,7 @@
                     <!--  便利店  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">便利店</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">便利店</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearCVSRevenue.data?$util.getMoney(pageData.curYearCVSRevenue.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearCVSRevenue.data?$util.getMoney(pageData.lYearCVSRevenue.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -113,8 +149,8 @@
                     <!--  餐饮客房  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">餐饮客房</div>
-                        <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearGRORevenue.data || pageData.curYearSCRevenue.data?$util.getMoney((Number(pageData.curYearGRORevenue.data) + Number(pageData.curYearSCRevenue.data)) / 10000):'0.00'}}</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">餐饮客房</div>
+                        <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearSCRevenue.data?$util.getMoney(pageData.curYearSCRevenue.data/ 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearSCRevenue.data?$util.getMoney(pageData.lYearSCRevenue.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
                           <span>{{GRORevenueNumber>0?'+':GRORevenueNumber<0?'':''}}</span>
@@ -163,7 +199,7 @@
                     <!--  商铺租赁  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">商铺租赁</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">商铺租赁</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearCoopRevenue.data?$util.getMoney(pageData.curYearCoopRevenue.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearCoopRevenue.data?$util.getMoney(pageData.lYearCoopRevenue.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -211,40 +247,49 @@
                 </div>
 
               </div>
-              <div class="showIconBox" @click="handleChangeToCustomers" v-else>
-                <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
-              </div>
+<!--              <div class="showIconBox" @click="handleChangeToCustomers">-->
+<!--                <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>-->
+<!--              </div>-->
             </div>
           </div>
           <!--  营业收入 -->
           <div class="contentTitleBoxOuter">
             <text class="contentTitle">营业收入</text>
-            <div class="YOYBox">
-              <text class="YOYBoxText">同比去年</text>
-              <div class="YOYBoxValue">
-                <span :style="{color:tradeAccountAdd>0?'#E83944':tradeAccountAdd<0?'#0E9976':''}">{{tradeAccountAdd>0?'+':tradeAccountAdd<0?'':''}}</span>
-                <span :style="{color:tradeAccountAdd>0?'#E83944':tradeAccountAdd<0?'#0E9976':''}">{{`${tradeAccountAdd || '-'}%`}}</span>
+            <div style="display: flex;align-items: center">
+              <div class="YOYNumber">
+                <text class="YOYNumberText">增长</text>
+                <div class="YOYNumberValue">
+                  <span style="color: #A69E9F">{{tradeAccountNumber>0?'+':tradeAccountNumber<0?'':''}}</span>
+                  <span style="color: #A69E9F">{{`${tradeAccountNumber || '-'}`}}</span>
+                </div>
+              </div>
+              <div class="YOYBox">
+                <text class="YOYBoxText">增幅</text>
+                <div class="YOYBoxValue">
+                  <span :style="{color:tradeAccountAdd>0?'#E83944':tradeAccountAdd<0?'#0E9976':''}">{{tradeAccountAdd>0?'+':tradeAccountAdd<0?'':''}}</span>
+                  <span :style="{color:tradeAccountAdd>0?'#E83944':tradeAccountAdd<0?'#0E9976':''}">{{`${tradeAccountAdd || '-'}%`}}</span>
+                </div>
               </div>
             </div>
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox">
-              <div class="leftBox">
+              <div class="leftBox revenueLeft">
                 <text class="value">{{pageData.curYearAccount.data?$util.getMoney(pageData.curYearAccount.data / 10000):'0.00'}}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div class="rightBox">
+              <div class="rightBox revenueRight">
                 <text class="value">{{pageData.lYearAccount.data?$util.getMoney(pageData.lYearAccount.data / 10000):'0.00'}}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png"/>
+              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png"/>
             </div>
 
-            <div class="otherListBox">
-              <div class="listType"  v-if="isShowRevenue">
-                <div class="downBox" @click="handleChangeRevenue">
-                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
-                </div>
+            <div class="otherListBox"  v-if="isShowAllDetail">
+              <div class="listType">
+<!--                <div class="downBox" @click="handleChangeRevenue">-->
+<!--                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>-->
+<!--                </div>-->
                 <div class="moduleBox" v-if="pageType===1">
                   <div class="listTitleBox">
                     <div class="titleItem" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">类别</div>
@@ -258,7 +303,7 @@
                     <!-- 自营-->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营</div>
+                        <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营(除税)</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearSelfAccount.data?$util.getMoney(pageData.curYearSelfAccount.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearSelfAccount.data?$util.getMoney(pageData.lYearSelfAccount.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -274,7 +319,7 @@
                     <!--  便利店  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">便利店</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">便利店</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearCVSAccount.data?$util.getMoney(pageData.curYearCVSAccount.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearCVSAccount.data?$util.getMoney(pageData.lYearCVSAccount.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -290,7 +335,7 @@
                     <!--  餐饮客房  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">餐饮客房</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">餐饮客房</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearSCAccount.data ?$util.getMoney(pageData.curYearSCAccount.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearSCAccount.data?$util.getMoney(pageData.lYearSCAccount.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -306,7 +351,7 @@
                     <!--  外包  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包</div>
+                        <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包(除税)</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearCoopAccount.data?$util.getMoney(pageData.curYearCoopAccount.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearCoopAccount.data?$util.getMoney(pageData.lYearCoopAccount.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -322,7 +367,7 @@
                     <!--  商铺租赁  -->
                     <div class="bigBox">
                       <div class="row">
-                        <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">商铺租赁</div>
+                        <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">商铺租赁</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.curYearCoopAccount.data?$util.getMoney(pageData.curYearCoopAccount.data / 10000):'0.00'}}</div>
                         <div class="valueItemBox" style="width: 110rpx">{{pageData.lYearCoopAccount.data?$util.getMoney(pageData.lYearCoopAccount.data / 10000):'0.00'}}</div>
                         <div class="addItem" style="width: 110rpx">
@@ -360,40 +405,46 @@
                   </div>
                 </div>
               </div>
-              <div class="showIconBox" @click="handleChangeRevenue" v-else>
-                <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
-              </div>
+<!--              <div class="showIconBox" @click="handleChangeRevenue">-->
+<!--                <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>-->
+<!--              </div>-->
             </div>
           </div>
           <!--  入区流量  -->
           <div class="contentTitleBoxOuter">
             <text class="contentTitle">入区流量</text>
-            <div class="YOYBox">
-              <text class="YOYBoxText">同比去年</text>
-              <div class="YOYBoxValue">
-                <span :style="{color:carEntryAdd>0?'#E83944':carEntryAdd<0?'#0E9976':''}">{{carEntryAdd>0?'+':carEntryAdd<0?'':''}}</span>
-                <span :style="{color:carEntryAdd>0?'#E83944':carEntryAdd<0?'#0E9976':''}">{{`${carEntryAdd || '-'}%`}}</span>
+            <div style="display: flex;align-items: center">
+              <div class="YOYNumber">
+                <text class="YOYNumberText">增长</text>
+                <div class="YOYNumberValue">
+                  <span style="color: #A69E9F">{{carEntryNumber>0?'+':carEntryNumber<0?'':''}}</span>
+                  <span style="color: #A69E9F">{{`${carEntryNumber || '-'}`}}</span>
+                </div>
+              </div>
+              <div class="YOYBox">
+                <text class="YOYBoxText">增幅</text>
+                <div class="YOYBoxValue">
+                  <span :style="{color:carEntryAdd>0?'#E83944':carEntryAdd<0?'#0E9976':''}">{{carEntryAdd>0?'+':carEntryAdd<0?'':''}}</span>
+                  <span :style="{color:carEntryAdd>0?'#E83944':carEntryAdd<0?'#0E9976':''}">{{`${carEntryAdd || '-'}%`}}</span>
+                </div>
               </div>
             </div>
           </div>
           <div class="overAllDataBottom">
             <div class="pkBox">
-              <div class="leftBox">
+              <div class="leftBox carLeft">
                 <text class="value">{{pageData.curYearBayonet.data?$util.getMoney(pageData.curYearBayonet.data / 10000):'0.00'}}</text>
                 <text class="label">2024年/万辆</text>
               </div>
-              <div class="rightBox">
+              <div class="rightBox carRight">
                 <text class="value">{{pageData.lYearBayonet.data?$util.getMoney(pageData.lYearBayonet.data / 10000):'0.00'}}</text>
                 <text class="label">2023年/万辆</text>
               </div>
-              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png"/>
+              <img class="pkLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png"/>
             </div>
 
-            <div class="otherListBox" v-if="pageType===2">
-              <div class="listType" v-if="isShowCarEntry">
-                <div class="downBox" @click="handleChangeCarEntry">
-                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
-                </div>
+            <div class="otherListBox">
+              <div class="listType" v-if="isShowAllDetail && pageType===2">
                 <div class="areaBox">
                   <div class="listTitleBox">
                     <div class="titleItem" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">类别</div>
@@ -416,9 +467,12 @@
                     </div>
                   </div>
                 </div>
+                <div class="downBox" style="margin-top: 16rpx" @click="handleChangeCarEntry">
+                  <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+                </div>
               </div>
               <div class="showIconBox" @click="handleChangeCarEntry" v-else>
-                <img class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+                <img :style="{transform:isShowAllDetail?'rotate(-90deg)':''}" class="getMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
               </div>
             </div>
           </div>
@@ -428,36 +482,36 @@
           <div class="revenueDetailTitleBox">
             <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png"/>
             <img class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailIcon.png"/>
-            <text class="modalUnit">单位：万元</text>
+<!--            <text class="modalUnit">单位：万元</text>-->
+            <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
+            <text class="goTest" @click="handleGoTest">看测试页面</text>
           </div>
           <div class="revenueContent">
             <scroll-view scroll-x="true" class="navList" :scrollIntoView="currentScroll" :scroll-with-animation="true">
               <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
             </scroll-view>
-
+<!--            <span class="dateText">{{selectDateText || ''}}</span>-->
             <div class="modalBox">
               <div class="modalTitleBox" v-if="pageType===1">
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
                   <div class="modalIndex"></div>
                   <text class="modalText">对客销售</text>
-<!--                  <text class="modalUnit">/万元</text>-->
+                  <text class="modalUnit">/万元</text>
                 </div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney(pageData.curYearRevenue.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearRevenue.value?$util.getMoney(pageData.lYearRevenue.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span>{{revenueToCustomerNumber>0?'+':revenueToCustomerNumber<0?'':''}}</span>
-                  <span>{{`${revenueToCustomerNumber || '-'}`}}</span>
-                </div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span :style="{color:revenueToCustomerAdd>0?'#E83944':revenueToCustomerAdd<0?'#0E9976':''}">{{revenueToCustomerAdd>0?'+':revenueToCustomerAdd<0?'':''}}</span>
-                  <span :style="{color:revenueToCustomerAdd>0?'#E83944':revenueToCustomerAdd<0?'#0E9976':''}">{{`${revenueToCustomerAdd || '-'}%`}}</span>
+                <div class="moreBox" @click="handleGoMorePage(1)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
                 </div>
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
                   <div class="modalIndex"></div>
                   <text class="modalText">对客销售</text>
-                  <!--                  <text class="modalUnit">/万元</text>-->
+                  <text class="modalUnit">/万元</text>
+                </div>
+                <div class="moreBox" @click="handleGoMorePage(1)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
                 </div>
               </div>
 
@@ -471,9 +525,23 @@
 <!--                  <div class="titleItem"  style="width: 130rpx">同比去年</div>-->
                 </div>
                 <div class="typeFirst" v-if="pageType===1">
+                  <!-- 合计 -->
+                  <div class="row">
+                    <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">合计</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney((Number(pageData.curYearRevenue.value) - Number(pageData.curYearWJRevenue.value)) / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.lYearRevenue.value?$util.getMoney((Number(pageData.lYearRevenue.value) - Number(pageData.lYearWJRevenue.value)) / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">
+                      <span>{{revenueToCustomerNumber>0?'+':revenueToCustomerNumber<0?'':''}}</span>
+                      <span>{{`${revenueToCustomerNumber || '-'}`}}</span>
+                    </div>
+                    <div class="addItem" style="width: 110rpx">
+                      <span :style="{color:revenueToCustomerAdd>0?'#E83944':revenueToCustomerAdd<0?'#0E9976':''}">{{revenueToCustomerAdd>0?'+':revenueToCustomerAdd<0?'':''}}</span>
+                      <span :style="{color:revenueToCustomerAdd>0?'#E83944':revenueToCustomerAdd<0?'#0E9976':''}">{{`${revenueToCustomerAdd || '-'}%`}}</span>
+                    </div>
+                  </div>
                   <!-- 自营-->
                   <div class="row">
-                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营</div>
+                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营合计</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearSelfRevenue.value?$util.getMoney(pageData.curYearSelfRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearSelfRevenue.value?$util.getMoney(pageData.lYearSelfRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -487,7 +555,7 @@
                   </div>
                   <!-- 便利店-->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">便利店</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">便利店</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCVSRevenue.value?$util.getMoney(pageData.curYearCVSRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCVSRevenue.value?$util.getMoney(pageData.lYearCVSRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -501,9 +569,9 @@
                   </div>
                   <!--  餐饮及客房  -->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">餐饮及客房</div>
-                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearSCRevenue.value || pageData.curYearGRORevenue.value?$util.getMoney((Number(pageData.curYearSCRevenue.value) + Number(pageData.curYearGRORevenue.value)) / 10000):'0.00'}}</div>
-                    <div class="compareItem" style="width: 110rpx">{{pageData.lYearSCRevenue.value ?$util.getMoney(pageData.lYearSCRevenue.value / 10000):'0.00'}}</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">餐饮及客房</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearSCRevenue.value?$util.getMoney((pageData.curYearSCRevenue.value) / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.lYearSCRevenue.value?$util.getMoney(pageData.lYearSCRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
                       <span>{{revenueSCANumber>0?'+':revenueSCANumber<0?'':''}}</span>
                       <span>{{`${revenueSCANumber || '-'}`}}</span>
@@ -515,7 +583,7 @@
                   </div>
                   <!-- 外包-->
                   <div class="row">
-                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包</div>
+                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包合计</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCoopRevenue.value?$util.getMoney(pageData.curYearCoopRevenue.value/ 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCoopRevenue.value ?$util.getMoney(pageData.lYearCoopRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -529,7 +597,7 @@
                   </div>
                   <!-- 商铺租赁 -->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">商铺租赁</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">商铺租赁</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCoopRevenue.value?$util.getMoney(pageData.curYearCoopRevenue.value/ 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCoopRevenue.value ?$util.getMoney(pageData.lYearCoopRevenue.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -565,24 +633,32 @@
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 380rpx)',textAlign:'left'}">
                   <div class="modalIndex"></div>
                   <text class="modalText">营业收入</text>
-<!--                  <text class="modalUnit">/万元</text>-->
+                  <text class="modalUnit">/万元</text>
                 </div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney(pageData.curYearAccount.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearAccount.value?$util.getMoney(pageData.lYearAccount.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span>{{incomeDailyNumber>0?'+':incomeDailyNumber<0?'':''}}</span>
-                  <span>{{`${incomeDailyNumber || '-'}`}}</span>
-                </div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{incomeDailyAdd>0?'+':incomeDailyAdd<0?'':''}}</span>
-                  <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{`${incomeDailyAdd || '-'}%`}}</span>
+                <div class="moreBox" @click="handleGoMorePage(2)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
                 </div>
+<!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney(pageData.curYearAccount.value / 10000):'0.00'}}</div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearAccount.value?$util.getMoney(pageData.lYearAccount.value / 10000):'0.00'}}</div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">-->
+<!--                  <span>{{incomeDailyNumber>0?'+':incomeDailyNumber<0?'':''}}</span>-->
+<!--                  <span>{{`${incomeDailyNumber || '-'}`}}</span>-->
+<!--                </div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">-->
+<!--                  <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{incomeDailyAdd>0?'+':incomeDailyAdd<0?'':''}}</span>-->
+<!--                  <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{`${incomeDailyAdd || '-'}%`}}</span>-->
+<!--                </div>-->
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 380rpx)',textAlign:'left'}">
                   <div class="modalIndex"></div>
                   <text class="modalText">营业收入</text>
-                  <!--                  <text class="modalUnit">/万元</text>-->
+                  <text class="modalUnit">/万元</text>
+                </div>
+                <div class="moreBox" @click="handleGoMorePage(2)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
                 </div>
               </div>
 
@@ -596,9 +672,23 @@
                   <!--                  <div class="titleItem"  style="width: 130rpx">同比去年</div>-->
                 </div>
                 <div class="typeFirst" v-if="pageType===1">
+                  <!-- 合计-->
+                  <div class="row">
+                    <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">合计</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearRevenue.value?$util.getMoney(pageData.curYearAccount.value / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.lYearAccount.value?$util.getMoney(pageData.lYearAccount.value / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">
+                      <span>{{incomeDailyNumber>0?'+':incomeDailyNumber<0?'':''}}</span>
+                      <span>{{`${incomeDailyNumber || '-'}`}}</span>
+                    </div>
+                    <div class="addItem" style="width: 110rpx">
+                      <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{incomeDailyAdd>0?'+':incomeDailyAdd<0?'':''}}</span>
+                      <span :style="{color:incomeDailyAdd>0?'#E83944':incomeDailyAdd<0?'#0E9976':''}">{{`${incomeDailyAdd || '-'}%`}}</span>
+                    </div>
+                  </div>
                   <!-- 自营-->
                   <div class="row">
-                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营</div>
+                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">自营合计</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearSelfAccount.value?$util.getMoney(pageData.curYearSelfAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearSelfAccount .value?$util.getMoney(pageData.lYearSelfAccount .value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -612,7 +702,7 @@
                   </div>
                   <!-- 便利店-->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">便利店</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">便利店</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCVSAccount.value?$util.getMoney(pageData.curYearCVSAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCVSAccount.value?$util.getMoney(pageData.lYearCVSAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -626,8 +716,8 @@
                   </div>
                   <!--  餐饮及客房  -->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">餐饮及客房</div>
-                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearSCAccount.value || pageData.curYearSCAccount.value?$util.getMoney((Number(pageData.curYearSCRevenue.value) + Number(pageData.curYearGRORevenue.value)) / 10000):'0.00'}}</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">餐饮及客房</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearSCAccount.value?$util.getMoney((pageData.curYearSCAccount.value) / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearSCAccount.value ?$util.getMoney(pageData.lYearSCAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
                       <span>{{inComeDailyFoodNumber>0?'+':inComeDailyFoodNumber<0?'':''}}</span>
@@ -640,7 +730,7 @@
                   </div>
                   <!-- 外包-->
                   <div class="row">
-                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包</div>
+                    <div class="valueItem father" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">外包合计</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCoopAccount.value?$util.getMoney(pageData.curYearCoopAccount.value/ 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCoopAccount.value ?$util.getMoney(pageData.lYearCoopAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -654,7 +744,7 @@
                   </div>
                   <!-- 商铺租赁 -->
                   <div class="row">
-                    <div class="valueItem son" :style="{width: 'calc(100% - 450rpx)',textAlign:'left',marginLeft:'20rpx'}">商铺租赁</div>
+                    <div class="valueItem son" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">商铺租赁</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.curYearCoopAccount.value?$util.getMoney(pageData.curYearCoopAccount.value/ 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">{{pageData.lYearCoopAccount.value ?$util.getMoney(pageData.lYearCoopAccount.value / 10000):'0.00'}}</div>
                     <div class="compareItem" style="width: 110rpx">
@@ -693,16 +783,20 @@
                   <text class="modalText">入区车流</text>
                   <text class="modalUnit">/万辆</text>
                 </div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearBayonet.value?$util.getMoney(pageData.curYearBayonet.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearBayonet.value?$util.getMoney(pageData.lYearBayonet.value / 10000):'0.00'}}</div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span>{{entryCarDailyNumber>0?'+':entryCarDailyNumber<0?'':''}}</span>
-                  <span>{{`${entryCarDailyNumber || '-'}`}}</span>
-                </div>
-                <div class="modalTitleItem1" style="width: 110rpx">
-                  <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{entryCarDailyAdd>0?'+':revenueToCustomerAdd<0?'':''}}</span>
-                  <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{`${entryCarDailyAdd || '-'}%`}}</span>
+                <div class="moreBox" @click="handleGoMorePage(3)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
                 </div>
+<!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.curYearBayonet.value?$util.getMoney(pageData.curYearBayonet.value / 10000):'0.00'}}</div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">{{pageData.lYearBayonet.value?$util.getMoney(pageData.lYearBayonet.value / 10000):'0.00'}}</div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">-->
+<!--                  <span>{{entryCarDailyNumber>0?'+':entryCarDailyNumber<0?'':''}}</span>-->
+<!--                  <span>{{`${entryCarDailyNumber || '-'}`}}</span>-->
+<!--                </div>-->
+<!--                <div class="modalTitleItem1" style="width: 110rpx">-->
+<!--                  <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{entryCarDailyAdd>0?'+':revenueToCustomerAdd<0?'':''}}</span>-->
+<!--                  <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{`${entryCarDailyAdd || '-'}%`}}</span>-->
+<!--                </div>-->
               </div>
               <div class="modalTitleBox" v-else>
                 <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
@@ -710,6 +804,37 @@
                   <text class="modalText">入区车流</text>
                   <text class="modalUnit">/万辆</text>
                 </div>
+                <div class="moreBox" @click="handleGoMorePage(3)">
+                  <span class="moreText">服务区排名</span>
+                  <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/haveMoreICon.svg"/>
+                </div>
+              </div>
+
+              <div class="modalDetail" v-if="pageType===1">
+                <div class="modalDetailTitle">
+                  <div class="titleItem"  :style="{width: 'calc(100% - 440rpx)',textAlign:'left'}">类别</div>
+                  <div class="titleItem"  style="width: 110rpx">2024年</div>
+                  <div class="titleItem"  style="width: 110rpx">2023年</div>
+                  <div class="titleItem"  style="width: 110rpx">增长</div>
+                  <div class="titleItem"  style="width: 110rpx">增幅</div>
+                  <!--                  <div class="titleItem"  style="width: 130rpx">同比去年</div>-->
+                </div>
+                <div class="typeFirst">
+                  <!-- 合计-->
+                  <div class="row">
+                    <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">合计</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.curYearBayonet.value?$util.getMoney(pageData.curYearBayonet.value / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">{{pageData.lYearBayonet.value?$util.getMoney(pageData.lYearBayonet.value / 10000):'0.00'}}</div>
+                    <div class="compareItem" style="width: 110rpx">
+                      <span>{{entryCarDailyNumber>0?'+':entryCarDailyNumber<0?'':''}}</span>
+                      <span>{{`${entryCarDailyNumber || '-'}`}}</span>
+                    </div>
+                    <div class="addItem" style="width: 110rpx">
+                      <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{entryCarDailyAdd>0?'+':revenueToCustomerAdd<0?'':''}}</span>
+                      <span :style="{color:entryCarDailyAdd>0?'#E83944':entryCarDailyAdd<0?'#0E9976':''}">{{`${entryCarDailyAdd || '-'}%`}}</span>
+                    </div>
+                  </div>
+                </div>
               </div>
 
               <div class="modalDetail" v-if="pageType===2">
@@ -753,16 +878,7 @@ export default {
     return {
       statusBarHeight:0,
       menu:{},
-      scrollList:[
-        // {label: '1月26日',value:'2024-01-26'},
-        // {label: '1月27日',value:'2024-01-27'},
-        // {label: '1月28日',value:'2024-01-28'},
-        // {label: '1月29日',value:'2024-01-29'},
-        // {label: '1月30日',value:'2024-01-30'},
-        // {label: '1月31日',value:'2024-01-31'},
-        // {label: '2月1日',value:'2024-02-1'},
-        // {label: '2月2日',value:'2024-02-2'},
-      ],
+      scrollList:[],
       currentScroll:'',
       selectIndex: 2,
       curYear:2024,
@@ -771,14 +887,20 @@ export default {
       allDateDay:'',
       pageData:{},// 当天的数据
       yesDayPageData:{},// 前一天的数据
-      revenueAdd: 0,// 对客销售金额增长
+      revenueAdd: 0,// 对客销售金额增幅
+      revenueNumber: 0,// 对客销售金额增长
       howDayNumber: 0,// 春运开始的第几天
       isShowToCustomers: false,// 是否显示对客的详情
       isShowRevenue:false,// 是否显示营业收入
       isShowCarEntry:false,// 是否显示入区车流
       pageType:1,// 按模块区分 按片区区分
       areaDataList:[],// 按片区分的值
-
+      isShowAllDetail:false,// 是否展示三个的详情
+      selectDateText:'',// 选择的日期
+      showSpring:false,
+      springService:null,// 当前选中的服务区
+      useInfo:{},// 用户信息
+      isShowWarningTime: true,// 是否显示警告文字
 
       selfRevenueNumber:0,// 对客自营营业额增长
       selfRevenueAdd: 0,// 对客自营营业额增幅
@@ -791,7 +913,8 @@ export default {
       leaseRevenueNumber:0,// 对客租赁增长
       leaseRevenueAdd:0,// 对客租赁增幅
 
-      tradeAccountAdd:0,// 营业收入增长
+      tradeAccountAdd:0,// 营业收入增幅
+      tradeAccountNumber:0,// 营业收入增长
       tradeSelfAccountNumber:0,// 营业自营营业额增长
       tradeSelfAccountAdd:0,// 营业自营营业额增幅
       tradeStoresAccountNumber:0,// 营业自营便利店增长
@@ -803,7 +926,8 @@ export default {
       leaseAccountNumber:0,// 营业租赁增长
       leaseAccountAdd:0,// 营业租赁增幅
 
-      carEntryAdd:0,// 车流量的增长
+      carEntryAdd:0,// 车流量的增幅
+      carEntryNumber:0,// 车流量的增长
 
       revenueToCustomerAdd:0,// 每日对客销售增幅
       revenueToCustomerNumber:0,// 每日对客销售增长
@@ -846,17 +970,13 @@ export default {
       this.selectIndex = Number(query.selectType)
     }
 
-
     const date = new Date()
     let y = date.getFullYear()
     this.curYear = y
     this.compareYear = y - 1
-    console.log('query',query)
-    console.log('this.selectIndex',this.selectIndex)
 
     this.lastDay = uni.getStorageSync('lastDay')
     this.currentScroll = 'item'+ uni.getStorageSync('lastDay')
-    console.log('this.currentScroll',this.currentScroll)
     const lastDate = new Date(this.lastDay)
     let lastM = lastDate.getMonth() + 1
     let lastD = lastDate.getDate()
@@ -882,128 +1002,160 @@ export default {
       }
     }
     this.scrollList = dateList
+    this.selectDateText = dateList[dayNumber-1].value
     uni.showLoading({
       title: '正在加载...'
     })
-     await this.handleGetPageData()
-     await this.handleGetAreaData()
-     // await this.handleGetRestaurantData()
-
+    await this.handleGetNewUpdateTime()
+    await this.handleGetPageData()
+    await this.handleGetAreaData()
+    // await this.handleGetRestaurantData()
     uni.hideLoading()
+  },
+  async onShow(){
+    let seat = uni.getStorageSync('springService')
+    if (seat){
+      this.springService = seat
+      this.showSpring = true
+      uni.showLoading({
+        title: '正在加载...'
+      })
 
+      await this.handleGetPageData()
+      await this.handleGetAreaData()
+      // await this.handleGetRestaurantData()
+
+      uni.hideLoading()
+    }else{
+      this.showSpring = false
+    }
+  },
+  destroyed(){
+    uni.removeStorageSync('springService')
   },
   methods:{
     async handleGetPageData(date){
-      let req = {
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
-        curYear:this.curYear,
-        compareYear:this.compareYear,
-        HolidayType:this.selectIndex,
-        StatisticsDate:date || this.lastDay
+      let req
+      if (this.springService){
+        req = {
+          pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+          curYear:this.curYear,
+          compareYear:this.compareYear,
+          HolidayType:this.selectIndex,
+          StatisticsDate:date || this.lastDay,
+          ServerpartId:this.springService.Serverpart_ID
+        }
+      }else{
+        req = {
+          pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+          curYear:this.curYear,
+          compareYear:this.compareYear,
+          HolidayType:this.selectIndex,
+          StatisticsDate:date || this.lastDay,
+        }
       }
+
       const data = await request.$webGet('CommercialApi/Revenue/GetHolidayAnalysis',req)
-      console.log('data',data)
       this.pageData = data.Result_Data
-      console.log('this.pageData',this.pageData)
       // 对客销售金额增幅
-      this.revenueAdd = Number( this.$util.getMoney((((this.pageData.curYearRevenue.data / this.pageData.lYearRevenue.data)-1)*100)))
+      this.revenueAdd = Number((((this.pageData.curYearRevenue.data / this.pageData.lYearRevenue.data)-1)*100).toFixed(2))
+      this.revenueNumber = Number(((this.pageData.curYearRevenue.data - this.pageData.lYearRevenue.data)/10000).toFixed(2))
 
       // 自营营业额增长
-      this.selfRevenueNumber = Number(this.$util.getMoney(((this.pageData.curYearSelfRevenue.data - this.pageData.lYearSelfRevenue.data) / 10000)))
+      this.selfRevenueNumber = Number(((this.pageData.curYearSelfRevenue.data - this.pageData.lYearSelfRevenue.data) / 10000).toFixed(2))
       // 自营营业额增幅
-      this.selfRevenueAdd = Number(this.$util.getMoney((((this.pageData.curYearSelfRevenue.data / this.pageData.lYearSelfRevenue.data)-1)*100)))
+      this.selfRevenueAdd = Number((((this.pageData.curYearSelfRevenue.data / this.pageData.lYearSelfRevenue.data)-1)*100).toFixed(2))
       // 对客自营便利店增长
-      this.selfStoresRevenueNumber = Number(this.$util.getMoney(((this.pageData.curYearCVSRevenue.data - this.pageData.lYearCVSRevenue.data) / 10000)))
+      this.selfStoresRevenueNumber = Number(((this.pageData.curYearCVSRevenue.data - this.pageData.lYearCVSRevenue.data) / 10000).toFixed(2))
       // 对客自营便利店增幅
-      this.selfStoresRevenueAdd = Number(this.$util.getMoney((((this.pageData.curYearCVSRevenue.data / this.pageData.lYearCVSRevenue.data)-1)*100)))
+      this.selfStoresRevenueAdd = Number((((this.pageData.curYearCVSRevenue.data / this.pageData.lYearCVSRevenue.data)-1)*100).toFixed(2))
       // 对客餐饮+客房及其他增长
-      this.GRORevenueNumber = Number(this.$util.getMoney((((Number(this.pageData.curYearGRORevenue.data) + Number(this.pageData.curYearSCRevenue.data)) -  Number(this.pageData.lYearSCRevenue.data)) / 10000)))
+      this.GRORevenueNumber = Number(((this.pageData.curYearSCRevenue.data -  this.pageData.lYearSCRevenue.data) / 10000).toFixed(2))
       // 对客餐饮+客房及其他增幅
-      this.GRORevenueAdd = Number(this.$util.getMoney(((((Number(this.pageData.curYearGRORevenue.data) + Number(this.pageData.curYearSCRevenue.data)) / Number(this.pageData.lYearCVSRevenue.data))-1)*100)))
+      this.GRORevenueAdd = Number(((((this.pageData.curYearSCRevenue.data) / this.pageData.lYearSCRevenue.data)-1)*100).toFixed(2))
       // this.GRORevenueAdd = 100
       // 对客外包增长
-      this.outsourceRevenueNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopRevenue.data - this.pageData.lYearCoopRevenue.data) / 10000)))
+      this.outsourceRevenueNumber = Number(((this.pageData.curYearCoopRevenue.data - this.pageData.lYearCoopRevenue.data) / 10000).toFixed(2))
       // 对客外包增幅
-      this.outsourceRevenueAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopRevenue.data / this.pageData.lYearCoopRevenue.data)-1)*100)))
+      this.outsourceRevenueAdd = Number((((this.pageData.curYearCoopRevenue.data / this.pageData.lYearCoopRevenue.data)-1)*100).toFixed(2))
       // 对客租赁增长
-      this.leaseRevenueNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopRevenue.data - this.pageData.lYearCoopRevenue.data) / 10000)))
+      this.leaseRevenueNumber = Number(((this.pageData.curYearCoopRevenue.data - this.pageData.lYearCoopRevenue.data) / 10000).toFixed(2))
       // 对客租赁增幅
-      this.leaseRevenueAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopRevenue.data / this.pageData.lYearCoopRevenue.data)-1)*100)))
+      this.leaseRevenueAdd = Number((((this.pageData.curYearCoopRevenue.data / this.pageData.lYearCoopRevenue.data)-1)*100).toFixed(2))
 
       // 营业收入增长
-      this.tradeAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearAccount.data / this.pageData.lYearAccount.data)-1)*100)))
+      this.tradeAccountAdd = Number((((this.pageData.curYearAccount.data / this.pageData.lYearAccount.data)-1)*100).toFixed(2))
+      this.tradeAccountNumber = Number(((this.pageData.curYearAccount.data - this.pageData.lYearAccount.data)/10000).toFixed(2))
       // 营业自营营业额增长
-      this.tradeSelfAccountNumber = Number(this.$util.getMoney(((this.pageData.curYearSelfAccount.data - this.pageData.lYearSelfAccount.data) / 10000)))
+      this.tradeSelfAccountNumber = Number(((this.pageData.curYearSelfAccount.data - this.pageData.lYearSelfAccount.data) / 10000).toFixed(2))
       // 营业自营营业额增幅
-      this.tradeSelfAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearSelfAccount.data / this.pageData.lYearSelfAccount.data)-1)*100)))
+      this.tradeSelfAccountAdd = Number((((this.pageData.curYearSelfAccount.data / this.pageData.lYearSelfAccount.data)-1)*100).toFixed(2))
       // 营业自营便利店增长
-      this.tradeStoresAccountNumber = Number(this.$util.getMoney(((this.pageData.curYearCVSAccount.data - this.pageData.lYearCVSAccount.data) / 10000)))
+      this.tradeStoresAccountNumber = Number(((this.pageData.curYearCVSAccount.data - this.pageData.lYearCVSAccount.data) / 10000).toFixed(2))
       // 营业自营便利店增幅
-      this.tradeStoresAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearCVSAccount.data / this.pageData.lYearCVSAccount.data)-1)*100)))
+      this.tradeStoresAccountAdd = Number((((this.pageData.curYearCVSAccount.data / this.pageData.lYearCVSAccount.data)-1)*100).toFixed(2))
       // 餐饮及客房增长
-      this.tradeSCAAccountNumber = Number(this.$util.getMoney(((this.pageData.curYearSCAccount.data - this.pageData.lYearSCAccount.data) / 10000)))
+      this.tradeSCAAccountNumber = Number(((this.pageData.curYearSCAccount.data - this.pageData.lYearSCAccount.data) / 10000).toFixed(2))
       // 餐饮及客房增幅
-      this.tradeSCAAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearSCAccount.data / this.pageData.lYearSCAccount.data)-1)*100)))
+      this.tradeSCAAccountAdd = Number((((this.pageData.curYearSCAccount.data / this.pageData.lYearSCAccount.data)-1)*100).toFixed(2))
       // 营业外包增长
-      this.outsourceAccountNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopAccount.data - this.pageData.lYearCoopAccount.data) / 10000)))
+      this.outsourceAccountNumber = Number(((this.pageData.curYearCoopAccount.data - this.pageData.lYearCoopAccount.data) / 10000).toFixed(2))
       // 营业外包增幅
-      this.outsourceAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopAccount.data / this.pageData.lYearCoopAccount.data)-1)*100)))
+      this.outsourceAccountAdd = Number((((this.pageData.curYearCoopAccount.data / this.pageData.lYearCoopAccount.data)-1)*100).toFixed(2))
       // 营业租赁增长
-      this.leaseAccountNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopAccount.data - this.pageData.lYearCoopAccount.data) / 10000)))
+      this.leaseAccountNumber = Number(((this.pageData.curYearCoopAccount.data - this.pageData.lYearCoopAccount.data) / 10000).toFixed(2))
       // 营业租赁增幅
-      this.leaseAccountAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopAccount.data / this.pageData.lYearCoopAccount.data)-1)*100)))
+      this.leaseAccountAdd = Number((((this.pageData.curYearCoopAccount.data / this.pageData.lYearCoopAccount.data)-1)*100).toFixed(2))
 
       // 车流量的增长
-      this.carEntryAdd = Number(this.$util.getMoney((((this.pageData.curYearBayonet.data / this.pageData.lYearBayonet.data)-1)*100)))
+      this.carEntryAdd = Number((((this.pageData.curYearBayonet.data / this.pageData.lYearBayonet.data)-1)*100).toFixed(2))
+      this.carEntryNumber = Number(((this.pageData.curYearBayonet.data - this.pageData.lYearBayonet.data)/10000).toFixed(2))
 
-      // 商铺租赁营收增长
-      this.CoopRevenueAdd = Number((((this.pageData.curYearCoopRevenue.data / this.pageData.lYearCoopRevenue.data)-1)*100).toFixed(2))
-      // 万佳城市增长
-      this.WJCityAdd = Number((((this.pageData.curYearWJRevenue.data / this.pageData.lYearWJRevenue.data)-1)*100).toFixed(2))
-      // 入区车流增长
-      this.entryCarAdd = Number((((this.pageData.curYearBayonet.data / this.pageData.lYearBayonet.data)-1)*100).toFixed(2))
 
 
       // 当日
-      // 每日对客销售增幅
-      this.revenueToCustomerAdd = Number(this.$util.getMoney((((this.pageData.curYearRevenue.value / this.pageData.lYearRevenue.value)-1)*100)))
-      this.revenueToCustomerNumber = Number(this.$util.getMoney(((this.pageData.curYearRevenue.value - this.pageData.lYearRevenue.value) / 10000)))
+      // 每日对客销售增幅 要减去万佳的
+      let realDailyRevenue = Number(this.pageData.curYearRevenue.value) - Number(this.pageData.curYearWJRevenue.value)
+      let realDailyWj = Number(this.pageData.lYearRevenue.value) - Number(this.pageData.lYearWJRevenue.value)
+
+      this.revenueToCustomerAdd = Number((((realDailyRevenue / realDailyWj)-1)*100).toFixed(2))
+      this.revenueToCustomerNumber = Number(((realDailyRevenue - realDailyWj) / 10000).toFixed(2))
       // 每日对客自营收入
-      this.revenueUserAdd = Number(this.$util.getMoney((((this.pageData.curYearSelfRevenue.value / this.pageData.lYearSelfRevenue.value)-1)*100)))
-      this.revenueUserNumber = Number(this.$util.getMoney(((this.pageData.curYearSelfRevenue.value - this.pageData.lYearSelfRevenue.value) / 10000)))
+      this.revenueUserAdd = Number((((this.pageData.curYearSelfRevenue.value / this.pageData.lYearSelfRevenue.value)-1)*100).toFixed(2))
+      this.revenueUserNumber = Number(((this.pageData.curYearSelfRevenue.value - this.pageData.lYearSelfRevenue.value) / 10000).toFixed(2))
       // 每日对客便利店收入
-      this.revenueStoreAdd = Number(this.$util.getMoney((((this.pageData.curYearCVSRevenue.value / this.pageData.lYearCVSRevenue.value)-1)*100)))
-      this.revenueStoreNumber = Number(this.$util.getMoney(((this.pageData.curYearCVSRevenue.value - this.pageData.lYearCVSRevenue.value) / 10000)))
+      this.revenueStoreAdd = Number((((this.pageData.curYearCVSRevenue.value / this.pageData.lYearCVSRevenue.value)-1)*100).toFixed(2))
+      this.revenueStoreNumber = Number(((this.pageData.curYearCVSRevenue.value - this.pageData.lYearCVSRevenue.value) / 10000).toFixed(2))
       // 每日餐饮及客房增幅
-      this.revenueSCAAdd = Number(this.$util.getMoney(((((Number(this.pageData.curYearSCRevenue.value) + Number(this.pageData.curYearGRORevenue.value)) / this.pageData.lYearSCRevenue.value)-1)*100)))
-      this.revenueSCANumber = Number(this.$util.getMoney((((Number(this.pageData.curYearSCRevenue.value) + Number(this.pageData.curYearGRORevenue.value)) - this.pageData.lYearSCRevenue.value)/ 10000)))
+      this.revenueSCAAdd = Number(((((this.pageData.curYearSCRevenue.value) / this.pageData.lYearSCRevenue.value)-1)*100).toFixed(2))
+      this.revenueSCANumber = Number((((this.pageData.curYearSCRevenue.value) - this.pageData.lYearSCRevenue.value)/ 10000).toFixed(2))
       // 每日外包增幅
-      this.outsourceDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopRevenue.value / this.pageData.lYearCoopRevenue.value)-1)*100)))
-      this.outsourceDailyNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopRevenue.value - this.pageData.lYearCoopRevenue.value) / 10000)))
+      this.outsourceDailyAdd = Number((((this.pageData.curYearCoopRevenue.value / this.pageData.lYearCoopRevenue.value)-1)*100).toFixed(2))
+      this.outsourceDailyNumber = Number(((this.pageData.curYearCoopRevenue.value - this.pageData.lYearCoopRevenue.value) / 10000).toFixed(2))
       // 每日租赁增幅
-      this.leaseDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopRevenue.value / this.pageData.lYearCoopRevenue.value)-1)*100)))
-      this.leaseDailyNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopRevenue.value - this.pageData.lYearCoopRevenue.value) / 10000)))
+      this.leaseDailyAdd = Number((((this.pageData.curYearCoopRevenue.value / this.pageData.lYearCoopRevenue.value)-1)*100).toFixed(2))
+      this.leaseDailyNumber = Number(((this.pageData.curYearCoopRevenue.value - this.pageData.lYearCoopRevenue.value) / 10000).toFixed(2))
       // 每日营业收入增幅
-      this.incomeDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearAccount.value / this.pageData.lYearAccount.value)-1)*100)))
-      this.incomeDailyNumber = Number(this.$util.getMoney(((this.pageData.curYearAccount.value - this.pageData.lYearAccount.value) / 10000)))
+      this.incomeDailyAdd = Number((((this.pageData.curYearAccount.value / this.pageData.lYearAccount.value)-1)*100).toFixed(2))
+      this.incomeDailyNumber = Number(((this.pageData.curYearAccount.value - this.pageData.lYearAccount.value) / 10000).toFixed(2))
       // 每日自营营收增幅
-      this.inComeDailyRevenueAdd = Number(this.$util.getMoney((((this.pageData.curYearSelfAccount.value / this.pageData.lYearSelfAccount.value)-1)*100)))
-      this.inComeDailyRevenueNumber = Number(this.$util.getMoney(((this.pageData.curYearSelfAccount.value - this.pageData.lYearSelfAccount.value) / 10000)))
+      this.inComeDailyRevenueAdd = Number((((this.pageData.curYearSelfAccount.value / this.pageData.lYearSelfAccount.value)-1)*100).toFixed(2))
+      this.inComeDailyRevenueNumber = Number(((this.pageData.curYearSelfAccount.value - this.pageData.lYearSelfAccount.value) / 10000).toFixed(2))
       // 每日自营便利店
-      this.inComeDailyStoreAdd = Number(this.$util.getMoney((((this.pageData.curYearCVSAccount.value / this.pageData.lYearCVSAccount.value)-1)*100)))
-      this.inComeDailyStoreNumber = Number(this.$util.getMoney(((this.pageData.curYearCVSAccount.value - this.pageData.lYearCVSAccount.value) / 10000)))
+      this.inComeDailyStoreAdd = Number((((this.pageData.curYearCVSAccount.value / this.pageData.lYearCVSAccount.value)-1)*100).toFixed(2))
+      this.inComeDailyStoreNumber = Number(((this.pageData.curYearCVSAccount.value - this.pageData.lYearCVSAccount.value) / 10000).toFixed(2))
       // 每日自营餐饮及客房
-      this.inComeDailyFoodAdd = Number(this.$util.getMoney((((this.pageData.curYearSCAccount.value / this.pageData.lYearSCAccount.value)-1)*100)))
-      this.inComeDailyFoodNumber = Number(this.$util.getMoney(((this.pageData.curYearSCAccount.value - this.pageData.lYearSCAccount.value) / 10000)))
+      this.inComeDailyFoodAdd = Number((((this.pageData.curYearSCAccount.value / this.pageData.lYearSCAccount.value)-1)*100).toFixed(2))
+      this.inComeDailyFoodNumber = Number(((this.pageData.curYearSCAccount.value - this.pageData.lYearSCAccount.value) / 10000).toFixed(2))
       // 每日外包营收增幅
-      this.outsourceInComeDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopAccount.value / this.pageData.lYearCoopAccount.value)-1)*100)))
-      this.outsourceInComeDailyNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopAccount.value - this.pageData.lYearCoopAccount.value) / 10000)))
+      this.outsourceInComeDailyAdd = Number((((this.pageData.curYearCoopAccount.value / this.pageData.lYearCoopAccount.value)-1)*100).toFixed(2))
+      this.outsourceInComeDailyNumber = Number(((this.pageData.curYearCoopAccount.value - this.pageData.lYearCoopAccount.value) / 10000).toFixed(2))
       // 每日租赁增幅
-      this.leaseInComeDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearCoopAccount.value / this.pageData.lYearCoopAccount.value)-1)*100)))
-      this.leaseInComeDailyNumber = Number(this.$util.getMoney(((this.pageData.curYearCoopAccount.value - this.pageData.lYearCoopAccount.value) / 10000)))
+      this.leaseInComeDailyAdd = Number((((this.pageData.curYearCoopAccount.value / this.pageData.lYearCoopAccount.value)-1)*100).toFixed(2))
+      this.leaseInComeDailyNumber = Number(((this.pageData.curYearCoopAccount.value - this.pageData.lYearCoopAccount.value) / 10000).toFixed(2))
       // 每日车流增幅
-      this.entryCarDailyAdd = Number(this.$util.getMoney((((this.pageData.curYearBayonet.value / this.pageData.lYearBayonet.value)-1)*100)))
-      this.entryCarDailyNumber =Number(this.$util.getMoney(((this.pageData.curYearBayonet.value - this.pageData.lYearBayonet.value) / 10000)))
+      this.entryCarDailyAdd = Number((((this.pageData.curYearBayonet.value / this.pageData.lYearBayonet.value)-1)*100).toFixed(2))
+      this.entryCarDailyNumber =Number(((this.pageData.curYearBayonet.value - this.pageData.lYearBayonet.value) / 10000).toFixed(2))
     },
     // 拿到片区区分的顶部
     async handleGetAreaData(date){
@@ -1013,10 +1165,9 @@ export default {
         compareYear:this.compareYear,
         HolidayType:this.selectIndex,
         StatisticsDate:date || this.lastDay,
-        businessRegion:1
+        businessRegion:1,
       }
       const data = await request.$webGet('CommercialApi/Revenue/GetHolidaySPRAnalysis',req)
-      console.log('area',data.Result_Data)
       let res = data.Result_Data
       let list = []
       if (res.List && res.List.length>0){
@@ -1031,36 +1182,35 @@ export default {
         list.forEach(item=>{
           // 对客营收
           // 年增长
-          item.yearNumber = Number(this.$util.getMoney((item.curYearRevenue.data - item.lYearRevenue.data) / 10000))
+          item.yearNumber = Number(((item.curYearRevenue.data - item.lYearRevenue.data) / 10000).toFixed(2))
           // 年增幅
-          item.yearAdd = Number(this.$util.getMoney(((item.curYearRevenue.data / item.lYearRevenue.data)-1)*100))
+          item.yearAdd = Number((((item.curYearRevenue.data / item.lYearRevenue.data)-1)*100).toFixed(2))
           // 天增长
-          item.dailyNumber = Number(this.$util.getMoney((item.curYearRevenue.value - item.lYearRevenue.value) / 10000))
+          item.dailyNumber = Number(((item.curYearRevenue.value - item.lYearRevenue.value) / 10000).toFixed(2))
           // 天增幅
-          item.dailyAdd = Number(this.$util.getMoney(((item.curYearRevenue.value / item.lYearRevenue.value)-1)*100))
+          item.dailyAdd = Number((((item.curYearRevenue.value / item.lYearRevenue.value)-1)*100).toFixed(2))
 
           // 营业收入
           // 年增长
-          item.yearRevenueNumber = Number(this.$util.getMoney((item.curYearAccount.data - item.lYearAccount.data) / 10000))
+          item.yearRevenueNumber = Number(((item.curYearAccount.data - item.lYearAccount.data) / 10000).toFixed(2))
           // 年增幅
-          item.yearRevenueAdd = Number(this.$util.getMoney(((item.curYearAccount.data / item.lYearAccount.data)-1)*100))
+          item.yearRevenueAdd = Number((((item.curYearAccount.data / item.lYearAccount.data)-1)*100).toFixed(2))
           // 天增长
-          item.dailyRevenueNumber = Number(this.$util.getMoney((item.curYearAccount.value - item.lYearAccount.value) / 10000))
+          item.dailyRevenueNumber = Number(((item.curYearAccount.value - item.lYearAccount.value) / 10000).toFixed(2))
           // 天增幅
           item.dailyRevenueAdd = Number((((item.curYearAccount.value / item.lYearAccount.value)-1)*100).toFixed(2))
 
           //入区流量
           // 年增长
-          item.yearCarNumber = Number(this.$util.getMoney((item.curYearBayonet.data - item.lYearBayonet.data) / 10000))
+          item.yearCarNumber = Number(((item.curYearBayonet.data - item.lYearBayonet.data) / 10000).toFixed(2))
           // 年增幅
-          item.yearCarAdd = Number(this.$util.getMoney(((item.curYearBayonet.data / item.lYearBayonet.data)-1)*100))
+          item.yearCarAdd = Number((((item.curYearBayonet.data / item.lYearBayonet.data)-1)*100).toFixed(2))
           // 天增长
-          item.dailyCarNumber = Number(this.$util.getMoney((item.curYearBayonet.value - item.lYearBayonet.value) / 10000))
+          item.dailyCarNumber = Number(((item.curYearBayonet.value - item.lYearBayonet.value) / 10000).toFixed(2))
           // 天增幅
-          item.dailyCarAdd = Number(this.$util.getMoney(((item.curYearBayonet.value / item.lYearBayonet.value)-1)*100))
+          item.dailyCarAdd = Number((((item.curYearBayonet.value / item.lYearBayonet.value)-1)*100).toFixed(2))
         })
       }
-      console.log('list',list)
       this.areaDataList = list
     },
     // 拿到片区的餐饮
@@ -1117,7 +1267,6 @@ export default {
           item.dailyCarAdd = Number(this.$util.getMoney(((item.curYearBayonet.value / item.lYearBayonet.value)-1)*100))
         })
       }
-      console.log('Restaurant',list)
     },
     handleBack(){
       uni.navigateBack({
@@ -1126,10 +1275,11 @@ export default {
     },
   //   切换时间的方法
     async handleChangeTime(value){
-      console.log('value',value)
       this.currentScroll = 'item'+value
+      this.selectDateText = value
       this.pageData = null
       this.areaDataList = []
+      this.handleReset()
       uni.showLoading({
         title: '正在加载...'
       })
@@ -1151,7 +1301,99 @@ export default {
     },
   // 切换入区车流的显示
     handleChangeCarEntry(){
-      this.isShowCarEntry = !this.isShowCarEntry
+      // this.isShowCarEntry = !this.isShowCarEntry
+      this.isShowAllDetail = !this.isShowAllDetail
+    },
+    // 清空已有数据
+    handleReset(){
+      this.revenueAdd = 0
+      this.selfRevenueNumber = 0
+      this.selfRevenueAdd = 0
+      this.selfStoresRevenueNumber = 0
+      this.selfStoresRevenueAdd = 0
+      this.GRORevenueNumber = 0
+      this.GRORevenueAdd = 0
+      this.outsourceRevenueNumber = 0
+      this.outsourceRevenueAdd = 0
+      this.leaseRevenueNumber = 0
+      this.leaseRevenueAdd = 0
+      this.tradeAccountAdd = 0
+      this.tradeSelfAccountNumber = 0
+      this.tradeSelfAccountAdd = 0
+      this.tradeStoresAccountNumber = 0
+      this.tradeStoresAccountAdd = 0
+      this.tradeSCAAccountNumber = 0
+      this.tradeSCAAccountAdd = 0
+      this.outsourceAccountNumber = 0
+      this.outsourceAccountAdd = 0
+      this.leaseAccountNumber = 0
+      this.leaseAccountAdd = 0
+      this.carEntryAdd = 0
+      this.revenueToCustomerAdd = 0
+      this.revenueToCustomerNumber = 0
+      this.revenueUserAdd = 0
+      this.revenueUserNumber = 0
+      this.revenueStoreAdd = 0
+      this.revenueStoreNumber = 0
+      this.revenueSCAAdd = 0
+      this.revenueSCANumber = 0
+      this.outsourceDailyAdd = 0
+      this.outsourceDailyNumber = 0
+      this.leaseDailyAdd = 0
+      this.leaseDailyNumber = 0
+      this.incomeDailyAdd = 0
+      this.incomeDailyNumber = 0
+      this.inComeDailyRevenueAdd = 0
+      this.inComeDailyRevenueNumber = 0
+      this.inComeDailyStoreAdd = 0
+      this.inComeDailyStoreNumber = 0
+      this.inComeDailyFoodAdd = 0
+      this.inComeDailyFoodNumber = 0
+      this.outsourceInComeDailyAdd = 0
+      this.outsourceInComeDailyNumber = 0
+      this.leaseInComeDailyAdd = 0
+      this.leaseInComeDailyNumber = 0
+      this.entryCarDailyAdd = 0
+      this.entryCarDailyNumber = 0
+    },
+    handleGoMap(){
+      this.$util.toNextRoute('navigateTo', '/pages/map/index?type=springTravel')
+    },
+    // 查询全部
+    async handleSearchAll(){
+      this.showSpring = false
+      uni.removeStorageSync('springService')
+      this.springService = undefined
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      await this.handleGetPageData()
+      await this.handleGetAreaData()
+
+      uni.hideLoading()
+    },
+    // 跳转到门店详情页面
+    handleGoShopDetail(){
+      // ServerpartIds=416&time=2024-01-31&ProvinceCode=340000
+      let time = this.currentScroll.split('item')[1]
+      this.$util.toNextRoute('navigateTo', `/pages/nationalPage/nationalServerpart?ProvinceCode=${this.useInfo.userData.ProvinceCode || '340000'}&ServerpartIds=${this.springService.Serverpart_ID}&time=${time}`)
+    },
+    // 跳转更多记录的页面
+    handleGoMorePage(type){
+      let time = this.currentScroll.split('item')[1]
+      this.$util.toNextRoute('navigateTo', `/pages/nationalPage/rankPage?type=${type}&time=${time}`)
+    },
+    handleGoTest(type){
+      this.$util.toNextRoute('navigateTo', `/pages/nationalPage/testPage`)
+    },
+    // 获取最新的同步日期
+    async handleGetNewUpdateTime(){
+      const data = await request.$webGet('CommercialApi/Revenue/GetLastSyncDateTime')
+      console.log('1111',data)
+      console.log('this',this.lastDay)
+      if (this.lastDay === data.Result_Data){
+        this.isShowWarningTime = false
+      }
     }
   }
 }
@@ -1199,6 +1441,81 @@ export default {
         bottom: -3px;
         left: 40px;
       }
+      .seachBox{
+        position: absolute;
+        bottom: 0;
+        left: 60px;
+        width: 400rpx;
+        background: #fff;
+        border-radius: 32rpx;
+        margin-left: 16rpx;
+        box-sizing: border-box;
+        padding: 10rpx 20rpx;
+        display: flex;
+        align-items: center;
+        .searchIcon{
+          width: 32rpx;
+          height: 32rpx;
+          margin-right: 8rpx;
+        }
+        .searchText{
+          font-size: 28rpx;
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          color: #B6BACB;
+          line-height: 40rpx;
+          white-space: nowrap;
+        }
+      }
+      .picker{
+        position: absolute;
+        bottom: 0;
+        left: 40px;
+        .selectService{
+          display: flex;
+          align-items: center;
+          .img{
+            width: 40px;
+            height: 40px;
+            z-index: 2;
+          }
+          .select{
+            height: 32px;
+            background: #F8F8FA;
+            border-radius: 0 16px 16px 0;
+            transform: translateX(-20px);
+            box-sizing: border-box;
+            padding-left: 25px;
+            display: flex;
+            align-items: center;
+            .content{
+              display: flex;
+              align-items: center;
+              .uni-input{
+                padding: 0;
+                background: transparent;
+                font-size: 14px;
+                font-family: PingFangSC-Semibold, PingFang SC;
+                font-weight: 600;
+                color: #160002;
+              }
+              .area{
+                font-size: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #786B6C;
+                line-height: 40px;
+                margin-left: 4px;
+              }
+              .rightArrow{
+                width: 24px;
+                height: 12px;
+              }
+            }
+
+          }
+        }
+      }
     }
   }
 
@@ -1216,20 +1533,20 @@ export default {
         border-radius: 16rpx;
         .overAllDataTop{
           width: 100%;
-          height: 160rpx;
           background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FEDEDD 100%);
           border-radius: 14rpx 14rpx 16rpx 16rpx;
           box-sizing: border-box;
-          padding: 22rpx;
+          padding: 22rpx 22rpx 0;
           .titleBox{
             width: 100%;
             display: flex;
             justify-content: space-between;
             align-items: flex-start;
+            margin-bottom: 5px;
             .titleBoxLeft{
               display: flex;
               .titleImg{
-                width: 216rpx;
+                width: 144rpx;
                 height: 74rpx;
               }
               .titleNotice{
@@ -1238,12 +1555,13 @@ export default {
                 font-weight: 400;
                 color: #9A9A9A;
                 line-height: 37rpx;
+                white-space: nowrap;
               }
             }
             .typeChangeBox{
               display: flex;
               align-items: center;
-              background: #EFEFEF;
+              background: #FFFFFF;
               border-radius: 6rpx;
               box-sizing: border-box;
               padding: 4rpx;
@@ -1261,10 +1579,20 @@ export default {
                 font-weight: 400;
                 color: #160002;
                 line-height: 36rpx;
-                background: #fff;
+                background: #F5EFEF;
                 border-radius: 6rpx;
               }
             }
+            .searchAllBox{
+              font-size: 24rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #160002;
+              line-height: 36rpx;
+              background: #fff;
+              border-radius: 6rpx;
+              padding: 6rpx 16rpx;
+            }
           }
           .contentTitleBox{
             width: 100%;
@@ -1272,12 +1600,31 @@ export default {
             align-items: center;
             justify-content: space-between;
             .contentTitle{
-              font-size: 24rpx;
+              font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               color: #160002;
               line-height: 36rpx;
             }
+            .YOYNumber{
+              display: flex;
+              align-items: center;
+              margin-right: 32rpx;
+              .YOYNumberText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #A69E9F;
+                line-height: 36rpx;
+              }
+              .YOYNumberValue{
+                font-size: 24rpx;
+                font-family: DINAlternate, DINAlternate;
+                //font-weight: bold;
+                color: #A69E9F;
+                line-height: 40rpx;
+              }
+            }
             .YOYBox{
               .YOYBoxText{
                 font-size: 24rpx;
@@ -1295,6 +1642,17 @@ export default {
               }
             }
           }
+          .waringText{
+            display: inline-block;
+            position: relative;
+            top: -10px;
+            font-size: 24rpx;
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            color: #9A9A9A;
+            line-height: 37rpx;
+            white-space: nowrap;
+          }
         }
         .contentTitleBoxOuter{
           width: 100%;
@@ -1305,12 +1663,31 @@ export default {
           justify-content: space-between;
           margin-bottom: 16rpx;
           .contentTitle{
-            font-size: 24rpx;
+            font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             color: #160002;
             line-height: 36rpx;
           }
+          .YOYNumber{
+            display: flex;
+            align-items: center;
+            margin-right: 32rpx;
+            .YOYNumberText{
+              font-size: 24rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #A69E9F;
+              line-height: 36rpx;
+            }
+            .YOYNumberValue{
+              font-size: 24rpx;
+              font-family: DINAlternate, DINAlternate;
+              //font-weight: bold;
+              color: #A69E9F;
+              line-height: 40rpx;
+            }
+          }
           .YOYBox{
             display: flex;
             align-items: center;
@@ -1334,6 +1711,54 @@ export default {
           width: 100%;
           box-sizing: border-box;
           padding: 0 24rpx 24rpx;
+          .contentTitleBox{
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .contentTitle{
+              font-size: 28rpx;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 400;
+              color: #160002;
+              line-height: 36rpx;
+            }
+            .YOYNumber{
+              display: flex;
+              align-items: center;
+              margin-right: 32rpx;
+              .YOYNumberText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #A69E9F;
+                line-height: 36rpx;
+              }
+              .YOYNumberValue{
+                font-size: 24rpx;
+                font-family: DINAlternate, DINAlternate;
+                //font-weight: bold;
+                color: #A69E9F;
+                line-height: 40rpx;
+              }
+            }
+            .YOYBox{
+              .YOYBoxText{
+                font-size: 24rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #A69E9F;
+                line-height: 36rpx;
+              }
+              .YOYBoxValue{
+                font-size: 36rpx;
+                font-family: DINAlternate, DINAlternate;
+                font-weight: bold;
+                color: #E83944;
+                line-height: 40rpx;
+              }
+            }
+          }
           .pkBox{
             width: 100%;
             height: 140rpx;
@@ -1344,8 +1769,8 @@ export default {
               top: 50%;
               left: 50%;
               transform: translate(-50%,-50%);
-              width: 56rpx;
-              height: 56rpx;
+              width: 88rpx;
+              height: 88rpx;
             }
             .leftBox,.rightBox{
               width: 50%;
@@ -1376,7 +1801,6 @@ export default {
                 line-height: 40rpx;
               }
             }
-
             .rightBox{
               right: 0;top: 0;
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png");
@@ -1398,6 +1822,30 @@ export default {
                 line-height: 40rpx;
               }
             }
+            .revenueLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueLeft.png");
+            }
+            .revenueRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueRight.png");
+              .value{
+                color: #D48F00;
+              }
+              .label{
+                color: #D48F00;
+              }
+            }
+            .carLeft{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png");
+            }
+            .carRight{
+              background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png");
+              .value{
+                color: #3873DD;
+              }
+              .label{
+                color: #3873DD;
+              }
+            }
           }
 
           .otherListBox{
@@ -1406,7 +1854,8 @@ export default {
             border-radius: 16rpx;
             padding: 24rpx;
             box-sizing: border-box;
-            margin-top: 24rpx;
+            margin-top: 16rpx;
+            margin-bottom: 16rpx;
             .listType{
               .downBox{
                 width: 100%;
@@ -1565,7 +2014,7 @@ export default {
           position: relative;
           .detailLogo{
             width: 144rpx;
-            height: 72rpx;
+            height: 74rpx;
           }
           .detailIcon{
             width: 104rpx;
@@ -1574,6 +2023,11 @@ export default {
             right: 22rpx;
             top: 22rpx;
           }
+          .goTest{
+            position: absolute;
+            right: 22rpx;
+            top: 15rpx;
+          }
           .modalUnit{
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1581,8 +2035,8 @@ export default {
             color: #9A9A9A;
             line-height: 36rpx;
             position: absolute;
-            right: 24rpx;
-            top: 20rpx;
+            left: 170rpx;
+            top: 26rpx;
           }
         }
         .revenueContent{
@@ -1597,7 +2051,6 @@ export default {
             white-space: nowrap;
             padding-bottom: 12rpx;
             border-bottom: 1px solid #F5F4F4;
-            margin-bottom: 32rpx;
             .scrollItem{
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1615,6 +2068,14 @@ export default {
               line-height: 40rpx;
             }
           }
+          .dateText{
+            font-size: 24rpx;
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            color: #A69E9F;
+            margin: 16rpx 0;
+            display: inline-block;
+          }
 
           .modalBox{
             margin-top: 40rpx;
@@ -1625,6 +2086,7 @@ export default {
               margin-bottom: 16rpx;
               display: flex;
               align-items: center;
+              justify-content: space-between;
               .modalTitleItem{
                 display: flex;
                 align-items: center;
@@ -1651,6 +2113,22 @@ export default {
                   line-height: 36rpx;
                 }
               }
+              .moreBox{
+                display: flex;
+                align-items: center;
+                .moreText{
+                  font-size: 24rpx;
+                  font-family: PingFangSC, PingFang SC;
+                  font-weight: 400;
+                  color: #9A9A9A;
+                  line-height: 36rpx;
+                }
+                .moreIcon{
+                  width: 24rpx;
+                  height: 36rpx;
+                  margin-left: 4rpx;
+                }
+              }
               .modalTitleItem1{
                 font-size: 24rpx;
                 text-align: center;
@@ -1689,8 +2167,25 @@ export default {
                     text-align: center;
                     text-indent: 8rpx;
                   }
+                  .bigFather{
+                    position: relative;
+                    font-weight: 600;
+                  }
+                  .bigFather:before{
+                    position: absolute;
+                    top: 50%;
+                    left: -8rpx;
+                    transform: translateY(-50%);
+                    content:'';
+                    display: inline-block;
+                    width: 8rpx;
+                    height: 8rpx;
+                    border-radius: 50%;
+                    background: #DB6465;
+                  }
                   .father{
                     position: relative;
+                    font-weight: 600;
                   }
                   .father:before{
                     position: absolute;
diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue
new file mode 100644
index 0000000..77b14a0
--- /dev/null
+++ b/pages/nationalPage/testPage.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="main">
+    <div class="img" :style="{left:allScreen?'100%':'0%'}" @click="handleShowAllScreen">
+      <qiunDataCharts
+          type="area"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :canvas2d="true"
+          :inScrollView="true"
+          tooltipFormat="entryCarNumber"
+          :ontouch="true"
+      />
+    </div>
+
+    <div class="allScreen" :style="{left:allScreen?'0%':'100%'}"  @click="handleShowAllScreen">
+      <qiunDataCharts
+          type="area"
+          :opts="opts2"
+          :chartData="res"
+          :animation="false"
+          tooltipFormat="entryCarNumber"
+          :ontouch="true"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import qiunDataCharts from "./components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
+import request from '@/util/index.js'
+export default {
+  components: {qiunDataCharts},
+  data() {
+    return {
+      opts:{},
+      opts2:{},
+      res:{},
+      allScreen:false
+    }
+  },
+  onLoad(){
+
+
+
+
+    this.handleGetData()
+  },
+  methods:{
+    async handleGetData(){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      const req = {
+        pushProvinceCode:'340000',
+        StatisticsDate:'2024-02-01',
+        holidayType: 2,
+        curYear:2024,
+        compareYear:2023,
+      }
+      const data = await request.$webGet('CommercialApi/Revenue/GetHolidayCompare',req)
+      console.log('data',data)
+      let dateList = []
+      let dataObj = data.Result_Data
+      let allDateList = ''
+      dataObj.compareList.forEach(item=>{
+        const date = new Date(item.name)
+        let m = date.getMonth() + 1
+        let d = date.getDate()
+        let dateText = `${m}.${d}`
+        item.easyDate = dateText
+        if (allDateList.indexOf(dateText)===-1){
+          if (allDateList){
+            allDateList+=`,${dateText}`
+          }else{
+            allDateList = dateText
+          }
+        }
+      })
+      dataObj.curList.forEach(item=>{
+        const date = new Date(item.name)
+        let m = date.getMonth() + 1
+        let d = date.getDate()
+        let dateText = `${m}.${d}`
+        item.easyDate = dateText
+        if (allDateList.indexOf(dateText)===-1){
+          if (allDateList){
+            allDateList+=`,${dateText}`
+          }else{
+            allDateList = dateText
+          }
+        }
+      })
+
+      allDateList = allDateList.split(',')
+      dateList = allDateList
+      console.log('dateList',dateList)
+      console.log('dataObj.compareList',dataObj.compareList)
+      console.log('dataObj.curList',dataObj.curList)
+      let max = 0
+      let compareList = []
+      let realCompareList = []
+
+      let curListList = []
+      let realCurList = []
+
+      dataObj.compareList.forEach(item=>{
+        const date = new Date(item.name)
+        let m = date.getMonth() + 1
+        let d = date.getDate()
+        let dateText = `${m}.${d}`
+        item.easyDate = dateText
+        if (allDateList.indexOf(dateText)===-1){
+          if (allDateList){
+            allDateList+=`,${dateText}`
+          }else{
+            allDateList = dateText
+          }
+        }
+      })
+      dataObj.curList.forEach(item=>{
+        const date = new Date(item.name)
+        let m = date.getMonth() + 1
+        let d = date.getDate()
+        let dateText = `${m}.${d}`
+        item.easyDate = dateText
+        if (allDateList.indexOf(dateText)===-1){
+          if (allDateList){
+            allDateList+=`,${dateText}`
+          }else{
+            allDateList = dateText
+          }
+        }
+      })
+
+
+      allDateList.forEach(item=>{
+        let beforeValue = dataObj.compareList.filter(filter=> filter.easyDate === item)[0]
+        beforeValue = beforeValue?beforeValue.value:null
+        if (beforeValue){
+          if (Number(beforeValue) / 10000 > max){
+            max = Number(beforeValue) / 10000
+          }
+          compareList.push(Number(beforeValue) / 10000)
+          realCompareList.push(Number(beforeValue))
+        }
+        else{
+          compareList.push(0)
+          realCompareList.push(0)
+        }
+
+        let compareValue = dataObj.curList.filter(filter=> filter.easyDate === item)[0]
+        compareValue = compareValue?compareValue.value:null
+        if (compareValue){
+          if (Number(compareValue) / 10000 > max){
+            max = Number(compareValue) / 10000
+          }
+          curListList.push(Number(compareValue) / 10000)
+          realCurList.push(Number(compareValue))
+        }else{
+          curListList.push(0)
+          realCurList.push(0)
+        }
+      })
+
+      let res = {
+        categories: dateList,
+        series:[
+          {
+            name:`24年`,
+            data:curListList,
+            real:realCurList,
+          },
+          {
+            name:`23年`,
+            data:compareList,
+            real:realCompareList,
+          },
+        ],
+        max:Number(max.toFixed(2)),
+      }
+      console.log('res',res)
+      this.res = res
+
+      this.opts = {
+        categories: res.categories,
+        series: res.series,
+        animation: false,
+        rotate: false,
+        rotateLock: false,
+        enableScroll: true,
+        background: "#FFFFFF",
+        color: ["#1E80FF", "#00B6FF","#ACB9CD"],
+        padding: [15, 15, 5, 5],
+        dataLabel: false,
+        legend: {
+          show: true,
+          position: "bottom",
+          lineHeight: 25,
+          float: 'center'
+
+        },
+        xAxis: {
+          disableGrid: true,
+          itemCount: 7
+        },
+        yAxis: {
+          gridType: "dash",
+          dashLength: 2,
+          splitNumber:4,
+          data: [
+            {
+              min: 0,
+              max:res.max
+            }
+          ]
+        },
+        extra: {
+          area: {
+            type: "curve",
+            opacity: 0.2,
+            addLine: true,
+            width: 2,
+            gradient: true,
+            activeType: "hollow"
+          }
+        }
+      }
+
+
+      let phoneInfo = uni.getStorageSync('phoneInfo')
+      console.log('phoneInfo',phoneInfo)
+      this.opts2 = {
+        // width:phoneInfo.screenHeight+'px',
+        // height:(2*phoneInfo.screenWidth)+'px',
+        categories: res.categories,
+        series: res.series,
+        animation: false,
+        rotate: true,
+        rotateLock: false,
+        enableScroll: true,
+        background: "#FFFFFF",
+        color: ["#1E80FF", "#00B6FF","#ACB9CD"],
+        padding: [15, 15, 5, 5],
+        dataLabel: false,
+        legend: {
+          show: true,
+          position: "bottom",
+          lineHeight: 25,
+          float: 'center'
+
+        },
+        xAxis: {
+          disableGrid: true,
+          itemCount: 10
+        },
+        yAxis: {
+          gridType: "dash",
+          dashLength: 2,
+          splitNumber:4,
+          data: [
+            {
+              min: 0,
+              max:res.max
+            }
+          ]
+        },
+        extra: {
+          area: {
+            type: "curve",
+            opacity: 0.2,
+            addLine: true,
+            width: 2,
+            gradient: true,
+            activeType: "hollow"
+          }
+        }
+      }
+      uni.hideLoading()
+    },
+    handleShowAllScreen(){
+      this.allScreen = !this.allScreen
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.main{
+  width: 100%;
+  height: 100vh;
+  .img{
+    position: fixed;
+    top: 0;
+  }
+  .allScreen{
+    position: fixed;
+    top: 0;
+    width: 100vh;
+    height: 100vh;
+  }
+}
+</style>