From e7c9226e6a2f3c5b6ad1a5427dab5f74dde0c7c0 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 25 Dec 2023 19:18:13 +0800
Subject: [PATCH] update

---
 pages/commercialBI/carPortrait.vue            |  53 +--
 .../commercialBI/components/car/homePlace.vue |   1 +
 .../components/car/monthTotal.vue             |  13 +-
 pages/commercialBI/components/noData.vue      |   1 -
 pages/commercialBI/formatPortrait.vue         |  58 +--
 pages/index/components/rateCharts.vue         |   4 +-
 pages/index/index.vue                         | 366 +++++++++++++-----
 pages/map/index.vue                           |  72 +++-
 static/images/seach/searchIcon.svg            |   1 +
 9 files changed, 399 insertions(+), 170 deletions(-)
 create mode 100644 static/images/seach/searchIcon.svg

diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue
index e47b8de..64aa214 100644
--- a/pages/commercialBI/carPortrait.vue
+++ b/pages/commercialBI/carPortrait.vue
@@ -108,11 +108,11 @@
                                 <text class="value">{{time}}</text>
                             </div>
                         </div>
-                        <div v-if="carData.length>0">
+                        <div v-if="carData && carData.length>0">
                             <entry-zone :carData="carData" :time="time" :month="thisMonth" />
                             <analyse :analyseInfo="{analysisins_type: 1102,analysisins_format: 2000}"  />
                         </div>
-                        <no-data v-if="!carData.length"  :type="'car'"/>
+                        <no-data v-if="!carData"  :type="'car'"/>
                     </div>
 
                     <div class="chartsItem" style="margin-top: 32px">
@@ -140,7 +140,7 @@
                         </view>
 
                         <p class="title">{{thisMonth?thisMonth:'-'}}月车辆归属地</p>
-                        <div v-if="homePlace.length>0">
+                        <div v-if="homePlace && homePlace.length>0">
                             <home-place :selectProvinceName="selectProvinceName" :selectValue="selectValue" :homeData="homePlace" :homeCity="cityPlace" @getHomeDate="getHomeData"/>
                             <div style="display: flex">
                                 <!--                      <div class="selectType" >-->
@@ -155,25 +155,25 @@
 
                             <analyse :analyseInfo="{analysisins_type: 1103,analysisins_format: 2000}"  />
                         </div>
-                        <no-data v-if="!homePlace.length"  :type="'car'"/>
+                        <no-data v-if="!homePlace"  :type="'car'"/>
                     </div>
 
                     <div class="chartsItem" style="margin-top: 32px">
                         <p class="title">{{thisMonth?thisMonth:'-'}}月车型停留分析/日均</p>
-                        <div v-if="carTypeTimeData.series.length>0">
+                        <div v-if="carTypeTimeData.series && carTypeTimeData.series.length>0">
                             <car-type-time :data="carTypeTimeData"/>
                             <analyse :analyseInfo="{analysisins_type: 1104,analysisins_format: 2000}"  />
                         </div>
-                        <no-data v-if="!carTypeTimeData.series.length"  :type="'car'"/>
+                        <no-data v-if="!carTypeTimeData.series"  :type="'car'"/>
                     </div>
 
                     <div class="chartsItem" style="margin-top: 32px">
                         <p class="title">{{thisMonth?thisMonth:'-'}}月车型停留分布图/日均</p>
-                        <div  v-if="timeAnalysisData.series.length>0">
+                        <div v-if="timeAnalysisData.series && timeAnalysisData.series.length>0">
                             <time-analysis :data="timeAnalysisData"/>
                             <analyse :analyseInfo="{analysisins_type: 1105,analysisins_format: 2000}"  />
                         </div>
-                        <no-data v-if="!timeAnalysisData.series.length"  :type="'car'"/>
+                        <no-data v-if="!timeAnalysisData.series"  :type="'car'"/>
                     </div>
 
                     <div class="chartsItem" style="margin-top: 32px">
@@ -188,11 +188,11 @@
                                 </view>
                             </div>
                         </div>
-                        <div v-if="percentEntryData.length>0">
+                        <div v-if="percentEntryData && percentEntryData.length>0">
                             <percent-entry :data="percentEntryData" />
                             <analyse :analyseInfo="{analysisins_type: 1106,analysisins_format: 2000}"  />
                         </div>
-                        <no-data v-if="!percentEntryData.length"  :type="'car'"/>
+                        <no-data v-if="!percentEntryData "  :type="'car'"/>
                     </div>
                 </div>
               <div v-else class="otherCharts">
@@ -341,7 +341,7 @@ import MonthTotal from "./components/car/monthTotal.vue";
 import NoData from "./components/noData.vue";
 import Analyse from "./components/analyse.vue";
 import CommercialType from "./commercialType.vue";
-import shopCell from "../everdayRenven/components/listUnit.vue";
+// import shopCell from "../everdayRenven/components/listUnit.vue";
 import EntryRate from "./components/car/entryRate.vue";
 import anhuiYestodayRevenueData from "../everdayRenven/components/anhuiYestodayRevenueData";
 import {getFieldEnum} from "../../util/dateTime";
@@ -363,7 +363,7 @@ export default {
         tabList:[],//选项卡列表
         carTypeList:[],//车型选项卡
         carNumAll : 0,//一共的入区车流数
-        monthTotalList:[],//月累计
+        monthTotalList:{},//月累计
         carData:[],//入区车流的数据
         homePlaceAll:[],//车辆归属地两区总和列表
         homePlace:[],//车辆归属地
@@ -402,7 +402,7 @@ export default {
       }
     },
     components: {
-      shopCell,
+      // shopCell,
       CommercialType,EntryRate,
       Analyse, NoData, PercentEntry, CarTypeTime, HomePlace, EntryZone,timeAnalysis,MonthTotal},
     computed:{
@@ -626,6 +626,7 @@ export default {
               item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}]
               item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':''
           })
+          if (bayonetPie && bayonetPie.length>0){
             for (let i=0;i<=bayonetPie.length-1;i++){
               for (let j=0;j<=bayonetPie.length - i - 1;j++){
                 if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){
@@ -637,14 +638,18 @@ export default {
                 }
               }
             }
+          }
+
           bayonetPie.forEach(item=>{
-            for (let i=0;i<=item.spList.length-1;i++){
-              for (let j=0;j<=item.spList.length - i - 1;j++){
-                if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){
-                  if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){
-                    let temp = item.spList[j]
-                    item.spList[j] = item.spList[j + 1]
-                    item.spList[j + 1] = temp
+            if (item.spList && item.spList.length>0){
+              for (let i=0;i<=item.spList.length-1;i++){
+                for (let j=0;j<=item.spList.length - i - 1;j++){
+                  if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){
+                    if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){
+                      let temp = item.spList[j]
+                      item.spList[j] = item.spList[j + 1]
+                      item.spList[j + 1] = temp
+                    }
                   }
                 }
               }
@@ -976,6 +981,9 @@ export default {
         })
       },
       getHomeData(){
+        uni.showLoading({
+          title:'加载中....'
+        })
           const date = new Date(this.endTime?this.endTime:this.time)
           let y = date.getFullYear()
           let m = date.getMonth() + 1
@@ -1036,6 +1044,7 @@ export default {
               this.homePlace = dataList[this.selectTab]?dataList[this.selectTab]:[]
 
           })
+        uni.hideLoading()
       },
 
       getCityList(ProvinceName,allCount){
@@ -1078,7 +1087,7 @@ export default {
           }).then(res=>{
               let result = res.Result_Data.List
               let series = []
-              if (result.length>0){
+              if (result && result.length>0){
                   result.forEach(item=>{
                       let stayTime = []
                       let stayTimeMax = 0
@@ -1213,7 +1222,7 @@ export default {
           }
           request.$webGet('CommercialApi/Revenue/GetSPBayonetList',req).then(res=>{
               this.percentEntryData = res.Result_Data.List
-              if (this.percentEntryData.length>0){
+              if (this.percentEntryData && this.percentEntryData.length>0){
                   this.allEntry = res.Result_Data.List[0].Entry_Rate
                   this.addAllEntry = res.Result_Data.List[0].Entry_GrowthRate
               }else{
diff --git a/pages/commercialBI/components/car/homePlace.vue b/pages/commercialBI/components/car/homePlace.vue
index 64ae5e9..8438e6e 100644
--- a/pages/commercialBI/components/car/homePlace.vue
+++ b/pages/commercialBI/components/car/homePlace.vue
@@ -92,6 +92,7 @@ export default {
         homeCity:{
             handler(value){
               value.forEach(item=>{
+                console.log('item.rate',item.rate)
                 item.rate = item.rate.toFixed(2) + '%'
               })
               this.progressList = value
diff --git a/pages/commercialBI/components/car/monthTotal.vue b/pages/commercialBI/components/car/monthTotal.vue
index 04e1575..2947fb1 100644
--- a/pages/commercialBI/components/car/monthTotal.vue
+++ b/pages/commercialBI/components/car/monthTotal.vue
@@ -17,12 +17,13 @@ export default {
     props: {
         data: {
             type: Object,
-            default: () => {}
+            default: {}
         }
     },
     watch: {
         data: {
             handler(value) {
+              console.log('val1111ue',value)
                 this.handleCarData(value)
             },
             immediate:true,
@@ -89,9 +90,15 @@ export default {
                 categories: value.categories,
                 series: value.series
             }
-            let config={
+            let config = {
+              carMax:'',
+              moneyMax:''
+            }
+            if (value && value.series && value.series.length>0 ){
+              config={
                 carMax:value.series[0].max > value.series[1].max ? this.getSplitNumber(value.series[0].max):this.getSplitNumber(value.series[1].max),
                 moneyMax:value.series[2].max > value.series[3].max ? this.getSplitNumber(value.series[2].max):this.getSplitNumber(value.series[3].max)
+              }
             }
             this.drawCharts('monthTotal', res, config)
         },
@@ -132,7 +139,7 @@ export default {
                     disableGrid: true,
                     axisLine: false,
                     fontColor: '#777777',
-                    fontSize:data.categories.length<10 ? 13 : 11
+                    fontSize:data.categories && data.categories.length<10 ? 13 : 11
                 },
                 yAxis:{
                     showTitle:true,
diff --git a/pages/commercialBI/components/noData.vue b/pages/commercialBI/components/noData.vue
index c287fa9..0e24df1 100644
--- a/pages/commercialBI/components/noData.vue
+++ b/pages/commercialBI/components/noData.vue
@@ -11,7 +11,6 @@ export default {
     name: "noData",
     data(){
         return {
-          type:''
         }
     },
     props:{
diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue
index 5aaa5f6..87c7f85 100644
--- a/pages/commercialBI/formatPortrait.vue
+++ b/pages/commercialBI/formatPortrait.vue
@@ -1,15 +1,16 @@
 <template>
     <div class="main">
-      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
-        <commercial-type :have="4"/>
-      </div>
+<!--      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--        <commercial-type :have="4"/>-->
+<!--      </div>-->
       <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
 <!--        <commercial-type :have="4"/>-->
       </div>
 <!--        <header-top :bgUrl="bgUrl" :menu="menu" :bgColor="bgColor" :title="title" :analyseInfo="analyseInfo" :topBg="topBg" :page="page" :backType="backType"-->
 <!--                    :serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo"/>-->
-        <div class="header" :style="{height:`${status.screenWidth / 1.37}px`}">
-          <div class="box" :style="{top:(menu.bottom - (menu.height / 2)) + 'px'}">
+<!--        <div class="header" :style="{height:`${status.screenWidth / 1.37}px`}">-->
+        <div class="header" :style="{ height: menu.bottom + 5 + 'px'}">
+          <div class="box" :style="{top:menu.top + (menu.height - 32) / 2 + 'px'}">
             <div class="icon" @click="handleBack">
               <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"></image>
             </div>
@@ -34,7 +35,7 @@
 <!--          </div>-->
         </div>
 
-        <div class="charts" :style="{height:`calc(100vh - ${status.screenWidth / 1.37}px)`}">
+        <div class="charts" :style="{height:`calc(100vh - 85px)`}">
           <div class="top">
             <div :class="selectTab===item.value?'topItem bg':'topItem'" v-for="(item,index) in tabList" :key="index" @click="handleChangeTab(item.value)">
               <image class="icon"  :src="item.img"></image>
@@ -55,7 +56,7 @@
           </div>
 
 <!--          height: calc(100vh - 404px);-->
-          <scroll-view class="list" :style="{height: `calc(100vh - ${status.screenWidth / 1.37}px - 132px)`}" :show-scrollbar="false" scroll-y="true" :scroll-top="scrollTop" @scroll="handleScroll" :scroll-with-animation="true">
+          <scroll-view class="list" :style="{height: `calc(100vh - 400rpx)`}" :show-scrollbar="false" scroll-y="true" :scroll-top="scrollTop" @scroll="handleScroll" :scroll-with-animation="true">
             <div class="listItem" v-for="(item,index) in tableList" :key="index" @click="handleToDetail(item)">
               <div class="left">
                 <image class="logo" :src="item.BRAND_INTRO"></image>
@@ -69,10 +70,11 @@
                 </div>
                 <view style="display: flex;justify-content: flex-end">
                   <div class="suggest" @click.stop="handleShopDetail(item)" v-if="item.MerchantName">
-                    <view style="width: 100%;display: inline-block;text-align: right">
-                      {{item.MerchantName || ''}}
-                    </view>
-                    <!--                  <text class="value">{{item.COMMISSION_RATIO || '-'}}</text>-->
+<!--                    <view style="width: 100%;display: inline-block;text-align: right;font-size: 11px;">-->
+<!--                      {{item.MerchantName || ''}}-->
+<!--                    </view>-->
+                    {{item.MerchantName || '-'}}
+<!--                    <text class="value"></text>-->
                     <!--                  <text class="text">建议提成比例</text>-->
                   </div>
                 </view>
@@ -346,13 +348,14 @@ export default {
     width: 100vw;
     min-height: 100vh;
     background: #fff;
+  background: url("https://eshangtech.com/ShopICO/ahyd-BID/brand/headerBg.svg")no-repeat;
   .header{
-    height: 272px;
+    //height: 272px;
     //background: linear-gradient(135deg, #7660FF 0%, #A0BAFD 31%, #B8D2FF 47%, #CAD9FF 66%, #BCB6FF 100%);
     width: 100vw;
-    background: url("https://eshangtech.com/ShopICO/ahyd-BID/brand/headerBg.svg")no-repeat;
+    //background: url("https://eshangtech.com/ShopICO/ahyd-BID/brand/headerBg.svg")no-repeat;
     background-size: cover;
-    background-position-y: -5px;
+    //background-position-y: -5px;
     .box{
       padding: 0 16px;
       position: absolute;
@@ -360,7 +363,7 @@ export default {
       width: 100%;
       display: flex;
       align-items: center;
-      transform: translateY(-50%);
+      //transform: translateY(-50%);
       .icon{
         width: 24px;
         height: 24px;
@@ -449,7 +452,7 @@ export default {
     border-top-right-radius: 16px;
     overflow: hidden;
     background: #fff;
-    transform: translateY(-16px);
+    //transform: translateY(-16px);
     .top{
       width: 100%;
       height: 100px;
@@ -589,7 +592,7 @@ export default {
           }
         }
         .right{
-          flex:1;
+          width: calc(100% - 100px);
           margin-left: 12px;
           .title{
             display: inline-block;
@@ -610,7 +613,7 @@ export default {
               display: inline-block;
               padding: 1px 8px;
               margin-right: 8px;
-              background: linear-gradient(270deg, rgba(90, 199, 255, 0.15) 0%, rgba(90, 193, 255, 0.15) 100%);
+              //background: linear-gradient(270deg, rgba(90, 199, 255, 0.15) 0%, rgba(90, 193, 255, 0.15) 100%);
               border-radius: 2px;
             }
           }
@@ -618,19 +621,24 @@ export default {
             display: inline-block;
             box-sizing: border-box;
             width: 100%;
+            color: #9D99B0;
             //width: 80%;
             min-height: 25px;
             padding: 0 8px;
-            background: linear-gradient(270deg, RGBA(222, 231, 255, 1) 0%, RGBA(241, 246, 255, 1) 100%);
+            //background: linear-gradient(270deg, RGBA(222, 231, 255, 1) 0%, RGBA(241, 246, 255, 1) 100%);
             border-radius: 2px;
             margin-top: 10px;
+            font-size: 11px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
             .value{
-              font-size: 14px;
-              font-family: DINAlternate-Bold, DINAlternate;
-              font-weight: bold;
-              color: #396CFF;
-              line-height: 16px;
-              margin-right: 4px;
+              font-size: 11px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              text-overflow: ellipsis;
+              overflow: hidden;
+              white-space: nowrap;
             }
             .text{
               font-size: 12px;
diff --git a/pages/index/components/rateCharts.vue b/pages/index/components/rateCharts.vue
index 7f1dbd1..3d35525 100644
--- a/pages/index/components/rateCharts.vue
+++ b/pages/index/components/rateCharts.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="rateMain">
     <image v-if="preferPath" style="width: 144rpx;height: 144rpx" :src="preferPath"></image>
-    <canvas v-if="name"  style="width: 144rpx;height: 144rpx;position:fixed;left: 100%" :canvas-id="name" id="rate"/>
+    <canvas style="width: 144rpx;height: 144rpx;position:fixed;left: 100%" :canvas-id="name" id="rate"/>
   </view>
 </template>
 
@@ -85,7 +85,7 @@ export default {
         },
         extra: {
           ring: {
-            ringWidth: 10,
+            ringWidth: 8,
             activeOpacity: 0.5,
             activeRadius: 10,
             offsetAngle: -90,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1c450f6..ef46ec0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,31 +11,41 @@
       <!--  时间选择  -->
       <div class="headerTop"
            :style="{ height: menu.bottom + 5 + 'px'}">
-        <view class="selectTime" :style="{ top: menu.top + (menu.height - 22) / 2 + 'px' }">
-          <image class="dateIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDateTime.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stDateTime.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stDateTime.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stDateTime.svg'"></image>
-<!--          <picker mode="date" :value="single"  @change="bindDateChange" >-->
-          <picker mode="date" fields="month" :value="single" :start="startDate" :end="endData" @change="bindDateChange" >
-            <view class="time">
-<!--              <text class="day" >{{ thisDay }}</text>-->
-              <view class="uni-input" :style="{color: 1<=selectMonth && selectMonth<=3?'#B33115':4<=selectMonth && selectMonth<=6?'#025B93':7<=selectMonth && selectMonth<=9?'#2249A2':10<=selectMonth && selectMonth<=12?'#783F0F':''}"  style="background: transparent;padding: 0;height:100%">{{ single }}</view>
-              <image class="icon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDownArrow.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stDownArrow.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stDownArrow.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stDownArrow.svg'"></image>
-            </view>
-          </picker>
+<!--        <view class="selectTime" :style="{ top: menu.top + (menu.height - 22) / 2 + 'px' }">-->
+<!--          <image class="dateIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDateTime.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stDateTime.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stDateTime.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stDateTime.svg'"></image>-->
+<!--&lt;!&ndash;          <picker mode="date" :value="single"  @change="bindDateChange" >&ndash;&gt;-->
+<!--          <picker mode="date" fields="month" :value="single" :start="startDate" :end="endData" @change="bindDateChange" >-->
+<!--            <view class="time">-->
+<!--&lt;!&ndash;              <text class="day" >{{ thisDay }}</text>&ndash;&gt;-->
+<!--              <view class="uni-input" :style="{color: 1<=selectMonth && selectMonth<=3?'#B33115':4<=selectMonth && selectMonth<=6?'#025B93':7<=selectMonth && selectMonth<=9?'#2249A2':10<=selectMonth && selectMonth<=12?'#783F0F':''}"  style="background: transparent;padding: 0;height:100%">{{ single }}</view>-->
+<!--              <image class="icon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDownArrow.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stDownArrow.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stDownArrow.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stDownArrow.svg'"></image>-->
+<!--            </view>-->
+<!--          </picker>-->
+<!--        </view>-->
+        <view class="selectTime" :style="{ top: menu.top + (menu.height - 32) / 2 + 'px' ,height:menu.height+'px',marginLeft:'10rpx'}">
+          <view class="searchIconBox">
+            <image style="width:40rpx;height: 40rpx" src="/static/images/tabBar/company_active.png"/>
+<!--            <text class="searchIconText">数智看板</text>-->
+          </view>
+          <view class="seachBox" @click="handleGoMap">
+            <image class="searchIcon" src="/static/images/seach/searchIcon.svg"/>
+            <text class="searchText">请输入想看的服务区</text>
+          </view>
         </view>
       </div>
       <div :style="{height: menu.bottom + 5 + 'px',width:'100%'}"></div>
 
 <!--      ,height:loadMore?'200px':'38px'-->
       <div class="storeDetail"  :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}">
-        <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1280rpx`:`760rpx`}"  @change="handleChangeSelect" :current="selectDetail">
+        <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1340rpx`:`682rpx`}"  @change="handleChangeSelect" :current="selectDetail">
           <block v-for="(item,index) in swiperList" :key="index">
             <swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'">
-              <view class="box" :style="{height: loadMore?selectMonth===index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?`1280rpx`:'760rpx':selectMonth===index+1|| selectMonth === ((index+1)%12===0?12:(index+1)%12)?`760rpx`:'456rpx',background:(1<=(index+1) || 1<=((index + 1)%12===0?12:(index + 1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'#FEB39F':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'#8AC9EA':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'#93B2EF':'#DDB795'}">
+              <view class="box" :style="{height: loadMore?selectMonth===index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?`1340rpx`:'682rpx':selectMonth===index+1|| selectMonth === ((index+1)%12===0?12:(index+1)%12)?`682rpx`:'456rpx',background:(1<=(index+1) || 1<=((index + 1)%12===0?12:(index + 1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'#FEB39F':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'#8AC9EA':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'#93B2EF':'#DDB795'}">
                 <view  class="top" :style="{background:(1<=(index+1) || 1<=((index + 1)%12===0?12:(index + 1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%)':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'linear-gradient(135deg, #D4F7FF 0%, #FFFFFF 29%, #FFFFFF 69%, #CEECFF 100%)':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'linear-gradient(135deg, #D5E8FF 0%, #FFFFFF 29%, #FFFFFF 69%, #D3E0FF 100%)':'linear-gradient(135deg, #FEEBD1 0%, #FFFFFF 29%, #FFFFFF 69%, #FFE7D4 100%)'}">
                   <view style="display: inline-block" @click="goToRevenueStatic">
                     <view class="statistics">
                       <image class="staticImg" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticIcon.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticIcon.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticIcon.svg'"/>
-                      <text class="staticTitle">营收统计</text>
+                      <text class="staticTitle">营收分析</text>
                       <image class="staticIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticMore.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticMore.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticMore.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticMore.svg'"/>
                     </view>
                   </view>
@@ -43,13 +53,13 @@
                     <view class="revenueTop">
                       <view class="revenueTopLeft">
                         <text class="revenueNumber">{{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}}</text>
-                        <view class="moreIcon" @click="changeShowRealBox">?
-                          <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
-                            <view><text class="label">对客营收：</text>{{showTableData.CashPay?$util.fmoney(showTableData.CashPay,2):'-'}}</view>
-                            <view><text class="label">自营收入：</text>{{typeList && typeList.length>0?$util.fmoney(typeList[0].value,2) : '-'}}</view>
-                            <view><text class="label">外租收入：</text>{{typeList && typeList.length>0?$util.fmoney(typeList[1].value,2) : '-'}}</view>
-                          </view>
-                        </view>
+<!--                        <view class="moreIcon" @click="changeShowRealBox">?-->
+<!--                          <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">-->
+<!--                            <view><text class="label">对客营收：</text>{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>-->
+<!--                            <view><text class="label">自营收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>-->
+<!--                            <view><text class="label">外租收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>-->
+<!--                          </view>-->
+<!--                        </view>-->
                       </view>
                       <view class="revenueTopRight" v-if="showTableData.add">
                         <!--https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg-->
@@ -58,7 +68,8 @@
                       </view>
                     </view>
                     <view class="revenueNav">
-                      <text class="leftNav">{{selectMonth}}月对客营收<text class="unit">/万元</text></text>
+<!--                      <text class="leftNav">{{selectMonth}}月对客营收<text class="unit">/万元</text></text>-->
+                      <text class="leftNav">对客营收</text>
                       <text class="rightNav">同比</text>
                     </view>
                     <view class="newBox">
@@ -70,14 +81,15 @@
                         </view>
 
                       </view>
-                      <view class="message">
+                      <view class="message" >
                         <view class="smallDetailItem" style="margin-right: 14px">
                           <view class="messageTop">
                             <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
-                            <text class="typeTitle">自营收入<text class="unit">/万元</text></text>
+                            <text class="typeTitle">自营收入</text>
+<!--                            <text class="unit">/万元</text>-->
                           </view>
-                          <view class="middle" v-if="monthAdd">
-                            <text class="money">{{typeList[0].showValue?$util.fmoney(typeList[0].showValue,2):''}}</text>
+                          <view class="middle" v-if="typeList && typeList.length>0">
+                            <text class="money">{{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}}</text>
                             <view class="addItem">{{monthAdd || ''}}%</view>
                           </view>
                           <view class="messageBottom" v-if="typeList && typeList[0].add">
@@ -89,10 +101,11 @@
                         <view class="smallDetailItem">
                           <view class="messageTop">
                             <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>
-                            <text class="typeTitle">外租收入<text class="unit">/万元</text></text>
+                            <text class="typeTitle">外租收入</text>
+<!--                            <text class="unit">/万元</text>-->
                           </view>
                           <view class="middle">
-                            <text class="money">{{typeList[1].showValue?$util.fmoney(typeList[1].showValue,2):''}}</text>
+                            <text class="money">{{externalMoney?$util.fmoney(externalMoney || 0,2):''}}</text>
                             <!--                        <view class="addItem">+13.18%</view>-->
                           </view>
                           <view class="messageBottom"  v-if="typeList && typeList[1].add">
@@ -103,7 +116,9 @@
                       </view>
                       <view class="moneyRate">
                         <view class="leftBox" @click="handleShowYDModal" v-if="showRateChart">
-                          <rateCharts :success="moneyRateList" :colorList="1<=selectMonth && selectMonth<=3?['#DB573B','#FFAB30']:4<=selectMonth && selectMonth<=6?['#137BBD','#5DC1E0']:7<=selectMonth && selectMonth<=9?['#3663CB','#7CADF8']:['#A66A37','#DCA858']" :name="`${selectMonth}rate`"/>
+                          <view class="rateChartsBox">
+                            <rateCharts :success="moneyRateList" :colorList="1<=selectMonth && selectMonth<=3?['#DB573B','#FFAB30']:4<=selectMonth && selectMonth<=6?['#137BBD','#5DC1E0']:7<=selectMonth && selectMonth<=9?['#3663CB','#7CADF8']:['#A66A37','#DCA858']" :name="`${selectMonth}rate`"/>
+                          </view>
                           <view class="haveNoticeBox" v-if="ydModal" @click.stop="handleShowYDModal">
                             <text class="label">驿达入账:<text class="value">{{ydRate}}%</text></text>
                             <text class="label">商家入账:<text class="value">{{shopRate}}%</text></text>
@@ -112,21 +127,32 @@
                         <view class="rightBox">
                           <view class="noticeItem">
                             <view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
-                            <view class="noticeText">驿达入账<span class="noticeSmallText">/万元</span></view>
-                            <text class="noticeMoney">{{currentPeriodData.Royalty_Theory?$util.fmoney(currentPeriodData.Royalty_Theory / 10000,2):'-'}}</text>
+                            <view class="noticeText">驿达入账</view>
+<!--                            <span class="noticeSmallText">/万元</span>-->
+                            <text class="noticeMoney">{{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}}</text>
                           </view>
                           <view class="noticeItem">
                             <view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>
-                            <view class="noticeText">商家入账<span class="noticeSmallText">/万元</span></view>
-                            <text class="noticeMoney">{{ currentPeriodData.SubRoyalty_Theory?$util.fmoney(currentPeriodData.SubRoyalty_Theory / 10000,2):'-' }}</text>
+                            <view class="noticeText">商家入账</view>
+<!--                            <span class="noticeSmallText">/万元</span>-->
+                            <text class="noticeMoney">{{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }}</text>
                           </view>
                         </view>
                       </view>
-                      <view class="goBusiness">
-                        <view class="bussinessRight" @click="handleGoProject">
-                          <span class="bussinessText">商家欠款</span>
-                          <image class="staticIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticMore.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticMore.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticMore.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticMore.svg'"/>
+                    </view>
+                    <view class="goBusiness">
+                      <!--                        @click="handleGoProject"-->
+                      <view class="bussinessRight" >
+                        <span class="bussinessText">单位 万元</span>
+                        <view class="moreIcon" @click="changeShowRealBox">?
+                          <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
+                            <view><text class="label">对客营收：</text>{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>
+                            <view><text class="label">自营收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>
+                            <view><text class="label">外租收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>
+                          </view>
                         </view>
+                        <!--                          <span class="bussinessText">商家欠款</span>-->
+                        <!--                          <image class="staticIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticMore.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticMore.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticMore.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticMore.svg'"/>-->
                       </view>
                     </view>
                   </view>
@@ -229,48 +255,84 @@
 
                       <view class="otherDetailBottom">
                         <view class="bottomItem" @click="handleShowTrafficDetail" style="margin-bottom: 16rpx">
-                          <view class="itemLeft">
-                            <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryCar.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryCar.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryCar.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryCar.svg'"/>
-                            <text class="itemTitle">入区车流</text>
+                          <view class="bottomSmallItem">
+                            <view class="itemLeft">
+                              <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryCar.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryCar.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryCar.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryCar.svg'"/>
+                              <text class="itemTitle">入区车流</text>
+                            </view>
+                            <view class="itemCenter">
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficCurrentObj.Vehicle_AddUpCount?trafficCurrentObj.AddUpCount:''}}</text>
+                              <text  class="itemText">{{`/${trafficeUnit || '-'}`}}</text>
+                            </view>
                           </view>
-                          <view class="itemCenter">
-                            <text class="itemValue">{{trafficYOYObj.Vehicle_GrowthRate?trafficYOYObj.Vehicle_GrowthRate>0?'+'+trafficYOYObj.Vehicle_GrowthRate+'%':trafficYOYObj.Vehicle_GrowthRate+'%':'-'}}</text>
-                            <text  class="itemText">/同比</text>
-                          </view>
-                          <view class="itemRight">
-                            <text class="itemValue">{{trafficQOQObj.Vehicle_GrowthRate?trafficQOQObj.Vehicle_GrowthRate>0?'+'+trafficQOQObj.Vehicle_GrowthRate+'%':trafficQOQObj.Vehicle_GrowthRate+'%':'-'}}</text>
-                            <text class="itemText">/环比</text>
+                          <view class="bottomSmallItem">
+                            <view class="itemLeft">
+
+                            </view>
+                            <view class="itemCenter">
+                              <text class="itemValue">{{trafficYOYObj.Vehicle_GrowthRate?trafficYOYObj.Vehicle_GrowthRate>0?'+'+trafficYOYObj.Vehicle_GrowthRate+'%':trafficYOYObj.Vehicle_GrowthRate+'%':'-'}}</text>
+                              <text  class="itemText">/同比</text>
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficQOQObj.Vehicle_GrowthRate?trafficQOQObj.Vehicle_GrowthRate>0?'+'+trafficQOQObj.Vehicle_GrowthRate+'%':trafficQOQObj.Vehicle_GrowthRate+'%':'-'}}</text>
+                              <text class="itemText">/环比</text>
+                            </view>
                           </view>
                         </view>
 
                         <view class="bottomItem" @click="handleShowTrafficDetail"  style="margin-bottom: 16rpx">
-                          <view class="itemLeft">
-                            <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryRate.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryRate.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryRate.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryRate.svg'"/>
-                            <text class="itemTitle">入区率</text>
+                          <view class="bottomSmallItem">
+                            <view class="itemLeft">
+                              <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryRate.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryRate.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryRate.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryRate.svg'"/>
+                              <text class="itemTitle">入区率</text>
+                            </view>
+                            <view class="itemCenter">
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficCurrentObj.Entry_Rate?trafficCurrentObj.Entry_Rate + '%':''}}</text>
+                            </view>
                           </view>
-                          <view class="itemCenter">
-                            <text class="itemValue">{{trafficYOYObj.Entry_GrowthRate?trafficYOYObj.Entry_GrowthRate>0?'+'+trafficYOYObj.Entry_GrowthRate+'%':trafficYOYObj.Entry_GrowthRate+'%':'-'}}</text>
-                            <text  class="itemText">/同比</text>
-                          </view>
-                          <view class="itemRight">
-                            <text class="itemValue">{{trafficQOQObj.Entry_GrowthRate?trafficQOQObj.Entry_GrowthRate>0?'+'+trafficQOQObj.Entry_GrowthRate+'%':trafficQOQObj.Entry_GrowthRate+'%':'-'}}</text>
-                            <text class="itemText">/环比</text>
+                          <view  class="bottomSmallItem">
+                            <view class="itemLeft">
+                            </view>
+                            <view class="itemCenter">
+                              <text class="itemValue">{{trafficYOYObj.Entry_GrowthRate?trafficYOYObj.Entry_GrowthRate>0?'+'+trafficYOYObj.Entry_GrowthRate+'%':trafficYOYObj.Entry_GrowthRate+'%':'-'}}</text>
+                              <text  class="itemText">/同比</text>
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficQOQObj.Entry_GrowthRate?trafficQOQObj.Entry_GrowthRate>0?'+'+trafficQOQObj.Entry_GrowthRate+'%':trafficQOQObj.Entry_GrowthRate+'%':'-'}}</text>
+                              <text class="itemText">/环比</text>
+                            </view>
                           </view>
                         </view>
 
                         <view class="bottomItem" @click="handleShowTrafficDetail">
-                          <view class="itemLeft">
-                            <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryFix.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryFix.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryFix.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryFix.svg'"/>
-                            <text class="itemTitle">停留时长</text>
+                          <view class="bottomSmallItem">
+                            <view class="itemLeft">
+                              <image class="leftIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stEntryFix.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stEntryFix.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stEntryFix.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stEntryFix.svg'"/>
+                              <text class="itemTitle">停留时长</text>
+                            </view>
+                            <view class="itemCenter">
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficCurrentObj.Stay_Times?trafficCurrentObj.Stay_Times + '分钟':''}}</text>
+                            </view>
                           </view>
-                          <view class="itemCenter">
-                            <text class="itemValue">{{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}}</text>
-                            <text  class="itemText">/同比</text>
-                          </view>
-                          <view class="itemRight">
-                            <text class="itemValue">{{trafficQOQObj.StayTimes_GrowthRate?trafficQOQObj.StayTimes_GrowthRate>0?'+'+trafficQOQObj.StayTimes_GrowthRate+'%':trafficQOQObj.StayTimes_GrowthRate+'%':'-'}}</text>
-                            <text class="itemText">/环比</text>
+                          <view  class="bottomSmallItem">
+                            <view class="itemLeft">
+                            </view>
+                            <view class="itemCenter">
+                              <text class="itemValue">{{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}}</text>
+                              <text  class="itemText">/同比</text>
+                            </view>
+                            <view class="itemRight">
+                              <text class="itemValue">{{trafficQOQObj.StayTimes_GrowthRate?trafficQOQObj.StayTimes_GrowthRate>0?'+'+trafficQOQObj.StayTimes_GrowthRate+'%':trafficQOQObj.StayTimes_GrowthRate+'%':'-'}}</text>
+                              <text class="itemText">/环比</text>
+                            </view>
                           </view>
+
                         </view>
 
                         <view class="monthDetail" @click.stop="handleShowTrafficDetail" v-if="showMonthDetail">
@@ -614,7 +676,7 @@
           </view>
 
           <view class="chart">
-            <div v-show="selectTab===1" v-if="regionProgress.length>0">
+            <div v-show="selectTab===1" v-if="regionProgress && regionProgress.length>0">
               <div>
                 <div class="operation-c-list" v-for="(item,o) in regionProgress" :key="o" :style="{marginBottom:o===regionProgress.length?'0px':''}">
                   <div class="top">
@@ -636,7 +698,7 @@
                 </div>
               </div>
             </div>
-            <div v-show="selectTab===2" v-if="areaProgress.length>0">
+            <div v-show="selectTab===2" v-if="areaProgress && areaProgress.length>0">
               <div>
                 <div class="operation-c-list" v-for="(item,o) in areaProgress" :key="o" :style="{marginBottom:o===regionProgress.length?'0px':''}">
                   <div class="top">
@@ -931,6 +993,7 @@ export default {
       trafficQOQObj:{},// 环比对象
       trafficYOYObj:{},// 同比对象
       trafficCurrentObj:{},// 当前月
+      trafficeUnit:'',// 单位
       showMonthDetail:false,//月度车流的显示框
       yesObjCompared:'',//昨日营收的比较值
       moneyRateList:[],
@@ -939,6 +1002,8 @@ export default {
       ydRate:'',// 驿达百分比
       shopRate:'',// 商家百分比
       showRateChart:true,// 显示百分比表格
+      revenueMoney:'',// 自营收入
+      externalMoney:'',// 外租收入
     }
   },
   watch:{
@@ -1511,7 +1576,7 @@ export default {
         ShowCount:20
       }
       request.$webGet('CommercialApi/BigData/GetBayonetWarning',req).then(res=>{
-        if (res.Result_Data.List.length>0){
+        if (res.Result_Data.List && res.Result_Data.List.length>0){
           this.special = true
         }
         res.Result_Data.List.forEach(item=>{
@@ -1532,6 +1597,9 @@ export default {
         this.warningList = list.slice(0,3)
       })
     },
+    handleGoMap(){
+      this.$util.toNextRoute('navigateTo', '/pages/map/index?type=index')
+    },
     handleReg(){
       this.$util.toNextRoute('redirectTo', '/pages/register/register')
     },
@@ -1666,17 +1734,25 @@ export default {
         const date = new Date(this.lastDay)
         // let y = date.getFullYear()
         // let m = e.detail.current + 1
-        // if(m<10){
-        //   m='0'+m
-        // }
+        if(m<10){
+          m='0'+m
+        }
         this.single = `${2023+y}-${m}`
         this.showTableData = null
+        this.currentPeriodData = null
         // this.yesObj = null
         this.typeList = []
+        this.revenueMoney = ''
+        this.externalMoney = ''
         this.carInfo = null
         this.examineObj = null
+        this.trafficCurrentObj = null
+        this.trafficeUnit = null
+        this.trafficYOYObj = null
+        this.trafficQOQObj = null
         this.dailyExamineObj = null
         this.monthAdd = null
+        console.log('this.typeList',this.typeList)
         // 月份详情卡片的详情
         this.initYesterdayData(this.selectMonth!==date.getMonth()+1)
         // 自营计划
@@ -1782,6 +1858,7 @@ export default {
       this.$util.toNextRoute('navigateTo', `/pages/newamine/index?come=index&type=${type}&time=${this.single}`)
     },
     async initYesterdayData(type,str){
+      this.typeList= []
       // type 判断如果是滑动的 就是true  日期就传空  别的地方调用 默认传入时间
       let flag3 = false
       // 获取营收推送汇总数据 老的
@@ -1791,8 +1868,10 @@ export default {
       //   ShowCompareRate: true,
       //   ShowYearRevenue: true
       // }
+      console.log('this.single',this.single)
       const nowDate = new Date(this.single)
       let month = JSON.parse(JSON.stringify(this.selectMonth))
+      console.log('nowDate.getFullYear()',nowDate.getFullYear())
       if (month<10){
         month = '0'+ month
       }
@@ -1834,6 +1913,7 @@ export default {
         this.currentPeriodData = result.MonthRevenueModel.CurAccountRoyalty
         this.moneyRateList = [this.currentPeriodData.Royalty_Theory,this.currentPeriodData.SubRoyalty_Theory]
         let sum = this.currentPeriodData.Royalty_Theory+this.currentPeriodData.SubRoyalty_Theory
+        console.log('currentPeriodData',this.currentPeriodData)
         if(sum===0){
           this.ydRate = '-'
           this.shopRate = '-'
@@ -1841,7 +1921,7 @@ export default {
           this.ydRate = ((this.currentPeriodData.Royalty_Theory / sum)*100).toFixed(2)
           this.shopRate = ((this.currentPeriodData.SubRoyalty_Theory / sum)*100).toFixed(2)
         }
-
+        console.log('result.BusinessTypeList',result.BusinessTypeList)
         result.BusinessTypeList.forEach(item=>{
           progressAll+=Number(item.value)
           let index = (item.value /10000).toString().indexOf('.')
@@ -1870,6 +1950,8 @@ export default {
           }
         })
         this.typeList = result.BusinessTypeList
+        this.revenueMoney = result.BusinessTypeList[0].showValue
+        this.externalMoney = result.BusinessTypeList[1].showValue
 
         this.progressObj={
           owner:Number(((this.typeList[0].value / progressAll)*100).toFixed(2)),
@@ -1897,6 +1979,7 @@ export default {
 
 
         this.showTableData = result.MonthRevenueModel
+        console.log('result.MonthRevenueModel',result.MonthRevenueModel)
         if (this.showTableData.RevenueYOY){
           this.showTableData.add = Number(((this.showTableData.CashPay-this.showTableData.RevenueYOY)/this.showTableData.RevenueYOY*100).toFixed(2))
           this.showTableData.add = this.showTableData.add>0?'+'+this.showTableData.add:this.showTableData.add
@@ -1982,13 +2065,24 @@ export default {
         Statistics_Date:time
       }
       request.$webGet('CommercialApi/Revenue/GetProvinceAvgBayonetAnalysis',req).then(res=>{
+        console.log('res11121212',res)
         res.Result_Data.List.forEach(item=>{
           if (item.Serverpart_Name==='QOQ'){
             this.trafficQOQObj = item
           }else if(item.Serverpart_Name==='YOY'){
             this.trafficYOYObj = item
           }else{
+            console.log('this.trafficCurrentObj',this.trafficCurrentObj)
             this.trafficCurrentObj = item
+            if (this.trafficCurrentObj.Vehicle_AddUpCount / 1000000 >=1){
+              this.trafficCurrentObj.AddUpCount = this.$util.fmoney(this.$util.getMoney(this.trafficCurrentObj.Vehicle_AddUpCount/1000000),2)
+              this.trafficeUnit = '百万辆'
+            }else if (this.trafficCurrentObj.Vehicle_AddUpCount / 10000>=1){
+              this.trafficCurrentObj.AddUpCount = this.$util.fmoney(this.$util.getMoney(this.trafficCurrentObj.Vehicle_AddUpCount/10000),2)
+              this.trafficeUnit = '万辆'
+            }else{
+              this.trafficCurrentObj.AddUpCount = this.trafficCurrentObj.Vehicle_AddUpCount
+            }
           }
         })
         this.showRateChart = true
@@ -2149,7 +2243,7 @@ export default {
        console.log('this.showTableData.CashPay',this.showTableData.CashPay)
        let number = this.showTableData.CashPay / 10000
        console.log('number',number)
-       this.showTableData.CashPayChange = this.$util.fmoney(number,2)
+       this.showTableData.CashPayChange = this.$util.fmoney(this.$util.getMoney(number),2)
        // for (let key in this.showTableData){
         //   if (this.showTableData[key]){
         //     // 在有值的前提下
@@ -2243,10 +2337,41 @@ $iphoneHeight: env(safe-area-inset-bottom);
         position: absolute;
         display: flex;
         align-items: center;
-        .dateIcon {
-          width: 16px;
-          height: 16px;
-          margin-right: 4px;
+        .searchIconBox{
+          display: flex;
+          align-items: center;
+          .dateIcon {
+            width: 16px;
+            height: 16px;
+            margin-right: 4px;
+          }
+          .searchIconText{
+            font-size: 28rpx;
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 600;
+            color: #160002;
+            line-height: 40rpx;
+          }
+        }
+        .seachBox{
+          width: 350rpx;
+          height: 100%;
+          background: #fff;
+          border-radius: 32rpx;
+          margin-left: 16rpx;
+          box-sizing: border-box;
+          padding: 10rpx 20rpx;
+          display: flex;
+          align-items: center;
+            .searchIcon{
+              width: 32rpx;
+              height: 32rpx;
+              margin-right: 12rpx;
+            }
+          .searchText{
+            font-size: 28rpx;
+            color: #A69E9F;
+          }
         }
         .time {
           display: flex;
@@ -2310,7 +2435,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
               background: rgba(254, 192, 168,0.8);
               .top{
                 width: 100%;
-                height: 690rpx;
+                height: 610rpx;
                 background: linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%);
                 border-bottom-right-radius: 32rpx;
                 border-bottom-left-radius: 32rpx;
@@ -2406,7 +2531,8 @@ $iphoneHeight: env(safe-area-inset-bottom);
                       font-size: 28rpx;
                       font-family: PingFangSC-Regular, PingFang SC;
                       font-weight: 400;
-                      color: #160002;
+                      //color: #160002;
+                      color: #A69E9F;
                       line-height: 40rpx;
                       .unit{
                         font-size: 28rpx;
@@ -2429,12 +2555,12 @@ $iphoneHeight: env(safe-area-inset-bottom);
                   .newBox{
                     width: 100%;
                     box-sizing: border-box;
-                    padding: 32rpx 16rpx 0;
+                    padding: 16rpx 16rpx 0;
                     //background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%);                    border-radius: 16rpx;
-                    margin-top: 32rpx;
+                    //margin-top: 32rpx;
                     .progress{
                       width: 100%;
-                      height: 24rpx;
+                      height: 18rpx;
                       border-radius: 12rpx;
                       background: #FFAB30;
                       //overflow: hidden;
@@ -2463,7 +2589,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                     .message{
                       width: 100%;
                       display: flex;
-                      margin-top: 32rpx;
+                      margin-top: 16rpx;
                       .smallDetailItem{
                         width: 50%;
                         .messageTop{
@@ -2541,7 +2667,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                     .moneyRate{
                       width: 100%;
                       box-sizing: border-box;
-                      margin-top: 40rpx;
+                      margin-top: 16rpx;
                       height: 144rpx;
                       display: flex;
                       align-items: center;
@@ -2550,6 +2676,10 @@ $iphoneHeight: env(safe-area-inset-bottom);
                         height: 144rpx;
                         margin-right: 16rpx;
                         position: relative;
+                        .rateChartsBox{
+                          width: 144rpx;
+                          height: 144rpx;
+                        }
                         .haveNoticeBox{
                           position: absolute;
                           bottom: 0;left: 0;
@@ -2604,27 +2734,52 @@ $iphoneHeight: env(safe-area-inset-bottom);
                         }
                       }
                     }
-                    .goBusiness{
-                      width: 100%;
+                  }
+                  .goBusiness{
+                    width: 100%;
+                    display: flex;
+                    justify-content: flex-end;
+                    .bussinessRight{
                       display: flex;
-                      justify-content: flex-end;
-                      .bussinessRight{
+                      align-items: center;
+                      .bussinessText{
+                        font-size: 28rpx;
+                        font-family: PingFangSC-Regular, PingFang SC;
+                        font-weight: 400;
+                        color: #A69E9F;
+                        line-height: 40rpx;
+                        margin: 0 4px;
+                      }
+                      .moreIcon{
+                        width: 12px;
+                        height: 12px;
                         display: flex;
                         align-items: center;
-                        .bussinessText{
-                          font-size: 28rpx;
-                          font-family: PingFangSC-Semibold, PingFang SC;
-                          font-weight: 400;
-                          color: #A69E9F;
-                          line-height: 40rpx;
-                          margin: 0 4px;
-                        }
-                        .staticIcon{
-                          width: 32rpx;
-                          height: 32rpx;
-                          opacity: 0.25;
+                        justify-content: center;
+                        border: 2px solid #A69E9F;
+                        border-radius: 50%;
+                        color: #A69E9F;
+                        font-size: 12px;
+                        font-weight: 600;
+                        margin-left: 6px;
+                        position: relative;
+                        .realBox{
+                          position: absolute;
+                          //left: 0;top: 0;
+                          right: 0;bottom: 0;
+                          display: inline-block;
+                          padding: 5px 10px;
+                          background: #fff;
+                          border-radius: 10rpx;
+                          box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
+                          z-index:9;
                         }
                       }
+                      .staticIcon{
+                        width: 32rpx;
+                        height: 32rpx;
+                        opacity: 0.25;
+                      }
                     }
                   }
                 }
@@ -2757,9 +2912,12 @@ $iphoneHeight: env(safe-area-inset-bottom);
                       margin-top: 40rpx;
                       position: relative;
                       .bottomItem{
-                        display: flex;
-                        align-items: center;
-                        justify-content: space-between;
+                        width: 100%;
+                        .bottomSmallItem{
+                          width: 100%;
+                          display: flex;
+                          align-items: center;
+                        }
                         .itemLeft{
                           width: 140rpx;
                           display: flex;
diff --git a/pages/map/index.vue b/pages/map/index.vue
index b477dee..6da6252 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -29,7 +29,10 @@
           <div class="serviceList" :style="{height:isMoveUp?`calc(100vh - 90px - ${menu.bottom + 5}px)`:''}">
               <div class="serviceItem" v-for="(item,index) in serviceList" :key="index" @click="handleGoDetail(item.SERVERPART_ID,item)">
                   <div class="topItem">
+                    <view class="leftItem">
                       <p class="title">{{item.SERVERPART_NAME }}</p>
+                      <view class="typeBox">{{serviceTypeObj[item.SERVERPART_TYPE]}}</view>
+                    </view>
                       <div class="box">
                           <div class="imgBox">
                               <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/service/phone.svg"></image>
@@ -63,6 +66,7 @@
 
 <script>
 import request from '@/util/index.js'
+import {getFieldEnum} from "../../util/dateTime";
 export default {
     name: "index",
     data(){
@@ -85,7 +89,9 @@ export default {
             markers:'',//地图属性
             covers:'',//地图属性
             area:'',//当前选中片区名称
-            serviceInfo:{}
+            serviceInfo:{},
+          type:'',// 哪里进来
+          serviceTypeObj:{}
         }
     },
     onLoad(option){
@@ -105,11 +111,15 @@ export default {
                 this.getServiceList()
             }
         })
+      if (option.serviceInfo){
         this.serviceInfo = JSON.parse(option.serviceInfo)
+      }
         if (option.chartType){
             this.chartType = true
         }
         this.page = option.page
+        this.type = option.type
+      console.log('type',this.type)
     },
     onShow(){
         let seat = uni.getStorageSync('currentService')
@@ -133,7 +143,8 @@ export default {
         this.menu = uni.getMenuButtonBoundingClientRect()
         // 地图初始化
         this.mapCtx = uni.createMapContext('myMap')
-
+      // 服务区类型枚举
+      this.handleServiceType()
         // this.getLocation()
         // this.getListData()
     },
@@ -157,6 +168,17 @@ export default {
         }
     },
     methods:{
+      // 枚举服务区类型 SERVERPART_TYPE
+      async handleServiceType(){
+        const data = await getFieldEnum({ FieldExplainField: 'SERVERPART_TYPE' });
+        console.log('data',data)
+        let obj = {}
+        data.forEach(item=>{
+          obj[Number(item.value)] = item.label
+        })
+        console.log('obj',obj)
+        this.serviceTypeObj = obj
+      },
         //跳转到腾讯地图
         handleGomap(item){
             let seat = uni.getStorageSync('seatInfo')
@@ -199,10 +221,14 @@ export default {
             }
             const data = await request.$webGet('CommercialApi/BaseInfo/GetSPRegionList',req)
             console.log('data123',data)
-            let list = [{name:'安徽驿达',value:'0'}]
+            let list = []
             data.Result_Data.List.forEach(item=>{
               list.push({name:item.name,value:item.value})
             })
+            // let list = [{name:'安徽驿达',value:'0'}]
+            // data.Result_Data.List.forEach(item=>{
+            //   list.push({name:item.name,value:item.value})
+            // })
             this.array = list
             if (this.area){
                 this.array.forEach((item,index)=>{
@@ -264,19 +290,23 @@ export default {
             }
             uni.setStorageSync('currentService',res) //当前选中服务区信息
             let pageList = getCurrentPages()
+          if (this.type==='index'){
+            this.$util.toNextRoute('navigateTo', `/pages/map/detail`)
+          }else{
             if (this.chartType){
-                if (pageList.length>2){
-                    uni.navigateBack({
-                        delta: 1
-                    })
-                }
+              if (pageList.length>2){
+                uni.navigateBack({
+                  delta: 1
+                })
+              }
             }else{
-                if (pageList.length>2){
-                    uni.navigateBack({
-                        delta: 1
-                    })
-                }
+              if (pageList.length>2){
+                uni.navigateBack({
+                  delta: 1
+                })
+              }
             }
+          }
         },
         async getListData(){
           let id
@@ -467,6 +497,9 @@ export default {
                   display: flex;
                   justify-content: space-between;
                   align-items: center;
+                .leftItem{
+                  display: flex;
+                  align-items: center;
                   .title{
                     font-size: 14px;
                     font-family: PingFangSC-Semibold, PingFang SC;
@@ -474,6 +507,19 @@ export default {
                     color: #160002;
                     line-height: 20px;
                   }
+                  .typeBox{
+                    background: linear-gradient(180deg, rgba(49, 144, 255, 0.2) 0%, rgba(22, 87, 255, 0.2) 100%);
+                    border-radius: 8rpx;
+                    padding: 0 16rpx;
+                    font-size: 28rpx;
+                    font-family: PingFangSC, PingFang SC;
+                    font-weight: 400;
+                    color: #1E67FF;
+                    line-height: 40rpx;
+                    margin-left: 16rpx;
+                  }
+                }
+
                   .box{
                       display: flex;
                       align-items: center;
diff --git a/static/images/seach/searchIcon.svg b/static/images/seach/searchIcon.svg
new file mode 100644
index 0000000..b41ec63
--- /dev/null
+++ b/static/images/seach/searchIcon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703491182126" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4271" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M851.710029 803.043632c67.147306-78.301344 107.720374-180.059935 107.720373-291.298435 0-247.27171-200.453405-447.724091-447.724091-447.724091S63.981197 264.473487 63.981197 511.745197s200.453405 447.724091 447.724091 447.724091c111.2385 0 212.997092-40.573067 291.298435-107.720374l97.632622 97.632621c13.449313 13.449313 35.255968 13.449313 48.706305 0 13.449313-13.449313 13.449313-35.255968 0-48.706305l-97.632621-97.631598z m-67.805292-19.10001l-22.499434 19.294439c-34.062793 29.209252-72.504314 52.006468-114.25623 67.759243-43.206034 16.301268-88.775906 24.566512-135.441739 24.566512-102.521978 0-198.907189-39.924291-271.40127-112.417349s-112.417349-168.879292-112.417349-271.40127 39.924291-198.907189 112.417349-271.40127S409.184333 127.926578 511.706311 127.926578c102.521978 0 198.907189 39.924291 271.40127 112.417349s112.417349 168.879292 112.417349 271.40127c0 46.666856-8.265244 92.236727-24.566512 135.441738-15.752776 41.75294-38.549991 80.193437-67.759243 114.256231l-19.294438 22.500456z" p-id="4272" fill="#1890ff"></path></svg>
\ No newline at end of file