diff --git a/pages.json b/pages.json
index 84b3ed2..e2084ba 100644
--- a/pages.json
+++ b/pages.json
@@ -319,6 +319,7 @@
                 {
                     "path": "detail",
                     "style": {
+                        "navigationStyle": "custom",
                         "navigationBarTitleText": ""
                     }
                 }
diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue
index b466b0b..8deb502 100644
--- a/pages/commercialBI/businessPortrait.vue
+++ b/pages/commercialBI/businessPortrait.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="main">
-      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
-        <commercial-type :have="3"/>
-      </div>
-        <header-top :bgUrl="bgUrl" :menu="menu" :bgColor="bgColor" :title="title" :analyseInfo="analyseInfo" :topBg="topBg" :page="page" :backType="backType"
+<!--      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--        <commercial-type :have="3"/>-->
+<!--      </div>-->
+        <header-top ref="headerTop" :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"
                     :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
-                    :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj"/>
+                    :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/>
 
         <div class="charts">
             <div class="chartsItem">
@@ -110,6 +110,7 @@ export default {
             bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/businessPortraitBg.svg',//背景图片路径
             page:'/pages/commercialBI/businessPortrait',
 
+            pageType:3000,
             detailBoxBg:'linear-gradient(136deg, #F6F2E9 0%, #FFFFFF 100%);',
             topLeftBg:'linear-gradient(180deg, rgba(255, 186, 7, 0.2) 0%, rgba(243, 131, 9, 0.2) 100%)',// 类别背景
             topLeftColor:'#F38609',// 类别文字颜色
@@ -199,11 +200,15 @@ export default {
         this.getBestsellerList()
       //   服务区基本信息
       this.getServiceInfo()
+      this.handleChangeCurrent()
     },
     onUnload() {
         this.$util.addUserBehavior()
     },
     methods:{
+      handleChangeCurrent(){
+        this.$refs.headerTop.handleChangeCurrent()
+      },
         onRefresh(){
             //交易分析
             this.getTransactionList()
diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue
index 64aa214..6d39d78 100644
--- a/pages/commercialBI/carPortrait.vue
+++ b/pages/commercialBI/carPortrait.vue
@@ -1,105 +1,154 @@
 <template>
   <div>
-    <div style="position: fixed;right: 0;top: 15%;z-index:99999999999">
-    <!--  组件通过传入的have去判断组件在哪个页面 然后哪个页面的标志就不显示  -->
-      <commercial-type :have="0" :time="searchText"/>
-    </div>
+<!--    <div style="position: fixed;right: 0;top: 15%;z-index:99999999999">-->
+<!--    &lt;!&ndash;  组件通过传入的have去判断组件在哪个页面 然后哪个页面的标志就不显示  &ndash;&gt;-->
+<!--      <commercial-type :have="0" :time="searchText"/>-->
+<!--    </div>-->
           <div class="main" v-if="isHaveData">
-              <div v-if="!isShowAllProvince" class="header" :style="{backgroundImage: 'url('+ 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/car.svg' +')'}">
-                  <div class="analyse" v-if="analyseText">
-                      <text class="title">分析</text>
-                      <text class="content">{{analyseText}}</text>
-                  </div>
-                  <div class="headerTop" :style="{height:(menu.bottom + 6) + 'px'}">
-                      <div class="box" :style="{top:(menu.bottom - (menu.height / 2)) + 'px'}">
-                          <div class="icon" @click="handleBack">
-                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"></image>
-                          </div>
-                          <text class="title">车流画像</text>
-                          <!--  占位  -->
-                          <div class="seize"></div>
+              <swiper class="swiperBox" :current="currentSwiper" @change="changeSwiper">
+                <swiper-item class="swiperItem" v-for="(item,index) in carSwiperList" :key="index">
+                  <view v-if="item!=='previous' && item!=='next'">
+                    <div v-if="!isShowAllProvince" class="header" :style="{backgroundImage: 'url('+ 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/car.svg' +')'}">
+                      <div class="analyse" v-if="analyseText">
+                        <text class="title">分析</text>
+                        <text class="content">{{analyseText}}</text>
                       </div>
-                  </div>
-                  <div class="serviceArea" :style="{top : (menu.bottom + 14) + 'px'}" >
-                      <div class="picker" @click="handleGoSelectService">
-                          <div class="selectService">
+                      <div class="headerTop" :style="{height:(menu.bottom + 6) + 'px'}">
+                        <div class="box" :style="{top:(menu.bottom - (menu.height / 2)) + 'px'}">
+                          <div class="icon" @click="handleBack">
+                            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"></image>
+                          </div>
+<!--                          <text class="title">车流画像</text>-->
+                          <div class="pickerTop" @click="handleGoSelectService">
+                            <div class="selectService">
                               <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
                               <view class="select">
-                                  <view class="content">
-                                      <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>
-                                      <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>
-                                      <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
-                                  </view>
+                                <view class="content">
+                                  <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>
+                                  <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>
+                                  <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+                                </view>
                               </view>
+                            </div>
                           </div>
+
+                          <!--  占位  -->
+                          <div class="seize"></div>
+                        </div>
                       </div>
-<!--                      <div class="other">-->
-<!--                          <div class="label">-->
-<!--                              <div v-for="(item,index) in labelList" :key="index" :class="index===0?'item0 item':index===1?'item1 item':index===2?'item2 item':index===3?'item3 item':index===4?'item4 item':'item'">-->
-<!--                                  {{item}}-->
-<!--                              </div>-->
+                      <div class="serviceArea" :style="{top : (menu.bottom + 14) + 'px'}" >
+<!--                        <div class="picker" @click="handleGoSelectService">-->
+<!--                          <div class="selectService">-->
+<!--                            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>-->
+<!--                            <view class="select">-->
+<!--                              <view class="content">-->
+<!--                                <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>-->
+<!--                                <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>-->
+<!--                                <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>-->
+<!--                              </view>-->
+<!--                            </view>-->
 <!--                          </div>-->
-<!--                      </div>-->
-                    <div class="detailBox">
-                      <div class="detailTop">
-                        <div class="topLeft">{{serviceTypeObj[serviceInfoObj.SERVERPART_TYPE]}}</div>
-                        <div class="topRight" @click="handleGoServiceMessage">
-                          <span class="rightText">查看更多</span>
-                          <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
-                        </div>
-                      </div>
-                      <div class="functionList">
-                        <div class="functionItem">
-                          <image class="haveFun" :src="haveFun.car?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
-                          <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carCarIcon.svg"/>
-                          <text class="funText">司机之家</text>
-                        </div>
-                        <div class="functionItem">
-                          <image class="haveFun" :src="haveFun.charge?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
-                          <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carCharge.svg"/>
-                          <text class="funText">充电桩</text>
-                        </div>
-                        <div class="functionItem">
-                          <image class="haveFun" :src="haveFun.bady?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
-                          <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carBady.svg"/>
-                          <text class="funText">母婴室</text>
-                        </div>
-                        <div class="functionItem">
-                          <image class="haveFun" :src="haveFun.gusetHome?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
-                          <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carGuestRoom.svg"/>
-                          <text class="funText">客房</text>
+<!--                        </div>-->
+
+                        <!--                      <div class="other">-->
+                        <!--                          <div class="label">-->
+                        <!--                              <div v-for="(item,index) in labelList" :key="index" :class="index===0?'item0 item':index===1?'item1 item':index===2?'item2 item':index===3?'item3 item':index===4?'item4 item':'item'">-->
+                        <!--                                  {{item}}-->
+                        <!--                              </div>-->
+                        <!--                          </div>-->
+                        <!--                      </div>-->
+                        <div class="detailBox">
+                          <div class="detailTop">
+                            <div class="topLeft">{{serviceTypeObj[serviceInfoObj.SERVERPART_TYPE]}}</div>
+                            <div class="topRight" @click="handleGoServiceMessage">
+                              <span class="rightText">查看更多</span>
+                              <img class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
+                            </div>
+                          </div>
+                          <div class="functionList">
+                            <div class="functionItem">
+                              <image class="haveFun" :src="haveFun.car?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
+                              <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carCarIcon.svg"/>
+                              <text class="funText">司机之家</text>
+                            </div>
+                            <div class="functionItem">
+                              <image class="haveFun" :src="haveFun.charge?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
+                              <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carCharge.svg"/>
+                              <text class="funText">充电桩</text>
+                            </div>
+                            <div class="functionItem">
+                              <image class="haveFun" :src="haveFun.bady?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
+                              <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carBady.svg"/>
+                              <text class="funText">母婴室</text>
+                            </div>
+                            <div class="functionItem">
+                              <image class="haveFun" :src="haveFun.gusetHome?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carHave.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carNoHave.svg'"/>
+                              <image class="carIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carGuestRoom.svg"/>
+                              <text class="funText">客房</text>
+                            </div>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-              </div>
-              <div v-if="isShowAllProvince" class="headerTop" >
-                <div class="header" :style="{height:menu.height + 'px',top:menu.top+'px'}">
-                  <image class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
-                  <div class="timeSelect">
-                    <img class="selectIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/selectDateIcon.svg"/>
-                    <picker mode="date" :value="searchText"  :end="lastDay" @change="changeAllProvinceSearch" >
-                      <view class="time">
-                        <view class="text">{{ searchText }}</view>
-                        <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/arrow_bottom.svg"></image>
-                      </view>
-                    </picker>
-                  </div>
-                </div>
+                    <div v-if="isShowAllProvince" class="headerTopBox" >
+                      <div class="header" :style="{height:menu.height + 'px',top:menu.top+'px'}">
+                        <image class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
+                        <div class="timeSelect">
+                          <img class="selectIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/selectDateIcon.svg"/>
+                          <picker mode="date" :value="searchText"  :end="lastDay" @change="changeAllProvinceSearch" >
+                            <view class="time">
+                              <view class="text">{{ searchText }}</view>
+                              <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/arrow_bottom.svg"></image>
+                            </view>
+                          </picker>
+                        </div>
+                      </div>
 
-                <div class="picker" :style="{top:(menu.bottom + 24)+'px'}" @click="handleGoSelectService">
-                  <div class="selectService" >
-                    <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
-                    <view class="select">
-                      <view class="content">
-                        <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>
-                        <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>
-                        <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
-                      </view>
-                    </view>
-                  </div>
-                </div>
-              </div>
+                      <div class="picker" :style="{top:(menu.bottom + 24)+'px'}" @click="handleGoSelectService">
+                        <div class="selectService" >
+                          <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+                          <view class="select">
+                            <view class="content">
+                              <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>
+                              <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>
+                              <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+                            </view>
+                          </view>
+                        </div>
+                      </div>
+                    </div>
+                  </view>
+                  <view style="width: 100%;height: 100%" v-else></view>
+                </swiper-item>
+              </swiper>
+
+<!--              <div v-if="isShowAllProvince" class="headerTop" >-->
+<!--                <div class="header" :style="{height:menu.height + 'px',top:menu.top+'px'}">-->
+<!--                  <image class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>-->
+<!--                  <div class="timeSelect">-->
+<!--                    <img class="selectIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/selectDateIcon.svg"/>-->
+<!--                    <picker mode="date" :value="searchText"  :end="lastDay" @change="changeAllProvinceSearch" >-->
+<!--                      <view class="time">-->
+<!--                        <view class="text">{{ searchText }}</view>-->
+<!--                        <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/arrow_bottom.svg"></image>-->
+<!--                      </view>-->
+<!--                    </picker>-->
+<!--                  </div>-->
+<!--                </div>-->
+
+<!--                <div class="picker" :style="{top:(menu.bottom + 24)+'px'}" @click="handleGoSelectService">-->
+<!--                  <div class="selectService" >-->
+<!--                    <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>-->
+<!--                    <view class="select">-->
+<!--                      <view class="content">-->
+<!--                        <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>-->
+<!--                        <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>-->
+<!--                        <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>-->
+<!--                      </view>-->
+<!--                    </view>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </div>-->
               <div class="charts" v-if="!isShowAllProvince">
                     <div class="chartsItem">
                         <div style="display: flex;align-items: center;justify-content: space-between">
@@ -398,7 +447,9 @@ export default {
         searchText:'',// 展示全省情況时显示的日期内容
         haveFun:{},
         serviceTypeObj:{},// 服务区类型对象
-        serviceInfoObj:{}
+        serviceInfoObj:{},
+        carSwiperList:[],
+        currentSwiper:1
       }
     },
     components: {
@@ -415,8 +466,11 @@ export default {
       this.backType = option.type
       // 服务区类型枚举
       this.handleServiceType()
+      // 造滑动框模块
+      this.carSwiperList = ['previous','','next']
     },
     onShow(){
+      this.currentSwiper=1
         this.carTypeList.forEach(item=>{
           item.select = false
         })
@@ -518,6 +572,21 @@ export default {
         this.searchText=''
     },
     methods:{
+      // 滚动轮播图
+      changeSwiper(e){
+        console.log('e',e)
+        this.currentSwiper = e.detail.current
+        let value = this.carSwiperList[Number(e.detail.current)]
+        if (value==='previous'){
+          uni.redirectTo({
+            url:`/pages/map/detail`
+          })
+        }else if(value==='next'){
+          uni.redirectTo({
+            url:`/pages/commercialBI/guestPortrait`
+          })
+        }
+      },
       // 点击查看更多跳转
       handleGoServiceMessage(){
         this.$util.toNextRoute('navigateTo', `/pages/map/detail`)
@@ -1242,359 +1311,369 @@ export default {
   background: #fff;
   min-height: 100vh;
   overflow: hidden;
-  .header{
+  .swiperBox{
     width: 100%;
     height: 648rpx;
-    //height: calc(1.056 * 100vw);
-    padding: 0 16px;
-    box-sizing: border-box;
-    position: relative;
-    background-repeat: no-repeat;
-    //background-size: cover;
-    background-size: 100% 100%;
-    .car{
-      width: 100vw;
-      height: 100%;
-      position: absolute;
-      z-index: 0;
-      top: 0;left: 0;
-    }
-    .analyse{
-      width: calc(100vw - 32px);
-      height: 48px;
-      box-sizing: border-box;
-      padding: 6px 12px;
-      background: #fff;
-      margin-top: 16px;
-      border-radius: 4px;
-      display: flex;
-      position: absolute;
-      bottom: 16px;
-      .title{
-        width: 28px;
-        height: 18px;
-        font-size: 12px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #160002;
-        line-height: 18px;
-        padding: 0 4px;
-        text-align: center;
-        border-radius: 4px;
-        background:rgba(6, 93, 255, 0.1);
-      }
-      .content{
-        width: calc(100% - 46px);
-        padding-left: 6px;
-        font-size: 12px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #786B6C;
-        line-height: 18px;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        overflow: hidden;
-        -webkit-line-clamp: 2;
-      }
-    }
-
-    .headerTop{
-      width: 100vw;
-      position: fixed;
-      top: 0;
-      left: 0;
-      z-index: 9999999999999;
-      background: linear-gradient(180deg, #A2B9E8 0%, #B2C6ED 100%);
-      .box{
-        padding: 0 16px;
-        position: absolute;
-        box-sizing: border-box;
+    .swiperItem{
+      width: 100%;
+      height: 648rpx;
+      .header{
         width: 100%;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        transform: translateY(-50%);
-        .icon{
-          width: 24px;
-          height: 24px;
-          .img{
-            width: 100%;
-            height: 100%;
-          }
+        height: 648rpx;
+        //height: calc(1.056 * 100vw);
+        padding: 0 16px;
+        box-sizing: border-box;
+        position: relative;
+        background-repeat: no-repeat;
+        //background-size: cover;
+        background-size: 100% 100%;
+        .car{
+          width: 100vw;
+          height: 100%;
+          position: absolute;
+          z-index: 0;
+          top: 0;left: 0;
         }
-        .title{
-          font-size: 36rpx;
-          font-family: PingFangSC-Medium, PingFang SC;
-          font-weight: 600;
-          color: #1C2130;
-          line-height: 56rpx;
-        }
-        .seize{
-          width: 24px;
-          height: 24px;
-        }
-      }
-    }
-    .serviceArea{
-      position: absolute;
-      box-sizing: border-box;
-      .picker{
-        .selectService{
+        .analyse{
+          width: calc(100vw - 32px);
+          height: 48px;
+          box-sizing: border-box;
+          padding: 6px 12px;
+          background: #fff;
+          margin-top: 16px;
+          border-radius: 4px;
           display: flex;
-          align-items: center;
-          .img{
-            width: 40px;
-            height: 40px;
-            z-index: 2;
-          }
-          .select{
-            height: 32px;
-            background: #F8F8FA;
-            border-radius: 0 16px 16px 0;
-            transform: translateX(-20px);
-            box-sizing: border-box;
-            padding-left: 25px;
-            display: flex;
-            align-items: center;
-            .content{
-              display: flex;
-              align-items: center;
-              .uni-input{
-                padding: 0;
-                background: transparent;
-                font-size: 14px;
-                font-family: PingFangSC-Semibold, PingFang SC;
-                font-weight: 600;
-                color: #160002;
-              }
-              .area{
-                font-size: 12px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #786B6C;
-                line-height: 40px;
-                margin-left: 4px;
-              }
-              .rightArrow{
-                width: 24px;
-                height: 12px;
-              }
-            }
-
-          }
-        }
-      }
-      .other{
-        margin-top: 12px;
-        width: calc(100vw - 32px);
-        text-align: center;
-        .label{
-          height: 54px;
-          position: relative;
-          .item{
-            position: absolute;
-            font-size: 32rpx;
+          position: absolute;
+          bottom: 16px;
+          .title{
+            width: 28px;
+            height: 18px;
+            font-size: 12px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #FFFFFF;
-            line-height: 44rpx;
-            padding: 4px 12px;
-            border-radius: 8rpx 8rpx 0rpx 8rpx;
+            color: #160002;
+            line-height: 18px;
+            padding: 0 4px;
+            text-align: center;
+            border-radius: 4px;
+            background:rgba(6, 93, 255, 0.1);
           }
-          .item{
-            background: linear-gradient(180deg, #3190FF 0%, #1657FF 100%);
-            top: 0px;
-          }
-          .item0{
-            left: 50%;
-            top: 50%;
-            transform: translateX(-50%);
-            z-index:3;
-            background: linear-gradient(180deg, rgba(49, 144, 255, 0.8) 0%, rgba(22, 87, 255, 0.8) 100%);
-          }
-          .item1{
-            left: 25%;
-            top: 80%;
-            z-index:2;
-            background: linear-gradient(180deg, rgba(49, 144, 255, 0.7) 0%, rgba(22, 87, 255, 0.7) 100%);
-          }
-          .item2{
-            right: 15%;
-            top: 80%;
-            z-index:2;
-            background: linear-gradient(180deg, rgba(49, 144, 255, 0.6) 0%, rgba(22, 87, 255, 0.6) 100%);
-          }
-          .item3{
-            right: 2%;
-            top:100%;
-            z-index:1;
-            background: linear-gradient(180deg, rgba(49, 144, 255, 0.5) 0%, rgba(22, 87, 255, 0.5) 100%);
-          }
-          .item4{
-            left: 2%;
-            top:100%;
-            z-index:1;
-            background: linear-gradient(180deg, rgba(49, 144, 255, 0.4) 0%, rgba(22, 87, 255, 0.4) 100%);
-          }
-        }
-        .car{
-          width: 228px;
-          height: 95px;
-        }
-      }
-      .detailBox{
-        width: 340rpx;
-        height: 312rpx;
-        background: linear-gradient(136deg, #F0F6FF 0%, #FFFFFF 100%);
-        border-radius: 16rpx;
-        margin-top: 32rpx;
-        box-sizing: border-box;
-        padding: 24rpx 32rpx;
-        .detailTop{
-          width: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .topLeft{
-            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;
-          }
-          .topRight{
-            display: flex;
-            align-items: center;
-            .rightText{
-              font-size: 28rpx;
-              font-family: PingFangSC, PingFang SC;
-              font-weight: 400;
-              color: #A69E9F;
-              line-height: 40rpx;
-            }
-            .moreIcon{
-              width: 24rpx;
-              height: 24rpx;
-              margin-left: 4rpx;
-            }
-          }
-        }
-        .functionList{
-          .functionItem{
-            margin-top: 16rpx;
-            display: flex;
-            align-items: center;
-            .haveFun{
-              width: 32rpx;
-              height: 32rpx;
-              margin-right: 18rpx;
-            }
-            .carIcon{
-              width: 32rpx;
-              height: 32rpx;
-              margin-right: 4rpx;
-            }
-            .funText{
-              font-size: 28rpx;
-              font-family: PingFangSC, PingFang SC;
-              font-weight: 400;
-              color: #6C737A;
-              line-height: 40rpx;
-            }
-          }
-        }
-      }
-    }
-  }
-  .headerTop{
-    width: 100%;
-    height: 152px;
-    box-sizing: border-box;
-    position: relative;
-    background: linear-gradient(90deg, #60AAFF 0%,#3E74FF 100%);
-    .header{
-      position: absolute;
-      width: 100%;
-      padding: 0 16px;
-      box-sizing: border-box;
-      display: flex;
-      align-items: center;
-      .backArrow{
-        width: 24px;
-        height: 24px;
-        margin-right: 16px;
-      }
-      .timeSelect{
-        display: flex;
-        align-items: center;
-        .selectIcon{
-          width: 16px;
-          height: 16px;
-        }
-        .time{
-          display: flex;
-          align-items: center;
-          .text{
-            margin: 0 5px;
-            color: #fff;
-          }
-          .icon{
-            width: 18px;
-            height: 18px;
-          }
-        }
-      }
-    }
-    .picker{
-      position: absolute;
-      left: 16px;
-      .selectService{
-        display: flex;
-        align-items: center;
-        .img{
-          width: 40px;
-          height: 40px;
-          z-index: 2;
-        }
-        .select{
-          height: 32px;
-          background: #F8F8FA;
-          border-radius: 0 16px 16px 0;
-          transform: translateX(-20px);
-          box-sizing: border-box;
-          padding-left: 25px;
-          display: flex;
-          align-items: center;
           .content{
+            width: calc(100% - 46px);
+            padding-left: 6px;
+            font-size: 12px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #786B6C;
+            line-height: 18px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            -webkit-line-clamp: 2;
+          }
+        }
+
+        .headerTop{
+          width: 100vw;
+          position: fixed;
+          top: 0;
+          left: 0;
+          z-index: 9999999999999;
+          background: linear-gradient(180deg, #A2B9E8 0%, #B2C6ED 100%);
+          .box{
+            padding: 0 16px;
+            position: absolute;
+            box-sizing: border-box;
+            width: 100%;
             display: flex;
             align-items: center;
-            .uni-input{
-              padding: 0;
-              background: transparent;
-              font-size: 14px;
-              font-family: PingFangSC-Semibold, PingFang SC;
-              font-weight: 600;
-              color: #160002;
-            }
-            .area{
-              font-size: 12px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 40px;
-              margin-left: 4px;
-            }
-            .rightArrow{
+            transform: translateY(-50%);
+            .icon{
               width: 24px;
-              height: 12px;
+              height: 24px;
+              .img{
+                width: 100%;
+                height: 100%;
+              }
+            }
+            .pickerTop{
+              margin-left: 16rpx;
+              .selectService{
+                display: flex;
+                align-items: center;
+                .img{
+                  width: 40px;
+                  height: 40px;
+                  z-index: 2;
+                }
+                .select{
+                  height: 32px;
+                  background: #F8F8FA;
+                  border-radius: 0 16px 16px 0;
+                  transform: translateX(-20px);
+                  box-sizing: border-box;
+                  padding-left: 25px;
+                  display: flex;
+                  align-items: center;
+                  .content{
+                    display: flex;
+                    align-items: center;
+                    .uni-input{
+                      padding: 0;
+                      background: transparent;
+                      font-size: 14px;
+                      font-family: PingFangSC-Semibold, PingFang SC;
+                      font-weight: 600;
+                      color: #160002;
+                    }
+                    .area{
+                      font-size: 12px;
+                      font-family: PingFangSC-Regular, PingFang SC;
+                      font-weight: 400;
+                      color: #786B6C;
+                      line-height: 40px;
+                      margin-left: 4px;
+                    }
+                    .rightArrow{
+                      width: 24px;
+                      height: 12px;
+                    }
+                  }
+
+                }
+              }
+            }
+            .title{
+              font-size: 36rpx;
+              font-family: PingFangSC-Medium, PingFang SC;
+              font-weight: 600;
+              color: #1C2130;
+              line-height: 56rpx;
+            }
+            .seize{
+              width: 24px;
+              height: 24px;
+            }
+          }
+        }
+        .serviceArea{
+          position: absolute;
+          box-sizing: border-box;
+          .other{
+            margin-top: 12px;
+            width: calc(100vw - 32px);
+            text-align: center;
+            .label{
+              height: 54px;
+              position: relative;
+              .item{
+                position: absolute;
+                font-size: 32rpx;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #FFFFFF;
+                line-height: 44rpx;
+                padding: 4px 12px;
+                border-radius: 8rpx 8rpx 0rpx 8rpx;
+              }
+              .item{
+                background: linear-gradient(180deg, #3190FF 0%, #1657FF 100%);
+                top: 0px;
+              }
+              .item0{
+                left: 50%;
+                top: 50%;
+                transform: translateX(-50%);
+                z-index:3;
+                background: linear-gradient(180deg, rgba(49, 144, 255, 0.8) 0%, rgba(22, 87, 255, 0.8) 100%);
+              }
+              .item1{
+                left: 25%;
+                top: 80%;
+                z-index:2;
+                background: linear-gradient(180deg, rgba(49, 144, 255, 0.7) 0%, rgba(22, 87, 255, 0.7) 100%);
+              }
+              .item2{
+                right: 15%;
+                top: 80%;
+                z-index:2;
+                background: linear-gradient(180deg, rgba(49, 144, 255, 0.6) 0%, rgba(22, 87, 255, 0.6) 100%);
+              }
+              .item3{
+                right: 2%;
+                top:100%;
+                z-index:1;
+                background: linear-gradient(180deg, rgba(49, 144, 255, 0.5) 0%, rgba(22, 87, 255, 0.5) 100%);
+              }
+              .item4{
+                left: 2%;
+                top:100%;
+                z-index:1;
+                background: linear-gradient(180deg, rgba(49, 144, 255, 0.4) 0%, rgba(22, 87, 255, 0.4) 100%);
+              }
+            }
+            .car{
+              width: 228px;
+              height: 95px;
+            }
+          }
+          .detailBox{
+            width: 340rpx;
+            height: 312rpx;
+            background: linear-gradient(136deg, #F0F6FF 0%, #FFFFFF 100%);
+            border-radius: 16rpx;
+            margin-top: 72rpx;
+            box-sizing: border-box;
+            padding: 24rpx 32rpx;
+            .detailTop{
+              width: 100%;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              .topLeft{
+                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;
+              }
+              .topRight{
+                display: flex;
+                align-items: center;
+                .rightText{
+                  font-size: 28rpx;
+                  font-family: PingFangSC, PingFang SC;
+                  font-weight: 400;
+                  color: #A69E9F;
+                  line-height: 40rpx;
+                }
+                .moreIcon{
+                  width: 24rpx;
+                  height: 24rpx;
+                  margin-left: 4rpx;
+                }
+              }
+            }
+            .functionList{
+              .functionItem{
+                margin-top: 16rpx;
+                display: flex;
+                align-items: center;
+                .haveFun{
+                  width: 32rpx;
+                  height: 32rpx;
+                  margin-right: 18rpx;
+                }
+                .carIcon{
+                  width: 32rpx;
+                  height: 32rpx;
+                  margin-right: 4rpx;
+                }
+                .funText{
+                  font-size: 28rpx;
+                  font-family: PingFangSC, PingFang SC;
+                  font-weight: 400;
+                  color: #6C737A;
+                  line-height: 40rpx;
+                }
+              }
             }
           }
-
         }
       }
+      .headerTopBox{
+        width: 100%;
+        //height: 152px;
+        height: 324px;
+        box-sizing: border-box;
+        position: relative;
+        background: linear-gradient(90deg, #60AAFF 0%,#3E74FF 100%);
+        .header{
+          position: absolute;
+          width: 100%;
+          padding: 0 16px;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          .backArrow{
+            width: 24px;
+            height: 24px;
+            margin-right: 16px;
+          }
+          .timeSelect{
+            display: flex;
+            align-items: center;
+            .selectIcon{
+              width: 16px;
+              height: 16px;
+            }
+            .time{
+              display: flex;
+              align-items: center;
+              .text{
+                margin: 0 5px;
+                color: #fff;
+              }
+              .icon{
+                width: 18px;
+                height: 18px;
+              }
+            }
+          }
+        }
+        .picker{
+          position: absolute;
+          left: 16px;
+          .selectService{
+            display: flex;
+            align-items: center;
+            .img{
+              width: 40px;
+              height: 40px;
+              z-index: 2;
+            }
+            .select{
+              height: 32px;
+              background: #F8F8FA;
+              border-radius: 0 16px 16px 0;
+              transform: translateX(-20px);
+              box-sizing: border-box;
+              padding-left: 25px;
+              display: flex;
+              align-items: center;
+              .content{
+                display: flex;
+                align-items: center;
+                .uni-input{
+                  padding: 0;
+                  background: transparent;
+                  font-size: 14px;
+                  font-family: PingFangSC-Semibold, PingFang SC;
+                  font-weight: 600;
+                  color: #160002;
+                }
+                .area{
+                  font-size: 12px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #786B6C;
+                  line-height: 40px;
+                  margin-left: 4px;
+                }
+                .rightArrow{
+                  width: 24px;
+                  height: 12px;
+                }
+              }
+
+            }
+          }
+        }
+      }
+
     }
   }
 
diff --git a/pages/commercialBI/components/car/homePlace.vue b/pages/commercialBI/components/car/homePlace.vue
index 8438e6e..64ae5e9 100644
--- a/pages/commercialBI/components/car/homePlace.vue
+++ b/pages/commercialBI/components/car/homePlace.vue
@@ -92,7 +92,6 @@ 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/headerTop.vue b/pages/commercialBI/components/headerTop.vue
index c789dbb..8b5a145 100644
--- a/pages/commercialBI/components/headerTop.vue
+++ b/pages/commercialBI/components/headerTop.vue
@@ -1,29 +1,46 @@
 <template>
-    <div class="header" :style="{backgroundImage: 'url('+ bgUrl +')'}">
-        <div class="headerTop" :style="{height:(menu.bottom + 6) + 'px',background:topBg}">
+  <swiper class="swiperBox" :current="currentSwiper" @change="changeSwiper">
+    <swiper-item class="swiperItem" v-for="(item,index) in carSwiperList" :key="index">
+      <view  v-if="item!=='previous' && item!=='next'">
+        <div class="header" :style="{backgroundImage: 'url('+ bgUrl +')'}">
+          <div class="headerTop" :style="{height:(menu.bottom + 6) + 'px',background:topBg}">
             <div class="box" :style="{top:(menu.bottom - (menu.height / 2)) + 'px'}">
-                <div class="icon" @click="handleBack">
-                    <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"></image>
-                </div>
-                <text class="title">{{title}}</text>
-                <div class="seize"></div>
-            </div>
-        </div>
-        <div class="serviceArea" :style="{top : (menu.bottom + 14) + 'px'}" >
-            <div class="picker" @click="handleGoSelectService">
+              <div class="icon" @click="handleBack">
+                <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"></image>
+              </div>
+<!--              <text class="title">{{title}}</text>-->
+              <div class="pickerTop" @click="handleGoSelectService">
                 <div class="selectService">
-                    <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
-                    <view class="select">
-                        <view class="content">
-<!--                            <view class="uni-input">{{serviceArray[serviceIndex]}}</view>-->
-                            <view class="uni-input">{{serverpartName}}</view>
-<!--                            <text class="area">{{area}}</text>-->
-                            <text class="area" v-if="serviceInfo.Serverpart_ID">{{spregionTypeName}}</text>
-                            <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
-                        </view>
+                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+                  <view class="select">
+                    <view class="content">
+                      <!--                            <view class="uni-input">{{serviceArray[serviceIndex]}}</view>-->
+                      <view class="uni-input">{{serverpartName}}</view>
+                      <!--                            <text class="area">{{area}}</text>-->
+                      <text class="area" v-if="serviceInfo.Serverpart_ID">{{spregionTypeName}}</text>
+                      <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
                     </view>
+                  </view>
                 </div>
+              </div>
+              <div class="seize"></div>
             </div>
+          </div>
+          <div class="serviceArea" :style="{top : (menu.bottom + 14) + 'px'}" >
+<!--            <div class="picker" @click="handleGoSelectService">-->
+<!--              <div class="selectService">-->
+<!--                <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>-->
+<!--                <view class="select">-->
+<!--                  <view class="content">-->
+<!--                    &lt;!&ndash;                            <view class="uni-input">{{serviceArray[serviceIndex]}}</view>&ndash;&gt;-->
+<!--                    <view class="uni-input">{{serverpartName}}</view>-->
+<!--                    &lt;!&ndash;                            <text class="area">{{area}}</text>&ndash;&gt;-->
+<!--                    <text class="area" v-if="serviceInfo.Serverpart_ID">{{spregionTypeName}}</text>-->
+<!--                    <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--              </div>-->
+<!--            </div>-->
 
             <div class="detailBox" :style="{background: detailBoxBg}">
               <div class="detailTop">
@@ -56,18 +73,22 @@
                 </div>
               </div>
             </div>
-<!--            <div class="label">-->
-<!--                <div :class="index===0?'labelItem labelItem0':index===1?'labelItem labelItem1':index===2?'labelItem labelItem2':index===3?'labelItem labelItem3':-->
-<!--                index===4?'labelItem labelItem4':index===5?'labelItem labelItem5':''" v-for="(item,index) in labelList" :key="index"-->
-<!--                :style="{background: 'linear-gradient('+bgColor+')'}"-->
-<!--                >{{ item }}</div>-->
-<!--            </div>-->
+            <!--            <div class="label">-->
+            <!--                <div :class="index===0?'labelItem labelItem0':index===1?'labelItem labelItem1':index===2?'labelItem labelItem2':index===3?'labelItem labelItem3':-->
+            <!--                index===4?'labelItem labelItem4':index===5?'labelItem labelItem5':''" v-for="(item,index) in labelList" :key="index"-->
+            <!--                :style="{background: 'linear-gradient('+bgColor+')'}"-->
+            <!--                >{{ item }}</div>-->
+            <!--            </div>-->
+          </div>
+          <!--        <div class="analyse" v-if="analyseText">-->
+          <!--            <text class="title">分析</text>-->
+          <!--            <text class="content">{{analyseText}}</text>-->
+          <!--        </div>-->
         </div>
-<!--        <div class="analyse" v-if="analyseText">-->
-<!--            <text class="title">分析</text>-->
-<!--            <text class="content">{{analyseText}}</text>-->
-<!--        </div>-->
-    </div>
+      </view>
+      <view v-else style="width: 100%;height: 100%" ></view>
+    </swiper-item>
+  </swiper>
 </template>
 
 <script>
@@ -163,12 +184,36 @@ export default {
       serviceTypeObj:{
         type:Object,
         default:()=>{}
+      },
+      pageType:{
+        type:Number,
+        default:0
       }
     },
     data() {
         return {
           labelList:[],
-          analyseText:''
+          analyseText:'',
+          currentSwiper:1,
+          carSwiperList:['previous','','next'],
+          goObj:{
+            1000:{
+              previous:'/pages/commercialBI/carPortrait',
+              next:'/pages/commercialBI/managePortrait'
+            },
+            2000:{
+              previous:'/pages/commercialBI/guestPortrait',
+              next:'/pages/commercialBI/businessPortrait'
+            },
+            3000:{
+              previous:'/pages/commercialBI/managePortrait',
+              next:'/pages/commercialBI/formatPortraitBI'
+            },
+            4000:{
+              previous:'/pages/commercialBI/businessPortrait',
+              next:`/pages/examine/detail?type=${1}`
+            },
+          }
         }
     },
     watch:{
@@ -185,6 +230,24 @@ export default {
     //     this.getLabelDetail()
     // },
     methods:{
+      handleChangeCurrent(){
+        this.currentSwiper = 1
+      },
+      // 滚动轮播图
+      changeSwiper(e){
+        console.log('e',e)
+        this.currentSwiper = e.detail.current
+        let value = this.carSwiperList[Number(e.detail.current)]
+          if (value==='previous'){
+            uni.redirectTo({
+              url:this.goObj[this.pageType].previous
+            })
+          }else if(value==='next'){
+            uni.redirectTo({
+              url:this.goObj[this.pageType].next
+            })
+          }
+      },
       // 点击查看更多跳转
       handleGoServiceMessage(){
         this.$util.toNextRoute('navigateTo', `/pages/map/detail`)
@@ -251,179 +314,238 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.header{
+.swiperBox{
   width: 100%;
   height: 648rpx;
-  //height: calc(1.056 * 100vw);
-  box-sizing: border-box;
-  position: relative;
-  padding: 0 16px;
-  background-repeat: no-repeat;
-  //background-size: cover;
-  background-size: 100% 100%;
-  .headerTop{
-    width: 100vw;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index:99999;
-    .box{
-      padding: 0 16px;
-      position: absolute;
-      box-sizing: border-box;
+  .swiperItem{
+    width: 100%;
+    height: 648rpx;
+    .header{
       width: 100%;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      transform: translateY(-50%);
-      .icon{
-        width: 24px;
-        height: 24px;
-        .img{
+      height: 648rpx;
+      //height: calc(1.056 * 100vw);
+      box-sizing: border-box;
+      position: relative;
+      padding: 0 16px;
+      background-repeat: no-repeat;
+      //background-size: cover;
+      background-size: 100% 100%;
+      .headerTop{
+        width: 100vw;
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index:99999;
+        .box{
+          padding: 0 16px;
+          position: absolute;
+          box-sizing: border-box;
           width: 100%;
-          height: 100%;
+          display: flex;
+          align-items: center;
+          transform: translateY(-50%);
+          .icon{
+            width: 24px;
+            height: 24px;
+            .img{
+              width: 100%;
+              height: 100%;
+            }
+          }
+          .pickerTop{
+            margin-left: 16rpx;
+            .selectService{
+              display: flex;
+              align-items: center;
+              .img{
+                width: 40px;
+                height: 40px;
+                z-index: 2;
+              }
+              .select{
+                min-width: 174px;
+                height: 32px;
+                background: #F8F8FA;
+                border-radius: 0 16px 16px 0;
+                transform: translateX(-20px);
+                box-sizing: border-box;
+                padding-left: 25px;
+                padding-right: 25px;
+                display: flex;
+                align-items: center;
+                position: relative;
+                .content{
+                  display: flex;
+                  align-items: center;
+                  .uni-input{
+                    padding: 0;
+                    background: transparent;
+                    font-size: 14px;
+                    font-family: PingFangSC-Semibold, PingFang SC;
+                    font-weight: 600;
+                    color: #160002;
+                    height: 40px;
+                    line-height: 40px;
+                  }
+                  .area{
+                    font-size: 14px;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: #786B6C;
+                    line-height: 40px;
+                    margin-left: 4px;
+                  }
+                  .rightArrow{
+                    width: 24px;
+                    height: 12px;
+                    position: absolute;
+                    right: 0px;
+                  }
+                }
+
+              }
+            }
+          }
+          .title{
+            font-size: 36rpx;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 600;
+            color: #1C2130;
+            line-height: 56rpx;
+          }
+          .seize{
+            width: 24px;
+            height: 24px;
+          }
         }
       }
-      .title{
-        font-size: 36rpx;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 600;
-        color: #1C2130;
-        line-height: 56rpx;
-      }
-      .seize{
-        width: 24px;
-        height: 24px;
-      }
-    }
-  }
-  .serviceArea{
-    width: calc(100% - 32px);
-    position: absolute;
-    box-sizing: border-box;
-    .picker{
-        .selectService{
+      .serviceArea{
+        width: calc(100% - 32px);
+        position: absolute;
+        box-sizing: border-box;
+        .picker{
+          .selectService{
             display: flex;
             align-items: center;
             .img{
-                  width: 40px;
-                  height: 40px;
-                  z-index: 2;
-              }
+              width: 40px;
+              height: 40px;
+              z-index: 2;
+            }
             .select{
-                  min-width: 174px;
-                  height: 32px;
-                  background: #F8F8FA;
-                  border-radius: 0 16px 16px 0;
-                  transform: translateX(-20px);
-                  box-sizing: border-box;
-                  padding-left: 25px;
-                  padding-right: 25px;
-                  display: flex;
-                  align-items: center;
-                  position: relative;
-                  .content{
-                      display: flex;
-                      align-items: center;
-                      .uni-input{
-                          padding: 0;
-                          background: transparent;
-                          font-size: 14px;
-                          font-family: PingFangSC-Semibold, PingFang SC;
-                          font-weight: 600;
-                          color: #160002;
-                          height: 40px;
-                          line-height: 40px;
-                      }
-                      .area{
-                          font-size: 14px;
-                          font-family: PingFangSC-Regular, PingFang SC;
-                          font-weight: 400;
-                          color: #786B6C;
-                          line-height: 40px;
-                          margin-left: 4px;
-                      }
-                      .rightArrow{
-                          width: 24px;
-                          height: 12px;
-                          position: absolute;
-                          right: 0px;
-                      }
-                  }
-
+              min-width: 174px;
+              height: 32px;
+              background: #F8F8FA;
+              border-radius: 0 16px 16px 0;
+              transform: translateX(-20px);
+              box-sizing: border-box;
+              padding-left: 25px;
+              padding-right: 25px;
+              display: flex;
+              align-items: center;
+              position: relative;
+              .content{
+                display: flex;
+                align-items: center;
+                .uni-input{
+                  padding: 0;
+                  background: transparent;
+                  font-size: 14px;
+                  font-family: PingFangSC-Semibold, PingFang SC;
+                  font-weight: 600;
+                  color: #160002;
+                  height: 40px;
+                  line-height: 40px;
+                }
+                .area{
+                  font-size: 14px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #786B6C;
+                  line-height: 40px;
+                  margin-left: 4px;
+                }
+                .rightArrow{
+                  width: 24px;
+                  height: 12px;
+                  position: absolute;
+                  right: 0px;
+                }
               }
-        }
-    }
-    .detailBox{
-      width: 340rpx;
-      height: 312rpx;
-      border-radius: 16rpx;
-      margin-top: 32rpx;
-      box-sizing: border-box;
-      padding: 24rpx 32rpx;
-      .detailTop{
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .topLeft{
-          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;
-        }
-        .topRight{
-          display: flex;
-          align-items: center;
-          .rightText{
-            font-size: 28rpx;
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            color: #A69E9F;
-            line-height: 40rpx;
-          }
-          .moreIcon{
-            width: 24rpx;
-            height: 24rpx;
-            margin-left: 4rpx;
+
+            }
           }
         }
-      }
-      .functionList{
-        .functionItem{
-          margin-top: 16rpx;
-          display: flex;
-          align-items: center;
-          .haveFun{
-            width: 32rpx;
-            height: 32rpx;
-            margin-right: 18rpx;
+        .detailBox{
+          width: 340rpx;
+          height: 312rpx;
+          border-radius: 16rpx;
+          margin-top: 72rpx;
+          box-sizing: border-box;
+          padding: 24rpx 32rpx;
+          .detailTop{
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .topLeft{
+              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;
+            }
+            .topRight{
+              display: flex;
+              align-items: center;
+              .rightText{
+                font-size: 28rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #A69E9F;
+                line-height: 40rpx;
+              }
+              .moreIcon{
+                width: 24rpx;
+                height: 24rpx;
+                margin-left: 4rpx;
+              }
+            }
           }
-          .carIcon{
-            width: 32rpx;
-            height: 32rpx;
-            margin-right: 4rpx;
-          }
-          .funText{
-            font-size: 28rpx;
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            color: #6C737A;
-            line-height: 40rpx;
+          .functionList{
+            .functionItem{
+              margin-top: 16rpx;
+              display: flex;
+              align-items: center;
+              .haveFun{
+                width: 32rpx;
+                height: 32rpx;
+                margin-right: 18rpx;
+              }
+              .carIcon{
+                width: 32rpx;
+                height: 32rpx;
+                margin-right: 4rpx;
+              }
+              .funText{
+                font-size: 28rpx;
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 400;
+                color: #6C737A;
+                line-height: 40rpx;
+              }
+            }
           }
         }
-      }
-    }
-    .label{
-        width: calc(60% + 20px);
-        height: 127px;
-        position: relative;
-        margin-top: 44px;
-        .labelItem{
+        .label{
+          width: calc(60% + 20px);
+          height: 127px;
+          position: relative;
+          margin-top: 44px;
+          .labelItem{
             position: absolute;
             font-size: 16px;
             font-family: PingFangSC-Regular, PingFang SC;
@@ -432,43 +554,43 @@ export default {
             line-height: 22px;
             border-radius: 4px 4px 0 4px;
             padding: 4px 12px;
-        }
-        .labelItem0{
+          }
+          .labelItem0{
             top: 50%;
             left: 50%;
             transform: translate(-50%,-50%);
             z-index:9;
-        }
-        .labelItem1{
+          }
+          .labelItem1{
             top: 30%;
             left: 5%;
             z-index:8;
             opacity: 0.8;
-        }
-        .labelItem2{
+          }
+          .labelItem2{
             right: 0;
             top: 30%;
             opacity: 0.7;
-        }
-        .labelItem3{
+          }
+          .labelItem3{
             top: 10%;
             left: 50%;
             transform: translateX(-50%);
             opacity: 0.6;
-        }
-        .labelItem4{
+          }
+          .labelItem4{
             bottom: 20%;
             left: 10%;
             opacity: 0.5;
-        }
-        .labelItem5{
+          }
+          .labelItem5{
             bottom: 20%;
             right: 20%;
             opacity: 0.4;
+          }
         }
-    }
-  }
-  .analyse{
+      }
+      .analyse{
         position: absolute;
         bottom: 16px;
         width: calc(100vw - 32px);
@@ -479,32 +601,34 @@ export default {
         border-radius: 4px;
         display: flex;
         .title{
-            width: 28px;
-            height: 18px;
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #160002;
-            line-height: 18px;
-            padding: 0 4px;
-            text-align: center;
-            border-radius: 4px;
-            background:rgba(6, 93, 255, 0.1);
+          width: 28px;
+          height: 18px;
+          font-size: 12px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #160002;
+          line-height: 18px;
+          padding: 0 4px;
+          text-align: center;
+          border-radius: 4px;
+          background:rgba(6, 93, 255, 0.1);
         }
         .content{
-            width: calc(100% - 46px);
-            padding-left: 6px;
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #786B6C;
-            line-height: 18px;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            overflow: hidden;
-            -webkit-line-clamp: 2;
+          width: calc(100% - 46px);
+          padding-left: 6px;
+          font-size: 12px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #786B6C;
+          line-height: 18px;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          overflow: hidden;
+          -webkit-line-clamp: 2;
         }
-    }
+      }
 
+    }
+  }
 }
 </style>
diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue
index 87c7f85..1b15a02 100644
--- a/pages/commercialBI/formatPortrait.vue
+++ b/pages/commercialBI/formatPortrait.vue
@@ -349,6 +349,7 @@ export default {
     min-height: 100vh;
     background: #fff;
   background: url("https://eshangtech.com/ShopICO/ahyd-BID/brand/headerBg.svg")no-repeat;
+  background-size: contain;
   .header{
     //height: 272px;
     //background: linear-gradient(135deg, #7660FF 0%, #A0BAFD 31%, #B8D2FF 47%, #CAD9FF 66%, #BCB6FF 100%);
diff --git a/pages/commercialBI/formatPortraitBI.vue b/pages/commercialBI/formatPortraitBI.vue
index f8dcd53..7a382ad 100644
--- a/pages/commercialBI/formatPortraitBI.vue
+++ b/pages/commercialBI/formatPortraitBI.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="main">
-    <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"
+<!--    <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--      <commercial-type :have="4"/>-->
+<!--    </div>-->
+    <header-top ref="headerTop" :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"
                 :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
-                :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj"/>
+                :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/>
 
     <div class="charts">
       <div class="chartsItem" >
@@ -87,6 +87,7 @@ export default {
       bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/formatPortraitBIBg.svg',//背景图片路径
       page:'/pages/commercialBI/formatPortrait',
 
+      pageType:4000,
       detailBoxBg:'linear-gradient(136deg, #F7F3FF 0%, #FFFFFF 100%);',
       topLeftBg:'linear-gradient(180deg, rgba(69, 159, 255, 0.2) 0%, rgba(71, 58, 255, 0.2) 100%)',// 类别背景
       topLeftColor:'#473DFF',// 类别文字颜色
@@ -177,11 +178,15 @@ export default {
     this.getBrandInfoList()
     //   服务区基本信息
     this.getServiceInfo()
+    this.handleChangeCurrent()
   },
   onUnload() {
     this.$util.addUserBehavior()
   },
   methods:{
+    handleChangeCurrent(){
+      this.$refs.headerTop.handleChangeCurrent()
+    },
     // 枚举服务区类型 SERVERPART_TYPE
     async handleServiceType(){
       const data = await getFieldEnum({ FieldExplainField: 'SERVERPART_TYPE' });
diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue
index 212fedc..c5d18d7 100644
--- a/pages/commercialBI/guestPortrait.vue
+++ b/pages/commercialBI/guestPortrait.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="main">
-    <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
-      <commercial-type :have="1"/>
-    </div>
-      <header-top :bgUrl="bgUrl" :menu="menu" :topBg="topBg" :bgColor="bgColor" :title="title"  :page="page" :backType="backType" :analyseInfo="analyseInfo"
+<!--    <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--      <commercial-type :have="1"/>-->
+<!--    </div>-->
+      <header-top ref="headerTop" :bgUrl="bgUrl" :menu="menu" :topBg="topBg" :bgColor="bgColor" :title="title"  :page="page" :backType="backType" :analyseInfo="analyseInfo"
                   :serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo"
                   :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
-                  :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj"/>
+                  :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/>
 
       <div class="charts">
           <div class="chartsItem">
@@ -90,7 +90,7 @@ export default {
             bgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/guestPortraitBg.svg',//背景图片路径
             page:'/pages/commercialBI/guestPortrait',
 
-
+            pageType:1000,
             detailBoxBg:'linear-gradient(136deg, #ECF6F6 0%, #FFFFFF 100%);',
             topLeftBg:'linear-gradient(180deg, rgba(48, 200, 237, 0.2) 0%, rgba(11, 147, 83, 0.2) 100%)',// 类别背景
             topLeftColor:'#0E9760',// 类别文字颜色
@@ -177,11 +177,15 @@ export default {
         this.getBusinessTypeList()
     //   服务区基本信息
       this.getServiceInfo()
+      this.handleChangeCurrent()
     },
     onUnload() {
         this.$util.addUserBehavior()
     },
     methods:{
+      handleChangeCurrent(){
+        this.$refs.headerTop.handleChangeCurrent()
+      },
         bindDateChange(e){
             const date = new Date(e.detail.value)
             let m = date.getMonth() + 1
diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue
index d6b368a..39e71d0 100644
--- a/pages/commercialBI/managePortrait.vue
+++ b/pages/commercialBI/managePortrait.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="main">
-      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
-        <commercial-type :have="2"/>
-      </div>
-        <header-top :bgUrl="bgUrl" :menu="menu" :bgColor="bgColor" :title="title" :analyseInfo="analyseInfo" :topBg="topBg" :page="page" :backType="backType"
+<!--      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--        <commercial-type :have="2"/>-->
+<!--      </div>-->
+        <header-top ref="headerTop" :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"
         :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
-                    :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj"/>
+                    :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/>
 
         <div class="charts">
             <div class="chartsItem">
@@ -213,6 +213,7 @@ export default {
             bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/managePortraitBg.svg',//背景图片路径
             page:'/pages/commercialBI/managePortrait',
 
+            pageType:2000,
             detailBoxBg:'linear-gradient(136deg, #F3EFFE 0%, #FFFFFF 100%);',
             topLeftBg:'linear-gradient(180deg, rgba(153, 108, 255, 0.2) 0%, rgba(93, 67, 248, 0.2) 100%)',// 类别背景
             topLeftColor:'#6347F9',// 类别文字颜色
@@ -311,11 +312,15 @@ export default {
       this.getServiceInfo()
       //   月度汇总信息
       this.getSummaryMonth()
+      this.handleChangeCurrent()
     },
     onUnload() {
         this.$util.addUserBehavior()
     },
     methods:{
+      handleChangeCurrent(){
+        this.$refs.headerTop.handleChangeCurrent()
+      },
       // 枚举服务区类型 SERVERPART_TYPE
       async handleServiceType(){
         const data = await getFieldEnum({ FieldExplainField: 'SERVERPART_TYPE' });
diff --git a/pages/examine/commercialType.vue b/pages/examine/commercialType.vue
index e8b374c..f9402d9 100644
--- a/pages/examine/commercialType.vue
+++ b/pages/examine/commercialType.vue
@@ -109,7 +109,7 @@ export default {
   .typeBigList{
     position: fixed;
     right: 0;
-    top: 12%;
+    top: 40px;
     .bigBox{
       width: 100%;
       height: 100%;
diff --git a/pages/examine/detail.vue b/pages/examine/detail.vue
index 8ca1ed2..4472eda 100644
--- a/pages/examine/detail.vue
+++ b/pages/examine/detail.vue
@@ -1,96 +1,127 @@
 <template>
   <view class="main">
-    <div style="position: fixed;right: 0;top: 5%;z-index:99999999999">
-      <!--  组件通过传入的have去判断组件在哪个页面 然后哪个页面的标志就不显示  -->
-      <commercial-type :have="0" :time="time"/>
-    </div>
-    <view class="content">
-      <view class="timeBox">{{time}}</view>
-      <view v-if="type===1"  class="serviceList" style="height:calc(100vh - 260px);">
-        <view v-if="serviceList.length>0">
-          <view class="serviceItem" v-for="(item,index) in serviceList" :key="index" >
-            <view class="itemTitle">
-              <span class="title">{{item.SERVERPART_NAME}}</span>
-              <span :class="item.EXAMINE_MQUARTER!=='0'?'secondUnit':'unit'">{{item.EXAMINE_MQUARTER!=='0'?item.EXAMINE_MQUARTER==='1'?'一'+'季度':item.EXAMINE_MQUARTER==='2'?'二'+'季度':item.EXAMINE_MQUARTER==='3'?'三'+'季度':'四' + '季度':'月度'}}</span>
-            </view>
-            <view class="detail" v-for="(subItem,subIndex) in item.list" :key="subIndex">
-              <view class="detailTop">
-                <view class="left">
-                  <image class="icon" :src="subItem.REGION_NAME==='南' || subItem.REGION_NAME==='北'?'https://eshangtech.com/ShopICO/ahyd-BID/examine/NS.svg':'/static/images/examine/ES.svg'"></image>
-                  <span class="type">{{subItem.REGION_NAME}}区</span>
-                </view>
-                <view class="right">
-                  {{subItem.SERVERPARTList[0].EXAMINE_SCORE }}
-                  <text class="unit">分</text>
-                </view>
-              </view>
-              <view class="detailMessage">
-                <view class="message" style="margin-bottom: 4px;display: flex;justify-content: space-between">
-                  <div class="box">
-                    <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/time.svg"></image>
-                    <span class="value">{{subItem.SERVERPARTList[0].EXAMINE_DATE}}</span>
-                  </div>
-                  <div style="display: inline-block;width: 40px;height: 16px;display: flex;justify-content: flex-end" @click="handleShowPopup(subItem)">
-                    <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
-                  </div>
-                </view>
-                <view class="message">
-                  <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/user.svg"></image>
-                  <span class="value">{{subItem.SERVERPARTList[0].EXAMINE_PERSON}}</span>
-                </view>
-              </view>
+<!--    <div style="position: fixed;right: 0;top: 5%;z-index:99999999999">-->
+<!--      &lt;!&ndash;  组件通过传入的have去判断组件在哪个页面 然后哪个页面的标志就不显示  &ndash;&gt;-->
+<!--      <commercial-type :have="6" :time="time"/>-->
+<!--    </div>-->
+    <view class="headerBox" :style="{top:menu.top  + 'px',height:menu.height+'px'}">
+      <image class="arrowIcon" @click="handleBack" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
+      <!--            <view class="center">{{type===1?'考核考评':'日常巡检'}}</view>-->
+      <div class="pickerTop" @click="handleGoSelectService">
+        <div class="selectService">
+          <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+          <view class="select">
+            <view class="content">
+              <view class="uni-input">{{serviceInfo.SERVERPART_NAME}}</view>
+              <p class="area" v-if="serviceInfo.Serverpart_ID">{{serviceInfo.SPREGIONTYPE_NAME}}</p>
+              <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg" ></image>
             </view>
           </view>
+        </div>
+      </div>
+      <view class="right"></view>
+    </view>
+    <swiper class="swiperBox" :current="currentSwiper" @change="changeSwiper">
+      <swiper-item class="swiperItem" v-for="(item,index) in carSwiperList" :key="index">
+        <view v-if="item!=='previous' && item!=='next'" class="header" :style="{background:`url(${item})`}">
+
         </view>
-        <view class="noData" v-else>
-          <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
-          <p class="text">暂无数据</p>
-        </view>
+      </swiper-item>
+    </swiper>
+
+<!--    <view class="bigContent" :style="{top: menu.bottom + 100 + 'px'}">-->
+    <view class="bigContent" style="top: 324px">
+      <view class="contentTop">
+        <view class="nameTop">{{type===1?'考核考评':'日常巡检'}}</view>
+        <view class="timeBox">{{time}}</view>
       </view>
-      <view v-if="type===2" class="serviceList" style="height:calc(100vh - 300px);">
-        <view v-if="inspectionList.length && inspectionList.length>0  ">
-          <view class="dailyInspection" v-for="(item,index) in inspectionList" :key="index">
-            <view class="itemTitle">
-              <span class="title">{{item.SERVERPART_NAME}}</span>
-              <view class="more" @click="handleShowPopup(item)">
-                <span class="moreText">更多记录</span>
-                <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+      <view class="content">
+        <view v-if="type===1"  class="serviceList" style="height:calc(100vh - 260px);">
+          <view v-if="serviceList.length>0">
+            <view class="serviceItem" v-for="(item,index) in serviceList" :key="index" >
+              <view class="itemTitle">
+                <span class="title">{{item.SERVERPART_NAME}}</span>
+                <span :class="item.EXAMINE_MQUARTER!=='0'?'secondUnit':'unit'">{{item.EXAMINE_MQUARTER!=='0'?item.EXAMINE_MQUARTER==='1'?'一'+'季度':item.EXAMINE_MQUARTER==='2'?'二'+'季度':item.EXAMINE_MQUARTER==='3'?'三'+'季度':'四' + '季度':'月度'}}</span>
               </view>
-            </view>
-            <view class="detail" v-for="(subItem,subIndex) in item.list" :key="subIndex">
-              <view class="detailTop">
-                <view class="left">
-                  <image class="icon" :src="subItem.REGION_NAME==='南' || subItem.REGION_NAME==='北'?'https://eshangtech.com/ShopICO/ahyd-BID/examine/NS.svg':'/static/images/examine/ES.svg'" />
-                  <span class="type">{{subItem.REGION_NAME}}区</span>
-                  <span class="number">({{subItem.SERVERPARTList.length}})</span>
+              <view class="detail" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                <view class="detailTop">
+                  <view class="left">
+                    <image class="icon" :src="subItem.REGION_NAME==='南' || subItem.REGION_NAME==='北'?'https://eshangtech.com/ShopICO/ahyd-BID/examine/NS.svg':'/static/images/examine/ES.svg'"></image>
+                    <span class="type">{{subItem.REGION_NAME}}区</span>
+                  </view>
+                  <view class="right">
+                    {{subItem.SERVERPARTList[0].EXAMINE_SCORE }}
+                    <text class="unit">分</text>
+                  </view>
                 </view>
-                <image class="right" :src="subItem.warning===true?'https://eshangtech.com/ShopICO/ahyd-BID/examine/success.svg':'/static/images/examine/warning.svg'"></image>
-                <!--                            <image v-if="subItem.SERVERPARTList[0].COMPLETE_STATE === 0" class="right" src="/static/images/examine/warning.svg"></image>-->
-              </view>
-              <view class="detailMessage">
-                <view class="person">
-                  <p class="value">{{subItem.SERVERPARTList[0].PATROL_PERSON}}</p>
-                  <p class="label">检查人</p>
-                </view>
-                <view class="person">
-                  <p class="value">{{subItem.SERVERPARTList[0].PATROL_DATE}}</p>
-                  <p class="label">检查日期</p>
-                </view>
-                <view class="person">
-                  <p class="value">{{subItem.SERVERPARTList[0].PATROL_ROUTE}}</p>
-                  <p class="label">路线</p>
-                </view>
-                <view class="person">
-                  <image v-if="subItem.SERVERPARTList[0].PATROL_IMG" class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/haveImg.svg"></image>
-                  <p v-if="subItem.SERVERPARTList[0].PATROL_IMG" class="label">图片</p>
+                <view class="detailMessage">
+                  <view class="message" style="margin-bottom: 4px;display: flex;justify-content: space-between">
+                    <div class="box">
+                      <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/time.svg"></image>
+                      <span class="value">{{subItem.SERVERPARTList[0].EXAMINE_DATE}}</span>
+                    </div>
+                    <div style="display: inline-block;width: 40px;height: 16px;display: flex;justify-content: flex-end" @click="handleShowPopup(subItem)">
+                      <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
+                    </div>
+                  </view>
+                  <view class="message">
+                    <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/user.svg"></image>
+                    <span class="value">{{subItem.SERVERPARTList[0].EXAMINE_PERSON}}</span>
+                  </view>
                 </view>
               </view>
             </view>
           </view>
+          <view class="noData" v-else>
+            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
+            <p class="text">暂无数据</p>
+          </view>
         </view>
-        <view class="noData" v-else>
-          <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
-          <p class="text">暂无数据</p>
+        <view v-if="type===2" class="serviceList" style="height:calc(100vh - 300px);">
+          <view v-if="inspectionList.length && inspectionList.length>0  ">
+            <view class="dailyInspection" v-for="(item,index) in inspectionList" :key="index">
+              <view class="itemTitle">
+                <span class="title">{{item.SERVERPART_NAME}}</span>
+                <view class="more" @click="handleShowPopup(item)">
+                  <span class="moreText">更多记录</span>
+                  <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+                </view>
+              </view>
+              <view class="detail" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                <view class="detailTop">
+                  <view class="left">
+                    <image class="icon" :src="subItem.REGION_NAME==='南' || subItem.REGION_NAME==='北'?'https://eshangtech.com/ShopICO/ahyd-BID/examine/NS.svg':'/static/images/examine/ES.svg'" />
+                    <span class="type">{{subItem.REGION_NAME}}区</span>
+                    <span class="number">({{subItem.SERVERPARTList.length}})</span>
+                  </view>
+                  <image class="right" :src="subItem.warning===true?'https://eshangtech.com/ShopICO/ahyd-BID/examine/success.svg':'/static/images/examine/warning.svg'"></image>
+                  <!--                            <image v-if="subItem.SERVERPARTList[0].COMPLETE_STATE === 0" class="right" src="/static/images/examine/warning.svg"></image>-->
+                </view>
+                <view class="detailMessage">
+                  <view class="person">
+                    <p class="value">{{subItem.SERVERPARTList[0].PATROL_PERSON}}</p>
+                    <p class="label">检查人</p>
+                  </view>
+                  <view class="person">
+                    <p class="value">{{subItem.SERVERPARTList[0].PATROL_DATE}}</p>
+                    <p class="label">检查日期</p>
+                  </view>
+                  <view class="person">
+                    <p class="value">{{subItem.SERVERPARTList[0].PATROL_ROUTE}}</p>
+                    <p class="label">路线</p>
+                  </view>
+                  <view class="person">
+                    <image v-if="subItem.SERVERPARTList[0].PATROL_IMG" class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/haveImg.svg"></image>
+                    <p v-if="subItem.SERVERPARTList[0].PATROL_IMG" class="label">图片</p>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="noData" v-else>
+            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/noData.svg"></image>
+            <p class="text">暂无数据</p>
+          </view>
         </view>
       </view>
     </view>
@@ -207,9 +238,19 @@ export default {
       popupServiceList:[],
       popupTab:[],
       popupTabSelect:0,// 选中的弹出框选项卡
+      statusBarHeight:'',
+      menu:{},
+      carSwiperList:['previous','https://eshangtech.com/ShopICO/ahyd-BID/examine/bg.png','next'],
+      currentSwiper:1,
+      serviceInfo:''
     }
   },
   onLoad(query){
+    // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置
+    let systemInfo = uni.getSystemInfoSync()
+    this.menu = uni.getMenuButtonBoundingClientRect()
+    console.log('this.menu',this.menu)
+
     let currentService = uni.getStorageSync('currentService')
     let lastDay = uni.getStorageSync('lastDay')
     this.currentService = currentService
@@ -223,11 +264,51 @@ export default {
     console.log('query',query)
   },
   onShow(){
+    let storeServiceInfo = uni.getStorageSync('currentService')
+    this.serviceInfo = storeServiceInfo
     uni.setNavigationBarTitle({
       title: this.type===1?'考核考评':'日常巡检'
     });
   },
   methods:{
+    handleBack(){
+      uni.switchTab({
+        url: '/pages/index/index'
+      })
+    },
+    //跳转到地图
+    handleGoSelectService() {
+      uni.navigateTo({
+        url:`/pages/map/index?chartType=${true}&page=/pages/examine/detail&serviceInfo=${JSON.stringify(this.serviceInfo)}`
+      })
+    },
+    // 滚动轮播图
+    changeSwiper(e){
+      console.log('e',e)
+      this.currentSwiper = e.detail.current
+      let value = this.carSwiperList[Number(e.detail.current)]
+      if (this.type===1){
+        if (value==='previous'){
+          uni.redirectTo({
+            url:`/pages/commercialBI/formatPortraitBI`
+          })
+        }else if(value==='next'){
+          uni.redirectTo({
+            url:`/pages/examine/detail?type=${2}`
+          })
+        }
+      }else{
+        if (value==='previous'){
+          uni.redirectTo({
+            url:`/pages/examine/detail?type=${1}`
+          })
+        }else if(value==='next'){
+          uni.redirectTo({
+            url:`/pages/map/detail`
+          })
+        }
+      }
+    },
     handleChangeChild(subItem){
       console.log('subItem',subItem)
       subItem.showChild = !subItem.showChild
@@ -379,102 +460,413 @@ export default {
 
 <style scoped lang="scss">
 .main{
-  .content{
-    width: calc(100% - 64rpx);
-    margin-left: 32rpx;
-    .timeBox{
-      width: 100%;
-      height: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
+  width: 100%;
+  height: 100vh;
+  position: relative;
+  .headerBox{
+    position: fixed;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 32rpx;
+    display: flex;
+    align-items: center;
+    z-index: 3;
+    .arrowIcon{
+      width: 48rpx;
+      height: 48rpx;
     }
-    .serviceList{
-      width: 100%;
-      .serviceItem{
-        width: 100%;
-        box-sizing: border-box;
-        padding: 16px;
-        border-radius: 8px;
-        margin-bottom: 12px;
-        background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-        .itemTitle{
+    .pickerTop{
+      margin-left: 16rpx;
+      .selectService{
+        display: flex;
+        align-items: center;
+        .img{
+          width: 40px;
+          height: 40px;
+          z-index: 2;
+        }
+        .select{
+          height: 32px;
+          background: #F8F8FA;
+          border-radius: 0 16px 16px 0;
+          transform: translateX(-20px);
+          box-sizing: border-box;
+          padding-left: 25px;
           display: flex;
           align-items: center;
+          .content{
+            display: flex;
+            align-items: center;
+            .uni-input{
+              padding: 0;
+              background: transparent;
+              font-size: 14px;
+              font-family: PingFangSC-Semibold, PingFang SC;
+              font-weight: 600;
+              color: #160002;
+            }
+            .area{
+              font-size: 12px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #786B6C;
+              line-height: 40px;
+              margin-left: 4px;
+            }
+            .rightArrow{
+              width: 24px;
+              height: 12px;
+            }
+          }
+
+        }
+      }
+    }
+  }
+  .swiperBox{
+    width:100%;
+    height: 340px;
+    position: relative;
+    .swiperItem{
+      width:100%;
+      height: 340px;
+      .header{
+        width:100%;
+        height: 340px;
+        position: absolute;
+        top: 0;left: 0;
+        z-index:1;
+
+      }
+    }
+  }
+  .bigContent{
+    width: 100%;
+    position: absolute;
+    z-index:2;
+    background: #fff;
+    left: 0;
+    border-top-left-radius: 32rpx;
+    border-top-right-radius: 32rpx;
+    .contentTop{
+      width: 100%;
+      box-sizing: border-box;
+      padding: 0 32rpx;
+      height: 40px;
+      font-size: 32rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      font-size: 32rpx;
+      //.nameTop{
+      //
+      //}
+      //.timeBox{
+      //
+      //  display: flex;
+      //  align-items: center;
+      //  justify-content: flex-end;
+      //}
+    }
+
+    .content{
+      width: calc(100% - 64rpx);
+      height: calc(100vh - 380px);
+      margin-left: 32rpx;
+      overflow-y: scroll;
+      .serviceList{
+        width: 100%;
+        .serviceItem{
+          width: 100%;
+          box-sizing: border-box;
+          padding: 16px;
+          border-radius: 8px;
+          margin-bottom: 12px;
+          background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
+          .itemTitle{
+            display: flex;
+            align-items: center;
+            .title{
+              font-size: 18px;
+              font-family: Alimama ShuHeiTi;
+              color: #33077A;
+              line-height: 26px;
+            }
+            .unit{
+              font-size: 12px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #3B48E3;
+              line-height: 12px;
+              padding: 3px 4px;
+              background: rgba(59, 72, 227, 0.1);
+              margin-left: 8px;
+              border-radius: 2px;
+            }
+            .secondUnit{
+              background:rgba(0, 147, 46, 0.1);
+              border-radius: 2px;
+              font-size: 12px;
+              padding: 3px 4px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #00932E;
+              margin-left: 8px;
+              line-height: 12px;
+            }
+          }
+          .detail{
+            margin-top: 18px;
+            .detailTop{
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              border-bottom: 1px solid rgba(212, 196, 244, 0.2);
+              padding: 0 0 8px;
+              .left{
+                display: flex;
+                align-items: center;
+                .icon{
+                  width: 22px;
+                  height: 22px;
+                }
+                .type{
+                  font-size: 14px;
+                  font-family: PingFangSC-Semibold, PingFang SC;
+                  font-weight: 600;
+                  color: #160002;
+                  line-height: 20px;
+                  margin-left: 8px;
+                }
+              }
+              .right{
+                font-size: 22px;
+                font-family: DINAlternate-Bold, DINAlternate;
+                font-weight: bold;
+                color: #160002;
+                line-height: 22px;
+                .unit{
+                  font-size: 12px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #786B6C;
+                  line-height: 18px;
+                  margin-left: 2px;
+                }
+              }
+            }
+            .detailMessage{
+              margin-top: 14px;
+              .message{
+                display: flex;
+                align-items: center;
+                .icon{
+                  width: 16px;
+                  height: 16px;
+                }
+                .value{
+                  font-size: 14px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #160002;
+                  line-height: 20px;
+                  margin-left: 8px;
+                  width: 90%;
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                }
+                .moreIcon{
+                  width: 16px;
+                  height: 16px;
+                }
+              }
+            }
+          }
+        }
+        .dailyInspection{
+          width: 100%;
+          height: 267px;
+          background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
+          border-radius: 8px;
+          margin-bottom: 12px;
+          box-sizing: border-box;
+          padding: 16px;
+          .itemTitle{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .title{
+              font-size: 18px;
+              font-family: Alimama ShuHeiTi;
+              color: #33077A;
+              line-height: 26px;
+            }
+            .more{
+              display: flex;
+              align-items: center;
+              .moreText{
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #786B6C;
+                line-height: 20px;
+              }
+              .icon{
+                width: 15px;
+                height: 15px;
+                margin-left: 7px;
+              }
+            }
+          }
+          .detail{
+            margin-top: 19px;
+            .detailTop{
+              width: 100%;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              .left{
+                display: flex;
+                align-items: center;
+                .icon{
+                  width: 22px;
+                  height: 22px;
+                  margin-right: 8px;
+                }
+                .type{
+                  font-size: 14px;
+                  font-family: PingFangSC-Semibold, PingFang SC;
+                  font-weight: 600;
+                  color: #160002;
+                  line-height: 20px;
+                  margin-right: 4px;
+                }
+                .number{
+                  font-size: 14px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #786B6C;
+                  line-height: 20px;
+                }
+              }
+              .right{
+                width: 20px;
+                height: 20px;
+              }
+            }
+            .detailMessage{
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              padding-bottom: 16px;
+              .person{
+                margin-top: 12px;
+                .value{
+                  font-size: 14px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #160002;
+                  line-height: 20px;
+                  margin-bottom: 2px;
+                }
+                .label{
+                  font-size: 12px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #786B6C;
+                  line-height: 18px;
+                }
+                .icon{
+                  margin-bottom:-2px;
+                  width: 16px;
+                  height: 19px;
+                }
+              }
+
+            }
+          }
+        }
+        .meeting{
+          width: 100%;
+          height: 209px;
+          background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
+          border-radius: 8px;
+          margin-bottom: 12px;
+          box-sizing: border-box;
+          padding: 16px;
           .title{
             font-size: 18px;
             font-family: Alimama ShuHeiTi;
             color: #33077A;
             line-height: 26px;
+            margin-bottom: 18px;
           }
-          .unit{
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #3B48E3;
-            line-height: 12px;
-            padding: 3px 4px;
-            background: rgba(59, 72, 227, 0.1);
-            margin-left: 8px;
-            border-radius: 2px;
-          }
-          .secondUnit{
-            background:rgba(0, 147, 46, 0.1);
-            border-radius: 2px;
-            font-size: 12px;
-            padding: 3px 4px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #00932E;
-            margin-left: 8px;
-            line-height: 12px;
-          }
-        }
-        .detail{
-          margin-top: 18px;
-          .detailTop{
+          .meetContent{
+            width: 100%;
             display: flex;
-            align-items: center;
             justify-content: space-between;
+            align-items: center;
+            padding-bottom: 8px;
             border-bottom: 1px solid rgba(212, 196, 244, 0.2);
-            padding: 0 0 8px;
             .left{
               display: flex;
               align-items: center;
               .icon{
-                width: 22px;
-                height: 22px;
+                width: 24px;
+                height: 24px;
+                margin-right: 8px;
               }
-              .type{
+              .text{
                 font-size: 14px;
                 font-family: PingFangSC-Semibold, PingFang SC;
                 font-weight: 600;
                 color: #160002;
                 line-height: 20px;
-                margin-left: 8px;
               }
             }
             .right{
-              font-size: 22px;
-              font-family: DINAlternate-Bold, DINAlternate;
-              font-weight: bold;
-              color: #160002;
-              line-height: 22px;
-              .unit{
-                font-size: 12px;
+              display: flex;
+              align-items: center;
+              .icon{
+                width: 12px;
+                height: 12px;
+                margin-right: 4px;
+              }
+              .text{
+                font-size: 14px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #786B6C;
-                line-height: 18px;
-                margin-left: 2px;
+                color: #160002;
+                line-height: 20px
               }
             }
           }
-          .detailMessage{
-            margin-top: 14px;
+          .noDataItem{
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            margin-top: 6px;
+            .img{
+              width: 80px;
+              height: 80px;
+            }
+            .text{
+              text-align: center;
+              font-size: 14px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #A69E9F;
+            }
+          }
+          .detail{
+            margin-top: 12px;
             .message{
               display: flex;
               align-items: center;
+              position: relative;
               .icon{
                 width: 16px;
                 height: 16px;
@@ -488,14 +880,65 @@ export default {
                 margin-left: 8px;
                 width: 90%;
                 white-space: nowrap;
-                overflow: hidden;
                 text-overflow: ellipsis;
+                overflow: hidden;
               }
-              .moreIcon{
-                width: 16px;
-                height: 16px;
+              .more{
+                width: 12px;
+                height: 12px;
+                position: absolute;
+                right: 0;
               }
             }
+            .other{
+              display: flex;
+              align-items: flex-start;
+              position: relative;
+              .icon{
+                width: 16px;
+                height: 16px;
+                margin-top: 2px;
+              }
+              .value{
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #160002;
+                line-height: 20px;
+                margin-left: 8px;
+                width: 90%;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+              }
+              .more{
+                width: 12px;
+                height: 12px;
+                position: absolute;
+                right: 0;bottom: 3px;
+              }
+            }
+          }
+        }
+        .noData{
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          margin-top: 20vh;
+          .img{
+            width: 80px;
+            height: 80px;
+          }
+          .text{
+            text-align: center;
+            font-size: 20px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #A69E9F;
+            line-height: 20px;
+            margin-top: 8px;
           }
         }
       }
@@ -602,263 +1045,6 @@ export default {
           }
         }
       }
-      .meeting{
-        width: 100%;
-        height: 209px;
-        background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-        border-radius: 8px;
-        margin-bottom: 12px;
-        box-sizing: border-box;
-        padding: 16px;
-        .title{
-          font-size: 18px;
-          font-family: Alimama ShuHeiTi;
-          color: #33077A;
-          line-height: 26px;
-          margin-bottom: 18px;
-        }
-        .meetContent{
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          padding-bottom: 8px;
-          border-bottom: 1px solid rgba(212, 196, 244, 0.2);
-          .left{
-            display: flex;
-            align-items: center;
-            .icon{
-              width: 24px;
-              height: 24px;
-              margin-right: 8px;
-            }
-            .text{
-              font-size: 14px;
-              font-family: PingFangSC-Semibold, PingFang SC;
-              font-weight: 600;
-              color: #160002;
-              line-height: 20px;
-            }
-          }
-          .right{
-            display: flex;
-            align-items: center;
-            .icon{
-              width: 12px;
-              height: 12px;
-              margin-right: 4px;
-            }
-            .text{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px
-            }
-          }
-        }
-        .noDataItem{
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          margin-top: 6px;
-          .img{
-            width: 80px;
-            height: 80px;
-          }
-          .text{
-            text-align: center;
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #A69E9F;
-          }
-        }
-        .detail{
-          margin-top: 12px;
-          .message{
-            display: flex;
-            align-items: center;
-            position: relative;
-            .icon{
-              width: 16px;
-              height: 16px;
-            }
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-left: 8px;
-              width: 90%;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              overflow: hidden;
-            }
-            .more{
-              width: 12px;
-              height: 12px;
-              position: absolute;
-              right: 0;
-            }
-          }
-          .other{
-            display: flex;
-            align-items: flex-start;
-            position: relative;
-            .icon{
-              width: 16px;
-              height: 16px;
-              margin-top: 2px;
-            }
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-left: 8px;
-              width: 90%;
-              display: -webkit-box;
-              -webkit-line-clamp: 2;
-              -webkit-box-orient: vertical;
-              overflow: hidden;
-            }
-            .more{
-              width: 12px;
-              height: 12px;
-              position: absolute;
-              right: 0;bottom: 3px;
-            }
-          }
-        }
-      }
-      .noData{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        margin-top: 20vh;
-        .img{
-          width: 80px;
-          height: 80px;
-        }
-        .text{
-          text-align: center;
-          font-size: 20px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #A69E9F;
-          line-height: 20px;
-          margin-top: 8px;
-        }
-      }
-    }
-    .dailyInspection{
-      width: 100%;
-      height: 267px;
-      background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-      border-radius: 8px;
-      margin-bottom: 12px;
-      box-sizing: border-box;
-      padding: 16px;
-      .itemTitle{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .title{
-          font-size: 18px;
-          font-family: Alimama ShuHeiTi;
-          color: #33077A;
-          line-height: 26px;
-        }
-        .more{
-          display: flex;
-          align-items: center;
-          .moreText{
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #786B6C;
-            line-height: 20px;
-          }
-          .icon{
-            width: 15px;
-            height: 15px;
-            margin-left: 7px;
-          }
-        }
-      }
-      .detail{
-        margin-top: 19px;
-        .detailTop{
-          width: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .left{
-            display: flex;
-            align-items: center;
-            .icon{
-              width: 22px;
-              height: 22px;
-              margin-right: 8px;
-            }
-            .type{
-              font-size: 14px;
-              font-family: PingFangSC-Semibold, PingFang SC;
-              font-weight: 600;
-              color: #160002;
-              line-height: 20px;
-              margin-right: 4px;
-            }
-            .number{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 20px;
-            }
-          }
-          .right{
-            width: 20px;
-            height: 20px;
-          }
-        }
-        .detailMessage{
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding-bottom: 16px;
-          .person{
-            margin-top: 12px;
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-bottom: 2px;
-            }
-            .label{
-              font-size: 12px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 18px;
-            }
-            .icon{
-              margin-bottom:-2px;
-              width: 16px;
-              height: 19px;
-            }
-          }
-
-        }
-      }
     }
   }
   .popup{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ef46ec0..2980c5b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,7 +25,7 @@
         <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>-->
+            <text class="searchIconText">数智驿达</text>
           </view>
           <view class="seachBox" @click="handleGoMap">
             <image class="searchIcon" src="/static/images/seach/searchIcon.svg"/>
@@ -143,7 +143,7 @@
                     <view class="goBusiness">
                       <!--                        @click="handleGoProject"-->
                       <view class="bussinessRight" >
-                        <span class="bussinessText">单位 万元</span>
+                        <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>
@@ -405,6 +405,44 @@
     </view>
 
     <view class="funEntry">
+      <!--    车流预警-->
+      <!--        -->
+      <view class="carWarning" v-if="special"  @click="handleGoWarning">
+        <div class="carWarningTop">
+          <!-- @click="handleGoWarning" -->
+          <div class="warningBox" >
+            <image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/home/carIcon.svg"/>
+            <div class="trafficBox" >
+              <text class="trafficCar">车流预警</text>
+              <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/carMoreIcon.svg"/>
+            </div>
+          </div>
+          <div class="moreStoreBox" >
+            <span class="moreText">更多记录</span>
+            <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
+          </div>
+        </div>
+        <div class="contentList" >
+          <div class="contentItem" v-for="(item,index) in warningList" :key="index">
+            <div class="index">
+              <div class="boxBg" v-if="index<=2"></div>
+              <span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
+            </div>
+            <div class="serviceBox">
+              <span class="name">{{item.name}}</span>
+              <span class="position">{{item.SERVERPART_REGION}}区</span>
+            </div>
+            <div class="numberBox">
+              <span class="number">{{item.VEHICLE_COUNT}}</span>
+              <span class="unit">/辆</span>
+            </div>
+            <div class="addBox">
+              <image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'https://eshangtech.com/ShopICO/ahyd-BID/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg'"/>
+              <span class="add">{{item.VEHICLE_RATE}}%</span>
+            </div>
+          </div>
+        </div>
+      </view>
 <!--      <span @click="handleGoProject">111</span>-->
 <!--      八个有背景的导航栏-->
       <view class="funBox">
@@ -447,19 +485,19 @@
         <view class="secondView">
 
           <view class="funItemView" @click="handleGoOperate" style="background: url('https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/newRevenueBg.svg')">
-            <text class="funItemTitle" style="color: #0086C6;">经营报表</text>
+            <text class="funItemTitle" style="color: #0086C6;">商业经营</text>
             <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/3stTypeImg.svg"/>
             <image class="typeImg"  src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stTypeImg.svg"/>
           </view>
-          <view class="funItemView" @click="handleFestival" style="margin-right: 9px;background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/brandHouse.svg')">
-            <text class="funItemTitle" style="color: #3F66DA;">经营品牌库</text>
+          <view class="funItemView" @click="handleFestival" style="background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/brandHouse.svg')">
+            <text class="funItemTitle" style="color: #3F66DA;">商业品牌</text>
             <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/4stTypeImg.svg"/>
             <image class="typeImg"  src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stTypeImg.svg"/>
 
 <!--            <image class="typeImg"  src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stTypeImg.svg"/>-->
           </view>
           <view class="funItemView" style="background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/newIndex/funFifth.svg')" @click="handleMoney">
-            <text class="funItemTitle" style="color: #7C46CD;">财务报表</text>
+            <text class="funItemTitle" style="color: #7C46CD;">财务月报</text>
             <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/5stTypeImg.svg"/>
             <image class="typeImg"  src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/5stTypeImg.svg"/>
           </view>
@@ -495,44 +533,7 @@
         </div>
       </div>
 
-	  <!--    车流预警-->
-<!--        -->
-	  <view class="carWarning" v-if="special"  @click="handleGoWarning">
-	    <div class="carWarningTop">
-			<!-- @click="handleGoWarning" -->
-	      <div class="warningBox" >
-	        <image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/home/carIcon.svg"/>
-	        <div class="trafficBox" >
-	          <text class="trafficCar">车流预警</text>
-	          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/carMoreIcon.svg"/>
-	        </div>
-	      </div>
-	      <div class="moreStoreBox" >
-	         <span class="moreText">更多记录</span>
-	         <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
-	      </div>
-	    </div>
-	    <div class="contentList" >
-	      <div class="contentItem" v-for="(item,index) in warningList" :key="index">
-	        <div class="index">
-	          <div class="boxBg" v-if="index<=2"></div>
-	          <span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
-	        </div>
-	        <div class="serviceBox">
-	          <span class="name">{{item.name}}</span>
-	          <span class="position">{{item.SERVERPART_REGION}}区</span>
-	        </div>
-	        <div class="numberBox">
-	          <span class="number">{{item.VEHICLE_COUNT}}</span>
-	          <span class="unit">/辆</span>
-	        </div>
-	        <div class="addBox">
-	          <image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'https://eshangtech.com/ShopICO/ahyd-BID/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg'"/>
-	          <span class="add">{{item.VEHICLE_RATE}}%</span>
-	        </div>
-	      </div>
-	    </div>
-	  </view>
+
       <!--    人流预警-->
       <view class="peopleWarning"  v-if="false">
         <div class="carWarningTop">
@@ -571,7 +572,7 @@
       </view>
 
       <!--    自营计划-->
-      <view class="selfPlan">
+      <view class="selfPlan" v-if="false">
         <view class="selfPlanTitle">自营计划</view>
 
         <view class="content">
@@ -661,7 +662,7 @@
       </view>
 
       <!--    营收占比-->
-      <view class="proportion">
+      <view class="proportion" v-if="false">
         <view class="proportionTitle">营收占比</view>
 
         <view class="contentPropor">
@@ -2346,15 +2347,17 @@ $iphoneHeight: env(safe-area-inset-bottom);
             margin-right: 4px;
           }
           .searchIconText{
-            font-size: 28rpx;
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 600;
+            font-size: 30rpx;
+            font-family: Alimama ShuHeiTi;
+            font-weight: 400;
             color: #160002;
             line-height: 40rpx;
+            margin-left: 6rpx;
+            //font-style: oblique;
           }
         }
         .seachBox{
-          width: 350rpx;
+          width: 330rpx;
           height: 100%;
           background: #fff;
           border-radius: 32rpx;
@@ -2369,7 +2372,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
               margin-right: 12rpx;
             }
           .searchText{
-            font-size: 28rpx;
+            font-size: 26rpx;
             color: #A69E9F;
           }
         }
@@ -4214,7 +4217,8 @@ $iphoneHeight: env(safe-area-inset-bottom);
     .carWarning{
       width:calc(100% - 32px);
       margin-left: 16px;
-      margin-top: 20px;
+      //margin-top: 20px;
+      margin-bottom: 20px;
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/home/warningBg.svg");
       background-repeat: no-repeat;
       background-size: cover;
diff --git a/pages/map/detail.vue b/pages/map/detail.vue
index 06d6958..18dc9a5 100644
--- a/pages/map/detail.vue
+++ b/pages/map/detail.vue
@@ -1,32 +1,47 @@
 <template>
   <div class="main">
-    <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">
-      <commercial-type :have="7"/>
-    </div>
+<!--    <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+<!--      <commercial-type :have="7"/>-->
+<!--    </div>-->
       <div class="leftArrow" :style="{top:(menu.top + ((menu.height - 24)/2) )+ 'px'}" >
           <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg" @click="handleBack"></image>
-          <div class="pickers" v-if="isShowPicker" @click="handleChangeService">
-              <div class="pick" :value="selectIndex" :range="array" range-key="name">
-                  <view class="picker">
-                      <p class="pickTitle">{{info.SERVERPART_NAME?info.SERVERPART_NAME:''}}</p>
-                      {{info.SPREGIONTYPE_NAME?info.SPREGIONTYPE_NAME:''}}
-                  </view>
-                  <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
-              </div>
+
+<!--          <div class="pickers"  @click="handleChangeService">-->
+<!--            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>-->
+<!--              <div class="pick" :value="selectIndex" :range="array" range-key="name">-->
+<!--                  <view class="picker">-->
+<!--                      <p class="pickTitle">{{info.SERVERPART_NAME?info.SERVERPART_NAME:''}}</p>-->
+<!--                      {{info.SPREGIONTYPE_NAME?info.SPREGIONTYPE_NAME:''}}-->
+<!--                  </view>-->
+<!--                  <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>-->
+<!--              </div>-->
+<!--          </div>-->
+        <div class="picker" :style="{top:(menu.bottom + 24)+'px'}" @click="handleChangeService">
+          <div class="selectService" >
+            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+            <view class="select">
+              <view class="content">
+                <view class="uni-input">{{info.SERVERPART_NAME?info.SERVERPART_NAME:''}}</view>
+                <p class="area">{{info.SPREGIONTYPE_NAME?info.SPREGIONTYPE_NAME:''}}</p>
+                <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+              </view>
+            </view>
           </div>
+        </div>
+
       </div>
       <div class="topImg">
           <swiper v-if="topBg && topBg.length>0" :current="currentImg" class="carousel" @change="changeSwiper">
-              <swiper-item class="imgIndex" v-for="(item,index) in topBg" :key="index" >
-                  <image class="img" :src="item"></image>
+              <swiper-item class="imgIndex" v-for="(item,index) in topBg" :key="index" :style="{backgroundImage:`url(${item})`}">
+<!--                  <image class="img" :src="item"></image>-->
               </swiper-item>
           </swiper>
           <div v-if="topBg && topBg.length>0" class="picNumber" @click="handlePreview">
               <image class="icon" src="/static/images/noImg.svg"></image>
-              <text class="text"> {{currentImg + 1}} / {{ topBg.length }}</text>
+              <text class="text"> {{ currentImg<1?1:currentImg>topBgRealLength?topBgRealLength:currentImg }} / {{ topBgRealLength }}</text>
               <image class="more" src="/static/images/more.svg"></image>
           </div>
-          <image v-else @click="handlePreview('default')" class="topDefaultBg" src="https://eshangtech.com/ShopICO/ahyd-BID/service/default.png"></image>
+<!--          <image v-else @click="handlePreview('default')" class="topDefaultBg" src="https://eshangtech.com/ShopICO/ahyd-BID/service/default.png"></image>-->
       </div>
       <div class="menu">
           <div class="top">
@@ -186,7 +201,8 @@ export default {
             selectTopBg:0,
             screenWidth:0,
             currentImg:0,//当前选中的图片
-          come:'',// 来自首页还是用户页
+          come:'',// 来自首页还是用户页,
+          topBgRealLength:0,// 去除添加的上一个 后一个 的真实图片长度
         }
     },
     onLoad(option){
@@ -205,6 +221,8 @@ export default {
     onShow(){
         let seat = uni.getStorageSync('currentService')
         this.handleSearch(seat)
+      this.topBg = []
+        this.currentImg = 1
     },
     onUnload() {
 
@@ -213,7 +231,19 @@ export default {
     methods:{
         // 滚动轮播图
         changeSwiper(e){
-            this.currentImg = e.detail.current
+          console.log('e',e)
+          this.currentImg = e.detail.current
+          console.log('thisbg',this.topBg[Number(e.detail.current)])
+          let value = this.topBg[Number(e.detail.current)].key
+            if (value==='previous'){
+              uni.redirectTo({
+                url:`/pages/examine/detail?type=${2}`
+              })
+            }else if(value==='next'){
+              uni.redirectTo({
+                url:`/pages/commercialBI/carPortrait`
+              })
+            }
         },
         // 点击预览图片
         handlePreview(type){
@@ -236,6 +266,7 @@ export default {
                 latitude:seat.latitude
             }
             const totalData = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo',reqs)
+          console.log('totalData',totalData)
             this.info = totalData.Result_Data
             this.typeList[4].isShow = this.info.HASCHARGE
             this.typeList[5].isShow = this.info.HASGUESTROOM
@@ -247,7 +278,23 @@ export default {
                 this.typeList[0].isShow = this.info.HASCHARGE
             }
             this.typeList[1].isShow = this.info.STARTDATE
+          if (this.info && this.info.ImageLits && this.info.ImageLits.length>0){
+            console.log('111')
             this.topBg = this.info.ImageLits
+            this.topBg.unshift({key:'previous'})
+            this.topBg.push({key:'next'})
+            this.currentImg = 1
+            this.topBgRealLength = this.topBg.length-2
+            console.log('this.topBg',this.topBg)
+            this.$forceUpdate()
+          }else{
+            this.topBg = ['https://eshangtech.com/ShopICO/ahyd-BID/service/default.png']
+            this.topBg.unshift({key:'previous'})
+            this.topBg.push({key:'next'})
+            this.currentImg = 1
+            this.topBgRealLength = this.topBg.length - 2
+          }
+
         },
         //选择服务区
         handleChangeService(){
@@ -355,47 +402,56 @@ export default {
             height: 24px;
             margin-right: 16px;
         }
-        .pickers{
-            min-width: 175px;
+      .picker{
+        .selectService{
+          display: flex;
+          align-items: center;
+          .img{
+            width: 40px;
+            height: 40px;
+            z-index: 2;
+          }
+          .select{
             height: 32px;
-            background: #FFFFFF;
-            border-radius: 16px;
+            background: #F8F8FA;
+            border-radius: 0 16px 16px 0;
+            transform: translateX(-40px);
             box-sizing: border-box;
-            padding: 0 12px;
-            .pick{
-                height: 100%;
-                position: relative;
-                .picker{
-                    height: 32px;
-                    font-size: 12px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #786B6C;
-                    line-height: 18px;
-                    display: flex;
-                    align-items: center;
-                    .pickTitle{
-                        font-size: 14px;
-                        font-family: PingFangSC-Semibold, PingFang SC;
-                        font-weight: 600;
-                        color: #160002;
-                        line-height: 20px;
-                        margin-right: 4px;
-                    }
-                }
-                .rightArrow{
-                    width: 24px;
-                    height: 12px;
-                    position: absolute;
-                    right: -10%;top: 50%;
-                    transform: translateY(-50%);
-                }
+            padding-left: 25px;
+            display: flex;
+            align-items: center;
+            .content{
+              display: flex;
+              align-items: center;
+              .uni-input{
+                padding: 0;
+                background: transparent;
+                font-size: 14px;
+                font-family: PingFangSC-Semibold, PingFang SC;
+                font-weight: 600;
+                color: #160002;
+              }
+              .area{
+                font-size: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #786B6C;
+                line-height: 40px;
+                margin-left: 4px;
+              }
+              .rightArrow{
+                width: 24px;
+                height: 12px;
+              }
             }
+
+          }
         }
+      }
     }
   .topImg{
     width: 100%;
-    height: 210px;
+    height: 324px;
     position: relative;
     .topDefaultBg{
       width: 100%;
@@ -409,10 +465,11 @@ export default {
         .imgIndex{
             width: 100%;
             height: 100%;
-            .img{
-                width: 100%;
-                height: 100%;
-            }
+          background-size: 100% 100%;
+            //.img{
+            //    width: 100%;
+            //    height: 324px;
+            //}
         }
     }
     .picNumber{
@@ -446,7 +503,7 @@ export default {
     .menu{
         width:100%;
         box-sizing: border-box;
-        height: calc(100vh - 196px);
+        height: calc(100vh - 332px);
         border-radius: 16px 16px 1px 1px;
         transform: translateY(-16px);
         .top{
@@ -620,7 +677,7 @@ export default {
                 width: 100vw;
                 box-sizing: border-box;
                 background: #fff;
-                padding: 12px 16px calc(16px + env(safe-area-inset-bottom));
+                padding: 12px 16px ;
                 .serviceItem{
                     margin-top: 4px;
                     .title{
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 6da6252..c64ddd0 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -91,7 +91,8 @@ export default {
             area:'',//当前选中片区名称
             serviceInfo:{},
           type:'',// 哪里进来
-          serviceTypeObj:{}
+          serviceTypeObj:{},
+          serviceMessage:{},// 当前选中的服务区
         }
     },
     onLoad(option){
@@ -123,6 +124,7 @@ export default {
     },
     onShow(){
         let seat = uni.getStorageSync('currentService')
+      console.log('seat',seat)
         if (seat && !seat.latitude){
             JSON.parse(seat)
         }
@@ -229,6 +231,11 @@ export default {
             // data.Result_Data.List.forEach(item=>{
             //   list.push({name:item.name,value:item.value})
             // })
+          let seat = uni.getStorageSync('currentService')
+          if (seat && seat.SERVERPART_NAME==='安徽驿达'){
+            this.selectIndex = 0
+            this.serviceMessage = seat
+          }
             this.array = list
             if (this.area){
                 this.array.forEach((item,index)=>{
@@ -342,6 +349,11 @@ export default {
             }
             const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req)
             this.serviceList = data.Result_Data.List
+          console.log(' this.serviceList', this.serviceList)
+          if (this.serviceMessage && this.serviceMessage.SERVERPART_NAME){
+            this.longitude = this.serviceList[0].SERVERPART_X
+            this.latitude = this.serviceList[0].SERVERPART_Y
+          }
         },
         //点击向上移动
         handleChangeUp(){
diff --git a/static/public/font2/EPAg3o21O7iw.woff2 b/static/public/font2/EPAg3o21O7iw.woff2
deleted file mode 100644
index 369341a..0000000
Binary files a/static/public/font2/EPAg3o21O7iw.woff2 and /dev/null differ
diff --git a/static/public/font2/EZIBw3INKZGz.woff b/static/public/font2/EZIBw3INKZGz.woff
new file mode 100644
index 0000000..43fa9cc
Binary files /dev/null and b/static/public/font2/EZIBw3INKZGz.woff differ
diff --git a/static/public/font2/dTdd8RYsECT8.woff b/static/public/font2/dTdd8RYsECT8.woff
new file mode 100644
index 0000000..9ad1fc4
Binary files /dev/null and b/static/public/font2/dTdd8RYsECT8.woff differ
diff --git a/static/public/font2/stylesheet.css b/static/public/font2/stylesheet.css
index 03c1747..51f9252 100644
--- a/static/public/font2/stylesheet.css
+++ b/static/public/font2/stylesheet.css
@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'Alimama ShuHeiTi';
-    src:url("/static/public/font2/tzfy1e4Fbqbs.woff");
+    src:url("/static/public/font2/EZIBw3INKZGz.woff");
     font-weight: bold;
     font-style: normal;
     font-display: swap;