diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index e930ad9..326b6ec 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -1,251 +1,313 @@
 <template>
-  <div>
+  <view :class="'province-theme-' + currentProvinceCode">
     <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"></AnhHead>
+        :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">
-            <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)"
-                v-if="areaProgress && areaProgress.length > 0" :class="{ active: nowTab == 3 }">
-                区域营收
-              </div>
-              <div class="operation-tab-unit" @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" v-if="
-                modelProgress &&
-                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 && 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 && 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>
-        </div>
+        <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>
 
-        <!-- 昨日日结上传 -->
-        <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>
-          <view style="font-size: 26rpx">
-            门店上传&nbsp;&nbsp;
-            <span class="upload-count">{{ headMsg.uploadState }}</span>
+          <view class="analysis-container">
+
+            <view class="modern-tabs">
+              <view class="tab-item" @click="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" @click="selectTab('nowTab', 2)" :class="{ 'active': nowTab == 2 }">
+                <view class="tab-icon">🏪</view>
+                <view class="tab-label">经营业态</view>
+              </view>
+              <view class="tab-item" @click="selectTab('nowTab', 3)"
+                v-if="areaProgress.length && areaProgress.length > 1" :class="{ 'active': nowTab == 3 }">
+                <view class="tab-icon">🗺</view>
+                <view class="tab-label">区域营收</view>
+              </view>
+              <view class="tab-item" @click="selectTab('nowTab', 4)"
+                v-if="theRequest.ProvinceCode == 340000 && theRequest.GroupType == 1000"
+                :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">
+                <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-header">
+                  <view class="traffic-title">
+                    <view class="traffic-icon">🚗</view>
+                    <text>车流分析概览</text>
+                  </view>
+                  <view class="traffic-summary">
+                    {{ bayonetProgress.length }}个区域
+                  </view>
+                </view>
+
+                <scroll-view class="traffic-scroll-container" scroll-y="true">
+                  <view class="traffic-regions">
+                    <view class="region-card" v-for="(item, o) in bayonetProgress" :key="o">
+                      <!-- 区域标题 -->
+                      <view class="region-header" @click="toggleRegionCollapse(item)">
+                        <view class="region-badge">
+                          <view class="region-icon">🗺️</view>
+                          <view class="region-title">{{ item.name }}</view>
+                        </view>
+                        <view class="region-actions">
+                          <view class="region-count">{{ item.list.length }}个服务区</view>
+                          <view class="region-arrow" :class="{ 'collapsed': item.collapsed }">▼</view>
+                        </view>
+                      </view>
+
+                      <!-- 服务区列表 -->
+                      <view class="service-areas" v-if="!item.collapsed">
+                        <view class="service-area-item" v-for="(child, idx) in item.list" :key="idx">
+                          <view class="service-header" @click="toggleServiceArea(item, idx)">
+                            <view class="service-info">
+                              <view class="service-name">{{ child.name }}</view>
+                              <view class="service-ratio">占比 {{ child.bili }}%</view>
+                            </view>
+                            <view class="service-actions">
+                              <view class="flow-stats">
+                                <view class="flow-item">
+                                  <text class="flow-label">入区</text>
+                                  <text class="flow-value">{{ child.data }}</text>
+                                </view>
+                                <view class="flow-divider">|</view>
+                                <view class="flow-item">
+                                  <text class="flow-label">断面</text>
+                                  <text class="flow-value">{{ child.flow }}</text>
+                                </view>
+                              </view>
+                              <view class="expand-arrow" :class="{ 'expanded': child.expanded }">▼</view>
+                            </view>
+                          </view>
+
+                          <!-- 方向车流数据 -->
+                          <view class="direction-list" v-if="child.expanded && child.list && child.list.length > 0">
+                            <view class="direction-item" v-for="(direction, didx) in child.list" :key="didx">
+                              <view class="direction-header">
+                                <view class="direction-info">
+                                  <text class="direction-name">{{ direction.name }}区</text>
+                                  <text class="direction-percent">{{ direction.bili }}%</text>
+                                </view>
+                                <view class="vehicle-stats">
+                                  <view class="vehicle-type-group">
+                                    <view class="vehicle-type-item">
+                                      <text class="vehicle-type-label">大型车</text>
+                                      <text class="vehicle-count-value">{{ direction.LargeVehicle_Count }}</text>
+                                    </view>
+                                    <view class="vehicle-type-item">
+                                      <text class="vehicle-type-label">中型车</text>
+                                      <text class="vehicle-count-value">{{ direction.MediumVehicle_Count }}</text>
+                                    </view>
+                                    <view class="vehicle-type-item">
+                                      <text class="vehicle-type-label">小型车</text>
+                                      <text class="vehicle-count-value">{{ direction.MinVehicle_Count }}</text>
+                                    </view>
+                                  </view>
+                                </view>
+                              </view>
+                            </view>
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </scroll-view>
+              </view>
+            </view>
           </view>
-        </div>
+        </view>
+
+        <!-- 日结上传区域 -->
+        <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>
         <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" @click="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" @click="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" @click.stop="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" />
+          <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' || theRequest.ProvinceCode == '734100'">
-        <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>
-import { mapState } from "vuex";
-import uCharts from "@/components/u-charts.js";
-import shopCell from "./components/listUnit.vue";
-import AnhHead from "./components/anhHead.vue";
-import RankContent from "./components/RankContent.vue";
-import anhuiYestodayRevenueData from "./components/anhuiYestodayRevenueData.js";
+import {
+  mapState
+} from 'vuex';
+import uCharts from '@/components/u-charts.js';
+import shopCell from './components/listUnit.vue'
+import AnhHead from './components/anhHead.vue'
+import RankContent from './components/RankContent.vue'
+import anhuiYestodayRevenueData from './components/anhuiYestodayRevenueData.js'
 var rincanvas = {};
-
+import request from '@/util/index.js'
 export default {
   data() {
-    const lastDay = this.$util.cutDate(new Date(), "YYYY-MM-DD", -1);
+    const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1)
 
-    const nowDay = this.$util.cutDate(new Date(), "MM月DD日");
+    const nowDay = this.$util.cutDate(new Date(), 'MM月DD日')
 
     return {
       showPage: false,
@@ -269,142 +331,208 @@ export default {
       modelProgress: null,
       isup: true,
       wechatPushSalesList: null, // 甘肃单品排行数据
-    };
+      currentMoney: '',
+      currentProvinceCode: '' // 当前省份代码
+    }
   },
   computed: {
     ...mapState({
-      PushAuthority: (state) => state.userData.PushAuthority,
-      ProvinceCode: (state) => state.userData.ProvinceCode,
+      'PushAuthority': (state) => state.userData.PushAuthority,
+      'ProvinceCode': (state) => state.userData.ProvinceCode,
     }),
     hasSeverpartIndexAuthority() {
-      let theRequest = this.theRequest;
+      let theRequest = this.theRequest
       if (this.theRequest && theRequest.ProvinceCode && this.PushAuthority) {
-        return this.PushAuthority.some(
-          (n) =>
-            n.ProvinceCode == theRequest.ProvinceCode && n.ShopAnalysisType == 1
-        );
+        return this.PushAuthority.some(n =>
+          n.ProvinceCode == theRequest.ProvinceCode && n.ShopAnalysisType == 1
+        )
       }
-      return false;
+      return false
     },
+    // 省份主题配色
+    provinceTheme() {
+      const themes = {
+        '330200': { // 宁波
+          primary: '#1890FF',
+          secondary: '#69C0FF',
+          background: '#E6F7FF',
+          accent: '#40A9FF'
+        },
+        '340000': { // 安徽
+          primary: '#748ED6',
+          secondary: '#91A7E3',
+          background: '#F0F4FF',
+          accent: '#A3B8E8'
+        },
+        '500000': { // 重庆
+          primary: '#FA541C',
+          secondary: '#FF7A45',
+          background: '#FFF2E8',
+          accent: '#FF8C73'
+        },
+        '510000': { // 四川
+          primary: '#FA8C16',
+          secondary: '#FFA940',
+          background: '#FFF7E6',
+          accent: '#FFAB65'
+        },
+        '520000': { // 贵州
+          primary: '#52C41A',
+          secondary: '#73D13D',
+          background: '#F6FFED',
+          accent: '#7CB342'
+        },
+        '530000': { // 云南（保持原色）
+          primary: '#27B25F',
+          secondary: '#4CCC7F',
+          background: '#F6FFED',
+          accent: '#5CDB87'
+        },
+        '630000': { // 青海
+          primary: '#13C2C2',
+          secondary: '#36CFC9',
+          background: '#E6FFFB',
+          accent: '#5CDBD3'
+        },
+        '734100': { // 海南
+          primary: '#E91E63',
+          secondary: '#F06292',
+          background: '#FCE4EC',
+          accent: '#F48FB1'
+        }
+      }
+      return themes[this.currentProvinceCode] || themes['530000'] // 如果找不到对应省份，使用云南配色
+    }
   },
   components: {
     shopCell,
     AnhHead,
-    RankContent,
+    RankContent
   },
   methods: {
-    toggleCard(isup) {
-      this.isup = !isup;
-      this.$forceUpdate();
-    },
-    bindDateChange(e) {
-      // 切换日期 加载选中日期的营收数据
-      // let nowDate = this.theRequest.time
-      let selectT = new Date(e.detail.value);
-      if (selectT <= new Date(this.lastDay)) {
-        this.theRequest.time = e.detail.value;
-        this.theRequest.month = this.$util.cutDate(e.detail.value, "YYYYMM");
-        this.sevenDate = [
-          this.$util.cutDate(selectT, "MM.DD", -13),
-          this.$util.cutDate(selectT, "MM.DD", -7),
-        ];
-        uni.showLoading({
-          title: "正在加载...",
-          mask: true,
-        });
-        this.initData();
-        // this.getTender()
-        this.todayAmount();
-        this.$forceUpdate();
+    // 初始化省份代码
+    initProvinceCode() {
+      let provinceCode = ''
+
+      // 优先使用theRequest中的省份代码  
+      if (this.theRequest && this.theRequest.ProvinceCode) {
+        provinceCode = this.theRequest.ProvinceCode
+      } else if (this.ProvinceCode) {
+        // 备用方案使用store中的省份代码
+        provinceCode = this.ProvinceCode
+      }
+
+      // 只有在确实找到省份代码时才设置和更新
+      if (provinceCode) {
+        this.currentProvinceCode = provinceCode
+        console.log('设置省份主题:', provinceCode)
+        // 强制更新以应用新主题
+        this.$forceUpdate()
       }
     },
-    toDetail(item, provinceId) {
-      // 如果当前页面至存在一个初始化的省份编码 则不需要传入参数provinceId
-      let date = this.theRequest.time;
-      let pcode = provinceId || this.theRequest.ProvinceCode;
+    // 获取主题颜色（小程序兼容版本）
+    getThemeColors() {
+      return this.provinceTheme
+    },
+    toggleCard(isup) {
+      this.isup = !isup
+      this.$forceUpdate()
+    },
+    bindDateChange(e) { // 切换日期 加载选中日期的营收数据
+      // let nowDate = this.theRequest.time
+      let selectT = new Date(e.detail.value)
+      if (selectT <= new Date(this.lastDay)) {
+        this.theRequest.time = e.detail.value
+        this.theRequest.month = this.$util.cutDate(e.detail.value, 'YYYYMM')
+        this.sevenDate = [this.$util.cutDate(selectT, 'MM.DD', -13),
+        this.$util.cutDate(selectT, 'MM.DD', -7)]
+        uni.showLoading({
+          title: '正在加载...',
+          mask: true
+        })
+        this.initData()
+        // this.getTender()
+        this.todayAmount()
+        this.$forceUpdate()
+      }
 
-      let severpartIndexPath =
-        "/pages/everdayRenven/AnhuiServerpart?ServerpartIds=" +
-        item.serverpart_Id +
-        "&time=" +
-        date +
-        "&ProvinceCode=" +
-        pcode;
-      let serverpartUploadPath =
-        "/pages/everdayRenven/detail?id=" +
-        item.serverpart_Id +
-        "&time=" +
-        date +
-        "&provinceId=" +
-        pcode;
+    },
+    toDetail(item, provinceId) { // 如果当前页面至存在一个初始化的省份编码 则不需要传入参数provinceId
+      let date = this.theRequest.time
+      let pcode = provinceId || this.theRequest.ProvinceCode
+
+      let severpartIndexPath = '/pages/everdayRenven/AnhuiServerpart?ServerpartIds=' + item.serverpart_Id +
+        '&time=' + date + '&ProvinceCode=' + pcode
+      let serverpartUploadPath = '/pages/everdayRenven/detail?id=' + item.serverpart_Id + '&time=' + date +
+        '&provinceId=' + pcode
 
       // 是否有权限进入服务区营收分析页面
-      let canToSeverpartIndex = !provinceId
-        ? this.hasSeverpartIndexAuthority
-        : this.PushAuthority.some((n) => {
-          return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1;
-        });
+      let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => {
+        return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1
+      })
+      this.$util.toNextRoute('navigateTo', severpartIndexPath)
 
-      this.$util.toNextRoute(
-        "navigateTo",
-        canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath
-      );
-
-      item.visited = true;
-      this.$forceUpdate();
+      item.visited = true
+      this.$forceUpdate()
     },
     selectTab(name, index) {
-      this[name] = index;
+      this[name] = index
     },
     toggleRegion(item) {
-      item.show = !item.show ? true : false;
-      this.$forceUpdate();
+      item.show = !item.show ? true : false
+      this.$forceUpdate()
+    },
+    // 切换区域展开/收起状态
+    toggleRegionCollapse(item) {
+      this.$set(item, 'collapsed', !item.collapsed)
+    },
+    // 切换服务区展开/收起状态  
+    toggleServiceArea(region, serviceIndex) {
+      const service = region.list[serviceIndex]
+      this.$set(service, 'expanded', !service.expanded)
     },
     touchPie(e, id) {
       rincanvas[id].showToolTip(e, {
         format: function (item) {
-          return item.name + ":" + item.data;
-        },
+          return item.name + ':' + item.data
+        }
       });
     },
     todayAmount() {
-      let _this = this;
-      let theRequest = this.theRequest;
-      this.$request
-        .$get("getCurRevenue", {
-          pushProvinceCode: theRequest.ProvinceCode,
-          serverPartId:
-            theRequest.GroupType == 1000 ? "" : theRequest.ServerpartIds,
-        })
-        .then((res) => {
-          if (res.ResultCode != 100) return;
+      let _this = this
+      let theRequest = this.theRequest
+      this.$request.$get('getCurRevenue', {
+        pushProvinceCode: theRequest.ProvinceCode,
+        serverPartId: theRequest.GroupType == 1000 ? '' : theRequest.ServerpartIds
+      }).then(res => {
+        if (res.ResultCode != 100) return
+
+        let avrticket = (res.Data.TOTALTICKET != 0 && res.Data.TOTALPRICE != 0) ? res.Data.TOTALPRICE /
+          res.Data
+            .TOTALTICKET : 0
+        _this.today = {
+          timeMoney: this.$util.fmoney(res.Data.TOTALPRICE, 2),
+          totalTicketCount: res.Data.TOTALTICKET,
+          avrticketCount: this.$util.fmoney(avrticket, 2),
+        }
+        _this.$forceUpdate()
+      })
 
-          let avrticket =
-            res.Data.TOTALTICKET != 0 && res.Data.TOTALPRICE != 0
-              ? res.Data.TOTALPRICE / res.Data.TOTALTICKET
-              : 0;
-          _this.today = {
-            timeMoney: this.$util.fmoney(res.Data.TOTALPRICE, 2),
-            totalTicketCount: res.Data.TOTALTICKET,
-            avrticketCount: this.$util.fmoney(avrticket, 2),
-          };
-          _this.$forceUpdate();
-        });
     },
 
     showPie(obj) {
       let data = {
-        series: [],
-      };
+        series: []
+      }
       const ctx = uni.createCanvasContext(obj.id, this);
-      data.series = data.series.concat(obj.data);
+      data.series = data.series.concat(obj.data)
       rincanvas[obj.id] = new uCharts({
         // 小程序图表工具
         // $this: this,
         // canvasId: obj.id,
         context: ctx,
         color: obj.colors,
-        type: "ring",
+        type: 'ring',
         fontSize: 12,
         padding: [15, 15, 25, 15],
         legend: {
@@ -413,7 +541,7 @@ export default {
           lineHeight: 11,
           margin: 0,
         },
-        background: "#FFFFFF",
+        background: '#FFFFFF',
         pixelRatio: 1,
         series: data.series,
         animation: false,
@@ -426,250 +554,205 @@ export default {
             labelWidth: 16,
             border: true,
             borderWidth: 1,
-            borderColor: "#fff",
-          },
+
+            borderColor: '#fff'
+          }
         },
       });
     },
     getDetail(obj) {
-      let _this = this;
-      this.$request
-        .$webGet("CommercialApi/Revenue/GetServerpartEndAccountList", {
-          Serverpart_ID: obj.ServerpartIds,
-          pushProvinceCode: obj.ProvinceCode,
-          Statistics_Date: obj.time,
-        })
-        .then((res) => {
-          if (res.Result_Code != 100) return;
-          res.Result_Data.ShopEndaccountList.map((n) => {
-            n.show = false;
-            n.detail = this.getListDetail(n);
-          });
+      console.log('obj', obj)
+      let _this = this
+      this.$request.$webGet('CommercialApi/Revenue/GetServerpartEndAccountList', {
+        Serverpart_ID: obj.ServerpartIds,
+        pushProvinceCode: obj.ProvinceCode,
+        Statistics_Date: obj.time,
 
-          _this.regionList = res.Result_Data.ShopEndaccountList;
-        });
+      }).then(res => {
+        if (res.Result_Code != 100) return
+        res.Result_Data.ShopEndaccountList.map(n => {
+          n.show = false
+          n.detail = this.getListDetail(n)
+        })
+
+        _this.regionList = res.Result_Data.ShopEndaccountList
+        console.log('_this.regionList', _this.regionList)
+      })
     },
     getListDetail(data) {
-      let arr = [];
+      let arr = []
       let keyJson = {
         SHOWMORE_SIGN: {
-          1: "【长款】",
-          2: "【异常长款】",
+          1: '【长款】',
+          2: '【异常长款】'
         }, // 长款
         SHOWLESS_SIGN: {
-          1: "【短款】",
-          2: "【异常短款】",
+          1: '【短款】',
+          2: '【异常短款】'
         }, // 短款
         SHOWABNORMAL_SIGN: {
-          1: "【异常校验】",
+          1: '【异常校验】'
         }, // 异常日结
         SHOWSCAN_SIGN: {
-          1: "【扫】",
+          1: '【扫】'
         }, // 扫码上传
         SHOWSSUPPLY_SIGN: {
-          1: "【补】",
+          1: '【补】'
         }, // 账期补录
         SHOWCHECK_SIGN: {
-          1: "【稽核检查】",
+          1: '【稽核检查】'
         }, // 稽核检查
         INTERFACE_SIGN: {
-          1: "【接口传输】",
+          1: '【接口传输】'
         }, // 接口传输
-      };
-      var keyCode = [
-        "SHOWABNORMAL_SIGN",
-        "SHOWCHECK_SIGN",
-        "SHOWMORE_SIGN",
-        "SHOWLESS_SIGN",
-        "SHOWSCAN_SIGN",
-        "SHOWSSUPPLY_SIGN",
-        "INTERFACE_SIGN",
-      ];
-      keyCode.map((n) => {
-        if (keyJson[n][data[n]]) arr.push(keyJson[n][data[n]]);
-      });
-      return arr;
+      }
+      var keyCode = ['SHOWABNORMAL_SIGN', 'SHOWCHECK_SIGN', 'SHOWMORE_SIGN', 'SHOWLESS_SIGN', 'SHOWSCAN_SIGN',
+        'SHOWSSUPPLY_SIGN', 'INTERFACE_SIGN'
+      ]
+      keyCode.map(n => {
+        if (keyJson[n][data[n]]) arr.push(keyJson[n][data[n]])
+      })
+      return arr
     },
     toggleShow(i) {
-      let item = this.regionList[i];
-      item.show = !item.show;
-      this.$forceUpdate();
+      let item = this.regionList[i]
+      item.show = !item.show
+      this.$forceUpdate()
     },
     defaultMsg() {
-      let option = null;
-      let _this = this;
+      let option = null
+      let _this = this
       if (this.PushAuthority && this.PushAuthority.length > 1) {
-        option = this.PushAuthority.find(
-          (n) => n.ProvinceCode === _this.ProvinceCode
-        );
+        option = this.PushAuthority.find(n => n.ProvinceCode === _this.ProvinceCode)
       } else {
-        option = this.PushAuthority[0];
+        option = this.PushAuthority[0]
       }
       return {
-        ...option,
-      };
+        ...option
+      }
     },
-    async initData() {
-      // 初始化营收数据
-      let _this = this;
-      console.log("theRequest", this.theRequest);
-      const [
-        reginList,
-        totalData,
-        busniessTypePie,
-        busniessTradePie,
-        busniessAreaPie,
-        bayonetPie,
-      ] = await anhuiYestodayRevenueData.getData(this.theRequest); // 获取实时数据
+    async initData() { // 初始化营收数据
+      let _this = this
+      console.log('this.theRequest1', this.theRequest)
+      this.theRequest.GroupType = 1000
+      this.theRequest.ServerpartIds = ''
+      const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
+        await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
 
       if (this.theRequest.GroupType !== 1010) {
-        this.regionList = reginList; // 营收上传列表 reginListModel[]
+        console.log('reginList', reginList)
+        this.regionList = reginList // 营收上传列表 reginListModel[]
       }
       // 组合及格式化 头部卡片总营收数据。
-      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.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(
-        this.theRequest.time,
-        "MM月DD日"
-      ); // 当前日期
-      totalData.budgetamoutShow = totalData.budgetAmount
-        ? _this.$util.fmoney(totalData.budgetAmount)
-        : 0.0; // 预算总营收
+      totalData.totalMoneyShow = this.$util.fmoney(totalData.cashPay) // 营收总数据格式化
+      totalData.dayOfShow = this.$util.cutDate(this.theRequest.time, 'MM月DD日') // 当前日期
+      totalData.budgetamoutShow = totalData.budgetAmount ?
+        _this.$util.fmoney(totalData.budgetAmount) : 0.00 // 预算总营收
 
       busniessTypePie.forEach((n, i) => {
-        if (n.name === "自营") {
+        if (n.name === '自营') {
           // 预算和实际差额
-          totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - n.data);
+          totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - n.data)
           // 预算和实际增长额比例
-          totalData.diffBili =
-            totalData.budgetAmount > 0
-              ? this.$util.fmoney(
-                (totalData.diffBudgetTotal / totalData.budgetAmount) * 100,
-                2
-              )
-              : "100";
+          totalData.diffBili = totalData.budgetAmount > 0 ?
+            this.$util.fmoney((totalData.diffBudgetTotal /
+              totalData.budgetAmount) * 100, 2) : '100'
         }
       });
-      this.headMsg = totalData;
-      console.log(this.headMsg);
+      this.headMsg = totalData
       // 饼图分析及数据条形分析
-      const [progressList, pieList] = this.getProgressData(
-        busniessTypePie,
-        totalData.cashPay
-      );
-      this.modelProgress = progressList;
+      const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
+      this.modelProgress = progressList
       // 经营类型分析
-      var colors1 = ["#FFAC37", "#6B75B8"];
+      var colors1 = ['#FFAC37', '#6B75B8'];
       // console.log(pieList)
       this.showPie({
-        id: "modelCont",
+        id: 'modelCont',
         data: pieList,
         colors: colors1,
       });
       // 经营业态
 
       // 饼图分析及数据条形分析
-      const [tprogressList, tpieList] = this.getProgressData(
-        busniessTradePie,
-        totalData.cashPay
-      );
+      const [tprogressList, tpieList] = this.getProgressData(busniessTradePie, totalData.cashPay)
 
-      this.regionProgress = tprogressList;
-      console.log("this.regionProgress", this.regionProgress);
-      console.log("tpieList", tpieList);
+      this.regionProgress = tprogressList
       // 经营类型分析
-      var colors2 = ["#5E67B4", "#4E5699", "#75B7AD", "#AFB7E6"];
+      var colors2 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6'];
       this.showPie({
-        id: "businessCont",
+        id: 'businessCont',
         data: tpieList,
         colors: colors2,
       });
 
       // 饼图分析及数据条形分析
-      const [aprogressList, apieList] = this.getProgressData(
-        busniessAreaPie,
-        totalData.cashPay
-      );
-      this.areaProgress = aprogressList;
-      console.log("this.areaProgress", this.areaProgress);
+      const [aprogressList, apieList] = this.getProgressData(busniessAreaPie, totalData.cashPay)
+      this.areaProgress = aprogressList
       // 区域营收分析
-      var colors3 = [
-        "#FFAC37",
-        "#d8ece9",
-        "#f7f5f6",
-        "#b2b7e3",
-        "#F4B27A",
-        "#F3B1C9",
-        "#e0e3f7",
-        "#FFE886",
-        "#f7f5f6",
-      ];
+      var colors3 = ['#FFAC37', '#d8ece9', '#f7f5f6', '#b2b7e3', '#F4B27A', '#F3B1C9', '#e0e3f7', '#FFE886', '#f7f5f6'];
       this.showPie({
-        id: "areaCont",
+        id: 'areaCont',
         data: apieList,
         colors: colors3,
       });
 
       // 安徽省本级显示的内容
-      if (
-        this.theRequest.GroupType == 1000 &&
-        this.theRequest.ProvinceCode == 340000
-      ) {
+      if (this.theRequest.GroupType == 1000 && this.theRequest.ProvinceCode == 340000) {
         // 显示片区车流量数据分析
-        const [bayonetList] = this.getBayonetData(bayonetPie);
-        this.bayonetProgress = bayonetList;
-        console.log("this.bayonetProgress", this.bayonetProgress);
+        const [bayonetList] = this.getBayonetData(bayonetPie)
+        this.bayonetProgress = bayonetList
       }
 
       if (reginList.length) {
-        this.showPage = true;
+        this.showPage = true
       }
-      this.isLoading = false;
-      uni.hideLoading();
+      this.isLoading = false
+      uni.hideLoading()
     },
     getProgressData(data, total) {
       var _data1 = [];
       var _data2 = [];
-      let _this = this;
+      let _this = this
       data.forEach((n, i) => {
+
         _data1.push({
           ...n,
-          textColor: "#999",
+          textColor: '#999',
           formatter: function (arg) {
-            if (typeof arg === "number") {
-              return [n.name, (arg * 100).toFixed(2) + "%"];
+
+            if (typeof arg === 'number') {
+              return [n.name, (arg * 100).toFixed(2) + '%']
             } else {
-              return [arg.name, (arg._proportion_ * 100).toFixed(2) + "%"];
+              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),
+          bili: _this.$util.fmoney((n.data / total) * 100, 2)
         });
+
       });
       _data1.sort(function (a, b) {
-        return b.data - a.data;
-      });
+        return b.data - a.data
+      })
       _data2.sort(function (a, b) {
-        return b.num - a.num;
-      });
+        return b.num - a.num
+      })
       return [_data2, _data1];
     },
     getBayonetData(data) {
       var _data1 = [];
-      let _this = this;
+      let _this = this
 
       data.forEach((n, i) => {
         var childData = [];
@@ -681,135 +764,310 @@ export default {
               name: o.name,
               data: o.Vehicle_Count,
               flow: o.SectionFlow_Count,
-              bili:
-                o.SectionFlow_Count == 0
-                  ? 100
-                  : _this.$util.fmoney(
-                    (o.Vehicle_Count / o.SectionFlow_Count) * 100,
-                    2
-                  ),
+              bili: o.SectionFlow_Count == 0 ? 100 : _this.$util.fmoney(
+                (o.Vehicle_Count / o.SectionFlow_Count) * 100, 2),
               MinVehicle_Count: o.MinVehicle_Count,
               MediumVehicle_Count: o.MediumVehicle_Count,
-              LargeVehicle_Count: o.LargeVehicle_Count,
+              LargeVehicle_Count: o.LargeVehicle_Count
             });
           });
           _list.sort(function (a, b) {
-            return b.bili - a.bili;
-          });
+            return b.bili - a.bili
+          })
 
           childData.push({
             name: m.name,
             data: m.Vehicle_Count, //+Number(data2[n[0]])
             flow: m.SectionFlow_Count,
-            bili:
-              m.SectionFlow_Count == 0
-                ? 0
-                : _this.$util.fmoney(
-                  (m.Vehicle_Count / m.SectionFlow_Count) * 100,
-                  2
-                ),
-            list: _list,
+            bili: m.SectionFlow_Count == 0 ? 0 : _this.$util.fmoney(
+              (m.Vehicle_Count / m.SectionFlow_Count) * 100, 2),
+            list: _list
           });
         });
         childData.sort(function (a, b) {
-          return b.bili - a.bili;
-        });
+          return b.bili - a.bili
+        })
 
         _data1.push({
           name: n.name,
           index: n.index,
-          list: childData,
+          list: childData
         });
       });
       _data1.sort(function (a, b) {
-        return a.index - b.index;
-      });
+        return a.index - b.index
+      })
 
       return [_data1];
     },
-    async getRankContent() {
-      // 甘肃需要单品排行显示
-      const { ProvinceCode, time } = this.theRequest;
-
-      const data = await this.$request.$webGet(
-        "CommercialApi/Revenue/GetWechatPushSalesList",
-        {
-          pushProvinceCode: ProvinceCode,
-          Statistics_Date: time,
-        }
-      );
-
-      console.log('getRankContentgetRankContentgetRankContentgetRankContent', time);
+    async getRankContent() { // 甘肃需要单品排行显示
+      const {
+        ProvinceCode,
+        time
+      } = this.theRequest
 
+      const data = await this.$request.$webGet('CommercialApi/Revenue/GetWechatPushSalesList', {
+        pushProvinceCode: ProvinceCode,
+        Statistics_Date: time
+      })
 
       if (data.Result_Code === 100 && data.Result_Data.TotalCount > 0) {
-        this.wechatPushSalesList = {};
-        data.Result_Data.List.forEach((n) => {
-          this.wechatPushSalesList[n.Data_Type] = n.GoodsList;
-        });
+        this.wechatPushSalesList = {}
+        data.Result_Data.List.forEach(n => {
+          this.wechatPushSalesList[n.Data_Type] = n.GoodsList
+        })
+
       } else {
-        this.wechatPushSalesList = {};
+        this.wechatPushSalesList = {}
       }
-      this.$forceUpdate();
+      this.$forceUpdate()
+    },
+    // 实时营收
+    handleRealRevenue() {
+      const {
+        ProvinceCode,
+      } = this.theRequest
+      const date = new Date()
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      let d = date.getDate()
+      if (m < 10) {
+        m = '0' + m
+      }
+      if (d < 10) {
+        d = '0' + d
+      }
+      let req = {
+        pushProvinceCode: ProvinceCode,
+        StatisticsDate: `${y}-${m}-${d}`
+      }
+      request.$webGet('CommercialApi/Revenue/GetCurRevenue', req).then(res => {
+        console.log('res222222', res)
+        this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount, 2)
+      })
     },
   },
 
   onUnload() {
-    this.$util.addUserBehaviorNew();
+    this.$util.addUserBehavior()
   },
   onPageScroll(options) {
-    this.opacity = (options.scrollTop - 30) / 68;
+    this.opacity = (options.scrollTop - 30) / 68
   },
   onLoad(option) {
-    console.log("optio1n", option);
-    uni.showLoading({
-      title: "正在加载...",
-    });
-    if (option.ProvinceCode) {
-      // 从推送进入
-      this.theRequest = option;
-      option.time = this.$util.cutDate(option.time, "YYYY-MM-DD");
-      option.month = this.$util.cutDate(option.time, "YYYYMM");
 
-      this.initData();
-    } else {
-      // 默认
+    uni.showLoading({
+      title: '正在加载...'
+    })
+    if (option.ProvinceCode) { // 从推送进入
+      this.theRequest = option
+      option.time = this.$util.cutDate(option.time, 'YYYY-MM-DD')
+      option.month = this.$util.cutDate(option.time, 'YYYYMM')
+
+      // 初始化省份主题
+      this.initProvinceCode()
+      this.initData()
+      this.handleRealRevenue()
+    } else { // 默认
 
       if (this.PushAuthority.length > 0) {
-        this.theRequest = this.defaultMsg() || {};
-        this.theRequest.time = this.lastDay;
-        this.theRequest.month = this.$util.cutDate(this.lastDay, "YYYYMM");
-        this.initData();
+        console.log('11111')
+        this.theRequest = this.defaultMsg() || {}
+        let storeTime = uni.getStorageSync('lastDay')
+        if (storeTime) {
+          this.theRequest.time = storeTime
+          this.theRequest.month = this.$util.cutDate(storeTime, 'YYYYMM')
+        } else {
+          this.theRequest.time = this.lastDay
+          this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM')
+        }
+
+        // 初始化省份主题
+        this.initProvinceCode()
+        this.initData()
+        this.handleRealRevenue()
       } else {
-        uni.hideLoading();
-        this.theRequest = null;
-        this.isLoading = false;
-        this.showPage = false;
-        this.opacity = 1;
+        uni.hideLoading()
+        this.theRequest = null
+        this.isLoading = false
+        this.showPage = false
+        this.opacity = 1
+        // 即使没有权限，也设置一个默认省份以避免样式异常
+        this.currentProvinceCode = '530000'
       }
     }
-    this.nowTab = this.theRequest.ProvinceCode == 340000 ? 1 : 2;
-    console.log("this.nowTab", this.nowTab);
-    this.todayAmount();
-    if (this.theRequest.GroupType == 1010) {
-      this.getDetail(this.theRequest);
+    this.nowTab = this.theRequest && this.theRequest.ProvinceCode == 340000 ? 1 : 2
+    this.todayAmount()
+    if (this.theRequest && this.theRequest.GroupType == 1010) {
+      this.getDetail(this.theRequest)
     }
-    console.log('this.theRequestthis.theRequestthis.theRequest', this.theRequest);
-
-    // 若省份为甘肃，则加载甘肃单品排行 
-    // 再加个云南、建工  要字符串 
-    if (this.theRequest.ProvinceCode == "620000" || this.theRequest.ProvinceCode == "530000" || this.theRequest.ProvinceCode == "734100") {
-      this.getRankContent();
+    // 若省份为甘肃，则加载甘肃单品排行
+    if (this.theRequest && (this.theRequest.ProvinceCode == "620000" || this.theRequest.ProvinceCode == "530000" || this.theRequest.ProvinceCode == '734100')) {
+      this.getRankContent()
     }
   },
-};
+
+}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+// 省份主题定义 - 创建mixin以便复用
+@mixin theme-colors($primary, $secondary) {
+
+  // 主要操作按钮和强调元素 - 使用主题色
+  .section-badge {
+    background: $primary;
+  }
+
+  .tab-item.active {
+    background: $primary;
+  }
+
+  .operation-tab-box .operation-tab-unit.active {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+
+  // 装饰性元素 - 使用主题色
+  .data-card::before {
+    background: $primary;
+  }
+
+  .service-card::before {
+    background: $primary;
+  }
+
+  .region-main::before {
+    background: $primary;
+  }
+
+  .progress-fill {
+    background: $primary;
+  }
+
+  .operation-c-list .progress .bgO {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  .region-cell-area li:nth-child(2n+1):before {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+
+  .status-dot.complete {
+    background: $primary;
+  }
+
+  // 关键数据和金额 - 使用主题色突出显示
+  .amount {
+    color: $primary;
+  }
+
+  .service-revenue {
+    color: $primary;
+  }
+
+  .region-revenue {
+    color: $primary;
+  }
+
+  .subservice-revenue {
+    color: $primary;
+  }
+
+  .flow-value {
+    color: $primary;
+  }
+
+  // 百分比和比率 - 使用主题色
+  .percentage {
+    color: $primary;
+  }
+
+  .service-ratio {
+    color: $primary;
+  }
+
+  .direction-percent {
+    color: $primary;
+  }
+
+  .metric-value.rate {
+    color: $primary;
+  }
+
+  // 状态和上传相关 - 使用主题色
+  .upload-count {
+    color: $primary;
+  }
+
+  .upload-rate {
+    color: $primary;
+  }
+
+  .summary-value {
+    color: $primary;
+  }
+
+  // 特殊状态 - 使用主题色
+  .subservice-card.visited .subservice-name {
+    color: $primary;
+  }
+
+  .uni-icon-arrowright.active {
+    color: $primary;
+  }
+
+  // 注释掉的部分，改用默认灰色/黑色，不跟随主题变化
+  // .flow-ratio { color: $primary; } 
+  // .stat-value { color: $primary; }
+  // .direction-ratio { color: $primary; }
+}
+
+// 宁波 330200
+.province-theme-330200 {
+  @include theme-colors(#1890FF, #69C0FF);
+}
+
+// 安徽 340000  
+.province-theme-340000 {
+  @include theme-colors(#748ED6, #91A7E3);
+}
+
+// 重庆 500000
+.province-theme-500000 {
+  @include theme-colors(#FA541C, #FF7A45);
+}
+
+// 四川 510000
+.province-theme-510000 {
+  @include theme-colors(#FA8C16, #FFA940);
+}
+
+// 贵州 520000
+.province-theme-520000 {
+  @include theme-colors(#52C41A, #73D13D);
+}
+
+// 云南 530000
+.province-theme-530000 {
+  @include theme-colors(#27B25F, #4CCC7F);
+}
+
+// 青海 630000
+.province-theme-630000 {
+  @include theme-colors(#13C2C2, #36CFC9);
+}
+
+// 海南 734100
+.province-theme-734100 {
+  @include theme-colors(#E91E63, #F06292);
+}
+
 .page-body {
-  background: #fff;
+  background-color: #f8f9fa;
   position: relative;
-  padding-bottom: 80rpx;
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 .uni-flex-column {
@@ -826,7 +1084,7 @@ export default {
 
 .uni-icon-arrowright {
   font-size: 32rpx;
-  color: #5a5a5a;
+  color: #5A5A5A;
 }
 
 .uni-icon-arrowright.active {
@@ -842,11 +1100,12 @@ export default {
 }
 
 .ct-red {
-  color: #d7565a !important;
+  color: #ff4757 !important;
+  font-weight: 600;
 }
 
 .new-content {
-  background: url("/static/images/revenue/banner.png") no-repeat bottom left;
+  background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/banner.png') no-repeat bottom left;
   height: 383rpx;
   background-size: 100%;
   color: #fff;
@@ -885,7 +1144,7 @@ export default {
   background-repeat: no-repeat;
   background-position: center right;
   padding: 0 30rpx;
-  color: #bed4f4;
+  color: #BED4F4;
   padding-top: 8rpx;
   position: relative;
 }
@@ -904,7 +1163,7 @@ export default {
   padding-bottom: 16rpx;
   color: #fff;
   padding-left: 4rpx;
-  font-family: "Bahnschrift Regular";
+  font-family: 'Bahnschrift Regular';
   letter-spacing: 2rpx;
   line-height: 1.1;
   transition: all 1s;
@@ -915,7 +1174,7 @@ export default {
 }
 
 .new-content .header-today-info text {
-  font-family: "Bahnschrift Regular";
+  font-family: 'Bahnschrift Regular';
   font-size: 30rpx;
 }
 
@@ -940,8 +1199,8 @@ text.fs12 {
   text-align: right;
   line-height: 1;
   letter-spacing: 0;
-  color: #bed4f4;
-  font-family: "Bahnschrift Regular";
+  color: #BED4F4;
+  font-family: 'Bahnschrift Regular';
   display: flex;
   align-items: center;
 }
@@ -950,30 +1209,31 @@ 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);
 }
 
 .head-cost-text {
-  color: #bed4f4;
+  color: #BED4F4;
   font-size: 28rpx;
 }
 
 .top-revenue-card {
   padding: 16rpx 30rpx 6rpx 30rpx;
-  font-family: "Bahnschrift Regular";
-  color: #d7b89a;
+  font-family: 'Bahnschrift Regular';
+  color: #D7B89A;
   align-items: flex-end;
+
 }
 
 .top-revenue-card .top-number {
   font-size: 56rpx;
-  color: #d0ac8b;
+  color: #D0AC8B;
   line-height: 1;
 }
 
 .top-revenue-card .upLoad-text {
-  font-size: 32rpx;
+  font-size: 28rpx;
 }
 
 .check-unit {
@@ -987,7 +1247,7 @@ text.fs12 {
   font-size: 32rpx;
   color: #868686;
   line-height: 1.2;
-  font-family: "Bahnschrift Regular";
+  font-family: 'Bahnschrift Regular';
 }
 
 .check-price-color text {
@@ -997,10 +1257,20 @@ text.fs12 {
 /* end */
 
 .modle-title {
-  padding-left: 24rpx;
-  font-size: 30rpx;
-  padding-top: 42rpx;
-  padding-bottom: 20rpx;
+  padding: 0 32rpx 0 32rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  display: flex;
+  align-items: center;
+  margin: 32rpx 20rpx 0 20rpx;
+  box-sizing: border-box;
+
+  image {
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 12rpx;
+  }
 }
 
 .modle-title .uni-icon-arrowdown {
@@ -1015,7 +1285,7 @@ text.fs12 {
 }
 
 .modle-title picker .revenue-date:before {
-  content: "";
+  content: '';
   position: absolute;
   width: 0rpx;
   height: 0rpx;
@@ -1031,8 +1301,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;
 }
@@ -1042,10 +1314,11 @@ text.fs12 {
   position: relative;
   font-size: 30rpx;
   font-weight: bolder;
+
 }
 
 .region-title:before {
-  content: "";
+  content: '';
   position: absolute;
   width: 20rpx;
   height: 20rpx;
@@ -1053,46 +1326,87 @@ text.fs12 {
   background-size: contain;
   left: 40rpx;
   top: 36rpx;
+
 }
 
 .active.region-title:before {
   background: url(/static/images/revenue/select_active.png) no-repeat center;
   background-size: contain;
+
 }
 
 /*日结上传*/
 .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 {
@@ -1102,68 +1416,85 @@ 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 {
-  color: #007aff;
+  color: #007AFF;
+
 }
 
 .region-cell-area li:after {
-  content: "";
-  background: url(/static/images/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;
+.region-cell-area li:nth-child(2n+1) {
+  background-color: #fff;
 }
 
-.region-cell-area li:nth-child(2n + 1):before {
-  content: "";
-  background-color: #5596f9;
+.region-cell-area li:nth-child(2n+1):before {
+  content: '';
+  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;
+  content: '';
+  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 {
   flex: 2;
   font-size: 22rpx;
+
 }
 
 .region-cell-area li>div:nth-child(1) {
@@ -1202,9 +1533,9 @@ text.fs12 {
   text-align: right;
 }
 
-.bayonet-cell-area li:nth-child(2n + 1):before {
-  content: "";
-  background-color: #5596f9;
+.bayonet-cell-area li:nth-child(2n+1):before {
+  content: '';
+  background-color: #5596F9;
   width: 8rpx;
   height: 8rpx;
   border-radius: 8rpx;
@@ -1215,8 +1546,8 @@ text.fs12 {
 }
 
 .bayonet-cell-area li:nth-child(2n):before {
-  content: "";
-  background-color: #fe6d67;
+  content: '';
+  background-color: #FE6D67;
   width: 8rpx;
   height: 8rpx;
   border-radius: 8rpx;
@@ -1250,7 +1581,7 @@ text.fs12 {
 }
 
 .bayonet-c-list div:before {
-  content: "";
+  content: '';
   background: url(/static/images/authority/fwq.png) no-repeat center;
   width: 35rpx;
   height: 35rpx;
@@ -1270,7 +1601,7 @@ text.fs12 {
   /* width: 60rpx; */
   height: 44rpx;
   font-size: 28rpx;
-  color: #a9a9a9;
+  color: #A9A9A9;
   background: #ececec;
   border-radius: 8rpx;
   text-align: center;
@@ -1281,7 +1612,7 @@ text.fs12 {
 }
 
 .line-tab-unit.active {
-  background-color: #667ed5;
+  background-color: #667ED5;
   color: #fff;
 }
 
@@ -1300,13 +1631,13 @@ text.fs12 {
 .revenue-line-data {
   width: 216rpx;
   height: 144rpx;
-  background-color: #f8f8f8;
+  background-color: #F8F8F8;
   border-radius: 12rpx;
-  color: #a5a5a5;
+  color: #A5A5A5;
   font-size: 24rpx;
   text-align: center;
   padding-top: 20rpx;
-  border: 2rpx solid #f8f8f8;
+  border: 2rpx solid #F8F8F8;
   box-sizing: border-box;
 }
 
@@ -1316,25 +1647,25 @@ text.fs12 {
 
 .revenue-line-data p:last-child {
   font-size: 40rpx;
-  font-family: "Bahnschrift Regular";
+  font-family: 'Bahnschrift Regular';
   line-height: 1.2;
 }
 
 .revenue-line-data.active {
-  border: 2rpx solid #889ded;
+  border: 2rpx solid #889DED;
   background-color: #f1f3fb;
-  color: #667ed5;
+  color: #667ED5;
 }
 
 .revenue-line-box .text-title {
-  color: #9498a4;
+  color: #9498A4;
   font-size: 24rpx;
   margin-top: 38rpx;
 }
 
 .revenue-line-box .up-text-title {
   color: #6eb92b;
-  font-family: "Bahnschrift Regular";
+  font-family: 'Bahnschrift Regular';
   font-size: 36rpx;
   line-height: 1.5;
 }
@@ -1345,12 +1676,13 @@ text.fs12 {
   width: 20rpx;
   height: 22rpx;
   display: inline-block;
-  background: url("/static/images/revenue/up-arrow.png") no-repeat center;
+  background: url('/static/images/revenue/up-arrow.png') no-repeat center;
   background-size: contain;
+
 }
 
 .text-week {
-  color: #c2c2c2;
+  color: #C2C2C2;
   margin-left: 32rpx;
 }
 
@@ -1360,13 +1692,14 @@ text.fs12 {
   width: 20rpx;
   height: 22rpx;
   display: inline-block;
-  background: url("/static/images/revenue/down-arrow.png") no-repeat center;
+  background: url('/static/images/revenue/down-arrow.png') no-repeat center;
   background-size: contain;
+
 }
 
 .revenue-line-box .down-text-title {
-  color: #f07878;
-  font-family: "Bahnschrift Regular";
+  color: #F07878;
+  font-family: 'Bahnschrift Regular';
   font-size: 36rpx;
   line-height: 1.5;
 }
@@ -1386,84 +1719,104 @@ text.fs12 {
 
 /*区域营收占比*/
 /* 	//.operation-bgfc {
-	//	background-color: #FCFCFC;
-	//	padding-bottom: 32rpx;
-	//} */
+//	background-color: #FCFCFC;
+//	padding-bottom: 32rpx;
+//} */
 
 .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 {
@@ -1493,30 +1846,30 @@ 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;
 }
 
 /*排行*/
 .ranking-tab-box {
-  margin: 20rpx 32rpx;
+  margin: 20rpx 20rpx;
   border: 2rpx solid #565656;
   border-radius: 8rpx;
   display: flex;
   align-items: center;
   text-align: center;
+
 }
 
 .ranking-tab-box .ranking-tab-unit {
@@ -1528,7 +1881,7 @@ canvas.operation-content {
 
 .ranking-tab-box .ranking-tab-unit.active {
   background-color: #565656;
-  color: #fff;
+  color: #fff
 }
 
 .ranking-tab-box .ranking-tab-unit+.ranking-tab-unit {
@@ -1540,6 +1893,10 @@ canvas.operation-content {
   min-height: 160rpx;
 }
 
+.ranking-content {
+  margin: 0 20rpx;
+}
+
 .ranking-content .ranking-list {
   display: flex;
   align-items: center;
@@ -1558,25 +1915,25 @@ canvas.operation-content {
 }
 
 .ranking-content .ranking-list:nth-child(1) .rank-index {
-  background: url("/static/images/revenue/top1.png") no-repeat center;
+  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(/static/images/revenue/top2.png) no-repeat center;
+  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(3) .rank-index {
-  background: url(/static/images/revenue/top3.png) no-repeat center;
+  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;
+  font-size: 24rpx;
   flex: 1;
 }
 
@@ -1597,11 +1954,824 @@ canvas.operation-content {
 }
 
 .ranking-content .ranking-unit-info text:nth-child(2n) {
-  color: #000;
+  color: #000
 }
 
 .ranking-ico {
   width: 72rpx;
   height: 72rpx;
 }
+
+// 新增主内容区域样式
+.main-content {
+  background-color: #fff;
+  margin: 0 20rpx 24rpx 20rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+  border: 1rpx solid #f0f0f0;
+}
+
+/* 现代化页面重设计样式 */
+.section-header {
+  padding: 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;
+  margin-top: 16rpx;
+}
+
+/* 现代化标签页 */
+.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;
+  margin: 0 8rpx;
+}
+
+.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: 24rpx;
+  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: 24rpx;
+  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: 0 20rpx 32rpx 20rpx;
+  background: #fff;
+  border-radius: 12rpx;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+  border: 1rpx solid #f0f0f0;
+  overflow: hidden;
+}
+
+.traffic-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 24rpx;
+  background: linear-gradient(135deg, #f8f9fa, #e9ecef);
+  border-bottom: 2rpx solid #f1f3f4;
+}
+
+.traffic-title {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.traffic-icon {
+  font-size: 28rpx;
+}
+
+.traffic-title text {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #2c3e50;
+}
+
+.traffic-summary {
+  font-size: 24rpx;
+  color: #6c757d;
+  background: #fff;
+  padding: 6rpx 12rpx;
+  border-radius: 16rpx;
+  border: 1rpx solid #e9ecef;
+}
+
+.traffic-scroll-container {
+  height: 700rpx;
+  background: #fff;
+}
+
+.traffic-regions {
+  padding: 20rpx;
+}
+
+.region-card {
+  background: #f8f9fa;
+  border-radius: 12rpx;
+  margin-bottom: 20rpx;
+  border: 1rpx solid rgba(0, 0, 0, 0.04);
+  overflow: hidden;
+}
+
+.region-card:last-child {
+  margin-bottom: 0;
+}
+
+.region-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16rpx 20rpx;
+  background: linear-gradient(135deg, #fff, #f8f9fa);
+  border-bottom: 1rpx solid #e9ecef;
+}
+
+.region-badge {
+  display: flex;
+  align-items: center;
+  gap: 10rpx;
+}
+
+.region-icon {
+  font-size: 24rpx;
+}
+
+.region-title {
+  font-size: 26rpx;
+  font-weight: 600;
+  color: #2c3e50;
+}
+
+.region-actions {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.region-count {
+  font-size: 22rpx;
+  color: #6c757d;
+  background: rgba(108, 117, 125, 0.1);
+  padding: 4rpx 12rpx;
+  border-radius: 12rpx;
+}
+
+.region-arrow {
+  font-size: 20rpx;
+  color: #999;
+  transition: transform 0.3s ease;
+}
+
+.region-arrow.collapsed {
+  transform: rotate(-90deg);
+}
+
+.service-areas {
+  padding: 12rpx;
+}
+
+.service-area-item {
+  background: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 12rpx;
+  border: 1rpx solid rgba(0, 0, 0, 0.04);
+  overflow: hidden;
+}
+
+.service-area-item:last-child {
+  margin-bottom: 0;
+}
+
+.service-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16rpx 16rpx 12rpx;
+  border-bottom: 1rpx solid #f1f3f4;
+  cursor: pointer;
+}
+
+.service-actions {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.service-info {
+  flex: 1;
+}
+
+.service-name {
+  font-size: 26rpx;
+  font-weight: 600;
+  color: #2c3e50;
+  margin-bottom: 4rpx;
+}
+
+.service-ratio {
+  font-size: 22rpx;
+  color: #27B25F;
+  font-weight: 500;
+}
+
+.flow-stats {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.flow-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 2rpx;
+}
+
+.flow-label {
+  font-size: 20rpx;
+  color: #6c757d;
+}
+
+.flow-value {
+  font-size: 24rpx;
+  font-weight: 600;
+  color: #27B25F;
+  font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+// 一些保持灰色的数据文字
+.stat-value {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #495057;
+  font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.direction-ratio {
+  font-size: 22rpx;
+  font-weight: 600;
+  color: #6c757d;
+  font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+.flow-divider {
+  color: #e9ecef;
+  font-size: 24rpx;
+}
+
+.expand-arrow {
+  font-size: 18rpx;
+  color: #999;
+  transition: transform 0.3s ease;
+  margin-left: 12rpx;
+}
+
+.expand-arrow.expanded {
+  transform: rotate(180deg);
+}
+
+.direction-list {
+  padding: 12rpx 16rpx 16rpx;
+}
+
+.direction-item {
+  background: #f8f9fa;
+  border-radius: 6rpx;
+  padding: 12rpx;
+  margin-bottom: 8rpx;
+}
+
+.direction-item:last-child {
+  margin-bottom: 0;
+}
+
+.direction-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.direction-info {
+  display: flex;
+  flex-direction: column;
+  gap: 4rpx;
+}
+
+.direction-name {
+  font-size: 24rpx;
+  font-weight: 600;
+  color: #2c3e50;
+}
+
+.direction-percent {
+  font-size: 20rpx;
+  color: #27B25F;
+  font-weight: 500;
+}
+
+.vehicle-stats {
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+}
+
+.vehicle-type-group {
+  display: flex;
+  gap: 16rpx;
+  flex-wrap: wrap;
+}
+
+.vehicle-type-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: #f8f9fa;
+  padding: 8rpx 12rpx;
+  border-radius: 8rpx;
+  border: 1rpx solid #e9ecef;
+  min-width: 60rpx;
+}
+
+.vehicle-type-label {
+  font-size: 20rpx;
+  color: #6c757d;
+  margin-bottom: 4rpx;
+}
+
+.vehicle-count-value {
+  font-size: 22rpx;
+  font-weight: 600;
+  color: #2c3e50;
+  font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+/* 上传数据区域 */
+.upload-section {
+  background: white;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin: 0 20rpx 24rpx 20rpx;
+  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: 28rpx;
+  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: 24rpx;
+  font-weight: 600;
+  color: #27B25F;
+  font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+}
+
+/* 服务列表 */
+.service-list {
+  background: white;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin: 0 20rpx 32rpx 20rpx;
+  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: 0 0 24rpx;
+  margin: 0 20rpx;
+  // 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: 24rpx;
+  font-weight: 600;
+  color: #2c3e50;
+}
+
+.region-revenue {
+  font-size: 28rpx;
+  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: 24rpx;
+  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 ade3680..3371422 100644
--- a/pages/everdayRenven/AnhuiServerpart.vue
+++ b/pages/everdayRenven/AnhuiServerpart.vue
@@ -1,333 +1,215 @@
 <template>
-  <view
-    :style="
-      showUnUpLoad
-        ? 'overflow:hideen;height:100vh;'
-        : 'height:100%;width:750rpx;'
-    "
-    class="page-body"
-    scroll-with-animation
-    v-if="showPage"
-  >
-    <div class="box-card" :style="'opacity:' + (1 - opacity) + ';'">
-      <div class="box-top-title">
-        <span class="box-center-title">{{ sMsg.serverpartname }}</span>
-        <picker
-          mode="date"
-          @change="bindDateChange"
-          :value="theRequest && theRequest.time"
-          start="2021/01/01"
-          class="title-clock"
-        >
-          <view
-            >{{ searchDate }} <text class="uni-icon uni-icon-arrowdown"></text
-          ></view>
-        </picker>
-      </div>
-      <view class="top-card">
-        <div class="box-center-box">
-          <div class="uni-flex ai-center jc-between">
-            <div class="main-amount-title">对客营收(元)</div>
-            <div class="tab-unit" @tap="showPop">
-              <span>上传门店：</span>
-              <span
-                class="tab-unit-num"
-                :class="{
-                  priceRed: sMsg.uploadCount !== sMsg.totalUploadCount,
-                }"
-                >{{ sMsg.uploadCount }}</span
-              >
-              <span
-                class="tab-unit-num"
-                :class="{
-                  'more-btn': sMsg.uploadCount !== sMsg.totalUploadCount,
-                }"
-                >{{ sMsg.totalUploadCount }}</span
-              >
-            </div>
-          </div>
-          <div class="uni-flex ai-base jc-between">
-            <span class="center-num">{{ sMsg.totalMoneyShow }}</span>
-            <span class="budgetamount">
-              <text class="budget-title">计划营收(元):</text>
-              <text
-                :class="
-                  sMsg.budgetAmount < sMsg.cashPay
-                    ? 'up-text-title'
-                    : 'down-text-title'
-                "
-              >
-                {{ sMsg.budgetamoutShow }}
-                <span style="font-size: 24rpx; margin-left: 12rpx"
-                  >{{ sMsg.diffBili }}%</span
-                >
-              </text>
-            </span>
-          </div>
-        </div>
-        <div class="uni-flex jc-between box-center-box">
-          <div class="check-unit">
-            <text>长款金额</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.diffMorePrice, 2) }} <text>元</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>短款金额</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.diffLessPrice, 2) }} <text>元</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>客单交易</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.ticketCount, 0) }} <text>笔</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>客单均价</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.tickave, 2) }} <text>元</text>
-            </div>
-          </div>
-        </div>
-        <div class="uni-flex jc-between box-center-box mt8">
-          <div class="check-unit">
-            <text>优惠金额</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.totalOffAmount, 2) }} <text>元</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>移动支付</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.mobilePayment, 2) }} <text>元</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>商品出售</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.totalCount, 0) }} <text>件</text>
-            </div>
-          </div>
-          <div class="check-unit">
-            <text>商品均价</text>
-            <div class="check-price-color">
-              {{ $util.fmoney(sMsg.countave, 2) }} <text>元</text>
-            </div>
-          </div>
-        </div>
-      </view>
-    </div>
-    <cover-view
-      class="fixed-box page-title"
-      :style="
-        'transform: translateY(' + fixedY + 'px);opacity:' + opacity + ';'
-      "
-    >
-      <cover-view>{{ sMsg.serverpartname || "" }}</cover-view>
-      <cover-view class="price-text" style="width: 200rpx; text-align: right"
-        >¥ {{ sMsg.totalMoneyShow }}
-      </cover-view>
-    </cover-view>
+  <view :class="'province-theme-' + currentProvinceCode" scroll-with-animation v-if="showPage">
+    <view class="page-body">
+      <div class="box-card" :style="'opacity:' + (1 - opacity) + ';'">
+        <div class="box-top-title">
+          <span class="box-center-title">{{ sMsg.serverpartname }}</span>
+          <picker mode="date" @change="bindDateChange" :value="theRequest && theRequest.time" :start="startTime"
+            :end="endTime" class="title-clock">
+            <view>{{ searchDate }} <text class="uni-icon uni-icon-arrowdown"></text></view>
+          </picker>
 
-    <template v-if="cateBrandList.length">
-      <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
-          >
+        </div>
+        <view class="top-card">
+          <div class="box-center-box">
+            <div class="uni-flex ai-center jc-between" style="margin-bottom: 8rpx;">
+              <div class="main-amount-title">对客营收(元)</div>
+              <div class="tab-unit" @tap="showPop">
+                <span>上传门店：</span>
+                <span class="tab-unit-num" :class="{ 'priceRed': sMsg.uploadCount !== sMsg.totalUploadCount }">{{
+                  sMsg.uploadCount
+                }}</span>
+                <span class="tab-unit-num " :class="{ 'more-btn': sMsg.uploadCount !== sMsg.totalUploadCount }">{{
+                  sMsg.totalUploadCount }}</span>
+              </div>
+            </div>
+            <div class="uni-flex ai-base jc-between">
+              <span class="center-num">{{ sMsg.totalMoneyShow }}</span>
+              <span class="budgetamount">
+                <text class="budget-title">计划营收(元):</text>
+                <text :class="sMsg.budgetAmount < sMsg.cashPay ? 'up-text-title' : 'down-text-title'">
+                  {{ sMsg.budgetamoutShow }}
+                  <span style="font-size: 24rpx;margin-left: 12rpx;">{{ sMsg.diffBili }}%</span>
+                </text>
+              </span>
+            </div>
+          </div>
+          <div class="uni-flex jc-between box-center-box">
+
+            <div class="check-unit">
+              <text>长款金额</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.diffMorePrice, 2) }} <text>元</text></div>
+            </div>
+            <div class="check-unit">
+              <text>短款金额</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.diffLessPrice, 2) }} <text>元</text></div>
+            </div>
+            <div class="check-unit">
+              <text>客单交易</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.ticketCount, 0) }} <text>笔</text></div>
+            </div>
+            <div class="check-unit">
+              <text>客单均价</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.tickave, 2) }} <text>元</text></div>
+            </div>
+          </div>
+          <div class="uni-flex jc-between box-center-box mt8">
+            <div class="check-unit">
+              <text>优惠金额</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.totalOffAmount, 2) }} <text>元</text></div>
+            </div>
+            <div class="check-unit">
+              <text>移动支付</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.mobilePayment, 2) }} <text>元</text></div>
+            </div>
+            <div class="check-unit">
+              <text>商品出售</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.totalCount, 0) }} <text>件</text></div>
+            </div>
+            <div class="check-unit">
+              <text>商品均价</text>
+              <div class="check-price-color">{{ $util.fmoney(sMsg.countave, 2) }} <text>元</text></div>
+            </div>
+          </div>
         </view>
+      </div>
+      <cover-view class="fixed-box page-title"
+        :style="'transform: translateY(' + fixedY + 'px);opacity:' + opacity + ';'">
+        <cover-view>{{ sMsg.serverpartname || '' }}</cover-view>
+        <cover-view class="price-text" style="width: 200rpx;text-align: right;">¥ {{ sMsg.totalMoneyShow }}
+        </cover-view>
+      </cover-view>
 
-        <!-- <view class="pie-content" v-show="nowTab==3">
+      <template v-if="cateBrandList.length">
+        <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>
+
+          <!-- <view class="pie-content" v-show="nowTab==3">
 					<div class="pie-title">经营模式占比</div>
 					<view class="operation-model-content">
 						<canvas canvas-id="modelCount" v-if="operationModel.length>0" id="modelCount"
 							class="operation-model-content" @click="touchPie($event,'modelCount')" />
 					</view>
 				</view> -->
+        </template>
+
+        <view v-show="nowTab == 1">
+          <!-- 安徽省 -->
+          <div class="pie-content">
+            <div class="model-busniess">经营业态占比</div>
+            <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>
+              <div class="uni-flex jc-between">
+                <div style="color: #667ED5;font-size: 26rpx;">{{ operationModel[0].name }}: <span
+                    style="font-size: 26rpx;">{{
+                      operationModel[0].bili }}</span>%</div>
+                <div style="color: #F3AF50;font-size: 26rpx;" v-if="operationModel[1].name">{{ operationModel[1].name
+                  }}:
+                  <span style="font-size: 26rpx;">{{ operationModel[1].bili }}</span>%
+                </div>
+              </div>
+              <div class="uni-flex jc-between">
+                <div style="margin-bottom: 0;font-size: 24rpx;"><span style="font-size: 26rpx;">{{
+                  operationModel[0].data
+                    }}</span>元
+                </div>
+                <div style="margin-bottom: 0;font-size: 24rpx;" v-if="operationModel[1].data"><span
+                    style="font-size: 26rpx;">{{
+                      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>
+            </scroll-view>
+            <div class="tab-content" v-if="cateBrandList.length">
+              <div class="shop-card" v-for="(m, i) in cateBrandList[nowShop].listBrandModel" :key="i"
+                @click="toBrandPage(m, i)">
+                <div>
+                  <image v-if="m.Brand_ICO" :src="m.Brand_ICO" mode="aspectFit"></image>
+                  <image v-else src="/static/images/revenue/home.png" mode="aspectFit"></image>
+                </div>
+                <div class="shop-name">{{ m.Brand_Name }}</div>
+                <div class="price-num">¥ {{ m.Revenue_Amount ? $util.fmoney(m.Revenue_Amount, 2) : '0.00' }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </view>
+
+        <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>
+
       </template>
 
-      <view v-show="nowTab == 1">
-        <!-- 安徽省 -->
-        <div class="pie-content">
-          <div class="model-busniess">经营业态占比</div>
-          <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>
-            <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>
-            <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>
-          </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>
-          </scroll-view>
-          <div class="tab-content" v-if="cateBrandList.length">
-            <div
-              class="shop-card"
-              v-for="(m, i) in cateBrandList[nowShop].listBrandModel"
-              :key="i"
-              @click="toBrandPage(m, i)"
-            >
-              <div>
-                <image
-                  v-if="m.Brand_ICO"
-                  :src="m.Brand_ICO"
-                  mode="aspectFit"
-                ></image>
-                <image
-                  v-else
-                  src="/static/images/revenue/home.png"
-                  mode="aspectFit"
-                ></image>
-              </div>
-              <div class="shop-name">{{ m.Brand_Name }}</div>
-              <div class="price-num">
-                ¥
-                {{
-                  m.Revenue_Amount ? $util.fmoney(m.Revenue_Amount, 2) : "0.00"
-                }}
-              </div>
-            </div>
-          </div>
-        </div>
+      <view style="height: 350rpx;" v-else>
+        <noFound :nodata="'true'" :text="noDataText" />
       </view>
 
-      <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>
-    </template>
+      <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' : ''">
 
-    <view style="height: 350rpx" v-else>
-      <noFound :nodata="'true'" :text="noDataText" />
-    </view>
-
-    <cover-view
-      class="uni-mask"
-      :style="showUnUpLoad ? ' display:block;' : 'opacity:0; display: none;'"
-      @click="closePop"
-      :catchtouchmove="showUnUpLoad ? 'return' : ''"
-    ></cover-view>
-    <cover-view
-      class="uni-popup uni-popup-middle"
-      :style="showUnUpLoad ? 'display:flex;' : 'display: none;'"
-      :catchtouchmove="showUnUpLoad ? 'return' : ''"
-    >
-      <cover-view class="header-top" v-if="unUploadList.length > 0"
-        >{{ sMsg.serverpartname }}未上传门店</cover-view
-      >
-      <cover-view class="pop-body">
-        <cover-view
-          class="uni-flex pop-row"
-          v-for="(c, i) in unUploadList"
-          :key="i"
-        >
-          <cover-view class="uni-flex ai-center">
-            <cover-view class="pop-index">{{
-              i > 8 ? i + 1 : "0" + (i + 1)
-            }}</cover-view>
-            <cover-view class="inline-item">{{
-              c.ServerpartShop_Name
-            }}</cover-view>
+        <cover-view class="header-top" v-if="unUploadList.length > 0">{{ sMsg.serverpartname }}未上传门店</cover-view>
+        <cover-view class="pop-body">
+          <cover-view class="uni-flex pop-row" v-for="(c, i) in unUploadList" :key="i">
+            <cover-view class="uni-flex ai-center">
+              <cover-view class="pop-index">{{ i > 8 ? i + 1 : '0' + (i + 1) }}</cover-view>
+              <cover-view class="inline-item">{{ c.ServerpartShop_Name }}</cover-view>
+            </cover-view>
+            <cover-view class="pop-row-bottom"></cover-view>
           </cover-view>
-          <cover-view class="pop-row-bottom"></cover-view>
         </cover-view>
+
       </cover-view>
-    </cover-view>
+
+    </view>
   </view>
 </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 = {};
+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);
+    const lastDay = this.$util.cutDate(new Date(), 'YYYY/MM/DD ', -1)
 
     return {
-      lastDay: lastDay + "23:59:59", // 该页面的最近有效日期
-      noDataText: "抱歉,该服务区暂无品牌分析数据",
+      lastDay: lastDay + '23:59:59', // 该页面的最近有效日期
+      noDataText: '抱歉,该服务区暂无品牌分析数据',
       scrollLeft: 0,
       theRequest: {},
       showAll: false,
-      showHeight: uni.upx2px(484) + "px",
-      searchDate: "",
+      showHeight: uni.upx2px(484) + 'px',
+      searchDate: '',
       sellData: [],
       scrollTop: 0,
       pageData: {},
@@ -345,495 +227,681 @@ export default {
       ServiceRevenueData: [],
       nowTab: 1,
       operationModel: [], // 安徽经营模式
-    };
+      startTime: '',//开始时间
+      endTime: '',//结束时间
+      currentProvinceCode: '' // 当前省份代码
+    }
+  },
+  computed: {
+    // 省份主题配色
+    provinceTheme() {
+      const themes = {
+        '330200': { // 宁波
+          primary: '#1890FF',
+          secondary: '#69C0FF',
+          background: '#E6F7FF',
+          accent: '#40A9FF'
+        },
+        '340000': { // 安徽
+          primary: '#748ED6',
+          secondary: '#91A7E3',
+          background: '#F0F4FF',
+          accent: '#A3B8E8'
+        },
+        '500000': { // 重庆
+          primary: '#FA541C',
+          secondary: '#FF7A45',
+          background: '#FFF2E8',
+          accent: '#FF8C73'
+        },
+        '510000': { // 四川
+          primary: '#FA8C16',
+          secondary: '#FFA940',
+          background: '#FFF7E6',
+          accent: '#FFAB65'
+        },
+        '520000': { // 贵州
+          primary: '#52C41A',
+          secondary: '#73D13D',
+          background: '#F6FFED',
+          accent: '#7CB342'
+        },
+        '530000': { // 云南（保持原色）
+          primary: '#27B25F',
+          secondary: '#4CCC7F',
+          background: '#F6FFED',
+          accent: '#5CDB87'
+        },
+        '630000': { // 青海
+          primary: '#13C2C2',
+          secondary: '#36CFC9',
+          background: '#E6FFFB',
+          accent: '#5CDBD3'
+        },
+        '734100': { // 海南
+          primary: '#E91E63',
+          secondary: '#F06292',
+          background: '#FCE4EC',
+          accent: '#F48FB1'
+        }
+      }
+      return themes[this.currentProvinceCode] || themes['530000'] // 如果找不到对应省份，使用云南配色
+    }
   },
   components: {
     ServiceRevenuePie,
     CustomerAnalysis,
-    CarAnalysis,
+    CarAnalysis
   },
   onLoad(option) {
-    console.log(option);
-    _self = this;
+    console.log(option)
+    _self = this
     uni.showLoading({
-      title: "正在加载...",
-    });
+      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);
+      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.initProvinceCode()
+
+      this.initData(option)
+      this.getData(option)
     }
+    let startTime // 开始时间
+    const date = new Date()
+    let y = date.getFullYear()
+    let m = date.getMonth() + 1
+    let d = date.getDate() - 1
+    if (d - 8 < 0) {
+      let num = 8 - d
+      m = m - 1
+      let changeMonth = m
+      if (changeMonth < 10) {
+        changeMonth = '0' + changeMonth
+      }
+      let thisMonthDay = this.$util.getThisMonthDay(`${y}-${changeMonth}`)
+      if (m < 10) {
+        m = '0' + m
+      }
+      startTime = `${y}-${m}-${thisMonthDay - num}`//真实的日期
+    } else {
+      if (m < 10) {
+        m = '0' + m
+      }
+      let day
+      day = d - 8
+      startTime = `${y}-${m}-${day}`
+    }
+    this.startTime = startTime
+    this.endTime = `${y}-${m}-${d}`
+
+
   },
   methods: {
+    // 初始化省份代码
+    initProvinceCode() {
+      let provinceCode = ''
+
+      // 优先使用theRequest中的省份代码  
+      if (this.theRequest && this.theRequest.ProvinceCode) {
+        provinceCode = this.theRequest.ProvinceCode
+      }
+
+      // 只有在确实找到省份代码时才设置和更新
+      if (provinceCode) {
+        this.currentProvinceCode = provinceCode
+        console.log('设置省份主题:', provinceCode)
+        // 强制更新以应用新主题
+        this.$forceUpdate()
+      }
+    },
+    // 获取主题颜色（小程序兼容版本）
+    getThemeColors() {
+      return this.provinceTheme
+    },
     changeTab(value) {
-      this.nowTab = value;
+      this.nowTab = value
       if (value == 2) {
-        let opt = this.theRequest;
+
+        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);
+          statisticsMonth: this.$util.cutDate(opt.time, 'YYYYMM', -30)
+        }
+        this.$refs['customerAna'].tabChange(1, params)
       }
       if (value == 4) {
-        let opt = this.theRequest;
+        let opt = this.theRequest
         const params = {
           serverpart_Id: opt.ServerpartIds,
           pushprovinceCode: opt.ProvinceCode,
-          StatisticsDate: opt.time,
-        };
-        this.$refs["carAna"].getTopData(params);
+          StatisticsDate: opt.time
+        }
+        this.$refs['carAna'].getTopData(params)
       }
+
     },
     closePop() {
-      this.showUnUpLoad = false;
+      this.showUnUpLoad = false
     },
 
     bindDateChange(e) {
-      let values = e.detail.value;
-      let selectT = new Date(e.detail.value);
-      this.unUploadList = [];
+      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);
+        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();
+          title: '正在加载'
+        })
+        this.initData(opt)
+        this.getData(opt)
+        this.$forceUpdate()
       } else {
         uni.showToast({
-          title: "请选择有效日期",
-          icon: "none",
-        });
+          title: '请选择有效日期',
+          icon: 'none',
+        })
       }
     },
 
     showFixed(options) {
-      this.scrollTop = options.scrollTop;
-      let selfHeight = uni.upx2px(396);
+
+      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();
+          this.fixedY = 0
+          this.opacity = 1
+          this.$forceUpdate()
         }
       } else {
         if (this.fixedY !== -selfHeight) {
-          this.fixedY = 0 - selfHeight;
-          this.opacity = 0;
-          this.$forceUpdate();
+          this.fixedY = 0 - selfHeight
+          this.opacity = 0
+          this.$forceUpdate()
         }
       }
+
     },
     toBrandPage(item, index) {
-      let theRequest = this.theRequest;
-      let nowShop = this.nowShop;
+      let theRequest = this.theRequest
+      let nowShop = this.nowShop
 
-      let btid = this.cateBrandList[nowShop].Business_Trade;
+      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);
+      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;
+
+      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 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;
+      let winWidth = uni.getSystemInfoSync().windowWidth
+      winWidth = (winWidth - 60) / 1.5
+      this.scrollLeft = leftWidthSum > winWidth ? (leftWidthSum - winWidth) : 0
 
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
-    getWidth(id) {
-      //得到元素的宽高
+    getWidth(id) { //得到元素的宽高
       return new Promise((res, rej) => {
-        uni
-          .createSelectorQuery()
-          .select("#" + id)
-          .fields(
-            {
-              size: true,
-              scrollOffset: true,
-            },
-            (data) => {
-              res(data);
-              // console.log(data)
-            }
-          )
-          .exec();
-      });
+        uni.createSelectorQuery().select("#" + id).fields({
+          size: true,
+          scrollOffset: true
+        }, (data) => {
+          res(data)
+          // console.log(data)
+        }).exec()
+      })
     },
-    operationFn() {
-      //昨日营收占比
+    operationFn() { //昨日营收占比
       let _this = this;
 
       // 业态营收占比
-      let colors1 = ["#FFAC37", "#d8ece9", "#e0e3f7", "#f7f5f6", "#b2b7e3"];
-      let list = [];
-      let list2 = [];
+      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,
-          };
+            data: m.Revenue_Amount
+          }
           let n2 = {
             name: m.Bussiness_Name,
-            value: m.Revenue_Amount,
-          };
-          list2.push(n2);
-          n.textColor = "#D1D1D1";
+            value: m.Revenue_Amount
+          }
+          list2.push(n2)
+          n.textColor = '#D1D1D1'
 
-          n.textSize = uni.upx2px(26);
+          n.textSize = uni.upx2px(26)
           n.formatter = function (arg) {
-            if (typeof arg === "number") {
-              return [n.name, (arg * 100).toFixed(2) + "%"];
+            if (typeof arg === 'number') {
+              return [n.name, (arg * 100).toFixed(2) + '%']
             } else {
-              return [arg.name, (arg._proportion_ * 100).toFixed(2) + "%"];
+              return [arg.name, (arg._proportion_ * 100).toFixed(2) + '%']
             }
-          };
-          list.push(n);
+
+          }
+          list.push(n)
         }
-      });
+
+      })
       if (list2.length > 0) {
-        _this.ServiceRevenueData.push(list2);
-        _this.sellData = list;
+        _this.ServiceRevenueData.push(list2)
+        _this.sellData = list
+
       }
-      if (
-        _this.pageData.listCurBusinessModel &&
-        _this.pageData.listCurBusinessModel.length > 0
-      ) {
-        let list = [];
-        _this.pageData.listCurBusinessModel.map((m) => {
+      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);
+              value: m.Revenue_Amount
+            }
+            list.push(n)
           }
-        });
-        _this.ServiceRevenueData.push(list);
+        })
+        _this.ServiceRevenueData.push(list)
       }
       if (list.length > 0) {
         _this.showPie({
-          id: "sellCate",
+          id: 'sellCate',
           data: list,
           colors: colors1,
         });
       }
     },
-    operationBusniess(arr, data) {
-      // 生成业态营收占比数据
+    operationBusniess(arr, data) { // 生成业态营收占比数据
       var _data1 = [];
       var _data2 = [];
-      let _this = this;
+      let _this = this
       arr.forEach((n, i) => {
         if (data[n[0]] > 0) {
-          let num = Number(data[n[0]]);
+          let num = Number(data[n[0]])
           _data1.push({
             name: n[1],
-            textColor: "#999",
+            textColor: '#999',
             data: data[n[0]], //+Number(data2[n[0]])
             formatter: function (arg) {
-              if (typeof arg === "number") {
-                return [n[1], (arg * 100).toFixed(2) + "%"];
+              if (typeof arg === 'number') {
+                return [n[1], (arg * 100).toFixed(2) + '%']
               } else {
-                return [arg.name, (arg._proportion_ * 100).toFixed(2) + "%"];
+                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 b.data - a.data
+      })
 
       return _data1;
     },
     showPie(obj) {
       let data = {
-        series: [],
-      };
+        series: []
+      }
       const ctx = uni.createCanvasContext(obj.id, this);
-      data.series = data.series.concat(obj.data);
+      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] : "",
+        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",
+          color: '#666666',
           // offsetY: uni.upx2px(-16),
         },
         animation: false,
         subtitle: {
-          name: "¥" + this.$util.fmoney(data.series[0].data, 2),
-          color: "#666666",
+          name: '¥' + this.$util.fmoney(data.series[0].data, 2),
+          color: '#666666',
           fontSize: uni.upx2px(30),
           offsetX: uni.upx2px(16),
         },
         fontSize: 12,
-        background: "#FFFFFF",
+        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),
+        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,
+            ringWidth: obj.id != 'modelCount' ? uni.upx2px(90) : 40,
             labelWidth: uni.upx2px(40),
             activeOpacity: 1,
-            activeRadius: 10,
+            activeRadius: 10
           },
           tooltip: {
             showBox: false,
-            bgColor: "#000",
+            bgColor: '#000',
             bgOpacity: 0.4,
-          },
+          }
         },
       });
+
     },
     touchPie(e, id, opt) {
-      let touches = null;
+
+      let touches = null
       if (id == "modelCount" && e.currentTarget.offsetTop < 100) {
-        e.currentTarget.offsetTop = e.currentTarget.offsetTop + uni.upx2px(620);
+        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];
+      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;
+        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",
+          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",
+          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;
+      let list = this.unUploadList
       if (list.length || this.todayUpList.length) {
-        this.showUnUpLoad = true;
-        this.$forceUpdate();
+        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) => {
-          console.log("GetServerpartBrand", res);
-          if (res.Result_Code != 100) return;
+      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;
+        _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: []
             }
-            return;
+            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
           }
-          _this.cateBrandList = [];
-        });
+          return
+        }
+        _this.cateBrandList = []
+      })
     },
     // 获取头部卡片 展示信息
 
     async initData(theRequest) {
-      let _this = this;
-      const [
-        totalData,
-        busniessTypePie,
-        busniessTradePie,
-        busniessTradeFathPie,
-      ] = await anhuiYestodayRevenueData.getData(theRequest, true);
+      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.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.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.0;
-      totalData.diffBudgetTotal = Math.abs(
-        totalData.budgetAmount - totalData.cashPay
-      );
-      totalData.diffBili =
-        totalData.budgetAmount > 0
-          ? this.$util.fmoney(
-              (totalData.diffBudgetTotal / totalData.budgetAmount) * 100,
-              2
-            )
-          : "100";
+      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;
+      this.sMsg = totalData
       // 饼图分析及数据条形分析
-      const [progressList, pieList] = this.getProgressData(
-        busniessTypePie,
-        totalData.cashPay
-      );
-      console.log("progressList", progressList);
-      this.operationModel = progressList;
+      const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
+
+      this.operationModel = progressList
       // 经营类型分析
-      var colors1 = ["#FFAC37", "#6B75B8"];
+      var colors1 = ['#FFAC37', '#6B75B8'];
       this.showPie({
-        id: "modelCount",
+        id: 'modelCount',
         data: pieList,
         colors: colors1,
       });
       // 经营业态
       // this.ServiceRevenueData = []
-      this.ServiceRevenueData = [busniessTradeFathPie, busniessTradePie];
+      this.ServiceRevenueData = [busniessTradeFathPie, busniessTradePie]
       if (totalData.uploadCount !== totalData.totalUploadCount) {
-        this.getUnUpLoadShops(theRequest);
+        this.getUnUpLoadShops(theRequest)
+
       }
-      this.showPage = true;
-      uni.hideLoading();
+      this.showPage = true
+      uni.hideLoading()
     },
     getProgressData(data, total) {
       var _data1 = [];
       var _data2 = [];
-      let _this = this;
+      let _this = this
       data.forEach((n, i) => {
         _data1.push({
           ...n,
-          textColor: "#999",
+          textColor: '#999',
           formatter: function (arg) {
-            if (typeof arg === "number") {
-              return [n.name, (arg * 100).toFixed(2) + "%"];
+            if (typeof arg === 'number') {
+              return [n.name, (arg * 100).toFixed(2) + '%']
             } else {
-              return [arg.name, (arg._proportion_ * 100).toFixed(2) + "%"];
+              return [arg.name, (arg._proportion_ * 100).toFixed(2) + '%']
             }
-          },
+
+          }
         });
-        console.log("n", n);
+
         _data2.push({
           name: n.name,
           num: n.data,
           data: _this.$util.fmoney(n.data, 2), //+Number(data2[n[0]])
-          bili: total > 0 ? _this.$util.fmoney((n.data / total) * 100, 2) : 0,
+          bili: _this.$util.fmoney((n.data / total) * 100, 2)
         });
+
       });
       _data1.sort(function (a, b) {
-        return b.data - a.data;
-      });
+        return b.data - a.data
+      })
       _data2.sort(function (a, b) {
-        return b.num - a.num;
-      });
+        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;
-        });
+      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);
-  },
-};
+    this.showFixed(e)
+  }
+}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+// 省份主题定义 - 创建mixin以便复用
+@mixin theme-colors($primary, $secondary) {
+
+  // 主要操作按钮和强调元素 - 使用主题色
+  .box-center-title {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  .tab.active {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+
+  .fixed-box {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+
+  .top-card {
+    background: linear-gradient(135deg, $primary 0%, $secondary 100%);
+  }
+
+  // 装饰性元素 - 使用主题色
+  .box-card::before {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  .pie-content::before {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  .header-top::after {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  // 关键数据和金额 - 使用主题色突出显示
+  .center-num {
+    color: #fff; // 保持白色在渐变背景上
+  }
+
+  .price-num {
+    color: #fff; // 门店卡片价格保持白色
+  }
+
+  // 进度条和状态指示器
+  .progress-left {
+    background: linear-gradient(90deg, $primary, $secondary);
+  }
+
+  .pop-index {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+
+  // 特殊状态元素
+  .shop-card:nth-child(6n) {
+    background: linear-gradient(135deg, $primary, $secondary);
+  }
+}
+
+// 宁波 330200
+.province-theme-330200 {
+  @include theme-colors(#1890FF, #69C0FF);
+}
+
+// 安徽 340000  
+.province-theme-340000 {
+  @include theme-colors(#748ED6, #91A7E3);
+}
+
+// 重庆 500000
+.province-theme-500000 {
+  @include theme-colors(#FA541C, #FF7A45);
+}
+
+// 四川 510000
+.province-theme-510000 {
+  @include theme-colors(#FA8C16, #FFA940);
+}
+
+// 贵州 520000
+.province-theme-520000 {
+  @include theme-colors(#52C41A, #73D13D);
+}
+
+// 云南 530000
+.province-theme-530000 {
+  @include theme-colors(#27B25F, #4CCC7F);
+}
+
+// 青海 630000
+.province-theme-630000 {
+  @include theme-colors(#13C2C2, #36CFC9);
+}
+
+// 海南 734100
+.province-theme-734100 {
+  @include theme-colors(#E91E63, #F06292);
+}
+
 .page-body {
-  background-color: #fff;
-  padding-bottom: 20rpx;
+  background-color: #f8f9fa;
+  padding: 0 32rpx 32rpx;
   box-sizing: border-box;
   -webkit-overflow-scrolling: touch;
+  min-height: 100vh;
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 .mt8 {
-  margin-top: 16rpx;
+  margin-top: 20rpx;
 }
 
 cover-view.page-title {
@@ -857,16 +925,17 @@ cover-view.page-title {
 }
 
 .fixed-box {
-  background-color: #686d8f;
-  /* background: linear-gradient(to right, #686D8F, #A1ACC6); */
-  transition: all 0.2s;
+  transition: all .3s ease;
   position: fixed;
   top: 0;
-  left: 0;
-  width: 100%;
+  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;
 }
 
 /* 业态 */
@@ -884,13 +953,16 @@ cover-view.page-title {
 
 /* 门店 */
 .shop-box {
-  margin: 32rpx 20rpx;
-  border-radius: 8rpx;
-  background-color: #f6f8fa;
-  padding: 36rpx 20rpx;
+  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;
 }
@@ -902,8 +974,8 @@ cover-view.page-title {
   vertical-align: middle;
 }
 
-.tab-shop .cate-name + .cate-name::before {
-  content: "|";
+.tab-shop .cate-name+.cate-name::before {
+  content: '|';
   color: #eeeeee;
   padding-right: 16rpx;
 }
@@ -912,148 +984,188 @@ cover-view.page-title {
   color: #000;
   font-size: 28rpx;
   font-weight: 600;
+
 }
 
 .tab-content {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 24rpx;
+  // margin-top: 24rpx;
   transition: all 0.5s cubic-bezier(0, 1, 0.5, 1);
-  margin: 24rpx auto 0 auto;
+  margin: 0 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);
+  margin: 24rpx 0 32rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
   background-color: #fff;
   position: relative;
-  margin-bottom: 48rpx;
-  padding-top: 32rpx;
-  padding-bottom: 30rpx;
+  padding: 32rpx 24rpx;
+  border: 1rpx solid #f0f0f0;
+  overflow: hidden;
+
+  // 主题色边框由 mixin 处理
 }
 
 .pie-title {
-  padding: 0 20rpx;
-  line-height: 80rpx;
-  font-size: 26rpx;
+  padding: 0;
+  line-height: 1.5;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 24rpx;
 }
 
 /* 门店卡片 */
 .shop-card {
-  width: 210rpx;
-  height: 227rpx;
-  border-radius: 8rpx;
+  width: 192rpx;
+  height: 240rpx;
+  border-radius: 16rpx;
   color: #fff;
   text-align: center;
-  padding-top: 20rpx;
+  padding: 24rpx 16rpx;
   box-sizing: border-box;
-  margin-top: 16rpx;
+  margin-top: 20rpx;
+  margin-right: 16rpx;
+  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);
+  }
+
+  &::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;
+  }
 }
 
 .shop-card:nth-child(6n-5) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #ed7c77, #d6524c);
-  background-size: contain;
+  background: linear-gradient(135deg, #ff6b6b, #ee5a52);
 }
 
 .shop-card:nth-child(6n-4) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #d1bea8, #ba9d7b);
-  margin-left: 18rpx;
-  background-size: contain;
+  background: linear-gradient(135deg, #feca57, #ff9ff3);
 }
 
 .shop-card:nth-child(6n-3) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #929cc0, #aab3d0);
-  margin-left: 18rpx;
-  background-size: contain;
+  background: linear-gradient(135deg, #a8e6cf, #7fcdcd);
 }
 
 .shop-card:nth-child(6n-2) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #779cb1, #a3bbc9);
-  background-size: contain;
-  margin-left: 0rpx;
+  background: linear-gradient(135deg, #74b9ff, #0984e3);
 }
 
 .shop-card:nth-child(6n-1) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #c08d80, #e8cbc7);
-  margin-left: 18rpx;
-  background-size: contain;
+  background: linear-gradient(135deg, #fd79a8, #e84393);
 }
 
 .shop-card:nth-child(6n) {
-  background: url(/static/images/revenue/shop-card.png) no-repeat center 50%,
-    linear-gradient(-35deg, #5cbe9c, #95d5bf);
-  margin-left: 18rpx;
-  background-size: contain;
-  margin-left: 18rpx;
+  // 主题色由 mixin 处理，无需额外间距
+}
+
+// 每行第3个卡片移除右边距，实现3列对齐
+.shop-card:nth-child(3n) {
+  margin-right: 0;
 }
 
 .shop-card .shop-name {
-  font-size: 24rpx;
-  text-shadow: 0 2rpx 2rpx #a9a5a0;
+  font-size: 26rpx;
+  text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3);
   line-height: 1.4;
-  max-height: 62rpx;
+  max-height: 64rpx;
   overflow: hidden;
+  font-weight: 500;
+  margin: 12rpx 0;
 }
 
 .shop-card image {
   border-radius: 50%;
-  border: 2rpx solid #fff;
-  background-color: #ffffff;
-  width: 62rpx;
-  height: 62rpx;
+  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: 38rpx;
-  font-family: Bahnschrift Regular;
+  font-size: 28rpx;
+  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: 24upx 24upx 0;
+  padding: 32rpx 24rpx 16rpx;
   background-color: #fff;
   width: 100%;
   box-sizing: border-box;
-  transition: all 0.2s;
-  background: url(../../static/images/effective/bg-top.png) no-repeat center;
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: top center;
+  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;
+
+  // 主题色边框由 mixin 处理
 }
 
 .top-card {
-  background: linear-gradient(to top, #989fb9, #686d8f);
-  margin-top: 24upx;
-  padding: 32upx 0 32rpx 0;
-  border-radius: 8rpx;
+  margin-top: 32rpx;
+  padding: 24rpx 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;
+  }
 }
 
 .budgetamount {
-  margin-left: 14rpx;
-  color: #fff;
-  font-family: "Bahnschrift Regular";
+  margin-left: 16rpx;
+  color: rgba(255, 255, 255, 0.9);
+  font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
 }
 
 .budget-title {
-  color: #dee1f1;
-  padding: 4rpx 6rpx 2rpx 6rpx;
-  border-radius: 2rpx;
-  margin-right: 4rpx;
+  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;
 }
 
 .up-text-title,
 .down-text-title {
   font-size: 32rpx;
-  font-family: "Bahnschrift Regular";
-  /* line-height: 1.2; */
+  font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+  font-weight: 600;
+  line-height: 1.3;
 }
 
 .up-text-title:after {
@@ -1062,8 +1174,9 @@ cover-view.page-title {
   width: 16rpx;
   height: 18rpx;
   display: inline-block;
-  background: url("/static/images/revenue/up-arrow.png") no-repeat center;
+  background: url('/static/images/revenue/up-arrow.png') no-repeat center;
   background-size: contain;
+
 }
 
 .down-text-title:after {
@@ -1072,23 +1185,29 @@ cover-view.page-title {
   width: 16rpx;
   height: 18rpx;
   display: inline-block;
-  background: url("/static/images/revenue/down-arrow.png") no-repeat center;
+  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;
+  margin-bottom: 8rpx;
 }
 
 .title-clock {
-  color: #999;
-  font-size: 24upx;
+  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;
 }
 
-/* 
+/*
 	.more-btn,.weisc-ico {
 		display: flex;
 		align-items: center;
@@ -1097,7 +1216,7 @@ cover-view.page-title {
 		font-size: 30upx;
 	} */
 .more-btn:after {
-  content: "";
+  content: '';
   display: inline-block;
   margin-left: 8upx;
   width: 10upx;
@@ -1107,12 +1226,13 @@ cover-view.page-title {
 }
 
 .box-center-title {
-  font-size: 24upx;
-  color: #010101;
-  border-radius: 24upx;
-  padding: 0 16upx;
-  background-color: #dedede;
+  font-size: 28rpx;
+  color: #fff;
+  border-radius: 24rpx;
+  padding: 8rpx 20rpx;
   text-align: center;
+  font-weight: 400;
+  box-shadow: 0 4rpx 12rpx rgba(39, 178, 95, 0.3);
 }
 
 .uni-icon-arrowdown {
@@ -1125,53 +1245,60 @@ cover-view.page-title {
 }
 
 .center-title {
-  color: #dedede;
+  color: #DEDEDE;
   font-size: 24rpx;
 }
 
 .center-num {
-  font-size: 64rpx;
+  font-size: 32rpx;
   color: #fff;
-  font-family: Bahnschrift Regular;
+  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: 24rpx;
-  color: #dee1f1;
+  font-size: 26rpx;
+  color: rgba(255, 255, 255, 0.9);
   text-align: center;
+  line-height: 1.4;
 }
 
 .main-amount-title {
-  color: #dee1f1;
-  font-size: 24rpx;
-  /* flex: 1; */
+  color: rgba(255, 255, 255, 0.9);
+  font-size: 26rpx;
+  font-weight: 500;
 }
 
 .tab-unit {
-  background-color: #3a3e5b;
-  border-radius: 24rpx 0 0 24rpx;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 20rpx;
   color: #fff;
-  font-size: 24rpx;
-  position: relative;
-  right: -12px;
-  padding: 0 20rpx;
+  font-size: 26rpx;
+  padding: 2rpx 16rpx;
+  font-weight: 500;
+  backdrop-filter: blur(10rpx);
+  border: 1rpx solid rgba(255, 255, 255, 0.3);
 }
 
 .check-price-color {
   color: #fff;
-  font-size: 34rpx;
-  font-family: Bahnschrift Regular;
-  line-height: 1.2;
+  font-size: 28rpx;
+  font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+  line-height: 1.3;
+  font-weight: 600;
+  margin-top: 8rpx;
 }
 
 .check-price-color text {
-  font-size: 22rpx;
+  font-size: 24rpx;
 }
 
 .tab-icon2 {
   font-size: 26rpx;
-  color: #dedede;
+  color: #DEDEDE;
   flex: 1;
 }
 
@@ -1180,21 +1307,21 @@ cover-view.page-title {
   color: #fff;
 }
 
-.tab-unit-num + .tab-unit-num:before {
-  content: "/";
+.tab-unit-num+.tab-unit-num:before {
+  content: '/';
   margin: 0 4rpx;
   color: #fff;
 }
 
 .priceGreen,
 .priceGreen.tab-unit-num {
-  color: #7cb9a5;
+  color: #7CB9A5;
   /* font-size: 28rpx; */
 }
 
 .priceRed,
 .tab-unit-num.priceRed {
-  color: #dd7575;
+  color: #DD7575;
   /* font-size: 28rpx; */
 }
 
@@ -1216,72 +1343,76 @@ cover-view.page-title {
   position: fixed;
   z-index: 999;
   background: #ffffff;
-  box-shadow: 0 0 30upx rgba(0, 0, 0, 0.1);
+  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;
+  min-width: 500rpx;
+  min-height: 400rpx;
+  border-radius: 20rpx;
   top: 30%;
   left: 50%;
   transform: translate(-50%, -20%);
   justify-content: flex-start;
-  padding: 0 30upx 30upx 30upx;
+  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: 30rpx;
-  font-weight: 600;
+  font-size: 32rpx;
+  font-weight: 700;
   color: #333;
   text-align: left;
   width: 100%;
-  padding: 32rpx 0;
+  padding: 32rpx 0 24rpx;
   background-color: #fff;
+  position: relative;
+
+  // 主题色下划线由 mixin 处理
 }
 
 .pop-body {
-  width: 600rpx;
-  max-height: 600rpx;
+  width: 100%;
+  max-height: 500rpx;
   overflow-y: auto;
   background-color: #fff;
-  padding-bottom: 8rpx;
+  padding-bottom: 16rpx;
+  border-radius: 8rpx;
 }
 
 .pop-row {
-  padding: 24rpx 10rpx 24rpx 0;
-  font-size: 24rpx;
+  padding: 20rpx 0;
+  font-size: 26rpx;
   align-items: center;
-  justify-content: space-between;
-
+  justify-content: flex-start;
   box-sizing: border-box;
   position: relative;
+  color: #333;
 }
 
 .pop-row .pop-row-bottom {
   position: absolute;
-  height: 2rpx;
+  height: 1rpx;
   width: 100%;
-  background-color: #efefef;
+  background: linear-gradient(90deg, transparent 0%, #e5e5e5 50%, transparent 100%);
   bottom: 0;
   left: 0;
 }
 
 .pop-index {
-  color: #df7f42;
-  border: 1rpx solid #df7f42;
-  border-radius: 8rpx;
-  padding: 2rpx 12rpx 0 12rpx;
-  margin-right: 12rpx;
-  font-size: 24rpx;
-  line-height: 30rpx;
-  height: 30rpx;
-  display: inline-block;
-  vertical-align: middle;
+  color: #fff;
+  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 {
@@ -1308,52 +1439,72 @@ cover-view.page-title {
 }
 
 .analysis-tabs {
-  margin: 24rpx auto;
-  width: 708rpx;
+  margin: 24rpx 0;
   overflow: hidden;
-  /* color: #777777; */
-  border: 1rpx solid #647bd1;
-  border-radius: 39rpx;
+  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;
+  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;
+  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";
+  font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
+  padding: 8rpx 24rpx;
+  background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  border: 1rpx solid #f0f0f0;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 }
 
 .model-busniess view {
-  font-size: 26rpx;
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  // margin-bottom: 16rpx;
 }
 
 .model-busniess .progress-content {
   width: 100%;
-  height: 28rpx;
-  border-radius: 2rpx;
+  height: 12rpx;
+  border-radius: 6rpx;
   display: flex;
   justify-content: space-between;
-  margin-top: 30rpx;
-  margin-bottom: 4rpx;
+  margin: 8rpx 0 8rpx;
   overflow: hidden;
+  box-shadow: inset 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
 }
 
 .model-busniess .progress-left {
-  background-color: #667ed5;
+  border-radius: 6rpx 0 0 6rpx;
 }
+
 .model-busniess .progress-right {
-  background-color: #f3af50;
+  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 ee492ed..ef6b81a 100644
--- a/pages/everdayRenven/components/RankContent.vue
+++ b/pages/everdayRenven/components/RankContent.vue
@@ -1,145 +1,403 @@
 <template>
-	<block>
-		<div class="uni-inline-item ranking-tab-box">
-			<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>
-			<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-unit">
-					<div>{{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>
-					</div>
-				</div>
-			</div>
-		</div>
-	</block>
+	<view class="ranking-container">
+		<!-- 现代化选项卡 -->
+		<view class="ranking-tabs">
+			<view class="tab-item" @tap="selectTab(1000)" :class="{ 'active': nowRank == 1000 }">
+				<view class="tab-icon">🏪</view>
+				<text class="tab-text">商超</text>
+			</view>
+			<view class="tab-item" @tap="selectTab(2000)" :class="{ 'active': nowRank == 2000 }">
+				<view class="tab-icon">🍽️</view>
+				<text class="tab-text">餐饮</text>
+			</view>
+			<view class="tab-item" @tap="selectTab(3000)" :class="{ 'active': nowRank == 3000 }">
+				<view class="tab-icon">🍿</view>
+				<text class="tab-text">小吃</text>
+			</view>
+		</view>
+
+		<!-- 排行榜内容 -->
+		<view class="ranking-content" v-if="wechatPushSalesList && wechatPushSalesList[nowRank]">
+			<view class="ranking-item" v-for="(item, index) in wechatPushSalesList[nowRank]" :key="index"
+				:class="'rank-' + (index + 1)">
+
+				<!-- 排名徽章 -->
+				<view class="rank-badge" :class="'rank-' + (index + 1)">
+					<view v-if="index < 3" class="medal-icon">
+						{{ index === 0 ? '🥇' : index === 1 ? '🥈' : '🥉' }}
+					</view>
+					<text v-else class="rank-number">{{ index + 1 }}</text>
+				</view>
+
+				<!-- 商品信息 -->
+				<view class="item-content">
+					<view class="item-name">{{ item.COMMODITY_NAME || item.Commodity_Name }}</view>
+					<view class="item-stats">
+						<view class="stat-item">
+							<text class="stat-label">销售额</text>
+							<text class="stat-value sales-amount">¥{{ $util.fmoney(item.TOTALPRICE || item.TotalPrice)
+							}}</text>
+						</view>
+						<view class="stat-divider">|</view>
+						<view class="stat-item">
+							<text class="stat-label">销量</text>
+							<text class="stat-value sales-count">{{ item.SELLCOUNT || item.SellCount }}</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+
+		<!-- 空状态 -->
+		<view v-else class="empty-state">
+			<view class="empty-icon">📊</view>
+			<text class="empty-text">暂无排行数据</text>
+		</view>
+	</view>
 </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;
-	
+<style lang="scss" scoped>
+.ranking-container {
+	margin: 20rpx 0;
+}
+
+/* 现代化选项卡 */
+.ranking-tabs {
+	display: flex;
+	background: #fff;
+	border-radius: 12rpx;
+	padding: 6rpx;
+	margin: 0 20rpx 24rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+	border: 1rpx solid #f0f0f0;
+}
+
+.tab-item {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 16rpx 8rpx;
+	border-radius: 8rpx;
+	transition: all 0.3s ease;
+	cursor: pointer;
+
+	&.active {
+		background: linear-gradient(135deg, #27B25F, #4CCC7F);
+		box-shadow: 0 4rpx 12rpx rgba(39, 178, 95, 0.3);
+		transform: translateY(-2rpx);
+
+		.tab-text {
+			color: #fff;
+			font-weight: 600;
+		}
+
+		.tab-icon {
+			transform: scale(1.1);
+		}
 	}
-	
-	.ranking-tab-box .ranking-tab-unit {
-		color: #565656;
-		flex: 1;
-		height: 64rpx;
-		line-height: 60rpx;
+
+	&:hover {
+		background: rgba(39, 178, 95, 0.1);
 	}
-	
-	.ranking-tab-box .ranking-tab-unit.active {
-		background-color: #565656;
-		color: #fff
+}
+
+.tab-icon {
+	font-size: 32rpx;
+	margin-bottom: 8rpx;
+	transition: transform 0.3s ease;
+}
+
+.tab-text {
+	font-size: 24rpx;
+	color: #666;
+	transition: all 0.3s ease;
+	font-weight: 500;
+}
+
+/* 排行榜内容 */
+.ranking-content {
+	padding: 0 20rpx;
+}
+
+.ranking-item {
+	display: flex;
+	align-items: center;
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 20rpx 24rpx;
+	margin-bottom: 16rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+	border: 1rpx solid #f5f5f5;
+	transition: all 0.3s ease;
+	position: relative;
+	overflow: hidden;
+
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		width: 4rpx;
+		background: linear-gradient(180deg, #27B25F, #4CCC7F);
+		opacity: 0;
+		transition: opacity 0.3s ease;
 	}
-	
-	.ranking-tab-box .ranking-tab-unit+.ranking-tab-unit {
-		border-left: 2rpx solid #565656;
+
+	&:hover {
+		box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.1);
+		transform: translateY(-2rpx);
+
+		&::before {
+			opacity: 1;
+		}
 	}
-	
-	.ranking-content {
-		/* display: none; */
-		min-height: 160rpx;
+
+	// 前三名特殊样式
+	&.rank-1 {
+		background: linear-gradient(135deg, #fffbf0, #fff);
+
+		&::before {
+			background: linear-gradient(180deg, #ffb300, #ffd700);
+			opacity: 1;
+		}
 	}
-	
-	.ranking-content .ranking-list {
-		display: flex;
-		align-items: center;
-		color: #000;
-		padding: 24rpx 32rpx;
+
+	&.rank-2 {
+		background: linear-gradient(135deg, #f0f0f0, #fff);
+
+		&::before {
+			background: linear-gradient(180deg, #c0c0c0, #e8e8e8);
+			opacity: 1;
+		}
 	}
-	
-	.ranking-content .rank-index {
-		width: 72rpx;
-		height: 72rpx;
-		text-align: center;
-		line-height: 72rpx;
-		font-size: 30rpx;
-		font-weight: bolder;
-		margin-right: 32rpx;
+
+	&.rank-3 {
+		background: linear-gradient(135deg, #f5f1eb, #fff);
+
+		&::before {
+			background: linear-gradient(180deg, #a0714d, #cd853f);
+			opacity: 1;
+		}
 	}
-	
-	.ranking-content .ranking-list:nth-child(1) .rank-index {
-		background: url('/static/images/revenue/top1.png') no-repeat center;
-		background-size: contain;
-		font-size: 0;
+}
+
+/* 排名徽章 */
+.rank-badge {
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 24rpx;
+	font-weight: 700;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+
+	&.rank-1,
+	&.rank-2,
+	&.rank-3 {
+		background: transparent;
+		box-shadow: none;
 	}
-	
-	.ranking-content .ranking-list:nth-child(2) .rank-index {
-		background: url(/static/images/revenue/top2.png) no-repeat center;
-		background-size: contain;
-		font-size: 0;
+
+	.medal-icon {
+		font-size: 36rpx;
+		animation: pulse 2s infinite;
 	}
-	
-	.ranking-content .ranking-list:nth-child(3) .rank-index {
-		background: url(/static/images/revenue/top3.png) no-repeat center;
-		background-size: contain;
-		font-size: 0;
+
+	.rank-number {
+		color: #fff;
+		font-size: 24rpx;
+		font-weight: 700;
 	}
-	
-	.ranking-content .ranking-list-unit {
-		font-size: 28rpx;
-		flex: 1;
+}
+
+.rank-badge:not(.rank-1):not(.rank-2):not(.rank-3) {
+	background: linear-gradient(135deg, #8c9eff, #a5b4fc);
+}
+
+@keyframes pulse {
+
+	0%,
+	100% {
+		transform: scale(1);
 	}
-	
-	.ranking-content .ranking-unit-info {
-		/* margin-top: 16rpx; */
-		display: flex;
-		align-items: center;
-		/* font-size: .13rem; */
+
+	50% {
+		transform: scale(1.05);
 	}
-	
-	.ranking-content .ranking-unit-info text {
-		flex: 2;
-		color: #929292;
+}
+
+/* 商品信息 */
+.item-content {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+}
+
+.item-name {
+	font-size: 24rpx;
+	color: #333;
+	font-weight: 600;
+	margin-bottom: 12rpx;
+	line-height: 1.4;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+}
+
+.item-stats {
+	display: flex;
+	align-items: center;
+}
+
+.stat-item {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+	flex: 1;
+}
+
+.stat-label {
+	font-size: 24rpx;
+	color: #6c757d;
+	margin-right: 8rpx;
+	line-height: 40rpx;
+	font-weight: 500;
+	white-space: nowrap;
+}
+
+.stat-value {
+	font-size: 24rpx;
+	font-weight: 600;
+	line-height: 40rpx;
+	// font-family: 'DIN Alternate', 'Bahnschrift', monospace;
+	white-space: nowrap;
+
+	&.sales-amount {
+		color: #27B25F;
 	}
-	
-	.ranking-content .ranking-unit-info text:nth-child(2) {
-		flex: 3;
+
+	&.sales-count {
+		color: #666;
 	}
-	
-	.ranking-content .ranking-unit-info text:nth-child(2n) {
-		color: #000
+}
+
+.stat-divider {
+	margin: 0 16rpx;
+	color: #e0e0e0;
+	font-size: 20rpx;
+}
+
+
+/* 空状态 */
+.empty-state {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80rpx 20rpx;
+	color: #999;
+}
+
+.empty-icon {
+	font-size: 80rpx;
+	margin-bottom: 20rpx;
+	opacity: 0.6;
+}
+
+.empty-text {
+	font-size: 28rpx;
+	color: #999;
+}
+
+/* 主题色支持 - 通过全局主题类控制 */
+:global(.province-theme-330200) .tab-item.active {
+	background: linear-gradient(135deg, #1890FF, #69C0FF);
+
+	.stat-value.sales-amount {
+		color: #1890FF;
 	}
-	
-	.ranking-ico {
-		width: 72rpx;
-		height: 72rpx;
+}
+
+:global(.province-theme-340000) .tab-item.active {
+	background: linear-gradient(135deg, #748ED6, #91A7E3);
+
+	.stat-value.sales-amount {
+		color: #748ED6;
 	}
+}
+
+:global(.province-theme-500000) .tab-item.active {
+	background: linear-gradient(135deg, #FA541C, #FF7A45);
+
+	.stat-value.sales-amount {
+		color: #FA541C;
+	}
+}
+
+:global(.province-theme-510000) .tab-item.active {
+	background: linear-gradient(135deg, #FA8C16, #FFA940);
+
+	.stat-value.sales-amount {
+		color: #FA8C16;
+	}
+}
+
+:global(.province-theme-520000) .tab-item.active {
+	background: linear-gradient(135deg, #52C41A, #73D13D);
+
+	.stat-value.sales-amount {
+		color: #52C41A;
+	}
+}
+
+:global(.province-theme-530000) .tab-item.active {
+	background: linear-gradient(135deg, #27B25F, #4CCC7F);
+
+	.stat-value.sales-amount {
+		color: #27B25F;
+	}
+}
+
+:global(.province-theme-630000) .tab-item.active {
+	background: linear-gradient(135deg, #13C2C2, #36CFC9);
+
+	.stat-value.sales-amount {
+		color: #13C2C2;
+	}
+}
+
+:global(.province-theme-734100) .tab-item.active {
+	background: linear-gradient(135deg, #E91E63, #F06292);
+
+	.stat-value.sales-amount {
+		color: #E91E63;
+	}
+}
 </style>
diff --git a/pages/everdayRenven/components/anhHead.vue b/pages/everdayRenven/components/anhHead.vue
index 33c61ff..6f2b7ee 100644
--- a/pages/everdayRenven/components/anhHead.vue
+++ b/pages/everdayRenven/components/anhHead.vue
@@ -202,7 +202,7 @@
               分润门店:
               <span
                 class="amount"
-                style="font-size: 28rpx; padding-left: 0.5em"
+                style="font-size: 24rpx; padding-left: 0.5em"
               >
                 {{ headMsg.shareShopCount }}个
               </span>
@@ -213,7 +213,7 @@
               驿达分润:
               <span
                 class="amount"
-                style="font-size: 28rpx; padding-left: 0.5em"
+                style="font-size: 24rpx; padding-left: 0.5em"
               >
                 {{ $util.fmoney(headMsg.royaltyPrice) }}元
               </span>
@@ -237,7 +237,7 @@
               万佳配送订单:
               <span
                 class="amount"
-                style="font-size: 28rpx; padding-left: 0.5em"
+                style="font-size: 24rpx; padding-left: 0.5em"
               >
                 {{ headMsg.deliverBillCount }}单
               </span>
@@ -248,7 +248,7 @@
               采购金额:
               <span
                 class="amount"
-                style="font-size: 28rpx; padding-left: 0.5em"
+                style="font-size: 24rpx; padding-left: 0.5em"
               >
                 {{ $util.fmoney(headMsg.deliverPrice) }}元
               </span>
diff --git a/pages/everdayRenven/components/listUnit.vue b/pages/everdayRenven/components/listUnit.vue
index fb06353..4d80b67 100644
--- a/pages/everdayRenven/components/listUnit.vue
+++ b/pages/everdayRenven/components/listUnit.vue
@@ -1,192 +1,379 @@
 <template>
 	<div>
-	<div class="analysis-cell" @tap="toggleShow" :class="{'active':item.show}">
-		<div class="shop-title">
-			<span> {{( i>8 ? i+1: '0'+(i+1) ) + ' '+item.SHOPNAME}}</span>
-			<p>
-				<span v-show="item.UNACCOUNT_SIGN">￥</span>
-				<span class="cell-price" :style="{'padding-right':!item.UNACCOUNT_SIGN ? '36rpx':'0','font-size':!item.UNACCOUNT_SIGN ? '24rpx':'36rpx'}">{{item.UNACCOUNT_SIGN ? $util.fmoney(item.CASHPAY_TOTAL,2): '无结账信息'}}</span>
-				<image src="/static/images/effective/true.png" mode="aspectFit" class="" v-if='item.SHOWDEAL_SIGN'></image>
-				<!-- <text class="uni-icon uni-icon-checkmarkempty"  v-if='item.SHOWDEAL_SIGN'></text> -->
-				
+		<div class="analysis-cell" @tap="toggleShow" :class="{ 'active': item.show }" :style="activeCellStyleStr">
+			<div class="shop-title" :class="'theme-' + provinceCode">
+				<span> {{ (i > 8 ? i + 1 : '0' + (i + 1)) + ' ' + item.SHOPNAME }}</span>
+				<p>
+					<span v-show="item.UNACCOUNT_SIGN">￥</span>
+					<span class="cell-price" :style="priceStyleStr">{{
+						item.UNACCOUNT_SIGN
+							? $util.fmoney(item.CASHPAY_TOTAL, 2) : '无结账信息' }}</span>
+					<image src="/static/images/effective/true.png" mode="aspectFit" class="" v-if='item.SHOWDEAL_SIGN'>
+					</image>
+					<!-- <text class="uni-icon uni-icon-checkmarkempty"  v-if='item.SHOWDEAL_SIGN'></text> -->
+
+				</p>
+			</div>
+			<p v-if="item.detail.length > 0" style="line-height: 1.2;">
+				<span v-for="(child, index) in item.detail" :key="index" class="atribute-tag">{{ child }} </span>
 			</p>
 		</div>
-		<p v-if=" item.detail.length>0" style="line-height: 1.2;">
-			<span v-for="(child,index) in item.detail" :key="index" class="atribute-tag">{{child}} </span>
-		</p>
-	</div>
-	<div class="analysis-detail" v-show="item.show">
-		<div class="detail-unit" v-for="(unit,o) in item.ShopEndAccountList" :key="o">
-			<div class="uni-inline-flex">
-				<span class="detail-title">结账时间：</span>
-				<div style="flex: 1;text-align: left;">
-					<div>起 {{unit.ENDACCOUNT_STARTDATE}}</div>
-					<div>止 {{unit.ENDACCOUNT_DATE}}</div>
-				</div>	
-				<span style="color:#EE7941;margin-right:50rpx;padding-top: 42rpx;">{{getHour(unit.ENDACCOUNT_STARTDATE,unit.ENDACCOUNT_DATE)}}小时</span>
-			</div>
-			<block v-if="unit.DESCRIPTION_DATE">
-				
-				<div class="detail-title">日结校验：{{unit.DESCRIPTION_DATE}}</div>
-				<p><span class="detail-title">{{unit.DESCRIPTION_STAFF}}：</span><span>{{unit.DIFFERENCE_REASON}}</span></p>
-			</block>
-			<block v-if="unit.APPROVE_DATE">
-				<div><span class="detail-title">日结审核：{{unit.APPROVE_DATE}}</span></div>
-				<p><span class="detail-title">{{unit.APPROVE_STAFF}}：</span><span>{{unit.APPROVED_INFO}}</span></p>
-			</block>
-			<div>
-				<p class="detail-short-info" v-show="unit.FACTAMOUNT_SALE">单品报表：<text class="uni-icon uni-icon-checkmarkempty"  ></text></p>
-				<p class="detail-short-info" v-show="unit.FACTAMOUNT_CIGARETTE">香烟数据：<span class="uni-icon uni-icon-checkmarkempty"></span></p>
-			</div>
-			<div><span class="detail-title detail-short-info">稽核次数：{{unit.CHECK_COUNT}} 次</span><span class="detail-short-info">长短款额：{{$util.fmoney(unit.DIFFERENT_PRICE)}} 元</span></div>
-			<div>
-				<span class="detail-title detail-short-info">现金缴款：{{$util.fmoney(unit.CASHPAY_DOWNLORD)}} 元</span>
-				<span class="detail-short-info">移动支付：{{$util.fmoney(unit.MOBILEPAYMENT)}} 元</span>
+		<div class="analysis-detail" v-show="item.show">
+			<div class="detail-unit" v-for="(unit, o) in item.ShopEndAccountList" :key="o">
+				<div class="uni-inline-flex">
+					<span class="detail-title">结账时间：</span>
+					<div style="flex: 1;text-align: left;">
+						<div style="font-size: 24rpx;">起 {{ unit.ENDACCOUNT_STARTDATE }}</div>
+						<div style="font-size: 24rpx;">止 {{ unit.ENDACCOUNT_DATE }}</div>
+					</div>
+					<span style="color:#EE7941;margin-right:50rpx;padding-top: 20rpx;font-size: 24rpx;">{{
+						getHour(unit.ENDACCOUNT_STARTDATE, unit.ENDACCOUNT_DATE) }}小时</span>
+				</div>
+				<block v-if="unit.DESCRIPTION_DATE">
+
+					<div class="detail-title">日结校验：{{ unit.DESCRIPTION_DATE }}</div>
+					<p><span class="detail-title">{{ unit.DESCRIPTION_STAFF }}：</span><span style="font-size: 24rpx;">{{
+						unit.DIFFERENCE_REASON
+					}}</span>
+					</p>
+				</block>
+				<block v-if="unit.APPROVE_DATE">
+					<div><span class="detail-title">日结审核：{{ unit.APPROVE_DATE }}</span></div>
+					<p><span class="detail-title" style="font-size: 24rpx;">{{ unit.APPROVE_STAFF }}：</span><span
+							style="font-size: 24rpx;">{{
+								unit.APPROVED_INFO }}</span>
+					</p>
+				</block>
+				<div>
+					<p class="detail-short-info" v-show="unit.FACTAMOUNT_SALE">单品报表：<text
+							class="uni-icon uni-icon-checkmarkempty"></text></p>
+					<p class="detail-short-info" v-show="unit.FACTAMOUNT_CIGARETTE">香烟数据：<span
+							class="uni-icon uni-icon-checkmarkempty"></span></p>
+				</div>
+				<div><span class="detail-title detail-short-info" style="font-size: 24rpx;">稽核次数：{{ unit.CHECK_COUNT }}
+						次</span><span class="detail-short-info" style="font-size: 24rpx;">长短款额：{{
+							$util.fmoney(unit.DIFFERENT_PRICE) }} 元</span></div>
+				<div>
+					<span class="detail-title detail-short-info" style="font-size: 24rpx;">现金缴款：{{
+						$util.fmoney(unit.CASHPAY_DOWNLORD) }} 元</span>
+					<span class="detail-short-info" style="font-size: 24rpx;">移动支付：{{ $util.fmoney(unit.MOBILEPAYMENT)
+						}} 元</span>
+				</div>
 			</div>
 		</div>
 	</div>
-	</div>
 </template>
 
 <script>
-	export default {
-		props: {
-			item: {
-				type: Object,
-				required: true
-			},
-			i: {
-				type: Number,
-				required: true
-			}
+export default {
+	props: {
+		item: {
+			type: Object,
+			required: true
 		},
-		data () {
-			return {
-				
-				
-			}
+		i: {
+			type: Number,
+			required: true
 		},
-		computed: {
-			
-		},
-		methods: {
-			getHour(start,end){
-				return parseInt((new Date(end) - new Date(start)) / (1000 * 3600)) 
-			},
-			
-			toggleShow () {
-				this.$emit('toggleShow', this.i)
+		provinceCode: {
+			type: String,
+			default: '530000' // 默认使用云南的配色
+		}
+	},
+	data() {
+		return {
+
+
+		}
+	},
+	computed: {
+		// 根据省份代码获取主题色
+		themeColors() {
+			const themes = {
+				'330200': { // 宁波
+					primary: '#1890FF',
+					secondary: '#69C0FF'
+				},
+				'340000': { // 安徽
+					primary: '#748ED6',
+					secondary: '#91A7E3'
+				},
+				'500000': { // 重庆
+					primary: '#FA541C',
+					secondary: '#FF7A45'
+				},
+				'510000': { // 四川
+					primary: '#FA8C16',
+					secondary: '#FFA940'
+				},
+				'520000': { // 贵州
+					primary: '#52C41A',
+					secondary: '#73D13D'
+				},
+				'530000': { // 云南（默认色）
+					primary: '#27B25F',
+					secondary: '#4CCC7F'
+				},
+				'630000': { // 青海
+					primary: '#13C2C2',
+					secondary: '#36CFC9'
+				},
+				'734100': { // 海南
+					primary: '#E91E63',
+					secondary: '#F06292'
+				}
 			}
+			return themes[this.provinceCode] || themes['530000']
+		},
+
+		// 动态样式字符串（小程序兼容）
+		activeCellStyleStr() {
+			if (!this.item.show) return ''
+			return `border: 2rpx solid ${this.themeColors.primary}; box-shadow: 0 4px 20px rgba(${this.hexToRgb(this.themeColors.primary)}, 0.15);`
+		},
+
+		// 价格样式字符串
+		priceStyleStr() {
+			const paddingRight = !this.item.UNACCOUNT_SIGN ? '0' : '0'
+			const fontSize = !this.item.UNACCOUNT_SIGN ? '24rpx' : '24rpx'
+			return `padding-right: ${paddingRight}; font-size: ${fontSize}; color: ${this.themeColors.primary};`
+		}
+	},
+	methods: {
+		getHour(start, end) {
+			return parseInt((new Date(end) - new Date(start)) / (1000 * 3600))
+		},
+
+		toggleShow() {
+			this.$emit('toggleShow', this.i)
+		},
+
+		// 将十六进制颜色转换为RGB
+		hexToRgb(hex) {
+			const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+			return result ?
+				`${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)}` :
+				'39, 178, 95'; // 默认绿色的RGB
 		}
 	}
+}
 </script>
 
-<style scoped>
-	.analysis-cell {
-		/* height: 1140rpx; */
-		background-color: #ffffff;
-		border-bottom: 2rpx solid #F8F8F8;
-		padding: 24rpx 20rpx 18rpx 30rpx;
-		display: flex;
-		flex-direction: column;
+<style lang="scss" scoped>
+.analysis-cell {
+	background-color: #fff;
+	border-radius: 16rpx;
+	margin-bottom: 16rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	padding: 16rpx 16rpx 8rpx;
+	display: flex;
+	flex-direction: column;
+	transition: all 0.3s ease;
+	position: relative;
+
+	&.active {
+		// 边框和阴影由动态样式控制
 	}
-	
-	.analysis-cell .shop-title {
+}
+
+.analysis-cell .shop-title {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	font-size: 24rpx;
+	font-weight: 600;
+	align-items: flex-start;
+
+	span {
+		color: #333;
+		flex: 1;
+	}
+
+	p {
 		display: flex;
-		justify-content: space-between;
-		position: relative;
-		margin-left: 20rpx;
-		font-size: 26rpx;
-		height: 100%;
 		align-items: center;
+		flex-shrink: 0;
 	}
-	
-	.analysis-cell .shop-title:before {
-		content: '';
-		position: absolute;
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 20rpx;
-		background: url(/static/images/revenue/select.png) no-repeat center;
-		background-size: contain;
-		left: -32rpx;
-		
+}
+
+.analysis-cell .shop-title:before {
+	content: '';
+	position: absolute;
+	width: 24rpx;
+	height: 24rpx;
+	border-radius: 50%;
+	left: -40rpx;
+	top: 4rpx;
+	background: #e0e0e0;
+	border: 3rpx solid #fff;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+}
+
+// 主题色状态指示点样式
+.analysis-cell.active .shop-title.theme-330200:before {
+	background: #1890FF;
+	box-shadow: 0 2rpx 12rpx rgba(24, 144, 255, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-340000:before {
+	background: #748ED6;
+	box-shadow: 0 2rpx 12rpx rgba(116, 142, 214, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-500000:before {
+	background: #FA541C;
+	box-shadow: 0 2rpx 12rpx rgba(250, 84, 28, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-510000:before {
+	background: #FA8C16;
+	box-shadow: 0 2rpx 12rpx rgba(250, 140, 22, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-520000:before {
+	background: #52C41A;
+	box-shadow: 0 2rpx 12rpx rgba(82, 196, 26, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-530000:before {
+	background: #27B25F;
+	box-shadow: 0 2rpx 12rpx rgba(39, 178, 95, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-630000:before {
+	background: #13C2C2;
+	box-shadow: 0 2rpx 12rpx rgba(19, 194, 194, 0.3);
+}
+
+.analysis-cell.active .shop-title.theme-734100:before {
+	background: #E91E63;
+	box-shadow: 0 2rpx 12rpx rgba(233, 30, 99, 0.3);
+}
+
+.shop-title image {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 12rpx;
+	border-radius: 4rpx;
+}
+
+.analysis-cell .cell-price {
+	// 颜色由动态样式控制
+	font-family: 'PingFang SC', sans-serif;
+	font-size: 24rpx;
+	font-weight: 700;
+}
+
+.atribute-tag {
+	display: inline-block;
+	background: linear-gradient(135deg, #ff9f43, #ff8c42);
+	color: #fff;
+	padding: 4rpx 12rpx;
+	margin: 4rpx 8rpx 4rpx 0;
+	border-radius: 20rpx;
+	font-size: 20rpx;
+	font-weight: 500;
+	box-shadow: 0 2rpx 8rpx rgba(255, 159, 67, 0.2);
+}
+
+.analysis-detail {
+	background-color: #f8f9fa;
+	border-radius: 12rpx;
+	position: relative;
+	overflow: hidden;
+	// margin-top: 16rpx;
+	border: 1rpx solid #f0f0f0;
+}
+
+.analysis-detail span,
+.analysis-detail view {
+	color: #333;
+	font-size: 26rpx;
+}
+
+.uni-icon-checkmarkempty,
+.analysis-detail span.uni-icon-checkmarkempty {
+	color: #2ed573;
+	font-size: 32rpx;
+	font-weight: 600;
+}
+
+.analysis-detail::before {
+	content: '';
+	width: 0;
+	height: 0;
+	border-left: 12rpx solid transparent;
+	border-right: 12rpx solid transparent;
+	border-bottom: 16rpx solid #f8f9fa;
+	position: absolute;
+	top: -16rpx;
+	left: 32rpx;
+}
+
+.analysis-detail .detail-unit {
+	background-color: #fff;
+	padding: 24rpx;
+	border-radius: 8rpx;
+	// margin: 16rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+
+	&:first-child {
+		// margin-top: 24rpx;
 	}
-	
-	.analysis-cell.active .shop-title:before {
-		background: url(/static/images/revenue/select_active.png) no-repeat center;
-		background-size: contain;
+
+	&:last-child {
+		margin-bottom: 24rpx;
 	}
-	.shop-title image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: 16rpx;
-		vertical-align: text-bottom;
+}
+
+.analysis-detail .detail-unit>div {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 16rpx;
+
+	&:last-child {
+		margin-bottom: 0;
 	}
-	.analysis-cell .cell-price {
-		color: #565656;
-		font-family: Bahnschrift Regular;
-		font-size: 38rpx;
+}
+
+.analysis-detail .detail-unit>p {
+	margin-bottom: 16rpx;
+
+	&:last-child {
+		margin-bottom: 0;
 	}
-	
-	.analysis-detail {
-		background-color: #fff;
-		position: relative;
+}
+
+.analysis-detail span {
+	display: inline-block;
+	vertical-align: middle;
+	line-height: 1.4;
+}
+
+.analysis-detail .detail-title {
+	min-width: 140rpx;
+	color: #666;
+	font-weight: 500;
+	font-size: 24rpx;
+}
+
+.analysis-detail .detail-short-info {
+	width: 50%;
+	color: #333;
+	font-size: 24rpx;
+
+	&:first-child {
+		padding-right: 16rpx;
 	}
-	.analysis-detail span, .analysis-detail view{
-		color: #333 ;
-		font-size: 24rpx ;
-	}
-	.uni-icon-checkmarkempty, .analysis-detail span.uni-icon-checkmarkempty {
-		color: #4F8E24;
-		font-size: 36rpx;
-	}
-	.analysis-detail::before {
-		content: '';
-		width: 24rpx;
-		height: 12rpx;
-		background: url(/static/images/revenue/bg-s.png) no-repeat center;
-		background-size: contain;
-		display: block;
-		position: absolute;
-		top: -12rpx;
-		left: 48rpx;
-	}
-	.analysis-detail .detail-unit {
-		background-color: #F8F8F8;
-		line-height: 2;
-		padding: 20rpx 10rpx 20rpx 50rpx;
-	}
-	
-	.analysis-detail .detail-unit>div {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 12rpx;
-	}
-	
-	.analysis-detail .detail-unit>p {
-		margin-top: 12rpx;
-	}
-	.analysis-detail .detail-unit+.detail-unit {
-		margin-top: 20rpx;
-	}
-	
-	.analysis-cell .atribute-tag {
-		color: #EE7941;
-		margin-left: 10rpx;
-		font-size: 24rpx;
-	}
-	
-	.analysis-detail span {
-		display: inline-block;
-		vertical-align: middle;
-	}
-	
-	.analysis-detail .detail-title {
-		min-width: 120rpx;
-	}
-	
-	.analysis-detail .detail-short-info {
-		width: 50%;
+}
+
+.uni-inline-flex {
+	span:last-child {
+		color: #ff9f43;
+		font-weight: 600;
+		font-size: 28rpx;
 	}
+}
 </style>
diff --git a/pages/everdayRenven/serviceDetail.vue b/pages/everdayRenven/serviceDetail.vue
index a2a563d..0062cd6 100644
--- a/pages/everdayRenven/serviceDetail.vue
+++ b/pages/everdayRenven/serviceDetail.vue
@@ -1,158 +1,328 @@
 <template>
-	<div class="page-body" v-if="showPage">
+	<div :class="'province-theme-' + currentProvinceCode" v-if="showPage">
+		<div class="page-body">
 
-		<div class="service-brand-box" >
-			<div class="uni-flex align-center">
+			<div class="service-brand-box">
+				<div class="uni-flex align-center">
 
-				<image v-if="pageMsg.Brand_ICO" :src="pageMsg.Brand_ICO" mode="aspectFit"></image>
-				<image v-else src="/static/images/revenue/home.png" mode="aspectFit"></image>
+					<image v-if="pageMsg.Brand_ICO" :src="pageMsg.Brand_ICO" mode="aspectFit"></image>
+					<image v-else src="/static/images/revenue/home.png" mode="aspectFit"></image>
 
 
-				<div class="band-name">{{pageMsg.Brand_Name}}</div>
+					<!-- <div class="band-name">{{ pageMsg.Brand_Name }}</div> -->
+					<div class="band-name">{{ pageMsg.ShopEndaccountList && pageMsg.ShopEndaccountList.length > 0 ?
+						pageMsg.ShopEndaccountList[0].SERVERPART_NAME : "" }}</div>
+				</div>
+				<div class="price-num">{{ pageMsg.Revenue_Amount ? $util.fmoney(pageMsg.Revenue_Amount, 2) : '0.00' }}
+				</div>
 			</div>
-			<div class="price-num">{{pageMsg.Revenue_Amount ? $util.fmoney(pageMsg.Revenue_Amount,2) :'0.00'}}</div>
-		</div>
-		<!--服务区门店分析-->
-
-		<div style="margin-top: 0 20rpx;" >
-			<shopCell v-for="(item,i) in pageMsg.ShopEndaccountList" :key="i" :item='item' @toggleShow="toggleShow" :i='i'></shopCell>
+			<!--服务区门店分析-->
+			<div style="margin-top: 0 20rpx;padding: 0 16rpx">
+				<shopCell v-for="(item, i) in pageMsg.ShopEndaccountList" :key="i" :item='item' @toggleShow="toggleShow"
+					:i='i' :provinceCode='currentProvinceCode'></shopCell>
 
+			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-	import shopCell from './components/listUnit.vue'
-	export default {
-		data() {
-			return {
-				showPage:false,
+import shopCell from './components/listUnit.vue'
+export default {
+	data() {
+		return {
+			showPage: false,
 
-				pageMsg: {},
-				keyJson : {
-						SHOWMORE_SIGN: { 1: '【长款】',2:'【异常长款】' }, // 长款
-						SHOWLESS_SIGN:{ 1: '【短款】',2:'【异常短款】' }, // 短款
-						SHOWABNORMAL_SIGN: { 1: '【异常校验】'},  // 异常日结
-						SHOWSCAN_SIGN : { 1: '【扫】'},  // 扫码上传
-						SHOWSSUPPLY_SIGN : { 1: '【补】' }, // 账期补录
-						SHOWCHECK_SIGN : { 1: '【稽核检查】' }, // 稽核检查
-						INTERFACE_SIGN : { 1: '【接口传输】' }, // 接口传输
-					}
-			}
-		},
-		components:{
-			shopCell
-		},
-		methods: {
-			toggleShow(i){
-
-				let item = this.pageMsg.ShopEndaccountList[i]
-				item.show = !item.show
-				this.$forceUpdate()
-			},
-
-
-			getDetail(data){
-				let arr =[]
-				let keyJson = this.keyJson
-				var keyCode =  ['SHOWABNORMAL_SIGN','SHOWCHECK_SIGN','SHOWMORE_SIGN','SHOWLESS_SIGN','SHOWSCAN_SIGN','SHOWSSUPPLY_SIGN','INTERFACE_SIGN']
-					 keyCode.map(n=>{
-
-						if( keyJson[n][data[n]] ) arr.push( keyJson[n][data[n]])
-
-					})
-					return arr
-			},
-			getBrandRevenue(obj) {
-				let _this = this
-				this.$request.$webGet('CommercialApi/Revenue/GetShopEndAccountList', {
-					Serverpart_Id: obj.id,
-					pushProvinceCode: obj.provinceId,
-					Statistics_Date: obj.time,
-					ServerpartShop_Ids: obj.shopid,
-				}).then(res => {
-					uni.hideLoading()
-					if (res.Result_Code != 100) return
-					res.Result_Data.ShopEndaccountList.map(n=>{
-						n.show = true
-						n.detail =  this.getDetail(n)
-					})
-					_this.pageMsg = res.Result_Data
-					_this.showPage =true
-				})
-			},
-			zgetBrandRevenue(obj) {
-				let _this = this
-				this.$request.$webGet('/WeChat/GetServerpartBrandShop', {
-					Serverpart_Id: obj.id,
-					business_Brand: obj.bid,
-					pushProvinceCode: obj.provinceId,
-					statictics_Time: obj.time,
-					bussiness_Trade: obj.btid,
-				}).then(res => {
-					uni.hideLoading()
-					if (res.Result_Code != 100) return
-					res.Result_Data.listBrandShopModel.map(n=>{
-						n.show = true
-						n.detail =  this.getDetail(n)
-					})
-					res.Result_Data.ShopEndaccountList = res.Result_Data.listBrandShopModel
-					_this.pageMsg = res.Result_Data
-					_this.showPage =true
-				})
-			},
-		},
-		onUnload() {
-			this.$util.addUserBehaviorNew()
-		},
-		onLoad(option) {
-			uni.showLoading({
-				title:'正在加载...'
-			})
-			if(option.provinceId==='330000'){
-				this.zgetBrandRevenue(option)
-			}else{
-
-			this.getBrandRevenue(option)
+			pageMsg: {},
+			currentProvinceCode: '', // 当前省份代码
+			keyJson: {
+				SHOWMORE_SIGN: { 1: '【长款】', 2: '【异常长款】' }, // 长款
+				SHOWLESS_SIGN: { 1: '【短款】', 2: '【异常短款】' }, // 短款
+				SHOWABNORMAL_SIGN: { 1: '【异常校验】' },  // 异常日结
+				SHOWSCAN_SIGN: { 1: '【扫】' },  // 扫码上传
+				SHOWSSUPPLY_SIGN: { 1: '【补】' }, // 账期补录
+				SHOWCHECK_SIGN: { 1: '【稽核检查】' }, // 稽核检查
+				INTERFACE_SIGN: { 1: '【接口传输】' }, // 接口传输
 			}
 		}
+	},
+	computed: {
+		// 省份主题配色
+		provinceTheme() {
+			const themes = {
+				'330200': { // 宁波
+					primary: '#1890FF',
+					secondary: '#69C0FF',
+					background: '#E6F7FF',
+					accent: '#40A9FF'
+				},
+				'340000': { // 安徽
+					primary: '#748ED6',
+					secondary: '#91A7E3',
+					background: '#F0F4FF',
+					accent: '#A3B8E8'
+				},
+				'500000': { // 重庆
+					primary: '#FA541C',
+					secondary: '#FF7A45',
+					background: '#FFF2E8',
+					accent: '#FF8C73'
+				},
+				'510000': { // 四川
+					primary: '#FA8C16',
+					secondary: '#FFA940',
+					background: '#FFF7E6',
+					accent: '#FFAB65'
+				},
+				'520000': { // 贵州
+					primary: '#52C41A',
+					secondary: '#73D13D',
+					background: '#F6FFED',
+					accent: '#7CB342'
+				},
+				'530000': { // 云南（保持原色）
+					primary: '#27B25F',
+					secondary: '#4CCC7F',
+					background: '#F6FFED',
+					accent: '#5CDB87'
+				},
+				'630000': { // 青海
+					primary: '#13C2C2',
+					secondary: '#36CFC9',
+					background: '#E6FFFB',
+					accent: '#5CDBD3'
+				},
+				'734100': { // 海南
+					primary: '#E91E63',
+					secondary: '#F06292',
+					background: '#FCE4EC',
+					accent: '#F48FB1'
+				}
+			}
+			return themes[this.currentProvinceCode] || themes['530000'] // 如果找不到对应省份，使用云南配色
+		}
+	},
+	components: {
+		shopCell
+	},
+	methods: {
+		// 初始化省份代码
+		initProvinceCode(provinceId) {
+			if (provinceId) {
+				this.currentProvinceCode = provinceId
+				console.log('设置省份主题:', provinceId)
+				// 强制更新以应用新主题
+				this.$forceUpdate()
+			}
+		},
+		// 获取主题颜色（小程序兼容版本）
+		getThemeColors() {
+			return this.provinceTheme
+		},
+		toggleShow(i) {
+
+			let item = this.pageMsg.ShopEndaccountList[i]
+			item.show = !item.show
+			this.$forceUpdate()
+		},
+
+
+		getDetail(data) {
+			let arr = []
+			let keyJson = this.keyJson
+			var keyCode = ['SHOWABNORMAL_SIGN', 'SHOWCHECK_SIGN', 'SHOWMORE_SIGN', 'SHOWLESS_SIGN', 'SHOWSCAN_SIGN', 'SHOWSSUPPLY_SIGN', 'INTERFACE_SIGN']
+			keyCode.map(n => {
+
+				if (keyJson[n][data[n]]) arr.push(keyJson[n][data[n]])
+
+			})
+			return arr
+		},
+		getBrandRevenue(obj) {
+			let _this = this
+			this.$request.$webGet('CommercialApi/Revenue/GetShopEndAccountList', {
+				Serverpart_Id: obj.id,
+				pushProvinceCode: obj.provinceId,
+				Statistics_Date: obj.time,
+				ServerpartShop_Ids: obj.shopid,
+			}).then(res => {
+				uni.hideLoading()
+				if (res.Result_Code != 100) return
+				res.Result_Data.ShopEndaccountList.map(n => {
+					n.show = true
+					n.detail = this.getDetail(n)
+				})
+				_this.pageMsg = res.Result_Data
+				console.log('_this.pageMsg_this.pageMsg_this.pageMsg', _this.pageMsg);
+
+				_this.showPage = true
+			})
+		},
+		zgetBrandRevenue(obj) {
+			let _this = this
+			this.$request.$webGet('/WeChat/GetServerpartBrandShop', {
+				Serverpart_Id: obj.id,
+				business_Brand: obj.bid,
+				pushProvinceCode: obj.provinceId,
+				statictics_Time: obj.time,
+				bussiness_Trade: obj.btid,
+			}).then(res => {
+				uni.hideLoading()
+				if (res.Result_Code != 100) return
+				res.Result_Data.listBrandShopModel.map(n => {
+					n.show = true
+					n.detail = this.getDetail(n)
+				})
+				res.Result_Data.ShopEndaccountList = res.Result_Data.listBrandShopModel
+				_this.pageMsg = res.Result_Data
+				console.log('_this.pageMsg_this.pageMsg_this.pageMsg', _this.pageMsg);
+				_this.showPage = true
+			})
+		},
+	},
+	onUnload() {
+		this.$util.addUserBehavior()
+	},
+	onLoad(option) {
+		uni.showLoading({
+			title: '正在加载...'
+		})
+
+		// 初始化省份主题
+		this.initProvinceCode(option.provinceId)
+
+		if (option.provinceId === '330000') {
+			this.zgetBrandRevenue(option)
+		} else {
+
+			this.getBrandRevenue(option)
+		}
 	}
+}
 </script>
 
-<style scoped>
-	.page-body {
-		background-color: #fff;
-		padding-top: 40rpx;
-		height: 100%;
-	}
-	/*服务区分析*/
+<style lang="scss" scoped>
+// 省份主题定义 - 创建mixin以便复用
+@mixin theme-colors($primary, $secondary) {
 
-	/* 服务区品牌详情 */
+	// 主要背景渐变元素 - 使用主题色
 	.service-brand-box {
-
-		width: 693rpx;
-		height: 103rpx;
-		color: #fff;
-		border-radius: 10rpx;
-		background: url(/static/images/revenue/brand-card.png) no-repeat 60rpx center,linear-gradient(#98a1c2 0%, #aab3d0 100%);
-		background-size: contain;
-		display: flex;
-		align-items: center;
-		margin: 0 auto;
-
-		padding: 0 25rpx;
-		justify-content: space-between;
-		box-sizing: border-box;
+		background: linear-gradient(135deg, $primary 0%, $secondary 100%);
 	}
-	.service-brand-box image {
-		height: 60rpx;
-		width: 60rpx;
-		border: 2rpx solid #fff;
+
+}
+
+// 宁波 330200
+.province-theme-330200 {
+	@include theme-colors(#1890FF, #69C0FF);
+}
+
+// 安徽 340000  
+.province-theme-340000 {
+	@include theme-colors(#748ED6, #91A7E3);
+}
+
+// 重庆 500000
+.province-theme-500000 {
+	@include theme-colors(#FA541C, #FF7A45);
+}
+
+// 四川 510000
+.province-theme-510000 {
+	@include theme-colors(#FA8C16, #FFA940);
+}
+
+// 贵州 520000
+.province-theme-520000 {
+	@include theme-colors(#52C41A, #73D13D);
+}
+
+// 云南 530000
+.province-theme-530000 {
+	@include theme-colors(#27B25F, #4CCC7F);
+}
+
+// 青海 630000
+.province-theme-630000 {
+	@include theme-colors(#13C2C2, #36CFC9);
+}
+
+// 海南 734100
+.province-theme-734100 {
+	@include theme-colors(#E91E63, #F06292);
+}
+
+.page-body {
+	background-color: #f8f9fa;
+	padding: 32rpx 24rpx;
+	min-height: 100vh;
+}
+
+/* 服务区品牌详情 */
+.service-brand-box {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	margin-bottom: 32rpx;
+	// 背景渐变由主题mixin控制
+	border-radius: 24rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	overflow: hidden;
+
+	&::before {
+		content: '';
+		position: absolute;
+		top: -50%;
+		right: -20%;
+		width: 200rpx;
+		height: 200rpx;
+		background: rgba(255, 255, 255, 0.1);
 		border-radius: 50%;
-		margin-right: 24rpx;
+		z-index: 1;
 	}
-	.service-brand-box .price-num {
-		font-size: 40rpx;
-		font-family: Bahnschrift Regular;
+
+	&::after {
+		content: '';
+		position: absolute;
+		bottom: -30%;
+		left: -10%;
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(255, 255, 255, 0.08);
+		border-radius: 50%;
+		z-index: 1;
 	}
+}
+
+.service-brand-box image {
+	width: 72rpx;
+	height: 72rpx;
+	border: 3rpx solid rgba(255, 255, 255, 0.8);
+	border-radius: 50%;
+	margin-right: 24rpx;
+	position: relative;
+	z-index: 2;
+}
+
+.band-name {
+	color: #fff;
+	font-size: 28rpx;
+	font-weight: 600;
+	position: relative;
+	z-index: 2;
+}
+
+.price-num {
+	color: #fff;
+	font-size: 28rpx;
+	font-weight: 700;
+	font-family: 'PingFang SC', sans-serif;
+	position: relative;
+	z-index: 2;
+	text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
 </style>
diff --git a/yxcl.zip b/yxcl.zip
new file mode 100644
index 0000000..e7b45d0
Binary files /dev/null and b/yxcl.zip differ