From a069709f764fb18a1b7b1b3bbad53f4872645285 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Tue, 26 Dec 2023 18:59:17 +0800
Subject: [PATCH] update

---
 pages.json                                    |   1 +
 pages/commercialBI/businessPortrait.vue       |  15 +-
 pages/commercialBI/carPortrait.vue            | 931 ++++++++--------
 .../commercialBI/components/car/homePlace.vue |   1 -
 pages/commercialBI/components/headerTop.vue   | 578 ++++++----
 pages/commercialBI/formatPortrait.vue         |   1 +
 pages/commercialBI/formatPortraitBI.vue       |  15 +-
 pages/commercialBI/guestPortrait.vue          |  16 +-
 pages/commercialBI/managePortrait.vue         |  15 +-
 pages/examine/commercialType.vue              |   2 +-
 pages/examine/detail.vue                      | 994 +++++++++++-------
 pages/index/index.vue                         | 108 +-
 pages/map/detail.vue                          | 171 ++-
 pages/map/index.vue                           |  14 +-
 static/public/font2/EPAg3o21O7iw.woff2        | Bin 3944 -> 0 bytes
 static/public/font2/EZIBw3INKZGz.woff         | Bin 0 -> 5880 bytes
 static/public/font2/dTdd8RYsECT8.woff         | Bin 0 -> 5848 bytes
 static/public/font2/stylesheet.css            |   2 +-
 18 files changed, 1673 insertions(+), 1191 deletions(-)
 delete mode 100644 static/public/font2/EPAg3o21O7iw.woff2
 create mode 100644 static/public/font2/EZIBw3INKZGz.woff
 create mode 100644 static/public/font2/dTdd8RYsECT8.woff

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 369341ae580108fac6422cd1cbce3784718e91fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3944
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
C!g3%0

diff --git a/static/public/font2/EZIBw3INKZGz.woff b/static/public/font2/EZIBw3INKZGz.woff
new file mode 100644
index 0000000000000000000000000000000000000000..43fa9cc25a1b88ba634e1d605446bf62d72886b6
GIT binary patch
literal 5880
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

literal 0
HcmV?d00001

diff --git a/static/public/font2/dTdd8RYsECT8.woff b/static/public/font2/dTdd8RYsECT8.woff
new file mode 100644
index 0000000000000000000000000000000000000000..9ad1fc447ada6510de2eebf25b2bdbb0f122fe35
GIT binary patch
literal 5848
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
V4T2D+dNRDl0nGF;tYB~U{{ZU&!u0?E

literal 0
HcmV?d00001

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;