diff --git a/pages/attendanceStatus/attendanceStatistics.vue b/pages/attendanceStatus/attendanceStatistics.vue
index 888877a..db6c26c 100644
--- a/pages/attendanceStatus/attendanceStatistics.vue
+++ b/pages/attendanceStatus/attendanceStatistics.vue
@@ -12,11 +12,11 @@
                         <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
                         <view class="select">
                             <view class="content">
-                                <view class="uni-input">{{ serviceInfo.SERVERPART_NAME ? serviceInfo.SERVERPART_NAME :
+                                <view class="uni-input">{{ serviceInfo.SAName ? serviceInfo.SAName :
                                     '请选择服务区' }}
                                 </view>
-                                <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}
-                                </p>
+                                <!-- <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}
+                                </p> -->
                                 <image class="rightArrow"
                                     src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
                             </view>
@@ -40,7 +40,7 @@
                             <view class="center">
                                 <text class="date-text">{{ selectDate ? $util.cutDate(new Date(selectDate), 'YYYY-MM') :
                                     ""
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="arrowBtn" @tap="handleChangeDate(1)">
                                 <image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/rightArrowIcon.png" />
@@ -220,7 +220,7 @@
                                 </view>
                                 <view class="rankValue">
                                     <text class="numberWithUnit">{{ getCurrentValue(item) }}{{ getCurrentUnit()
-                                        }}</text>
+                                    }}</text>
                                 </view>
                             </view>
                         </view>
@@ -262,14 +262,15 @@ export default {
         this.menu = uni.getMenuButtonBoundingClientRect()
         let currentService = uni.getStorageSync('currentService')
         this.serviceInfo = currentService
-        this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
-        this.handleGetData(currentService.SERVERPART_NAME)
+        // this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
+        this.handleGetData(currentService.SAName)
     },
     async onShow() {
         let currentService = uni.getStorageSync('currentService')
-        if (currentService.Serverpart_ID !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
-            this.handleGetServerpartDetail(currentService.Serverpart_ID)
-            this.handleGetData(currentService.SERVERPART_NAME)
+        if (currentService.SACode !== this.serviceInfo.SACode && !this.isFirst) {
+            // this.handleGetServerpartDetail(currentService.Serverpart_ID)
+            this.serviceInfo = currentService
+            this.handleGetData(currentService.SAName)
         }
         this.isFirst = false
     },
@@ -283,7 +284,7 @@ export default {
         retryLoad() {
             if (this.retryCount < 3) {
                 this.retryCount++
-                this.handleGetData(this.serviceInfo.SERVERPART_NAME)
+                this.handleGetData(this.serviceInfo.SAName)
             } else {
                 uni.showToast({
                     title: '多次重试失败，请检查网络连接',
@@ -391,7 +392,7 @@ export default {
         onCalendarConfirm(e) {
             console.log('选择日期:', e)
             this.selectDate = e.fulldate
-            this.handleGetData(this.serviceInfo.SERVERPART_NAME)
+            this.handleGetData(this.serviceInfo.SAName)
         },
 
         // 日历关闭
@@ -518,7 +519,7 @@ export default {
 
             this.selectDate = `${y}-${m}-${d}`;
             this.retryCount = 0 // 重置重试次数
-            await this.handleGetData(this.serviceInfo.SERVERPART_NAME)
+            await this.handleGetData(this.serviceInfo.SAName)
         },
     }
 }
diff --git a/pages/attendanceStatus/emergencyEvents.vue b/pages/attendanceStatus/emergencyEvents.vue
index 48f0e04..fced8e9 100644
--- a/pages/attendanceStatus/emergencyEvents.vue
+++ b/pages/attendanceStatus/emergencyEvents.vue
@@ -339,7 +339,7 @@ export default {
                 this.showList = []
                 const req = {
                     bsessionKey: "EA65F66FA29B47FD8072A4AFC66967B3",
-                    saName: this.serviceInfo.SERVERPART_NAME
+                    saName: this.serviceInfo.SAName
                 }
                 const data = await new Promise((resolve, reject) => {
                     uni.request({
@@ -368,7 +368,7 @@ export default {
                 this.showList = []
                 const req = {
                     bsessionKey: "0DAF3A5982D54A619D4B63A34CA20C55",
-                    saName: this.serviceInfo.SERVERPART_NAME
+                    saName: this.serviceInfo.SAName
                 }
                 const data = await new Promise((resolve, reject) => {
                     uni.request({
diff --git a/pages/attendanceStatus/index.vue b/pages/attendanceStatus/index.vue
index 3fef38c..21d7790 100644
--- a/pages/attendanceStatus/index.vue
+++ b/pages/attendanceStatus/index.vue
@@ -11,11 +11,11 @@
                         <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
                         <view class="select">
                             <view class="content">
-                                <view class="uni-input">{{ serviceInfo.SERVERPART_NAME ? serviceInfo.SERVERPART_NAME :
+                                <view class="uni-input">{{ serviceInfo.SAName ? serviceInfo.SAName :
                                     '' }}
                                 </view>
-                                <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}
-                                </p>
+                                <!-- <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }} -->
+                                <!-- </p> -->
                                 <image class="rightArrow"
                                     src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
                             </view>
@@ -28,14 +28,13 @@
         <!-- 服务区的信息 -->
         <view class="serviceDetail" style="margin-top: 16rpx;">
             <view class="detailTop">
-                <view class="serviceImg" v-if="serviceInfo.ImageLits && serviceInfo.ImageLits.length > 0">
+                <view class="serviceImg" v-if="serviceInfo.fileId && serviceInfo.fileId.length > 0">
                     <swiper scroll-x="true" circular="true" class="banner" indicator-dots="true"
                         indicator-active-color="#272625" autoplay interval="3000" :current="pageMsg.current"
                         style="width: 100%; height: 100%">
-                        <swiper-item v-for="(img, i) in serviceInfo.ImageLits" :key="i"
-                            style="width: 100%; height: 100%">
+                        <swiper-item v-for="(img, i) in serviceInfo.fileId" :key="i" style="width: 100%; height: 100%">
                             <image style="width: 100%; height: 100%" mode="aspectFill" lazy-load="true"
-                                :src="img || 'https://eshangtech.com/ShopICO/ahyd-BID/service/default.png'">
+                                :src="img.fileID ? 'https://fwqznxj.yciccloud.com:9081/fileDownloadApi/bsys/document/docDownloadAction?fileId=' + img.fileID : 'https://eshangtech.com/ShopICO/ahyd-BID/service/default.png'">
                             </image>
                         </swiper-item>
                     </swiper>
@@ -504,12 +503,15 @@ export default {
     onLoad() {
         this.menu = uni.getMenuButtonBoundingClientRect()
         let currentService = uni.getStorageSync('currentService')
+        console.log('currentServicecurrentServicecurrentService', currentService);
 
         // 防护：确保 currentService 存在
-        if (currentService && (currentService.Serverpart_ID || currentService.SERVERPART_ID)) {
-            this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
-            this.handleGetCurrentServiceAttendanceData(currentService.SERVERPART_NAME)
-            this.handleGetEventsData(currentService.SERVERPART_NAME)
+        if (currentService && (currentService.SAName || currentService.SACode)) {
+            this.serviceInfo = {
+                ...currentService,
+            }
+            this.handleGetCurrentServiceAttendanceData(currentService.SAName)
+            this.handleGetEventsData(currentService.SAName)
         } else {
             console.warn('onLoad: currentService 为空或无效')
             // 可以考虑跳转回服务区选择页面或显示错误提示
@@ -517,24 +519,28 @@ export default {
     },
     onShow() {
         let currentService = uni.getStorageSync('currentService')
-        console.log('currentService', currentService);
+        console.log('onShowonShowonShowonShow', currentService);
 
         // 防护：检查 currentService 是否有效
-        if (!currentService || (!currentService.Serverpart_ID && !currentService.SERVERPART_ID)) {
+        if (!currentService || (!currentService.SACode)) {
             console.warn('currentService 为空或无效，跳过更新');
             this.isFirst = false;
             return;
         }
 
         // 获取统一的服务区ID
-        const currentServiceId = currentService.Serverpart_ID || currentService.SERVERPART_ID;
-        const currentServiceName = currentService.SERVERPART_NAME;
+        const currentServiceId = currentService.SACode;
+        const currentServiceName = currentService.SAName;
 
         // 只有当服务区真正发生变化且不是首次加载时才更新
-        if (currentServiceId && currentServiceId !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
+        if (currentServiceId && currentServiceId !== this.serviceInfo.SACode && !this.isFirst) {
+            console.log('111111', currentService);
             this.emergencyListLength = 0
             this.dailyListLength = 0
-            this.handleGetServerpartDetail(currentServiceId);
+            this.serviceInfo = {
+                ...currentService,
+            }
+            // this.handleGetServerpartDetail(currentServiceId);
             this.handleGetCurrentServiceAttendanceData(currentServiceName);
             this.handleGetEventsData(currentServiceName)
         } else {
@@ -546,7 +552,7 @@ export default {
         async handleGetEventsData(saName) {
             const req = {
                 bsessionKey: "EA65F66FA29B47FD8072A4AFC66967B3",
-                saName: saName || this.serviceInfo.SERVERPART_NAME
+                saName: saName || this.serviceInfo.SAName
             }
             console.log('reqreq', req);
 
@@ -568,7 +574,7 @@ export default {
 
             const req2 = {
                 bsessionKey: "0DAF3A5982D54A619D4B63A34CA20C55",
-                saName: saName || this.serviceInfo.SERVERPART_NAME
+                saName: saName || this.serviceInfo.SAName
             }
             const data2 = await new Promise((resolve, reject) => {
                 uni.request({
@@ -672,7 +678,7 @@ export default {
             this.selectDate = `${year}-${month}-${day}`;
 
             console.log('serviceInfo', this.serviceInfo);
-            await this.handleGetCurrentServiceAttendanceData(this.serviceInfo.SERVERPART_NAME)
+            await this.handleGetCurrentServiceAttendanceData(this.serviceInfo.SAName)
         },
         // 查询服务区详情
         async handleGetServerpartDetail(id) {
@@ -716,7 +722,7 @@ export default {
                 latitude: obj.latitude ? obj.latitude * 1 : obj.SERVERPART_Y * 1,
                 longitude: obj.longitude ? obj.longitude * 1 : obj.SERVERPART_X * 1,
                 scale: 16, // 缩放比例
-                name: obj.SERVERPART_NAME,
+                name: obj.SAName,
                 // address: "", // 这个可能会影响地图的定位，所以可以选择不填
                 success(data) {
                 },
@@ -748,7 +754,7 @@ export default {
             // this.selectDate = e.detail.value
             this.selectDate = e.fulldate
 
-            await this.handleGetCurrentServiceAttendanceData(this.serviceInfo.SERVERPART_NAME)
+            await this.handleGetCurrentServiceAttendanceData(this.serviceInfo.SAName)
         },
         // 切换tab
         handleChangeTab(e) {
diff --git a/pages/attendanceStatus/roster.vue b/pages/attendanceStatus/roster.vue
index 4156dc6..df6ba8c 100644
--- a/pages/attendanceStatus/roster.vue
+++ b/pages/attendanceStatus/roster.vue
@@ -10,11 +10,11 @@
                         <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
                         <view class="select">
                             <view class="content">
-                                <view class="uni-input">{{ serviceInfo.SERVERPART_NAME ? serviceInfo.SERVERPART_NAME :
+                                <view class="uni-input">{{ serviceInfo.SAName ? serviceInfo.SAName :
                                     '' }}
                                 </view>
-                                <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}
-                                </p>
+                                <!-- <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}
+                                </p> -->
                                 <image class="rightArrow"
                                     src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
                             </view>
@@ -35,7 +35,7 @@
                         <view class="center">
                             <text class="date-text">{{ selectDate ? $util.cutDate(new Date(selectDate), 'YYYY-MM') :
                                 ""
-                            }}</text>
+                                }}</text>
                         </view>
                         <view class="arrowBtn" @tap="handleChangeDate(1)">
                             <image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/rightArrowIcon.png" />
@@ -175,25 +175,25 @@ export default {
         this.serviceInfo = currentService
         this.handleGetNewMonthData()
         // 加载排班数据
-        this.loadRosterData(currentService.SERVERPART_NAME)
+        this.loadRosterData(currentService.SAName)
     },
     onShow() {
         let currentService = uni.getStorageSync('currentService')
         console.log('currentService', currentService);
 
         // 防护：检查 currentService 是否有效
-        if (!currentService || (!currentService.Serverpart_ID && !currentService.SERVERPART_ID)) {
+        if (!currentService || (!currentService.SACode)) {
             console.warn('currentService 为空或无效，跳过更新');
             this.isFirst = false;
             return;
         }
 
         // 获取统一的服务区ID
-        const currentServiceId = currentService.Serverpart_ID || currentService.SERVERPART_ID;
-        const currentServiceName = currentService.SERVERPART_NAME;
+        const currentServiceId = currentService.SACode;
+        const currentServiceName = currentService.SAName;
 
         // 只有当服务区真正发生变化且不是首次加载时才更新
-        if (currentServiceId && currentServiceId !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
+        if (currentServiceId && currentServiceId !== this.serviceInfo.SACode && !this.isFirst) {
             this.serviceInfo = currentService
             this.rosterData = []
             this.userList = []
@@ -213,7 +213,7 @@ export default {
         retryLoad() {
             if (this.retryCount < 3) {
                 this.retryCount++
-                this.loadRosterData(this.serviceInfo.SERVERPART_NAME)
+                this.loadRosterData(this.serviceInfo.SAName)
             } else {
                 uni.showToast({
                     title: '多次重试失败，请检查网络连接',
diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index 0d68a5c..847827a 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -1,215 +1,264 @@
 <template>
-	<div>
+	<view>
 		<view class="page-body" v-if="showPage">
 			<AnhHead :today="today" :headMsg="headMsg" :lastDay="lastDay"
 				:groupType="theRequest && theRequest.GroupType" :provinceCode="theRequest && theRequest.ProvinceCode"
 				@bindDateChange="bindDateChange" :isup="isup" :nowDay="nowDay"
 				:selectDate="theRequest && theRequest.time" @toggle="toggleCard" :currentMoney="currentMoney"></AnhHead>
 			<!--营收占比的上面组件	-->
-			<view style="background-color: #fff;">
+			<view class="main-content">
 				<!--安徽省 昨日营收占比 -->
-				<div v-if="theRequest && theRequest.GroupType != 1010">
-					<div class="uni-inline-item modle-title">
-						<image :src="theRequest.ProvinceCode == 530000
-							? '/static/images/revenue/type-operation530000.svg'
-							: '/static/images/revenue/type-operation.png'
-							" mode="aspectFit"></image>
-						<text class="strong-text">营收占比</text>
-					</div>
-					<view class="box-operation">
+				<view v-if="theRequest && theRequest.GroupType != 1010">
+					<view class="section-header">
+						<view class="section-title">
+							<view class="section-icon">
+								<text class="icon-emoji">📊</text>
+							</view>
+							<text class="section-text">营收占比</text>
+						</view>
+						
+					</view>
+					<view class="analysis-container">
 
-						<div class="operation-tab-box">
-							<div class="operation-tab-unit" @tap="selectTab('nowTab', 1)"
-								v-if="theRequest.ProvinceCode == 340000" :class="{ 'active': nowTab == 1 }">经营模式</div>
-							<div class="operation-tab-unit" @tap="selectTab('nowTab', 2)"
-								:class="{ 'active': nowTab == 2 }">
-								经营业态</div>
-							<div class="operation-tab-unit" @tap="selectTab('nowTab', 3)"
+						<view class="modern-tabs">
+							<view class="tab-item" @tap="selectTab('nowTab', 1)"
+								v-if="theRequest.ProvinceCode == 340000" :class="{ 'active': nowTab == 1 }">
+								<view class="tab-icon">🏢</view>
+								<view class="tab-label">经营模式</view>
+							</view>
+							<view class="tab-item" @tap="selectTab('nowTab', 2)" :class="{ 'active': nowTab == 2 }">
+								<view class="tab-icon">🏪</view>
+								<view class="tab-label">经营业态</view>
+							</view>
+							<view class="tab-item" @tap="selectTab('nowTab', 3)"
 								v-if="areaProgress.length && areaProgress.length > 1"
-								:class="{ 'active': nowTab == 3 }">区域营收
-							</div>
-							<div class="operation-tab-unit" @tap="selectTab('nowTab', 4)"
+								:class="{ 'active': nowTab == 3 }">
+								<view class="tab-icon">🗺</view>
+								<view class="tab-label">区域营收</view>
+							</view>
+							<view class="tab-item" @tap="selectTab('nowTab', 4)"
 								v-if="theRequest.ProvinceCode == 340000 && theRequest.GroupType == 1000"
-								:class="{ 'active': nowTab == 4 }">车流分析
-							</div>
-						</div>
-						<div class="operation-content-box">
-							<div v-show="nowTab == 1"
+								:class="{ 'active': nowTab == 4 }">
+								<view class="tab-icon">🚗</view>
+								<view class="tab-label">车流分析</view>
+							</view>
+						</view>
+						<view class="content-wrapper">
+							<view class="chart-section" v-show="nowTab == 1"
 								v-if="modelProgress.length > 0 && theRequest.ProvinceCode == 340000">
-								<canvas canvas-id="modelCont" id="modelCont" class="operation-content"
-									@touchstart="touchPie($event, 'modelCont')"></canvas>
-								<div>
-									<div class="operation-c-list" v-for="(item, o) in modelProgress" :key="o">
-										<div class="operation-cl-unit">
-											<text>{{ item.name }} {{ item.bili }}%</text>
-											<text>{{ item.data }}元</text>
-										</div>
-										<div class="progress">
-											<div class="bgO" :style="{ 'width': item.bili + '%' }"></div>
-										</div>
-									</div>
-
-								</div>
-							</div>
-							<div v-show="nowTab == 2" v-if="regionProgress.length > 0">
-								<canvas canvas-id="businessCont" id="businessCont" class="operation-content"
-									@touchstart="touchPie($event, 'businessCont')"></canvas>
-								<div>
-									<div class="operation-c-list" v-for="(item, o) in regionProgress" :key="o">
-										<div class="operation-cl-unit">
-											<text>{{ item.name }} {{ item.bili }}%</text>
-											<text>{{ item.data }}元</text>
-										</div>
-										<div class="progress">
-											<div class="bgO" :style="{ 'width': item.bili + '%' }"></div>
-										</div>
-									</div>
-
-								</div>
-							</div>
-							<div v-show="nowTab == 3" v-if="areaProgress.length > 0">
-								<canvas canvas-id="areaCont" id="areaCont" class="operation-content"
-									@touchstart="touchPie($event, 'areaCont')"></canvas>
-								<div>
-									<div class="operation-c-list" v-for="(item, o) in areaProgress" :key="o">
-										<div class="operation-cl-unit">
-											<text>{{ item.name }} {{ item.bili }}%</text>
-											<text>{{ item.data }}元</text>
-										</div>
-										<div class="progress">
-											<div class="bgO" :style="{ 'width': item.bili + '%' }"></div>
-										</div>
-									</div>
-								</div>
-							</div>
-							<div v-show="nowTab == 4" v-if="bayonetProgress && bayonetProgress.length > 0">
-								<div>
-									<div class="operation-c-list" v-for="(item, o) in bayonetProgress" :key="o">
-										<div class="operation-cl-unit">
-											<text>{{ item.name }}</text>
-										</div>
-										<div style="padding: 10rpx;" class="bayonet-c-list"
-											v-for="(child, o) in item.list" :key="o">
-											<div class="operation-cl-unit1">
-												<text class="server">{{ child.name }}</text>
-												<text class="type" style="color: #868686;">入区流量/断面流量</text>
-												<text class="carType" style="color: #868686">大/中/小型车</text>
-											</div>
-											<ul class="bayonet-cell-area">
-												<li v-for="(childItem, o) in child.list" :key="o">
-													<text class="server">{{ childItem.name }}区:<text
-															style='color: #EF884F;'>{{ childItem.bili }}%</text></text>
-													<text class="type">{{ childItem.data }}/{{ childItem.flow }}</text>
-													<text class="carType">{{ childItem.LargeVehicle_Count }}/{{
-														childItem.MediumVehicle_Count }}/{{ childItem.MinVehicle_Count
-														}}</text>
-												</li>
-											</ul>
-											<!-- <div class="progress">
-												<div class="bgO" :style="{'width':item.bili+'%'}"></div>
-											</div> -->
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
+								<view class="chart-container">
+									<canvas canvas-id="modelCont" id="modelCont" class="modern-chart"
+										@touchstart="touchPie($event, 'modelCont')"></canvas>
+								</view>
+								<view class="data-cards">
+									<view class="data-card" v-for="(item, o) in modelProgress" :key="o">
+										<view class="card-header">
+											<view class="category-name">{{ item.name }}</view>
+											<view class="percentage">{{ item.bili }}%</view>
+										</view>
+										<view class="amount">￥{{ item.data }}</view>
+										<view class="progress-bar">
+											<view class="progress-fill" :style="{ 'width': item.bili + '%' }"></view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chart-section" v-show="nowTab == 2" v-if="regionProgress.length > 0">
+								<view class="chart-container">
+									<canvas canvas-id="businessCont" id="businessCont" class="modern-chart"
+										@touchstart="touchPie($event, 'businessCont')"></canvas>
+								</view>
+								<view class="data-cards">
+									<view class="data-card" v-for="(item, o) in regionProgress" :key="o">
+										<view class="card-header">
+											<view class="category-name">{{ item.name }}</view>
+											<view class="percentage">{{ item.bili }}%</view>
+										</view>
+										<view class="amount">￥{{ item.data }}</view>
+										<view class="progress-bar">
+											<view class="progress-fill" :style="{ 'width': item.bili + '%' }"></view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chart-section" v-show="nowTab == 3" v-if="areaProgress.length > 0">
+								<view class="chart-container">
+									<canvas canvas-id="areaCont" id="areaCont" class="modern-chart"
+										@touchstart="touchPie($event, 'areaCont')"></canvas>
+								</view>
+								<view class="data-cards">
+									<view class="data-card" v-for="(item, o) in areaProgress" :key="o">
+										<view class="card-header">
+											<view class="category-name">{{ item.name }}</view>
+											<view class="percentage">{{ item.bili }}%</view>
+										</view>
+										<view class="amount">￥{{ item.data }}</view>
+										<view class="progress-bar">
+											<view class="progress-fill" :style="{ 'width': item.bili + '%' }"></view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="traffic-analysis" v-show="nowTab == 4"
+								v-if="bayonetProgress && bayonetProgress.length > 0">
+								<view class="traffic-regions">
+									<view class="region-section" v-for="(item, o) in bayonetProgress" :key="o">
+										<view class="region-title">
+											<view class="region-icon">🗺️</view>
+											<view class="region-name">{{ item.name }}</view>
+										</view>
+										<view class="service-areas">
+											<view class="service-area-card" v-for="(child, o) in item.list" :key="o">
+												<view class="area-header">
+													<view class="area-name">🏢 {{ child.name }}</view>
+													<view class="flow-ratio">{{ child.bili }}%</view>
+												</view>
+												<view class="flow-stats">
+													<view class="stat-item">
+														<view class="stat-label">入区流量</view>
+														<view class="stat-value">{{ child.data }}</view>
+													</view>
+													<view class="stat-divider"></view>
+													<view class="stat-item">
+														<view class="stat-label">断面流量</view>
+														<view class="stat-value">{{ child.flow }}</view>
+													</view>
+												</view>
+												<view class="vehicle-breakdown">
+													<view class="vehicle-item" v-for="(childItem, idx) in child.list"
+														:key="idx">
+														<view class="direction-header">
+															<view class="direction-name">{{ childItem.name }}区</view>
+															<view class="direction-ratio">{{ childItem.bili }}%</view>
+														</view>
+														<view class="vehicle-types">
+															<text class="vehicle-type">🚛 {{
+																childItem.LargeVehicle_Count }}</text>
+															<text class="vehicle-type">🚐 {{
+																childItem.MediumVehicle_Count }}</text>
+															<text class="vehicle-type">🚗 {{ childItem.MinVehicle_Count
+															}}</text>
+														</view>
+													</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
 					</view>
-				</div>
+				</view>
 
-				<!-- 昨日日结上传 -->
-				<div class="uni-inline-item modle-title jc-between" v-if="regionList.length > 0">
-					<view class="uni-inline-item">
-						<image src="/static/images/revenue/yestoday-region.png" mode="aspectFit"></image>
-						<text class="strong-text">日结上传</text>
+				<!-- 日结上传区域 -->
+				<view class="upload-section" v-if="regionList.length > 0">
+					<view class="upload-header">
+						<view class="upload-title">
+							<view class="upload-icon">📊</view>
+							<view class="upload-text">日结上传状态</view>
+						</view>
+						<view class="upload-summary">
+							<view class="summary-label">上传情况</view>
+							<view class="summary-value">{{ headMsg.uploadState }}</view>
+						</view>
 					</view>
-					<view style="font-size: 26rpx;">
-						门店上传&nbsp;&nbsp; <span class="upload-count">{{ headMsg.uploadState }}</span>
-					</view>
-				</div>
+				</view>
 				<template v-if="theRequest && theRequest.GroupType == 1020 && regionList.length">
-					<div v-for="(item, i) in regionList[0].child" :key="i" class=" region-cell" @tap="toDetail(item)">
-						<div class="region-cell-unit">
-							<text>{{ item.serverpart_Name }}</text>
-							<div class="ct01">
-								<text class="strong-text">{{ $util.fmoney(item.cashpay, 2) }}</text>
-								<text>元</text>
-							</div>
-						</div>
-						<div class="region-cell-unit">
-							<text>上传率</text>
-							<div class="ct01">
-								<text class="strong-text">{{ item.totalcount > item.uploadcount ?
-									$util.fmoney((item.uploadcount / item.totalcount) * 100, 2) : 100 }}</text>
-								<text>%</text>
-							</div>
-						</div>
-						<div class="region-cell-unit"
-							:class="{ 'ct-red': item.uploadcount != item.totalcount, 'weisc-ico': item.uploadcount != item.totalcount }">
-							{{ item.uploadcount + '/' + item.totalcount }}
-						</div>
-						<div class="region-cell-image">
-							<text class="uni-icon-arrowright uni-icon"></text>
-						</div>
-					</div>
+					<view class="service-list">
+						<view v-for="(item, i) in regionList[0].child" :key="i" class="service-card"
+							@tap="toDetail(item)">
+							<view class="service-header">
+								<view class="service-info">
+									<view class="service-name">🏢 {{ item.serverpart_Name }}</view>
+									<view class="service-revenue">￥{{ $util.fmoney(item.cashpay, 2) }}</view>
+								</view>
+								<view class="service-status">
+									<view class="upload-rate"
+										:class="{ 'warning': item.uploadcount != item.totalcount }">
+										{{ item.totalcount > item.uploadcount ?
+											$util.fmoney((item.uploadcount / item.totalcount) * 100, 2) : 100 }}%
+									</view>
+									<view class="upload-fraction"
+										:class="{ 'incomplete': item.uploadcount != item.totalcount }">
+										{{ item.uploadcount }}/{{ item.totalcount }}
+									</view>
+								</view>
+							</view>
+							<view class="service-indicator">
+								<view class="status-dot"
+									:class="{ 'complete': item.uploadcount == item.totalcount, 'incomplete': item.uploadcount != item.totalcount }">
+								</view>
+								<view class="arrow-icon">›</view>
+							</view>
+						</view>
+					</view>
 				</template>
 				<template v-else-if="theRequest && theRequest.GroupType == 1000">
-					<!-- <div class="region-title" :class="{'active':regionShow1}">省内区域</div> -->
-					<div v-show="regionShow1">
+					<view class="region-list" v-show="regionShow1">
 						<block v-for="(item, i) in regionList" :key="i">
-							<div class=" region-cell" @tap="toggleRegion(item)">
-								<div class="region-cell-unit">
-									<text>{{ item.name }}</text>
-									<div class="ct01">
-										<text class="strong-text">{{ $util.fmoney(item.cashpay, 2) }}</text>
-										<text>元</text>
-									</div>
-								</div>
-								<div class="region-cell-unit">
-									<text>上传率</text>
-									<div class="ct01">
-										<text class="strong-text">{{ (item.totalcount > item.uploadcount) ?
-											$util.fmoney((item.uploadcount / item.totalcount) * 100, 2) :
-											'100.00' }}</text>
-										<text>%</text>
-									</div>
-								</div>
-								<div class="region-cell-unit"
-									:class="{ 'ct-red': item.uploadcount != item.totalcount }">
-									{{ item.uploadcount + '/' + item.totalcount }}
-								</div>
-								<div class="region-cell-image">
-									<text class="uni-icon-arrowright uni-icon" :class="{ 'active': item.show }"></text>
-								</div>
-							</div>
-							<ul class="region-cell-area" v-show="item.show">
-								<li v-for="(child, index) in item.child" :class="{ 'visited': child.visited }"
-									:key="index" @tap="toDetail(child)">
-									<div>{{ child.serverpart_Name }}</div>
-									<div>{{ $util.fmoney(child.cashpay, 2) }}<text>元</text></div>
-									<div :class="{ 'ct-red': child.uploadcount != child.totalcount }">
-										{{ child.uploadcount + '/' + child.totalcount }}
-									</div>
-								</li>
-							</ul>
+							<view class="region-card" @tap="toggleRegion(item)">
+								<view class="region-main">
+									<view class="region-info">
+										<view class="region-name">{{ item.name }}</view>
+										<view class="region-revenue">￥{{ $util.fmoney(item.cashpay, 2) }}</view>
+									</view>
+									<view class="region-metrics">
+										<view class="metric-item">
+											<view class="metric-label">上传率</view>
+											<view class="metric-value rate"
+												:class="{ 'incomplete': item.uploadcount != item.totalcount }">
+												{{ (item.totalcount > item.uploadcount) ?
+													$util.fmoney((item.uploadcount / item.totalcount) * 100, 2) : '100.00'
+												}}%
+											</view>
+										</view>
+										<view class="metric-item">
+											<view class="metric-label">状态</view>
+											<view class="metric-value fraction"
+												:class="{ 'incomplete': item.uploadcount != item.totalcount }">
+												{{ item.uploadcount }}/{{ item.totalcount }}
+											</view>
+										</view>
+										<view class="expand-indicator" :class="{ 'expanded': item.show }">
+											<view class="expand-icon">▼</view>
+										</view>
+									</view>
+								</view>
+								<view class="service-sublist" v-show="item.show">
+									<view class="subservice-card" v-for="(child, index) in item.child"
+										:class="{ 'visited': child.visited }" :key="index" @tap="toDetail(child)">
+										<view class="subservice-info">
+											<view class="subservice-name">{{ child.serverpart_Name }}</view>
+											<view class="subservice-revenue">￥{{ $util.fmoney(child.cashpay, 2) }}
+											</view>
+										</view>
+										<view class="subservice-status"
+											:class="{ 'incomplete': child.uploadcount != child.totalcount }">
+											{{ child.uploadcount }}/{{ child.totalcount }}
+										</view>
+										<view class="subservice-arrow">›</view>
+									</view>
+								</view>
+							</view>
 						</block>
-					</div>
+					</view>
 				</template>
 				<template v-else>
 					<shopCell v-for="(item, i) in regionList" :key="i" :item='item' @toggleShow="toggleShow" :i='i' />
 				</template>
 			</view>
 			<template v-if="theRequest && theRequest.ProvinceCode == '620000' || theRequest.ProvinceCode == '530000'">
-				<div class="uni-inline-item modle-title">
+				<view class="uni-inline-item modle-title">
 					<image src="/static/images/revenue/product-ranking.png" mode="aspectFit"></image>
 					<text class="strong-text">商品销售排行</text>
-				</div>
+				</view>
 				<RankContent :wechatPushSalesList="wechatPushSalesList" v-if="!isLoading"></RankContent>
 			</template>
 		</view>
-		<div v-if="!showPage && !isLoading">
+		<view v-if="!showPage && !isLoading">
 			<noFound :nodata="!showPage && !isLoading" :text="'您暂无' + lastDay + '营收数据'" />
-		</div>
-	</div>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -738,11 +787,12 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .page-body {
-	background: #fff;
+	background-color: #f8f9fa;
 	position: relative;
-	padding-bottom: 80rpx;
+	box-sizing: border-box;
+	min-height: 100vh;
 }
 
 .uni-flex-column {
@@ -775,7 +825,8 @@ export default {
 }
 
 .ct-red {
-	color: #D7565A !important;
+	color: #ff4757 !important;
+	font-weight: 600;
 }
 
 .new-content {
@@ -883,7 +934,7 @@ text.fs12 {
 .revenue-card-cont {
 	padding: 6rpx 0 32rpx 0;
 	border-radius: 12rpx;
-	margin: 0 20rpx;
+	margin: 0 32rpx;
 	box-shadow: 0rpx 0rpx 6rpx 0px rgba(224, 224, 224, 0.54);
 }
 
@@ -931,10 +982,20 @@ text.fs12 {
 /* end */
 
 .modle-title {
-	padding-left: 24rpx;
-	font-size: 30rpx;
-	padding-top: 42rpx;
-	padding-bottom: 20rpx;
+	padding: 0 32rpx 24rpx 32rpx;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333;
+	display: flex;
+	align-items: center;
+	margin-top: 32rpx;
+	box-sizing: border-box;
+
+	image {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 12rpx;
+	}
 }
 
 .modle-title .uni-icon-arrowdown {
@@ -965,8 +1026,10 @@ text.fs12 {
 }
 
 .upload-count {
-	font-family: 'Bahnschrift Regular';
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	font-size: 32rpx;
+	font-weight: 600;
+	color: #27B25F;
 	margin-left: 16rpx;
 	margin-right: 36rpx;
 }
@@ -1000,37 +1063,75 @@ text.fs12 {
 /*日结上传*/
 .region-cell {
 	display: flex;
-	align-items: flex-end;
+	align-items: center;
 	justify-content: space-between;
-	padding: 26rpx 24rpx 22rpx 42rpx;
+	padding: 32rpx 24rpx;
+	background-color: #fff;
+	margin-bottom: 12rpx;
+	border-radius: 12rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid #f5f5f5;
+	transition: all 0.3s ease;
+
+	&:active {
+		transform: scale(0.98);
+		box-shadow: 0 4rpx 20rpx rgba(39, 178, 95, 0.15);
+	}
 }
 
 .region-cell .region-cell-unit {
 	flex: 2;
 	display: flex;
 	flex-direction: column;
-	color: #929292;
-	font-size: 26rpx;
-	line-height: 1.5;
+	color: #666;
+	font-size: 28rpx;
+	line-height: 1.4;
 	text-align: right;
+
+	.strong-text {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+		font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	}
 }
 
 .region-cell .region-cell-unit:nth-child(1) {
 	flex: 3;
 	text-align: left;
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
 }
 
 .region-cell .region-cell-unit:nth-child(3) {
-	line-height: 50rpx;
+	line-height: 1.2;
+	font-size: 26rpx;
+	font-weight: 500;
+	padding: 8rpx 12rpx;
+	background-color: #f8f9fa;
+	border-radius: 8rpx;
+	min-width: 80rpx;
+	text-align: center;
 }
 
 .region-cell-image {
 	width: 48rpx;
 	display: flex;
 	align-items: center;
-	justify-content: flex-end;
-	height: 50rpx;
+	justify-content: center;
+	height: 48rpx;
 
+	.uni-icon-arrowright {
+		font-size: 28rpx;
+		color: #999;
+		transition: all 0.3s ease;
+
+		&.active {
+			transform: rotate(90deg);
+			color: #27B25F;
+		}
+	}
 }
 
 .region-cell image {
@@ -1040,10 +1141,13 @@ text.fs12 {
 
 /*日结上传服务区*/
 .region-cell-area {
-	/* display: none; */
-	max-height: 460rpx;
+	max-height: 600rpx;
 	overflow: auto;
 	-webkit-overflow-scrolling: touch;
+	background-color: #f8f9fa;
+	border-radius: 12rpx;
+	margin: 12rpx 0 0 0;
+	padding: 16rpx 0;
 }
 
 .region-cell-area li.visited view:first-child {
@@ -1052,53 +1156,64 @@ text.fs12 {
 }
 
 .region-cell-area li:after {
-	content: '';
-	background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/you-jt.png') no-repeat center;
-	width: 14rpx;
-	height: 24rpx;
-	background-size: contain;
+	content: '›';
+	font-size: 24rpx;
+	color: #999;
 	display: block;
 	position: absolute;
-	right: 24rpx;
-	top: 26rpx;
+	right: 16rpx;
+	top: 50%;
+	transform: translateY(-50%);
 }
 
 .region-cell-area li:nth-child(2n+1) {
-	background-color: #FCFCFC;
+	background-color: #fff;
 }
 
 .region-cell-area li:nth-child(2n+1):before {
 	content: '';
-	background-color: #5596F9;
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
 	width: 8rpx;
 	height: 8rpx;
-	border-radius: 8rpx;
+	border-radius: 50%;
 	display: block;
 	position: absolute;
-	left: 42rpx;
-
+	left: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
 }
 
 .region-cell-area li:nth-child(2n):before {
 	content: '';
-	background-color: #FE6D67;
+	background: linear-gradient(135deg, #ff9f43, #ff6b6b);
 	width: 8rpx;
 	height: 8rpx;
-	border-radius: 8rpx;
+	border-radius: 50%;
 	display: block;
 	position: absolute;
-	left: 42rpx;
+	left: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
 }
 
 .region-cell-area li {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-	padding: 16rpx 72rpx 16rpx 68rpx;
+	padding: 20rpx 24rpx 20rpx 48rpx;
 	position: relative;
 	text-align: right;
-	color: #2E2E2E;
-	background-color: #f7f7f7;
+	color: #333;
+	background-color: #fff;
+	margin: 8rpx 12rpx;
+	border-radius: 8rpx;
+	border: 1rpx solid #f0f0f0;
+	transition: all 0.2s ease;
+
+	&:active {
+		background-color: #f8f9fa;
+		transform: scale(0.99);
+	}
 }
 
 .region-cell-area li>div {
@@ -1334,81 +1449,99 @@ text.fs12 {
 //} */
 
 .box-operation {
-	box-shadow: 1px 2px 6px 0px rgba(224, 224, 224, 0.54);
-	margin: 20rpx 32rpx 0 32rpx;
-	border-radius: 12rpx;
+	background-color: #fff;
+	box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+	margin: 0 0 24rpx 0;
+	border-radius: 16rpx;
+	overflow: hidden;
+	border: 1rpx solid #f0f0f0;
 }
 
 .operation-tab-box {
-
-	background: #F1F1F1;
-	border-radius: 8rpx;
+	background: #f8f9fa;
+	border-radius: 0;
 	display: flex;
 	align-items: center;
 	text-align: center;
 	overflow: hidden;
+	margin: 0;
 }
 
 .operation-tab-box .operation-tab-unit {
-	color: #BABABA;
-	flex: 30%;
-	height: 120rpx;
-	line-height: 120rpx;
+	color: #666;
+	flex: 1;
+	height: 88rpx;
+	line-height: 88rpx;
 	position: relative;
-	padding-left: 24rpx;
+	font-size: 28rpx;
+	font-weight: 500;
+	transition: all 0.3s ease;
+	cursor: pointer;
 }
 
 .operation-tab-box .operation-tab-unit.active {
-	background-color: #fff;
-	color: #000000
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+	color: #fff;
+	font-weight: 600;
+	position: relative;
+	z-index: 2;
+	box-shadow: 0 4rpx 12rpx rgba(39, 178, 95, 0.3);
+	border-radius: 8rpx;
+	margin: 4rpx;
+	height: 80rpx;
+	line-height: 80rpx;
 }
 
 .operation-tab-box .operation-tab-unit.active:after {
-	content: '';
-	width: 30rpx;
-	height: 126rpx;
-	background-color: #fff;
-	border-radius: 0 14rpx 0 0;
-	position: absolute;
-	right: -20rpx;
-	transform: rotate(-9deg);
+	content: none;
 }
 
 .operation-tab-box .operation-tab-unit:after {
-	content: '';
-	width: 30rpx;
-	height: 126rpx;
-	border-radius: 0 14rpx 0 0;
-	background-color: #F1F1F1;
-	box-shadow: 6rpx 8rpx 4rpx rgba(0, 0, 0, 0.15);
-	position: absolute;
-	right: -20rpx;
-	transform: rotate(-9deg);
-	z-index: 1;
+	content: none;
 }
 
 .operation-content-box {
-	width: 686rpxrpx;
+	width: 100%;
 	overflow: hidden;
-	padding-bottom: 16rpx;
-
-}
-
-canvas.operation-content {
-	height: 500rpx;
-	width: 686rpx;
-	margin: 0 auto;
+	padding: 24rpx;
 	background-color: #fff;
 }
 
+canvas.operation-content {
+	height: 400rpx;
+	width: 100%;
+	max-width: 600rpx;
+	margin: 0 auto;
+	background-color: #fff;
+	border-radius: 8rpx;
+}
+
 .operation-c-list {
-	padding: 16rpx 32rpx;
+	padding: 20rpx 0;
+	border-bottom: 1rpx solid #f5f5f5;
+
+	&:last-child {
+		border-bottom: none;
+	}
 }
 
 .operation-cl-unit {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
+	font-size: 28rpx;
+	color: #333;
+	margin-bottom: 8rpx;
+
+	text:first-child {
+		font-weight: 600;
+		color: #27B25F;
+	}
+
+	text:last-child {
+		font-weight: 600;
+		font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	}
 }
 
 .operation-cl-unit1 {
@@ -1438,20 +1571,19 @@ canvas.operation-content {
 }
 
 .operation-c-list .progress {
-	width: 288rpx;
-	height: 12rpx;
-	background-color: #f9f9f9;
+	width: 100%;
+	height: 8rpx;
+	background-color: #f0f0f0;
 	border-radius: 4rpx;
 	margin-top: 12rpx;
+	overflow: hidden;
 }
 
 .operation-c-list .progress .bgO {
-	height: 12rpx;
+	height: 100%;
 	border-radius: 4rpx;
-	background: -webkit-linear-gradient(right, #EC6332, #EF884F);
-	background: -moz-linear-gradient(right, #EC6332, #EF884F);
-	background: -o-linear-gradient(right, #EC6332, #EF884F);
-	background: linear-gradient(to right, #EC6332, #EF884F);
+	background: linear-gradient(90deg, #27B25F, #4CCC7F);
+	transition: width 0.6s ease;
 }
 
 /*排行*/
@@ -1550,4 +1682,677 @@ canvas.operation-content {
 	width: 72rpx;
 	height: 72rpx;
 }
+
+// 新增主内容区域样式
+.main-content {
+	background-color: #fff;
+	margin: 0;
+	border-radius: 16rpx;
+	overflow: hidden;
+	box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+	border: 1rpx solid #f0f0f0;
+	margin-bottom: 24rpx;
+}
+
+/* 现代化页面重设计样式 */
+.section-header {
+	padding: 32rpx 24rpx 24rpx;
+	border-bottom: 2rpx solid #f1f3f4;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	background: #f8f9fa;
+}
+
+.section-title {
+	display: flex;
+	align-items: center;
+}
+
+.section-icon {
+	margin-right: 12rpx;
+}
+
+.icon-emoji {
+	font-size: 32rpx;
+}
+
+.section-text {
+	font-size: 28rpx;
+	font-weight: 700;
+	color: #2c3e50;
+}
+
+.section-badge {
+	background: #27B25F;
+	color: white;
+	font-size: 22rpx;
+	padding: 8rpx 16rpx;
+	border-radius: 20rpx;
+	font-weight: 500;
+}
+
+/* 分析容器 */
+.analysis-container {
+	background: #fff;
+}
+
+/* 现代化标签页 */
+.modern-tabs {
+	display: flex;
+	background: #f8f9fa;
+	padding: 8rpx;
+	margin: 0 24rpx 24rpx;
+	border-radius: 16rpx;
+}
+
+.tab-item {
+	flex: 1;
+	padding: 24rpx 16rpx;
+	text-align: center;
+	border-radius: 12rpx;
+	transition: all 0.3s ease;
+	cursor: pointer;
+	border: none;
+	background: transparent;
+	color: #666;
+}
+
+.tab-item.active {
+	background: #27B25F;
+	color: white;
+	box-shadow: 0 4rpx 16rpx rgba(39, 178, 95, 0.2);
+}
+
+.tab-icon {
+	font-size: 32rpx;
+	margin-bottom: 8rpx;
+	line-height: 1;
+}
+
+.tab-label {
+	font-size: 26rpx;
+	font-weight: 500;
+	line-height: 1.2;
+}
+
+/* 内容包装器 */
+.content-wrapper {
+	padding: 0 24rpx 32rpx;
+}
+
+/* 图表区域 */
+.chart-section {
+	margin-bottom: 32rpx;
+}
+
+.chart-container {
+	background: #f8f9fa;
+	border-radius: 16rpx;
+	padding: 24rpx;
+	margin-bottom: 24rpx;
+	box-shadow: 0 2rpx 16rpx rgba(0, 0, 0, 0.04);
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.modern-chart {
+	width: 100%;
+	height: 500rpx;
+	border-radius: 8rpx;
+	background: white;
+}
+
+/* 数据卡片布局 - 使用flex替代grid */
+.data-cards {
+	display: flex;
+	flex-wrap: wrap;
+	margin: -8rpx;
+}
+
+.data-card {
+	background: white;
+	border-radius: 12rpx;
+	padding: 24rpx 20rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+	position: relative;
+	overflow: hidden;
+	width: calc(50% - 16rpx);
+	margin: 8rpx;
+	box-sizing: border-box;
+}
+
+.data-card::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 4rpx;
+	background: #27B25F;
+}
+
+.card-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+}
+
+.category-name {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.percentage {
+	font-size: 24rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.amount {
+	font-size: 32rpx;
+	font-weight: 700;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+	margin-bottom: 12rpx;
+	line-height: 1.1;
+}
+
+.progress-bar {
+	width: 100%;
+	height: 8rpx;
+	background-color: #f0f0f0;
+	border-radius: 4rpx;
+	overflow: hidden;
+}
+
+.progress-fill {
+	height: 100%;
+	border-radius: 4rpx;
+	background: #27B25F;
+	transition: width 0.6s ease;
+}
+
+/* 流量分析区域 */
+.traffic-analysis {
+	margin-bottom: 32rpx;
+}
+
+.traffic-regions {
+	padding: 0;
+}
+
+.region-section {
+	margin-bottom: 32rpx;
+}
+
+.region-title {
+	display: flex;
+	align-items: center;
+	padding: 20rpx 0;
+	border-bottom: 2rpx solid #f1f3f4;
+	margin-bottom: 20rpx;
+}
+
+.region-icon {
+	font-size: 28rpx;
+	margin-right: 12rpx;
+}
+
+.region-name {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.service-areas {
+	display: flex;
+	flex-wrap: wrap;
+	margin: -10rpx;
+}
+
+.service-area-card {
+	background: #f8f9fa;
+	border-radius: 12rpx;
+	padding: 24rpx 20rpx;
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+	width: calc(50% - 20rpx);
+	margin: 10rpx;
+	box-sizing: border-box;
+}
+
+.area-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+}
+
+.area-name {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.flow-ratio {
+	font-size: 24rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.flow-stats {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+	padding: 16rpx;
+	background: white;
+	border-radius: 8rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
+
+.stat-item {
+	text-align: center;
+	flex: 1;
+}
+
+.stat-label {
+	font-size: 22rpx;
+	color: #6c757d;
+	margin-bottom: 4rpx;
+}
+
+.stat-value {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.stat-divider {
+	width: 1rpx;
+	height: 40rpx;
+	background: #e9ecef;
+	margin: 0 16rpx;
+}
+
+.vehicle-breakdown {
+	margin-top: 16rpx;
+}
+
+.vehicle-item {
+	background: white;
+	border-radius: 8rpx;
+	padding: 16rpx;
+	margin-bottom: 12rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
+
+.vehicle-item:last-child {
+	margin-bottom: 0;
+}
+
+.direction-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 12rpx;
+}
+
+.direction-name {
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.direction-ratio {
+	font-size: 22rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.vehicle-types {
+	display: flex;
+	gap: 16rpx;
+}
+
+.vehicle-type {
+	font-size: 22rpx;
+	color: #6c757d;
+	background: #f8f9fa;
+	padding: 6rpx 12rpx;
+	border-radius: 16rpx;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+/* 上传数据区域 */
+.upload-section {
+	background: white;
+	border-radius: 16rpx;
+	padding: 32rpx 24rpx 0;
+	margin-bottom: 32rpx;
+	box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.upload-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	// margin-bottom: 24rpx;
+	padding-bottom: 16rpx;
+	// border-bottom: 2rpx solid #f1f3f4;
+}
+
+.upload-title {
+	display: flex;
+	align-items: center;
+}
+
+.upload-icon {
+	font-size: 28rpx;
+	margin-right: 12rpx;
+}
+
+.upload-text {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.upload-summary {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+
+.summary-label {
+	font-size: 24rpx;
+	color: #6c757d;
+}
+
+.summary-value {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+/* 服务列表 */
+.service-list {
+	background: white;
+	border-radius: 16rpx;
+	padding: 24rpx;
+	margin-bottom: 32rpx;
+	box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.service-card {
+	background: #f8f9fa;
+	border-radius: 12rpx;
+	padding: 24rpx 20rpx;
+	margin-bottom: 16rpx;
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+	position: relative;
+	overflow: hidden;
+}
+
+.service-card:last-child {
+	margin-bottom: 0;
+}
+
+.service-card::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 4rpx;
+	background: #27B25F;
+}
+
+.service-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+}
+
+.service-info {
+	flex: 1;
+}
+
+.service-name {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #2c3e50;
+	margin-bottom: 8rpx;
+}
+
+.service-revenue {
+	font-size: 32rpx;
+	font-weight: 700;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.service-status {
+	text-align: right;
+}
+
+.upload-rate {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+	margin-bottom: 4rpx;
+}
+
+.upload-rate.warning {
+	color: #ff9f43;
+}
+
+.upload-fraction {
+	font-size: 22rpx;
+	color: #6c757d;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.upload-fraction.incomplete {
+	color: #ff4757;
+}
+
+.service-indicator {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	margin-top: 16rpx;
+}
+
+.status-dot {
+	width: 8rpx;
+	height: 8rpx;
+	border-radius: 50%;
+	background: #ff4757;
+}
+
+.status-dot.complete {
+	background: #27B25F;
+}
+
+.arrow-icon {
+	font-size: 24rpx;
+	color: #999;
+	font-weight: 600;
+}
+
+/* 区域列表 */
+.region-list {
+	background: white;
+	border-radius: 16rpx;
+	padding: 24rpx;
+	// margin-bottom: 32rpx;
+	box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.region-card {
+	background: #f8f9fa;
+	border-radius: 12rpx;
+	margin-bottom: 16rpx;
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+	overflow: hidden;
+}
+
+.region-card:last-child {
+	margin-bottom: 0;
+}
+
+.region-main {
+	padding: 24rpx 20rpx;
+	position: relative;
+}
+
+.region-main::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 4rpx;
+	background: #27B25F;
+}
+
+.region-info {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+}
+
+.region-name {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+.region-revenue {
+	font-size: 32rpx;
+	font-weight: 700;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.region-metrics {
+	display: flex;
+	align-items: center;
+	gap: 24rpx;
+}
+
+.metric-item {
+	text-align: center;
+}
+
+.metric-label {
+	font-size: 22rpx;
+	color: #6c757d;
+	margin-bottom: 4rpx;
+}
+
+.metric-value {
+	font-size: 26rpx;
+	font-weight: 600;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.metric-value.rate {
+	color: #27B25F;
+}
+
+.metric-value.rate.incomplete {
+	color: #ff9f43;
+}
+
+.metric-value.fraction {
+	color: #6c757d;
+}
+
+.metric-value.fraction.incomplete {
+	color: #ff4757;
+}
+
+.expand-indicator {
+	margin-left: auto;
+}
+
+.expand-icon {
+	font-size: 20rpx;
+	color: #999;
+}
+
+.service-sublist {
+	background: white;
+	border-top: 1rpx solid #e9ecef;
+	padding: 16rpx 0 0;
+}
+
+.subservice-card {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 16rpx 20rpx;
+	margin: 8rpx 16rpx;
+	background: #f8f9fa;
+	border-radius: 8rpx;
+	border: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.subservice-card.visited .subservice-name {
+	color: #27B25F;
+}
+
+.subservice-info {
+	flex: 1;
+}
+
+.subservice-name {
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #2c3e50;
+	margin-bottom: 4rpx;
+}
+
+.subservice-revenue {
+	font-size: 24rpx;
+	font-weight: 600;
+	color: #27B25F;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.subservice-status {
+	font-size: 22rpx;
+	font-weight: 600;
+	color: #6c757d;
+	font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+	margin-right: 16rpx;
+}
+
+.subservice-status.incomplete {
+	color: #ff4757;
+}
+
+.subservice-arrow {
+	font-size: 20rpx;
+	color: #999;
+	font-weight: 600;
+}
+
+/* 微信小程序兼容性修正 - 移除不支持的特性 */
+/* 移除 @media 查询，改用 flex 替代 grid */
 </style>
diff --git a/pages/everdayRenven/AnhuiServerpart.vue b/pages/everdayRenven/AnhuiServerpart.vue
index e75ea2e..1b11b2d 100644
--- a/pages/everdayRenven/AnhuiServerpart.vue
+++ b/pages/everdayRenven/AnhuiServerpart.vue
@@ -1,12 +1,12 @@
 <template>
-	<view :style="showUnUpLoad ? 'overflow:hideen;height:100vh;':'height:100%;width:750rpx;'" class="page-body"
+	<view :style="showUnUpLoad ? 'overflow:hideen;height:100vh;' : 'height:100%;'" class="page-body"
 		scroll-with-animation v-if="showPage">
-		<div class="box-card" :style="'opacity:'+(1-opacity)+';'">
+		<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>
+				<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>
@@ -17,18 +17,20 @@
 						<div class="tab-unit" @tap="showPop">
 							<span>上传门店：</span>
 							<span class="tab-unit-num"
-								:class="{'priceRed':sMsg.uploadCount!==sMsg.totalUploadCount}">{{sMsg.uploadCount}}</span>
+								:class="{ 'priceRed': sMsg.uploadCount !== sMsg.totalUploadCount }">{{ sMsg.uploadCount
+								}}</span>
 							<span class="tab-unit-num "
-								:class="{'more-btn':sMsg.uploadCount!==sMsg.totalUploadCount}">{{sMsg.totalUploadCount}}</span>
+								: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="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 :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>
@@ -37,54 +39,55 @@
 
 					<div class="check-unit">
 						<text>长款金额</text>
-						<div class="check-price-color">{{$util.fmoney(sMsg.diffMorePrice,2)}} <text>元</text></div>
+						<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 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 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 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 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 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 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 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 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">
-			<template v-if="theRequest.ProvinceCode=='340000'">
+			<template v-if="theRequest.ProvinceCode == '340000'">
 				<view class="uni-flex ai-center analysis-tabs">
 					<!-- <view @tap="changeTab(3)" class="tab" :class="{'active': nowTab==3}">经营模式</view> -->
-					<view @tap="changeTab(4)" class="tab" :class="{'active': nowTab==4}">车流分析</view>
-					<view @tap="changeTab(1)" class="tab" :class="{'active': nowTab==1}">经营分析</view>
-					<view @tap="changeTab(2)" class="tab" :class="{'active': nowTab==2}">客群分析</view>
+					<view @tap="changeTab(4)" class="tab" :class="{ 'active': nowTab == 4 }">车流分析</view>
+					<view @tap="changeTab(1)" class="tab" :class="{ 'active': nowTab == 1 }">经营分析</view>
+					<view @tap="changeTab(2)" class="tab" :class="{ 'active': nowTab == 2 }">客群分析</view>
 				</view>
 
 				<!-- <view class="pie-content" v-show="nowTab==3">
@@ -96,58 +99,66 @@
 				</view> -->
 			</template>
 
-			<view v-show="nowTab==1">
+			<view v-show="nowTab == 1">
 				<!-- 安徽省 -->
 				<div class="pie-content">
 					<div class="model-busniess">经营业态占比</div>
-					<ServiceRevenuePie ref="serviceRevenuePie" v-if="ServiceRevenueData.length==2 && nowTab==1"
+					<ServiceRevenuePie ref="serviceRevenuePie" v-if="ServiceRevenueData.length == 2 && nowTab == 1"
 						:data="ServiceRevenueData" @selectCate="selectCate" />
 					<!-- 其余省份 -->
 					<!-- <canvas v-else-if="sellData.length>0" canvas-id="sellCate" id="sellCate" class="operation-cate-content" @click="touchPie($event,'sellCate')"></canvas> -->
 					<div class="model-busniess">
 						<div>经营模式占比</div>
 						<div class="progress-content">
-							<div class="progress-left" :style="'width: '+operationModel[0].bili+'%;'"></div>
-							<div class="progress-right" :style="'width: '+operationModel[1].bili+'%;'"></div>
+							<div class="progress-left" :style="'width: ' + operationModel[0].bili + '%;'"></div>
+							<div class="progress-right" :style="'width: ' + operationModel[1].bili + '%;'"></div>
 						</div>
 						<div class="uni-flex jc-between">
-							<div style="color: #667ED5;">{{operationModel[0].name}}: <span
-									style="font-size: 32rpx;">{{operationModel[0].bili}}</span>%</div>
-							<div style="color: #F3AF50;" v-if="operationModel[1].name">{{operationModel[1].name}}: <span
-									style="font-size: 32rpx;">{{operationModel[1].bili}}</span>%</div>
+							<div style="color: #667ED5;">{{ operationModel[0].name }}: <span
+									style="font-size: 32rpx;">{{
+										operationModel[0].bili }}</span>%</div>
+							<div style="color: #F3AF50;" v-if="operationModel[1].name">{{ operationModel[1].name }}:
+								<span style="font-size: 32rpx;">{{ operationModel[1].bili }}</span>%
+							</div>
 						</div>
 						<div class="uni-flex jc-between">
-							<div><span style="font-size: 32rpx;">{{operationModel[0].data}}</span>元</div>
-							<div v-if="operationModel[1].data"><span
-									style="font-size: 32rpx;">{{operationModel[1].data}}</span>元</div>
+							<div style="margin-bottom: 0;"><span style="font-size: 32rpx;">{{ operationModel[0].data
+									}}</span>元
+							</div>
+							<div style="margin-bottom: 0;" v-if="operationModel[1].data"><span
+									style="font-size: 32rpx;">{{
+										operationModel[1].data
+									}}</span>元
+							</div>
 						</div>
 					</div>
 				</div>
 				<!-- 品牌列表 -->
 				<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>
+						<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 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 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>
 
-			<view class="" v-show="nowTab==2">
-				<CustomerAnalysis ref="customerAna" :show="nowTab==2" />
+			<view class="" v-show="nowTab == 2">
+				<CustomerAnalysis ref="customerAna" :show="nowTab == 2" />
 			</view>
-			<view class="" v-show="nowTab==4">
-				<CarAnalysis ref="carAna" :show="nowTab==4" />
+			<view class="" v-show="nowTab == 4">
+				<CarAnalysis ref="carAna" :show="nowTab == 4" />
 			</view>
 
 		</template>
@@ -156,17 +167,17 @@
 			<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="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="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 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 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>
@@ -178,791 +189,857 @@
 </template>
 
 <script>
-	import uCharts from '@/components/u-charts.js';
-	import ServiceRevenuePie from './components/ServiceRevenuePie.vue'
-	import CustomerAnalysis from './components/CustomerAnalysis.vue'
-	import CarAnalysis from './components/CarAnalysis.vue'
-	import anhuiYestodayRevenueData from './components/anhuiYestodayRevenueData.js'
-	let rincanvas = {}
-	var _self;
-	export default {
-		data() {
-			const lastDay = this.$util.cutDate(new Date(), 'YYYY/MM/DD ', -1)
+import uCharts from '@/components/u-charts.js';
+import ServiceRevenuePie from './components/ServiceRevenuePie.vue'
+import CustomerAnalysis from './components/CustomerAnalysis.vue'
+import CarAnalysis from './components/CarAnalysis.vue'
+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:'',//结束时间
-			}
-		},
-		components: {
-			ServiceRevenuePie,
-			CustomerAnalysis,
-			CarAnalysis
-		},
-		onLoad(option) {
-      console.log(option)
-			_self = this
-			uni.showLoading({
-				title: '正在加载...'
-			})
+		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: '',//结束时间
+		}
+	},
+	components: {
+		ServiceRevenuePie,
+		CustomerAnalysis,
+		CarAnalysis
+	},
+	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)
+		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 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}`
+			let thisMonthDay = this.$util.getThisMonthDay(`${y}-${changeMonth}`)
+			if (m < 10) {
+				m = '0' + m
 			}
-			this.startTime = startTime
-			this.endTime = `${y}-${m}-${d}`
+			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
 		},
-		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()
+		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: '正在加载'
 				})
-			},
-			operationFn() { //昨日营收占比
-				let _this = this;
+				this.initData(opt)
+				this.getData(opt)
+				this.$forceUpdate()
+			} else {
+				uni.showToast({
+					title: '请选择有效日期',
+					icon: 'none',
+				})
+			}
+		},
 
-				// 业态营收占比
-				let colors1 = ['#FFAC37', '#d8ece9', '#e0e3f7', '#f7f5f6', '#b2b7e3'];
+		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 = []
-				let list2 = []
-				_this.pageData.listBusinessModel.map((m, i) => {
+				_this.pageData.listCurBusinessModel.map(m => {
 					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,
+				_this.ServiceRevenueData.push(list)
+			}
+			if (list.length > 0) {
+				_this.showPie({
+					id: 'sellCate',
+					data: list,
 					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) => {
+			}
+		},
+		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({
-						...n,
+						name: n[1],
 						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) + '%']
+						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
+			})
 
-					_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
-				})
-			},
+			return _data1;
 		},
-		onPageScroll(e) {
-			this.showFixed(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: _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;
-	}
+<style lang="scss" scoped>
+.page-body {
+	background-color: #f8f9fa;
+	padding: 0 32rpx 32rpx;
+	box-sizing: border-box;
+	-webkit-overflow-scrolling: touch;
+	min-height: 100vh;
+}
 
-	.mt8 {
-		margin-top: 16rpx;
-	}
+.mt8 {
+	margin-top: 20rpx;
+}
 
-	cover-view.page-title {
-		color: #fff;
-	}
+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;
+.page-title {
+	background-color: #fcfcfc;
+	display: flex;
+	align-items: center;
+	height: 110rpx;
+	padding: 0 24rpx;
+	justify-content: space-between;
 
-		color: #000;
-		font-size: 30rpx;
-	}
+	color: #000;
+	font-size: 30rpx;
+}
 
-	.page-title text:last-child {
-		color: #383838;
-	}
+.page-title text:last-child {
+	color: #383838;
+}
 
-	.fixed-box {
-		background-color: #686D8F;
-		/* background: linear-gradient(to right, #686D8F, #A1ACC6); */
-		transition: all .2s;
-		position: fixed;
+.fixed-box {
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+	transition: all .3s ease;
+	position: fixed;
+	top: 0;
+	left: 32rpx;
+	width: calc(100% - 64rpx);
+	z-index: 999;
+	box-sizing: border-box;
+	color: #fff;
+	box-shadow: 0 4rpx 20rpx rgba(39, 178, 95, 0.3);
+	backdrop-filter: blur(10rpx);
+	border-radius: 0 0 16rpx 16rpx;
+}
+
+/* 业态 */
+.operation-cate-content {
+	height: 585rpx;
+	width: 690rpx;
+	margin: 0 auto;
+}
+
+.operation-model-content {
+	height: 480rpx;
+	width: 690rpx;
+	margin: 0 auto;
+}
+
+/* 门店 */
+.shop-box {
+	margin: 24rpx 0;
+	border-radius: 16rpx;
+	background-color: #fff;
+	padding: 32rpx 24rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	border: 1rpx solid #f0f0f0;
+}
+
+.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: 24rpx 0 32rpx;
+	border-radius: 16rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	background-color: #fff;
+	position: relative;
+	padding: 32rpx 24rpx;
+	border: 1rpx solid #f0f0f0;
+	overflow: hidden;
+
+	&::before {
+		content: '';
+		position: absolute;
 		top: 0;
 		left: 0;
-		width: 100%;
-		z-index: 999;
-		box-sizing: border-box;
-		color: #fff;
+		right: 0;
+		height: 4rpx;
+		background: linear-gradient(90deg, #27B25F, #4CCC7F);
+	}
+}
+
+.pie-title {
+	padding: 0;
+	line-height: 1.5;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 24rpx;
+}
+
+/* 门店卡片 */
+.shop-card {
+	width: 210rpx;
+	height: 240rpx;
+	border-radius: 16rpx;
+	color: #fff;
+	text-align: center;
+	padding: 24rpx 16rpx;
+	box-sizing: border-box;
+	margin-top: 20rpx;
+	position: relative;
+	overflow: hidden;
+	transition: all 0.3s ease;
+	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+
+	&:active {
+		transform: scale(0.98);
 	}
 
-	/* 业态 */
-	.operation-cate-content {
-		height: 585rpx;
-		width: 690rpx;
-		margin: 0 auto;
+	&::before {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: linear-gradient(135deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%);
+		pointer-events: none;
 	}
+}
 
-	.operation-model-content {
-		height: 480rpx;
-		width: 690rpx;
-		margin: 0 auto;
+.shop-card:nth-child(6n-5) {
+	background: linear-gradient(135deg, #ff6b6b, #ee5a52);
+}
+
+.shop-card:nth-child(6n-4) {
+	background: linear-gradient(135deg, #feca57, #ff9ff3);
+	margin-left: 18rpx;
+}
+
+.shop-card:nth-child(6n-3) {
+	background: linear-gradient(135deg, #a8e6cf, #7fcdcd);
+	margin-left: 18rpx;
+}
+
+.shop-card:nth-child(6n-2) {
+	background: linear-gradient(135deg, #74b9ff, #0984e3);
+	margin-left: 0rpx;
+}
+
+.shop-card:nth-child(6n-1) {
+	background: linear-gradient(135deg, #fd79a8, #e84393);
+	margin-left: 18rpx;
+}
+
+.shop-card:nth-child(6n) {
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+	margin-left: 18rpx;
+}
+
+.shop-card .shop-name {
+	font-size: 26rpx;
+	text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3);
+	line-height: 1.4;
+	max-height: 64rpx;
+	overflow: hidden;
+	font-weight: 500;
+	margin: 12rpx 0;
+}
+
+.shop-card image {
+	border-radius: 50%;
+	border: 3rpx solid rgba(255, 255, 255, 0.9);
+	background-color: #FFFFFF;
+	width: 64rpx;
+	height: 64rpx;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.2);
+}
+
+.shop-card .price-num {
+	font-size: 36rpx;
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	font-weight: 700;
+	text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3);
+	margin-top: auto;
+}
+
+.box-card {
+	padding: 32rpx 24rpx 0;
+	background-color: #fff;
+	width: 100%;
+	box-sizing: border-box;
+	transition: all .3s ease;
+	margin: 0 0 24rpx;
+	border-radius: 16rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	position: relative;
+	overflow: hidden;
+
+	&::before {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 8rpx;
+		background: linear-gradient(90deg, #27B25F, #4CCC7F);
 	}
+}
 
-	/* 门店 */
-	.shop-box {
-		margin: 32rpx 20rpx;
-		border-radius: 8rpx;
-		background-color: #F6F8FA;
-		padding: 36rpx 20rpx;
+.top-card {
+	background: linear-gradient(135deg, #27B25F 0%, #4CCC7F 100%);
+	margin-top: 32rpx;
+	padding: 40rpx 0;
+	border-radius: 16rpx;
+	position: relative;
+	box-shadow: 0 8rpx 24rpx rgba(39, 178, 95, 0.2);
 
+	&::before {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="90" cy="10" r="2" fill="white" opacity="0.3"/><circle cx="80" cy="20" r="1" fill="white" opacity="0.2"/><circle cx="70" cy="5" r="1.5" fill="white" opacity="0.4"/></svg>') repeat;
+		pointer-events: none;
 	}
+}
 
-	.tab-shop {
+.budgetamount {
+	margin-left: 16rpx;
+	color: rgba(255, 255, 255, 0.9);
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	font-weight: 500;
+}
 
-		color: #999999;
-		white-space: nowrap;
-	}
+.budget-title {
+	color: rgba(255, 255, 255, 0.8);
+	padding: 6rpx 12rpx;
+	border-radius: 12rpx;
+	margin-right: 8rpx;
+	background: rgba(255, 255, 255, 0.1);
+	font-size: 22rpx;
+}
 
-	.tab-shop .cate-name {
-		padding-right: 16rpx;
-		font-size: 26rpx;
-		display: inline-block;
-		vertical-align: middle;
-	}
+.up-text-title,
+.down-text-title {
+	font-size: 34rpx;
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	font-weight: 600;
+	line-height: 1.3;
+}
 
-	.tab-shop .cate-name+.cate-name::before {
-		content: '|';
-		color: #eeeeee;
-		padding-right: 16rpx;
-	}
+.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;
 
-	.tab-shop .cate-name.active {
-		color: #000;
-		font-size: 28rpx;
-		font-weight: 600;
+}
 
-	}
+.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;
 
-	.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;
-	}
+.box-top-title {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 8rpx;
+}
 
-	.pie-title {
-		padding: 0 20rpx;
-		line-height: 80rpx;
-		font-size: 26rpx;
-	}
+.title-clock {
+	color: #666;
+	font-size: 26rpx;
+	text-align: right;
+	padding: 8rpx 16rpx;
+	background-color: rgba(255, 255, 255, 0.9);
+	border-radius: 20rpx;
+	border: 1rpx solid #e5e5e5;
+}
 
-	/* 门店卡片 */
-	.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;
@@ -970,198 +1047,217 @@
 		color: #dd7575;
 		font-size: 30upx;
 	} */
-	.more-btn:after {
+.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: 28rpx;
+	color: #fff;
+	border-radius: 24rpx;
+	padding: 8rpx 20rpx;
+	background: linear-gradient(90deg, #27B25F, #4CCC7F);
+	text-align: center;
+	font-weight: 400;
+	box-shadow: 0 4rpx 12rpx rgba(39, 178, 95, 0.3);
+}
+
+.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: 40rpx;
+	color: #fff;
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	font-weight: 700;
+	text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.2);
+	letter-spacing: 2rpx;
+}
+
+.check-unit,
+.budgetamount {
+	font-size: 26rpx;
+	color: rgba(255, 255, 255, 0.9);
+	text-align: center;
+	line-height: 1.4;
+}
+
+.main-amount-title {
+	color: rgba(255, 255, 255, 0.9);
+	font-size: 26rpx;
+	font-weight: 500;
+}
+
+.tab-unit {
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20rpx;
+	color: #fff;
+	font-size: 26rpx;
+	padding: 8rpx 16rpx;
+	font-weight: 500;
+	backdrop-filter: blur(10rpx);
+	border: 1rpx solid rgba(255, 255, 255, 0.3);
+}
+
+.check-price-color {
+	color: #fff;
+	font-size: 38rpx;
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	line-height: 1.3;
+	font-weight: 600;
+	margin-top: 8rpx;
+}
+
+.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 {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	min-width: 500rpx;
+	min-height: 400rpx;
+	border-radius: 20rpx;
+	top: 30%;
+	left: 50%;
+	transform: translate(-50%, -20%);
+	justify-content: flex-start;
+	padding: 0 32rpx 32rpx;
+	box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.3);
+	border: 1rpx solid rgba(255, 255, 255, 0.2);
+}
+
+.header-top {
+	font-size: 32rpx;
+	font-weight: 700;
+	color: #333;
+	text-align: left;
+	width: 100%;
+	padding: 32rpx 0 24rpx;
+	background-color: #fff;
+	position: relative;
+
+	&::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;
+		bottom: 0;
+		left: 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;
+		background: linear-gradient(90deg, #27B25F, #4CCC7F);
 	}
+}
 
-	.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;
-	}
+.pop-body {
+	width: 100%;
+	max-height: 500rpx;
+	overflow-y: auto;
+	background-color: #fff;
+	padding-bottom: 16rpx;
+	border-radius: 8rpx;
+}
 
-	/* 	.customer-title {
+.pop-row {
+	padding: 20rpx 0;
+	font-size: 26rpx;
+	align-items: center;
+	justify-content: flex-start;
+	box-sizing: border-box;
+	position: relative;
+	color: #333;
+}
+
+.pop-row .pop-row-bottom {
+	position: absolute;
+	height: 1rpx;
+	width: 100%;
+	background: linear-gradient(90deg, transparent 0%, #e5e5e5 50%, transparent 100%);
+	bottom: 0;
+	left: 0;
+}
+
+.pop-index {
+	color: #fff;
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+	border-radius: 12rpx;
+	padding: 4rpx 12rpx;
+	margin-right: 16rpx;
+	font-size: 22rpx;
+	font-weight: 600;
+	min-width: 48rpx;
+	text-align: center;
+	box-shadow: 0 2rpx 8rpx rgba(39, 178, 95, 0.3);
+}
+
+/* 	.customer-title {
 		color: #525280;
 		font-size: 32rpx;
 		font-weight: 600;
@@ -1177,61 +1273,81 @@
 		align-items: center;
 		justify-content: space-between;
 	} */
-	.uni-icon-arrowright {
-		border: 1rpx solid #606060;
-		border-radius: 50%;
-		color: #606060;
-		font-size: 32rpx;
-	}
+.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;
-	}
+.analysis-tabs {
+	margin: 24rpx 0;
+	overflow: hidden;
+	background-color: #fff;
+	border-radius: 12rpx;
+	display: flex;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	border: 1rpx solid #f0f0f0;
+}
 
-	.tab {
-		text-align: center;
-		flex: 1;
-		height: 76rpx;
-		line-height: 76rpx;
-	}
+.tab {
+	text-align: center;
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	color: #666;
+	transition: all 0.3s ease;
+	font-weight: 500;
+	position: relative;
+}
 
-	.tab.active {
-		background: #f2f4f9;
-		color: #647BD1;
-	}
+.tab.active {
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+	color: #fff;
+	font-weight: 600;
+	box-shadow: 0 4rpx 12rpx rgba(39, 178, 95, 0.3);
+	border-radius: 8rpx;
+	margin: 4rpx;
+	height: 72rpx;
+	line-height: 72rpx;
+}
 
-	// 经营模式占比
-	.model-busniess {
-		margin: 12rpx 30rpx;
-		font-family: 'Bahnschrift Regular';
+// 经营模式占比
+.model-busniess {
+	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+	padding: 24rpx 24rpx 0;
+	background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
+	border-radius: 12rpx;
+	border: 1rpx solid #f0f0f0;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
 
-	}
+.model-busniess view {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 16rpx;
+}
 
-	.model-busniess view {
-		font-size: 26rpx;
-	}
+.model-busniess .progress-content {
+	width: 100%;
+	height: 12rpx;
+	border-radius: 6rpx;
+	display: flex;
+	justify-content: space-between;
+	margin: 20rpx 0 16rpx;
+	overflow: hidden;
+	box-shadow: inset 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+}
 
-	.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: linear-gradient(90deg, #27B25F, #4CCC7F);
+	border-radius: 6rpx 0 0 6rpx;
+}
 
-	.model-busniess .progress-left {
-		background-color: #667ED5;
-	}
-	.model-busniess .progress-right {
-		background-color: #F3AF50;
-	}
+.model-busniess .progress-right {
+	background: linear-gradient(90deg, #ff9f43, #ffb84d);
+	border-radius: 0 6rpx 6rpx 0;
+}
 </style>
diff --git a/pages/everdayRenven/components/RankContent.vue b/pages/everdayRenven/components/RankContent.vue
index d34c6df..239e680 100644
--- a/pages/everdayRenven/components/RankContent.vue
+++ b/pages/everdayRenven/components/RankContent.vue
@@ -1,23 +1,24 @@
 <template>
 	<block>
 		<div class="uni-inline-item ranking-tab-box">
-			<div class="ranking-tab-unit" @tap="selectTab(1000)" :class="{'active':nowRank==1000}">商超
+			<div class="ranking-tab-unit" @tap="selectTab(1000)" :class="{ 'active': nowRank == 1000 }">商超
 			</div>
-			<div class="ranking-tab-unit" @tap="selectTab(2000)" :class="{'active':nowRank==2000}">餐饮
+			<div class="ranking-tab-unit" @tap="selectTab(2000)" :class="{ 'active': nowRank == 2000 }">餐饮
 			</div>
-			<div class="ranking-tab-unit" @tap="selectTab(3000)" :class="{'active':nowRank==3000}">小吃
+			<div class="ranking-tab-unit" @tap="selectTab(3000)" :class="{ 'active': nowRank == 3000 }">小吃
 			</div>
 		</div>
 		<div class="ranking-content" v-if="wechatPushSalesList">
-			<div class="ranking-list" v-for="(item,index) in wechatPushSalesList[nowRank]" :key="index">
-				<div class="rank-index">{{item.RANK_ID||item.Rank_ID}}</div>
+			<div class="ranking-list" v-for="(item, index) in wechatPushSalesList[nowRank]" :key="index">
+				<div class="rank-index">{{ item.RANK_ID || item.Rank_ID }}</div>
 				<div class="ranking-list-unit">
-					<div>{{item.COMMODITY_NAME || item.Commodity_Name}}</div>
+					<div style="font-size: 24rpx;">{{ item.COMMODITY_NAME || item.Commodity_Name }}</div>
 					<div class="ranking-unit-info">
-						<text>销售金额 </text>
-						<text>¥{{$util.fmoney(item.TOTALPRICE || item.TotalPrice)}}</text>
-						<text>销售数量 </text>
-						<text>{{item.SELLCOUNT || item.SellCount}}</text>
+						<text style="font-size: 24rpx;">销售金额 </text>
+						<text style="font-size: 28rpx;font-weight: 600;">¥{{ $util.fmoney(item.TOTALPRICE ||
+							item.TotalPrice) }}</text>
+						<text style="font-size: 24rpx;">销售数量 </text>
+						<text style="font-size: 28rpx;font-weight: 600;">{{ item.SELLCOUNT || item.SellCount }}</text>
 					</div>
 				</div>
 			</div>
@@ -26,120 +27,120 @@
 </template>
 
 <script>
-	export default {
-		props: ['wechatPushSalesList'],
-		data: () => {
-			return {
-				nowRank: 1000
-			}
-		},
-		methods:{
-			selectTab(index){
-
-				this.nowRank=index
-			}
-		},
-		onLoad() {
-
+export default {
+	props: ['wechatPushSalesList'],
+	data: () => {
+		return {
+			nowRank: 1000
 		}
+	},
+	methods: {
+		selectTab(index) {
+
+			this.nowRank = index
+		}
+	},
+	onLoad() {
+
 	}
+}
 </script>
 
 <style>
-	/*排行*/
-	.ranking-tab-box {
-		margin: 20rpx 32rpx;
-		border: 2rpx solid #565656;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		text-align: center;
+/*排行*/
+.ranking-tab-box {
+	margin: 20rpx 32rpx;
+	border: 2rpx solid #565656;
+	border-radius: 8rpx;
+	display: flex;
+	align-items: center;
+	text-align: center;
 
-	}
+}
 
-	.ranking-tab-box .ranking-tab-unit {
-		color: #565656;
-		flex: 1;
-		height: 64rpx;
-		line-height: 60rpx;
-	}
+.ranking-tab-box .ranking-tab-unit {
+	color: #565656;
+	flex: 1;
+	height: 64rpx;
+	line-height: 60rpx;
+}
 
-	.ranking-tab-box .ranking-tab-unit.active {
-		background-color: #565656;
-		color: #fff
-	}
+.ranking-tab-box .ranking-tab-unit.active {
+	background-color: #565656;
+	color: #fff
+}
 
-	.ranking-tab-box .ranking-tab-unit+.ranking-tab-unit {
-		border-left: 2rpx solid #565656;
-	}
+.ranking-tab-box .ranking-tab-unit+.ranking-tab-unit {
+	border-left: 2rpx solid #565656;
+}
 
-	.ranking-content {
-		/* display: none; */
-		min-height: 160rpx;
-	}
+.ranking-content {
+	/* display: none; */
+	min-height: 160rpx;
+}
 
-	.ranking-content .ranking-list {
-		display: flex;
-		align-items: center;
-		color: #000;
-		padding: 24rpx 32rpx;
-	}
+.ranking-content .ranking-list {
+	display: flex;
+	align-items: center;
+	color: #000;
+	padding: 24rpx 32rpx;
+}
 
-	.ranking-content .rank-index {
-		width: 72rpx;
-		height: 72rpx;
-		text-align: center;
-		line-height: 72rpx;
-		font-size: 30rpx;
-		font-weight: bolder;
-		margin-right: 32rpx;
-	}
+.ranking-content .rank-index {
+	width: 72rpx;
+	height: 72rpx;
+	text-align: center;
+	line-height: 72rpx;
+	font-size: 30rpx;
+	font-weight: bolder;
+	margin-right: 32rpx;
+}
 
-	.ranking-content .ranking-list:nth-child(1) .rank-index {
-		background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top1.png') no-repeat center;
-		background-size: contain;
-		font-size: 0;
-	}
+.ranking-content .ranking-list:nth-child(1) .rank-index {
+	background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top1.png') no-repeat center;
+	background-size: contain;
+	font-size: 0;
+}
 
-	.ranking-content .ranking-list:nth-child(2) .rank-index {
-		background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top2.png') no-repeat center;
-		background-size: contain;
-		font-size: 0;
-	}
+.ranking-content .ranking-list:nth-child(2) .rank-index {
+	background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top2.png') no-repeat center;
+	background-size: contain;
+	font-size: 0;
+}
 
-	.ranking-content .ranking-list:nth-child(3) .rank-index {
-		background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top3.png') no-repeat center;
-		background-size: contain;
-		font-size: 0;
-	}
+.ranking-content .ranking-list:nth-child(3) .rank-index {
+	background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/top3.png') no-repeat center;
+	background-size: contain;
+	font-size: 0;
+}
 
-	.ranking-content .ranking-list-unit {
-		font-size: 28rpx;
-		flex: 1;
-	}
+.ranking-content .ranking-list-unit {
+	font-size: 24rpx;
+	flex: 1;
+}
 
-	.ranking-content .ranking-unit-info {
-		/* margin-top: 16rpx; */
-		display: flex;
-		align-items: center;
-		/* font-size: .13rem; */
-	}
+.ranking-content .ranking-unit-info {
+	/* margin-top: 16rpx; */
+	display: flex;
+	align-items: center;
+	/* font-size: .13rem; */
+}
 
-	.ranking-content .ranking-unit-info text {
-		flex: 2;
-		color: #929292;
-	}
+.ranking-content .ranking-unit-info text {
+	flex: 2;
+	color: #929292;
+}
 
-	.ranking-content .ranking-unit-info text:nth-child(2) {
-		flex: 3;
-	}
+.ranking-content .ranking-unit-info text:nth-child(2) {
+	flex: 3;
+}
 
-	.ranking-content .ranking-unit-info text:nth-child(2n) {
-		color: #000
-	}
+.ranking-content .ranking-unit-info text:nth-child(2n) {
+	color: #000
+}
 
-	.ranking-ico {
-		width: 72rpx;
-		height: 72rpx;
-	}
+.ranking-ico {
+	width: 72rpx;
+	height: 72rpx;
+}
 </style>
diff --git a/pages/everdayRenven/components/anhHead.vue b/pages/everdayRenven/components/anhHead.vue
index 5403cc0..5187402 100644
--- a/pages/everdayRenven/components/anhHead.vue
+++ b/pages/everdayRenven/components/anhHead.vue
@@ -407,7 +407,7 @@ export default {
   color: #bed4f4;
   /* color: #FAD5D2; */
 
-  font-size: 30rpx;
+  font-size: 28rpx;
 }
 
 .head-cost-text .date-tag {
@@ -549,7 +549,7 @@ export default {
 
 .revenue-card-cont {
   border-radius: 12rpx;
-  margin: 38rpx 20rpx 0 20rpx;
+  margin: 38rpx 32rpx 0 32rpx;
   overflow: hidden;
   box-shadow: 1rpx 2rpx 8rpx 0px rgba(224, 224, 224, 0.4);
   background: linear-gradient(to top, #ffffff 0%, #ffffff 51%, #e5e9fc 100%);
@@ -559,7 +559,7 @@ export default {
 .revenue-card-title {
   font-weight: 500;
   text-align: left;
-  font-size: 30rpx;
+  font-size: 28rpx;
 }
 
 .center-amount,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e05da0a..3c61c73 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -101,7 +101,7 @@
                             <view class="yearAccountItem" style="margin-bottom: 24rpx">
                                 <view class="itemTop">
                                     <view class="itemName">{{ (Math.floor(index / 12) + 2024).toString().slice(2, 4)
-                                    }}年累计对客销售<span class="unit">/亿元</span></view>
+                                        }}年累计对客销售<span class="unit">/亿元</span></view>
                                 </view>
                                 <view class="itemBottom">
                                     <span class="revenueNum" v-if="selectIndex === index && hasCurrentMonthData">{{
@@ -356,6 +356,7 @@ export default {
                     latitude: res.latitude,
                     longitude: res.longitude,
                 };
+
                 uni.setStorageSync("seatInfo", JSON.stringify(seatInfo));
                 _this.handleGetNearService(seatInfo.latitude, seatInfo.longitude)
             },
@@ -410,6 +411,23 @@ export default {
             _this.monthDataCache = {};
             _this.loadingMap = {};
             _this.handleGetOnLoad();
+
+
+            // 更新一下定位
+            uni.getLocation({
+                type: "gcj02",
+                altitude: true,
+                success: (res) => {
+                    let seatInfo = {
+                        latitude: res.latitude,
+                        longitude: res.longitude,
+                    };
+                    uni.setStorageSync("seatInfo", JSON.stringify(seatInfo));
+                    _this.handleGetNearService(seatInfo.latitude, seatInfo.longitude)
+                },
+                fail: (err) => {
+                },
+            });
         }
         uni.stopPullDownRefresh();
     },
@@ -799,20 +817,88 @@ export default {
         },
         // 拿一个最近的服务区 当默认服务区
         async handleGetNearService(latitude, longitude) {
-            let req = {
-                Province_Code: "530000",
-                longitude: latitude,
-                latitude: longitude,
-                ShowService: true,
-                PageIndex: 1,
-                PageSize: 1
-            }
-            const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
-            console.log('sdjkajdas', data);
-            let list = data.Result_Data.List
-            uni.setStorageSync('currentService', list[0]);
-        },
+            // let req = {
+            //     Province_Code: "530000",
+            //     longitude: latitude,
+            //     latitude: longitude,
+            //     ShowService: true,
+            //     PageIndex: 1,
+            //     PageSize: 1
+            // }
+            // const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
+            // console.log('sdjkajdas', data);
+            // let list = data.Result_Data.List
+            // // 存第一个做为默认服务区
+            // // uni.setStorageSync('currentService', list[0]);
+            // let nearObj = list[0]
+            // console.log('nearObjnearObjnearObj', nearObj);
 
+
+
+            let YNList = await this.handleGetYNServiceList()
+            console.log('YNListYNList', YNList);
+            if (YNList && YNList.length > 0) {
+                let nearList = []
+                YNList.forEach((item) => {
+                    let obj = JSON.parse(JSON.stringify(item))
+                    obj.SERVERPART_DISTANCE = this.haversineDistance({ lat: latitude, lng: longitude }, { lat: obj.latitude, lng: obj.longitude })
+                    obj.fileId = obj.fileId ? JSON.parse(obj.fileId) : []
+                    obj.businessModel = obj.businessModel ? JSON.parse(obj.businessModel) : []
+                    nearList.push(obj)
+                })
+
+                nearList = nearList.sort((a, b) => {
+                    const da = parseFloat(a.SERVERPART_DISTANCE) || 0;
+                    const db = parseFloat(b.SERVERPART_DISTANCE) || 0;
+                    return da - db;
+                });
+                uni.setStorageSync('currentService', nearList[0]);
+                // 存一下 全部的服务区 主要是拿个距离字段
+                uni.setStorageSync('ServerpartList', nearList)
+            }
+
+        },
+        // 算经纬度的之间距离的方法
+        haversineDistance({ lat: lat1, lng: lon1 }, { lat: lat2, lng: lon2 }) {
+            const toRad = (d) => d * Math.PI / 180;
+            const R = 6378137; // 地球半径(米) WGS84 椭球近似为球
+            const φ1 = toRad(lat1);
+            const φ2 = toRad(lat2);
+            const Δφ = toRad(lat2 - lat1);
+            const Δλ = toRad(lon2 - lon1);
+
+            const a = Math.sin(Δφ / 2) ** 2 +
+                Math.cos(φ1) * Math.cos(φ2) * Math.sin(Δλ / 2) ** 2;
+            const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+            const distanceMeters = R * c;
+
+            return (distanceMeters / 1000).toFixed(2); // 返回 km，字符串
+        },
+        // 请求一下云南那边的 服务区数据
+        async handleGetYNServiceList() {
+            let req = {
+                bsessionKey: "46BC6D5E069411B39C215C8A3B474B31",
+                pageNum: 1,
+                pageSize: 500
+            }
+            const data = await new Promise((resolve, reject) => {
+                uni.request({
+                    url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/getSaMsgAll",
+                    method: "POST",
+                    data: req,
+                    header: {
+                        "content-type": "application/x-www-form-urlencoded",
+                    },
+                    success(res) {
+                        resolve(res.data.data)
+                    },
+                });
+            });
+
+            // 这个是云南那边给来的数据 根据 云南的数据 把我们算的距离补给他们的数据里面
+            // let YNList = data.data
+            return data.data
+        },
         // uniapp小程序兼容性方法，保留作为备用
         getCurrentMonthText(index) {
             if (this.selectIndex === index && this.monthList[index]) {
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 779ae98..a598a8b 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -28,8 +28,9 @@
           @click="handleGoDetail(item.SERVERPART_ID, item)">
           <div class="topItem">
             <view class="leftItem">
-              <p class="title">{{ item.SERVERPART_NAME }}</p>
-              <view class="typeBox">{{ serviceTypeObj[item.SERVERPART_TYPE] }}</view>
+              <!-- <p class="title">{{ item.SERVERPART_NAME }}</p> -->
+              <p class="title">{{ item.SAName }}</p>
+              <!-- <view class="typeBox">{{ serviceTypeObj[item.SERVERPART_TYPE] }}</view>  -->
             </view>
             <div class="box">
               <div class="imgBox">
@@ -43,7 +44,7 @@
           <p class="distance">距您 <text class="number">{{ item.SERVERPART_DISTANCE }}</text> km</p>
           <div class="info">
             <image class="infoIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/service/address.svg"></image>
-            <p class="address">{{ item.SERVERPART_ADDRESS }}</p>
+            <p class="address">{{ item.belongArea }}-{{ item.belongRegion }}-{{ item.belongLine }}</p>
           </div>
           <div class="info" v-if="item.STARTDATE">
             <image class="infoIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/service/time.svg"></image>
@@ -96,7 +97,8 @@ export default {
       type: '',// 哪里进来
       serviceTypeObj: {},
       serviceMessage: {},// 当前选中的服务区
-      seatInfo: {}
+      seatInfo: {},
+      allServiceList: []
     }
   },
   onLoad(option) {
@@ -204,10 +206,10 @@ export default {
     handleGomap(item) {
       let obj = item;
       uni.openLocation({
-        latitude: obj.latitude ? obj.latitude * 1 : obj.SERVERPART_Y * 1,
-        longitude: obj.longitude ? obj.longitude * 1 : obj.SERVERPART_X * 1,
+        latitude: obj.latitude * 1,
+        longitude: obj.longitude * 1,
         scale: 16, // 缩放比例
-        name: obj.SERVERPART_NAME,
+        name: obj.SAName,
         // address: "", // 这个可能会影响地图的定位，所以可以选择不填
         success(data) {
         },
@@ -313,34 +315,47 @@ export default {
     },
     //搜索框触发的方法
     async handleSearch() {
-      let req = {
-        longitude: this.longitude,
-        Province_Code: '530000',
-        latitude: this.latitude,
-        Serverpart_Name: this.searchText
+      if (this.searchText) {
+        let res = []
+        if (this.allServiceList && this.allServiceList.length > 0) {
+
+          this.allServiceList.forEach((item) => {
+            if (item.SAName.indexOf(this.searchText) !== -1) {
+              res.push(item)
+            }
+          })
+        }
+        this.serviceList = res
+      } else {
+        this.serviceList = JSON.parse(JSON.stringify(this.allServiceList))
       }
-      const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
-      this.serviceList = data.Result_Data.List
+
+
+
+      // let req = {
+      //   longitude: this.longitude,
+      //   Province_Code: '530000',
+      //   latitude: this.latitude,
+      //   Serverpart_Name: this.searchText
+      // }
+      // const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
+      // this.serviceList = data.Result_Data.List
     },
     //跳转相对应的服务区详情界面
     handleGoDetail(id, item) {
       let res = {
-        SERVERPART_NAME: item.SERVERPART_NAME,//服务区
-        SPREGIONTYPE_NAME: item.SPREGIONTYPE_NAME,//片区
-        Serverpart_ID: item.SERVERPART_ID,
-        SPRegionType_ID: item.SPREGIONTYPE_ID,
-        longitude: item.SERVERPART_X,
-        latitude: item.SERVERPART_Y,
+        ...item,
+        // SERVERPART_NAME: item.SAName,//服务区
+        // SPREGIONTYPE_NAME: item.belongArea,//片区
+        // Serverpart_ID: "",
+        // SPRegionType_ID: "",
+        // longitude: item.longitude,
+        // latitude: item.latitude,
       }
-      uni.setStorageSync('currentService', res) //当前选中服务区信息
+      uni.setStorageSync('currentService', res)
       let pageList = getCurrentPages()
       if (this.type === 'index') {
         this.$util.toNextRoute('navigateTo', `/pages/summaryOfPortraits/index?index=0`)
-      } else if (this.type === 'springTravel') {
-        uni.setStorageSync('springService', res) //当前选中服务区信息
-        uni.navigateBack({
-          delta: 1
-        })
       } else if (this.type === 'attendanceStatus') {
         uni.navigateBack({
           delta: 1
@@ -358,22 +373,120 @@ export default {
           }
         }
       }
+
+      // let res = {
+      //   SERVERPART_NAME: item.SERVERPART_NAME,//服务区
+      //   SPREGIONTYPE_NAME: item.SPREGIONTYPE_NAME,//片区
+      //   Serverpart_ID: item.SERVERPART_ID,
+      //   SPRegionType_ID: item.SPREGIONTYPE_ID,
+      //   longitude: item.SERVERPART_X,
+      //   latitude: item.SERVERPART_Y,
+      // }
+      // uni.setStorageSync('currentService', res) //当前选中服务区信息
+      // let pageList = getCurrentPages()
+      // if (this.type === 'index') {
+      //   this.$util.toNextRoute('navigateTo', `/pages/summaryOfPortraits/index?index=0`)
+      // } else if (this.type === 'springTravel') {
+      //   uni.setStorageSync('springService', res) //当前选中服务区信息
+      //   uni.navigateBack({
+      //     delta: 1
+      //   })
+      // } else if (this.type === 'attendanceStatus') {
+      //   uni.navigateBack({
+      //     delta: 1
+      //   })
+      // } else {
+      //   if (this.chartType) {
+      //     uni.navigateBack({
+      //       delta: 1
+      //     })
+      //   } else {
+      //     if (pageList.length > 2) {
+      //       uni.navigateBack({
+      //         delta: 1
+      //       })
+      //     }
+      //   }
+      // }
     },
     async getListData() {
-      let user = uni.getStorageSync('seatInfo')
-
       let req = {
-        Province_Code: '530000',
-        Serverpart_ID: '',
-        longitude: this.seatInfo.longitude,
-        latitude: this.seatInfo.latitude
+        bsessionKey: "46BC6D5E069411B39C215C8A3B474B31",
+        pageNum: 1,
+        pageSize: 500
       }
-      console.log('req', req)
-      // const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
-      const data = await request.$webJavaGet('third-party/getServerPartList', req)
-      console.log('datadatadatadata', data);
+      const data = await new Promise((resolve, reject) => {
+        uni.request({
+          url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/getSaMsgAll",
+          method: "POST",
+          data: req,
+          header: {
+            "content-type": "application/x-www-form-urlencoded",
+          },
+          success(res) {
+            resolve(res.data.data)
+          },
+        });
+      });
 
-      this.serviceList = data.Result_Data.List
+      // 这个是云南那边给来的数据 根据 云南的数据 把我们算的距离补给他们的数据里面
+      let YNList = data.data
+      if (YNList && YNList.length > 0) {
+        YNList.forEach((item, index) => {
+          item.SERVERPART_DISTANCE = this.haversineDistance({ lat: this.seatInfo.latitude, lng: this.seatInfo.longitude }, { lat: item.latitude, lng: item.longitude })
+          item.fileId = item.fileId ? JSON.parse(item.fileId) : []
+          item.businessModel = item.businessModel ? JSON.parse(item.businessModel) : []
+          // fileId: obj.fileId ? JSON.parse(obj.fileId) : [],
+          // businessModel: obj.businessModel ? JSON.parse(obj.businessModel) : [],
+        })
+        uni.setStorageSync('YNList', YNList)
+        this.serviceList = YNList
+        this.allServiceList = YNList
+      }
+      // let serverpartList = uni.getStorageSync('ServerpartList')
+      // console.log('serverpartListserverpartListserverpartList', serverpartList);
+      // // 判断缓存里面 是不是有数据 没数据就调接口那新的  有数据 就用 serverpartList
+      // let list = []
+      // if (serverpartList && serverpartList.length > 0) {
+      //   list = serverpartList
+      // } else {
+      //   let req = {
+      //     Province_Code: "530000",
+      //     ShowService: true,
+      //     longitude: this.seatInfo.longitude,
+      //     latitude: this.seatInfo.latitude,
+      //     PageIndex: 1,
+      //     PageSize: 300
+      //   }
+      //   console.log('req', req)
+      //   const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
+      //   // const data = await request.$webJavaGet('third-party/getServerPartList', req)
+      //   console.log('datadatadatadata', data);
+      //   list = data.Result_Data.List
+      //   uni.setStorageSync('ServerpartList', list)
+      // }
+
+      // if (list && list.length > 0) {
+
+      // }
+      // console.log('this.serviceListthis.serviceListthis.serviceList', this.serviceList);
+
+    },
+    // 算经纬度的之间距离的方法
+    haversineDistance({ lat: lat1, lng: lon1 }, { lat: lat2, lng: lon2 }) {
+      const toRad = (d) => d * Math.PI / 180;
+      const R = 6378137; // 地球半径(米) WGS84 椭球近似为球
+      const φ1 = toRad(lat1);
+      const φ2 = toRad(lat2);
+      const Δφ = toRad(lat2 - lat1);
+      const Δλ = toRad(lon2 - lon1);
+
+      const a = Math.sin(Δφ / 2) ** 2 +
+        Math.cos(φ1) * Math.cos(φ2) * Math.sin(Δλ / 2) ** 2;
+      const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+      const distanceMeters = R * c;
+
+      return (distanceMeters / 1000).toFixed(2); // 返回 km，字符串
     },
     //点击向上移动
     handleChangeUp() {
diff --git a/pages/summaryOfPortraits/components/mapDetail.vue b/pages/summaryOfPortraits/components/mapDetail.vue
index 470d0c7..b0b80b4 100644
--- a/pages/summaryOfPortraits/components/mapDetail.vue
+++ b/pages/summaryOfPortraits/components/mapDetail.vue
@@ -4,11 +4,12 @@
     <!-- 服务区的信息 -->
     <view class="serviceDetail" style="margin-top: 16rpx;">
       <view class="detailTop">
-        <view class="serviceImg" v-if="topBg && topBg.length > 0">
+        <view class="serviceImg" v-if="info.fileId && info.fileId.length > 0">
           <swiper scroll-x="true" circular="true" class="banner" indicator-dots="true" indicator-active-color="#272625"
             autoplay interval="3000" style="width: 100%; height: 100%">
-            <swiper-item v-for="(img, i) in topBg" :key="i" style="width: 100%; height: 100%">
-              <image style="width: 100%; height: 100%" mode="aspectFill" lazy-load="true" :src="img"
+            <swiper-item v-for="(img, i) in info.fileId" :key="i" style="width: 100%; height: 100%">
+              <image style="width: 100%; height: 100%" mode="aspectFill" lazy-load="true"
+                :src="'https://fwqznxj.yciccloud.com:9081/fileDownloadApi/bsys/document/docDownloadAction?fileId=' + img.fileID"
                 @click="handlePreview"></image>
             </swiper-item>
           </swiper>
@@ -19,20 +20,15 @@
       <view class="detailBottom">
         <view class="detailFirst">
           <text class="serviceName">{{
-            info.SERVERPART_NAME || ""
-            }}</text>
+            info.SAName || ""
+          }}</text>
           <text class="serviceStatus">营业中</text>
         </view>
         <view class="detailSecond">
           <image class="detailFixedIcon" src="/static/images/home/address.png" />
           <text class="address">
-            <text class="distance">{{
-              info.SERVERPART_DISTANCE === 0
-                ? 0
-                : info.SERVERPART_DISTANCE || "-"
-            }}km</text>
-            <text class="addressText">{{ info.ServerpartInfo.SERVERPART_ADDRESS || "-"
-              }}{{ info.ServerpartInfo.EXPRESSWAY_NAME || "-" }}</text>
+            <text class="distance">{{ info.SERVERPART_DISTANCE || "-" }}km</text>
+            <text class="addressText">{{ info.belongRegion || "-" }}{{ info.belongLine || "-" }}</text>
           </text>
         </view>
         <view class="navigationBox" @click="handleGoMap">
@@ -42,7 +38,8 @@
     </view>
 
     <!-- 主要内容区域 -->
-    <scroll-view scroll-y="true" class="content-scroll" :style="{ height: `calc(100vh - ${(menu.bottom + 14)}px - 560rpx ) ` }">
+    <scroll-view scroll-y="true" class="content-scroll"
+      :style="{ height: `calc(100vh - ${(menu.bottom + 14)}px - 560rpx ) ` }">
       <view class="content-container">
 
         <!-- 基本信息卡片 -->
@@ -52,28 +49,34 @@
           </view>
 
           <view class="info-grid">
+            <!-- <view class="info-item">
+              <text class="info-label">服务区编码</text>
+              <text class="info-value">{{ info.SACode || '-' }}</text>
+            </view> -->
             <view class="info-item">
-              <text class="info-label">取水方式</text>
-              <text class="info-value">{{ getWaterIntakeType(info.ServerpartInfo &&
-                info.ServerpartInfo.WATERINTAKE_TYPE) }}</text>
+              <text class="info-label">所属片区</text>
+              <text class="info-value">{{ info.belongArea || '-' }}</text>
             </view>
             <view class="info-item">
-              <text class="info-label">污水处理</text>
-              <text class="info-value">{{ getSewageType(info.ServerpartInfo && info.ServerpartInfo.SEWAGEDISPOSAL_TYPE)
-                }}</text>
+              <text class="info-label">所在线路</text>
+              <text class="info-value">{{ info.belongLine || '-' }}</text>
             </view>
             <view class="info-item">
               <text class="info-label">所在地区</text>
-              <text class="info-value">{{ (info.ServerpartInfo && info.ServerpartInfo.SERVERPART_ADDRESS) || '-'
-                }}</text>
+              <text class="info-value">{{ info.belongRegion || '-' }}</text>
+            </view>
+            <!-- <view class="info-item">
+              <text class="info-label">桩号位置</text>
+              <text class="info-value">{{ info.pileNumLocation || '-' }}</text>
+            </view> -->
+            <view class="info-item">
+              <text class="info-label">经营模式</text>
+              <text class="info-value">{{ info.businessModel && info.businessModel.length > 0 ?
+                info.businessModel.toString() : '-' }}</text>
             </view>
             <view class="info-item">
-              <text class="info-label">管理单位</text>
-              <text class="info-value">{{ (info.ServerpartInfo && info.ServerpartInfo.MANAGERCOMPANY) || '-' }}</text>
-            </view>
-            <view class="info-item">
-              <text class="info-label">产权单位</text>
-              <text class="info-value">{{ (info.ServerpartInfo && info.ServerpartInfo.OWNEDCOMPANY) || '-' }}</text>
+              <text class="info-label">产权归属</text>
+              <text class="info-value">{{ info.propertyOwnership || '-' }}</text>
             </view>
           </view>
         </view>
@@ -86,31 +89,31 @@
 
           <view class="area-stats">
             <view class="stat-item">
-              <text class="stat-number">{{ formatArea(info.ServerpartInfo && info.ServerpartInfo.FLOORAREA) }}</text>
+              <text class="stat-number">{{ formatArea(info.floorArea) }}</text>
               <text class="stat-label">占地面积</text>
               <text class="stat-unit">m²</text>
             </view>
             <view class="stat-divider"></view>
             <view class="stat-item">
-              <text class="stat-number">{{ formatArea(info.ServerpartInfo && info.ServerpartInfo.SHAREAREA) }}</text>
+              <text class="stat-number">{{ formatArea(info.parkArea) }}</text>
               <text class="stat-label">停车场面积</text>
               <text class="stat-unit">m²</text>
             </view>
             <view class="stat-divider"></view>
             <view class="stat-item">
-              <text class="stat-number">{{ formatArea(info.ServerpartInfo && info.ServerpartInfo.SERVERPART_AREA)
-                }}</text>
-              <text class="stat-label">建筑面积</text>
+              <text class="stat-number">{{ formatArea((info.synthesisCatering || 0) + (info.supermarket || 0) +
+                (info.synthesiOther || 0)) }}</text>
+              <text class="stat-label">综合楼面积</text>
               <text class="stat-unit">m²</text>
             </view>
           </view>
         </view>
 
         <!-- 服务详情卡片 -->
-        <view class="service-card" v-for="(region, regionIndex) in info.RegionInfo" :key="regionIndex">
-          <view class="service-header">
-            <text class="service-title">🏢 {{ region.SERVERPART_REGIONNAME || '服务区域' }}</text>
-          </view>
+        <view class="service-card">
+          <!-- <view class="service-header">
+            <text class="service-title">🏢 {{ info.SAName || '服务区域' }}</text>
+          </view> -->
 
           <!-- 服务信息 -->
           <view class="service-section">
@@ -121,42 +124,45 @@
 
             <view class="service-grid">
               <view class="service-row">
-                <view class="service-item" :class="{ 'available': region.HASPANTRY, 'unavailable': !region.HASPANTRY }">
+                <view class="service-item"
+                  :class="{ 'available': info.manToiletNum > 0, 'unavailable': !info.manToiletNum }">
                   <image class="service-icon" src="https://eshangtech.com/ShopICO/ahyd-BID/service/manWc.svg" />
                   <text class="service-name">男厕</text>
-                  <text class="service-count" v-if="region.HASPANTRY">({{ region.HASPANTRY }})</text>
+                  <text class="service-count" v-if="info.manToiletNum">({{ info.manToiletNum }})</text>
                 </view>
-                <view class="service-item" :class="{ 'available': region.HASWIFI, 'unavailable': !region.HASWIFI }">
+                <view class="service-item"
+                  :class="{ 'available': info.womanToiletNum > 0, 'unavailable': !info.womanToiletNum }">
                   <image class="service-icon" src="https://eshangtech.com/ShopICO/ahyd-BID/service/womanWc.svg" />
                   <text class="service-name">女厕</text>
-                  <text class="service-count" v-if="region.HASWIFI">({{ region.HASWIFI }})</text>
+                  <text class="service-count" v-if="info.womanToiletNum">({{ info.womanToiletNum }})</text>
                 </view>
               </view>
               <view class="service-row">
                 <view class="service-item"
-                  :class="{ 'available': region.HASTHIRDTOILETS, 'unavailable': !region.HASTHIRDTOILETS }">
+                  :class="{ 'available': info.otherWCNum > 0, 'unavailable': !info.otherWCNum }">
                   <text class="service-name">第三卫生间</text>
+                  <text class="service-count" v-if="info.otherWCNum">({{ info.otherWCNum }})</text>
                 </view>
                 <view class="service-item"
-                  :class="{ 'available': region.TOILETCOUNT, 'unavailable': !region.TOILETCOUNT }">
-                  <text class="service-name">潮汐厕位</text>
-                  <text class="service-count" v-if="region.TOILETCOUNT">({{ region.TOILETCOUNT }})</text>
+                  :class="{ 'available': info.babyCareRoomNum > 0, 'unavailable': !info.babyCareRoomNum }">
+                  <text class="service-name">母婴室</text>
+                  <text class="service-count" v-if="info.babyCareRoomNum">({{ info.babyCareRoomNum }})</text>
+                </view>
+              </view>
+              <view class="service-row">
+                <view class="service-item" :class="{ 'available': info.faucetNum > 0, 'unavailable': !info.faucetNum }">
+                  <text class="service-name">水龙头</text>
+                  <text class="service-count" v-if="info.faucetNum">({{ info.faucetNum }})</text>
+                </view>
+                <view class="service-item"
+                  :class="{ 'available': info.repairStationArea > 0, 'unavailable': !info.repairStationArea }">
+                  <text class="service-name">汽修站</text>
                 </view>
               </view>
               <view class="service-row">
                 <view class="service-item"
-                  :class="{ 'available': region.HASWATERROOM, 'unavailable': !region.HASWATERROOM }">
-                  <text class="service-name">开水器</text>
-                  <text class="service-count" v-if="region.HASWATERROOM">({{ region.HASWATERROOM }})</text>
-                </view>
-                <view class="service-item" :class="{ 'available': region.HASCHILD, 'unavailable': !region.HASCHILD }">
-                  <text class="service-name">车辆维修</text>
-                </view>
-              </view>
-              <view class="service-row">
-                <view class="service-item"
-                  :class="{ 'available': region.HASSHOWERROOM, 'unavailable': !region.HASSHOWERROOM }">
-                  <text class="service-name">车辆加水</text>
+                  :class="{ 'available': info.addWaterArea > 0, 'unavailable': !info.addWaterArea }">
+                  <text class="service-name">加水区域</text>
                 </view>
                 <view class="service-item empty-item">
                   <!-- 空白项保持对齐 -->
@@ -175,22 +181,22 @@
             <view class="parking-grid">
               <view class="parking-row">
                 <view class="parking-item">
-                  <text class="parking-label">轿车车位</text>
-                  <text class="parking-count">{{ region.SMALLPARKING || 0 }}</text>
+                  <text class="parking-label">小型车位</text>
+                  <text class="parking-count">{{ info.minStallNum || 0 }}</text>
                 </view>
                 <view class="parking-item">
-                  <text class="parking-label">客车车位</text>
-                  <text class="parking-count">{{ region.PACKING || 0 }}</text>
+                  <text class="parking-label">中型车位</text>
+                  <text class="parking-count">{{ info.middleStallNum || 0 }}</text>
                 </view>
               </view>
               <view class="parking-row">
                 <view class="parking-item">
-                  <text class="parking-label">货车车位</text>
-                  <text class="parking-count">{{ region.TRUCKPACKING || 0 }}</text>
+                  <text class="parking-label">大型车位</text>
+                  <text class="parking-count">{{ info.maxStallNum || 0 }}</text>
                 </view>
                 <view class="parking-item">
-                  <text class="parking-label">危化品车位</text>
-                  <text class="parking-count">{{ region.DANPACKING || 0 }}</text>
+                  <text class="parking-label">加油车道</text>
+                  <text class="parking-count">{{ info.addOilRoadNum || 0 }}</text>
                 </view>
               </view>
             </view>
@@ -206,36 +212,115 @@
             <view class="business-grid">
               <view class="business-row">
                 <view class="business-item"
-                  :class="{ 'available': region.DININGROOMCOUNT, 'unavailable': !region.DININGROOMCOUNT }">
+                  :class="{ 'available': info.synthesisCatering > 0, 'unavailable': !info.synthesisCatering }">
                   <text class="business-name">餐饮服务</text>
+                  <text class="business-count" v-if="info.synthesisCatering">({{ formatArea(info.synthesisCatering)
+                    }}m²)</text>
                 </view>
                 <view class="business-item"
-                  :class="{ 'available': region.HASMESSAGESEARCH, 'unavailable': !region.HASMESSAGESEARCH }">
-                  <text class="business-name">住宿服务</text>
+                  :class="{ 'available': info.supermarket > 0, 'unavailable': !info.supermarket }">
+                  <text class="business-name">超市便利店</text>
+                  <text class="business-count" v-if="info.supermarket">({{ formatArea(info.supermarket) }}m²)</text>
                 </view>
               </view>
               <view class="business-row">
                 <view class="business-item"
-                  :class="{ 'available': region.HASBACKGROUNDRADIO, 'unavailable': !region.HASBACKGROUNDRADIO }">
-                  <text class="business-name">便利店</text>
+                  :class="{ 'available': info.LPGStationsArea > 0, 'unavailable': !info.LPGStationsArea }">
+                  <text class="business-name">加气站</text>
+                  <text class="business-count" v-if="info.LPGStationsArea">({{ formatArea(info.LPGStationsArea)
+                    }}m²)</text>
                 </view>
                 <view class="business-item"
-                  :class="{ 'available': region.DININGBXCOUNT, 'unavailable': !region.DININGBXCOUNT }">
-                  <text class="business-name">商铺</text>
-                  <text class="business-count" v-if="region.DININGBXCOUNT">({{ region.DININGBXCOUNT }})</text>
+                  :class="{ 'available': info.chargingStationArea > 0, 'unavailable': !info.chargingStationArea }">
+                  <text class="business-name">充电站</text>
+                  <text class="business-count" v-if="info.chargingStationArea">({{ formatArea(info.chargingStationArea)
+                    }}m²)</text>
                 </view>
               </view>
             </view>
 
-            <view class="business-type" v-if="region.BUSINESSTYPE">
-              <text class="business-type-label">经营模式：</text>
+            <view class="business-type" v-if="info.businessModel && info.businessModel.length > 0">
+              <text class=" business-type-label">经营模式：</text>
               <view class="business-type-tag">
-                <text class="business-type-text">{{ region.BUSINESSTYPE }}</text>
+                <text class="business-type-text">{{ info.businessModel && info.businessModel.length > 0 ?
+                  info.businessModel.toString() : '-' }}</text>
               </view>
             </view>
           </view>
         </view>
 
+        <!-- 设施详情卡片 -->
+        <view class="info-card">
+          <view class="card-header">
+            <text class="card-title">⚡ 设施详情</text>
+          </view>
+
+          <view class="info-grid">
+            <view class="info-item">
+              <text class="info-label">污水处理方量</text>
+              <text class="info-value">{{ info.sewageTreatmentVolume || '-' }}m³</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">变压器功率</text>
+              <text class="info-value">{{ info.transformerVA || '-' }}VA</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">加油枪数量</text>
+              <text class="info-value">{{ info.oilGunNum || 0 }}支</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">充电桩数量</text>
+              <text class="info-value">{{ info.chargingStationPileNum || 0 }}桩</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">充电枪数量</text>
+              <text class="info-value">{{ info.chargingStationGunNum || 0 }}枪</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">直流快充枪</text>
+              <text class="info-value">{{ info.DCFastGunNum || 0 }}枪</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">直流慢充枪</text>
+              <text class="info-value">{{ info.slowGunNum || 0 }}枪</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 区域面积卡片 -->
+        <view class="info-card">
+          <view class="card-header">
+            <text class="card-title">🏗️ 区域面积 <text
+                style="font-size: 24rpx;font-weight: 400;margin-left: 8rpx;">/m²</text></text>
+          </view>
+
+          <view class="info-grid">
+            <view class="info-item">
+              <text class="info-label">行车道面积</text>
+              <text class="info-value">{{ formatArea(info.drivewayArea) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">办公区面积</text>
+              <text class="info-value">{{ formatArea(info.officeArea) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">卫生间面积</text>
+              <text class="info-value">{{ formatArea(info.WCArea) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">绿化面积</text>
+              <text class="info-value">{{ formatArea(info.greenArea) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">员工住宿区</text>
+              <text class="info-value">{{ formatArea(info.employeeRoomArea) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">驾驶员休息室</text>
+              <text class="info-value">{{ formatArea(info.driverRoomArea) }}</text>
+            </view>
+          </view>
+        </view>
 
       </view>
     </scroll-view>
@@ -288,10 +373,10 @@ export default {
     // 跳转导航
     handleGoMap() {
       uni.openLocation({
-        latitude: this.info.SERVERPART_Y * 1,
-        longitude: this.info.SERVERPART_X * 1,
+        latitude: this.info.latitude * 1,
+        longitude: this.info.longitude * 1,
         scale: 16,
-        name: this.info.SERVERPART_NAME,
+        name: this.info.SAName,
         success(data) {
           console.log(data);
         },
@@ -316,10 +401,20 @@ export default {
       let systemInfo = uni.getSystemInfoSync()
       this.menu = uni.getMenuButtonBoundingClientRect()
       let seat = uni.getStorageSync('currentService')
-      this.handleSearch(seat)
+      // this.handleSearch(seat)
+      this.handleGetData(seat)
       this.topBg = []
     },
-
+    handleGetData(obj) {
+      // 模拟新数据结构的示例数据
+      let res = {
+        ...obj,
+        // fileId: obj.fileId ? JSON.parse(obj.fileId) : [],
+        // businessModel: obj.businessModel ? JSON.parse(obj.businessModel) : [],
+      }
+      console.log('新数据结构示例:', res);
+      this.info = res
+    },
     // 搜索服务区信息
     async handleSearch(seat) {
       let currentService = uni.getStorageSync("currentService");
@@ -372,23 +467,6 @@ export default {
       return typeMap[type] || ''
     },
 
-    // 获取取水方式
-    getWaterIntakeType(type) {
-      const typeMap = {
-        1: '自来水',
-        2: '井水'
-      }
-      return typeMap[type] || '-'
-    },
-
-    // 获取污水处理方式
-    getSewageType(type) {
-      const typeMap = {
-        1: '市政',
-        2: '污水处理设备'
-      }
-      return typeMap[type] || '-'
-    },
 
     // 格式化面积
     formatArea(area) {
@@ -624,7 +702,7 @@ export default {
 
   .content-scroll {
     background: @bg;
-    margin-top: 24rpx;
+    // margin-top: 24rpx;
   }
 
   .content-container {
diff --git a/pages/summaryOfPortraits/index.vue b/pages/summaryOfPortraits/index.vue
index 3447716..d1677fb 100644
--- a/pages/summaryOfPortraits/index.vue
+++ b/pages/summaryOfPortraits/index.vue
@@ -17,9 +17,9 @@
             <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
             <view class="select">
               <view class="content">
-                <view class="uni-input">{{ serviceInfo.SERVERPART_NAME ? serviceInfo.SERVERPART_NAME : '' }}</view>
-                <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}</p>
-                <text class="noticeText" v-if="serviceInfo.SERVERPART_NAME === '安徽驿达'">选择您要看的服务区</text>
+                <view class="uni-input">{{ serviceInfo.SAName ? serviceInfo.SAName : '' }}</view>
+                <!-- <p class="area">{{ serviceInfo.SPREGIONTYPE_NAME ? serviceInfo.SPREGIONTYPE_NAME : '' }}</p> -->
+                <!-- <text class="noticeText" v-if="serviceInfo.SERVERPART_NAME === '安徽驿达'">选择您要看的服务区</text> -->
                 <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg">
                 </image>
               </view>