update

pages/commercialBI/carPortrait.vue

@@ -568,7 +568,7 @@ export default {
               item.entry = entryNum
               item.flow = flowNum
               item.flowRate =flowNumNoZero? ((entryNumNoZero / flowNumNoZero)*100).toFixed(2) + '%':'-'
-              item.showChild = true
+              item.showChild = false
               item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}]
               item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':''
           })

pages/commercialBI/components/guest/consumptionLevel.vue

@@ -32,7 +32,7 @@
         <div class="gender">
             <div class="top">
                 <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/woman.svg"></image>
-                <p class="title">{{genderList[0].name}}</p>
+                <p class="title">{{genderList[1].name}}</p>
             </div>
             <div class="progress">
                 <div class="small" v-if="genderList[1].small" :style="{background:'#C6D3D7',width:genderList[1].small + '%'}" @click="handleShow('woman',0,genderList[0].small,$event)">{{genderList[1].small<16?'':genderList[1].small + '%'}}</div>

pages/commercialBI/managePortrait.vue

@@ -8,17 +8,17 @@
 
         <div class="charts">
             <div class="chartsItem">
-                <p class="title">营收分析</p>
+                <p class="title">合同执行情况</p>
                 <revenue-analysis :data="revenueList"/>
             </div>
             <div class="chartsItem" style="margin-top: 32px">
                 <p class="title">合同保底</p>
                 <contract-guarantee :data="contractList"/>
             </div>
-            <div class="chartsItem" style="margin-top: 32px">
-                <p class="title">客流客单交易</p>
-                <contract-guarantee :data="orderTransaction"/>
-            </div>
+<!--            <div class="chartsItem" style="margin-top: 32px">-->
+<!--                <p class="title">客流客单交易</p>-->
+<!--                <contract-guarantee :data="orderTransaction"/>-->
+<!--            </div>-->
             <div class="chartsItem" style="margin-top: 32px">
                 <p class="title">同比分析</p>
                 <view class="tab" >

pages/examine/index.vue

@@ -276,9 +276,11 @@ export default {
             popupServiceShowList:[],// 显示的表单内容
             popupServiceName:'',// 点击更多记录的表单名称
             popupMeetDetail:{},// 弹出框的会议详情内容
+          come:'',// 来自首页还是用户页
         }
     },
-    onLoad(){
+    onLoad(query){
+      this.come = query.come
       //  获取手机参数对页面进行适配
       let systemInfo = uni.getSystemInfoSync()
       this.windowHeight = systemInfo.windowHeight
@@ -438,9 +440,16 @@ export default {
         },
         // 返回按钮的方法
         handleBack(){
-          uni.switchTab({
-             url: '/pages/userCenter/userCenter'
-          })
+          if (this.come==='index'){
+            uni.switchTab({
+              url: '/pages/index/index'
+            })
+          }else{
+            uni.switchTab({
+              url: '/pages/userCenter/userCenter'
+            })
+          }
+
         },
         // 选择日期的方法
         handleChangeDate(value){

pages/map/detail.vue

@@ -181,9 +181,11 @@ export default {
             selectTopBg:0,
             screenWidth:0,
             currentImg:0,//当前选中的图片
+          come:'',// 来自首页还是用户页
         }
     },
     onLoad(option){
+      this.come = option.come
         // 获取手机参数
         let systemInfo = uni.getSystemInfoSync()
         this.statusBarHeight = Number(systemInfo.statusBarHeight)
@@ -200,6 +202,7 @@ export default {
         this.handleSearch(seat)
     },
     onUnload() {
+
         this.$util.addUserBehavior()
     },
     methods:{
@@ -282,9 +285,16 @@ export default {
         },
         //返回上一级页面
         handleBack(){
+          if (this.come==='index'){
             uni.switchTab({
-                url: '/pages/userCenter/userCenter'
+              url: '/pages/index/index'
             })
+          }else{
+            uni.switchTab({
+              url: '/pages/userCenter/userCenter'
+            })
+          }
+
         },
         //点击跳转导航页
         handleGoMap(){