update

2023-11-28 18:25:28 +08:00 · 2023-11-28 18:25:28 +08:00 · 0f50b3f824
commit 0f50b3f824
parent 0c0f5bb38f
18 changed files with 173 additions and 281 deletions
--- a/App.vue
+++ b/App.vue
@ -41,12 +41,9 @@
 			})

 			let _this = this
-      console.log('this.user.WeChat_MiniProToken',this.user.WeChat_MiniProToken)
 			if (this.user.WeChat_MiniProToken) {
-        console.log('1')
 				this.memberLogin()
 			} else {
-        console.log('2')
 				this.getLoginCode()
 			}

@ -85,7 +82,6 @@
 			//       var nowRoute = '/' + currentPage.route // 当前页面url
 			//       this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为
 			//     }
-			console.log('App Show')
      // uni.hideTabBar()
 		},
 		onHide: function(options) {
@ -97,7 +93,6 @@
 				let nowRoute = '/' + currentPage.route // 当前页面url
 				this.$util.addUserBehavior( {intoRoute: '', outtoRoute:nowRoute}) // 记录用户行为
 			}
-			console.log('App Hide')
 		}
 	}
 </script>
--- a/ahyd_DIB.zip
+++ b/ahyd_DIB.zip
--- a/common/utils.js
+++ b/common/utils.js
@ -211,7 +211,6 @@ function addUserBehaviorNew(obj) {
 	}
 	obj.visitChannels = store.state.visitChannels
 	let userDate = store.state.userData
-	console.log('userDate123',userDate)
 	let req = {
 		userName:userDate.UserName,
 		phoneNumber:userDate.Membership_Phone,
@ -222,7 +221,6 @@ function addUserBehaviorNew(obj) {
 		visitChannels:obj.visitChannels,
 		behaviorRecordDesc:''
 	}
-	console.log('req',req)
 	request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => {

 	})
@ -366,7 +364,6 @@ function handleReduceAMonth(nowTime,newTime){
 	const newDate = new Date(newTime)
 	let newY = newDate.getFullYear()
 	let newM = newDate.getMonth() + 1
-	console.log('newM',newM)
 	let thisMonth = newM<10?'0'+newM:newM

 	let howDay = this.getThisMonthDay(`${y}-${m}`)
@ -384,8 +381,6 @@ function handleReduceAMonth(nowTime,newTime){
 				if (newHowDay<10){
 					newHowDay = '0' + newHowDay
 				}
-				console.log('handleReduceAMonth',newHowDay)
-				console.log('handleReduceAMonth',`${newY}-${newM}-${newHowDay}`)
 				return `${newY}-${newM}-${newHowDay}`
 			}else{
 				if (newM===nowM){
@ -395,8 +390,6 @@ function handleReduceAMonth(nowTime,newTime){
 					if (nowD<10){
 						nowD = '0' + nowD
 					}
-					console.log('handleReduceAMonth',nowD)
-					console.log('handleReduceAMonth',`${newY}-${newM}-${nowD}`)
 					return `${newY}-${newM}-${nowD}`
 				}else{
 					if (newM<10){
@ -405,8 +398,6 @@ function handleReduceAMonth(nowTime,newTime){
 					if (newHowDay<10){
 						newHowDay = '0' + newHowDay
 					}
-					console.log('handleReduceAMonth',newHowDay)
-					console.log('handleReduceAMonth',`${newY}-${newM}-${newHowDay}`)
 					return `${newY}-${newM}-${newHowDay}`
 				}
 			}
@ -419,9 +410,6 @@ function handleReduceAMonth(nowTime,newTime){
 					if (newHowDay<10){
 						newHowDay = '0' + newHowDay
 					}
-					console.log('handleReduceAMonth',newHowDay)
-
-					console.log('handleReduceAMonth',`${newY}-${newM}-${newHowDay}`)
 					return `${newY}-${newM}-${newHowDay}`
 				}else{
 					if (newM<10){
@ -430,8 +418,6 @@ function handleReduceAMonth(nowTime,newTime){
 					if (d<10){
 						d = '0' + d
 					}
-					console.log('handleReduceAMonth',d)
-					console.log('handleReduceAMonth',`${newY}-${newM}-${d}`)
 					return `${newY}-${newM}-${d}`
 				}
 			}else{
@ -443,8 +429,6 @@ function handleReduceAMonth(nowTime,newTime){
 						if (nowD<10){
 							nowD = '0' + nowD
 						}
-						console.log('handleReduceAMonth',nowD)
-						console.log('handleReduceAMonth',`${newY}-${newM}-${nowD}`)
 						return `${newY}-${newM}-${nowD}`
 					}else{
 						if (d<newHowDay){
@ -454,8 +438,6 @@ function handleReduceAMonth(nowTime,newTime){
 							if (d<10){
 								d = '0' + d
 							}
-							console.log('handleReduceAMonth',d)
-							console.log('handleReduceAMonth',`${newY}-${newM}-${d}`)
 							return `${newY}-${newM}-${d}`
 						}else{
 							if (newM<10){
@ -464,8 +446,6 @@ function handleReduceAMonth(nowTime,newTime){
 							if (newHowDay<10){
 								newHowDay = '0' +newHowDay
 							}
-							console.log('handleReduceAMonth',newHowDay)
-							console.log('handleReduceAMonth',`${newY}-${newM}-${newHowDay}`)
 							return `${newY}-${newM}-${newHowDay}`
 						}

@ -477,8 +457,6 @@ function handleReduceAMonth(nowTime,newTime){
 					if (d<10){
 						d = '0' +d
 					}
-					console.log('handleReduceAMonth',d)
-					console.log('handleReduceAMonth',`${newY}-${newM}-${d}`)
 					return `${newY}-${newM}-${d}`
 				}
 			}
--- a/pages/commercialBI/components/car/entryZone.vue
+++ b/pages/commercialBI/components/car/entryZone.vue
@ -87,7 +87,6 @@ export default {
    watch:{
        carData:{
            handler(value){
-              console.log('value222',value)
                if (value.length>0){
                    this.isShowData = true
                }
@ -118,7 +117,6 @@ export default {
            let carSum = 0 //一共多少辆车
            let Vehicle_CountAll=0  //入区车流量
            let SectionFlow_CountAll=0 //车流量
-            console.log('this.id',this.id)
            value.forEach(item=>{
                data.push({name:item.Serverpart_Region+'区   '+item.Vehicle_Count  ,value:item.Entry_Rate })
                carSum+=item.Vehicle_Count
--- a/pages/commercialBI/noData.vue
+++ b/pages/commercialBI/noData.vue
@ -19,7 +19,6 @@ export default {
        if (query.type){
          this.type = query.type
        }
-        console.log('this.type',this.type)
        let userInfo = uni.getStorageSync('vuex')
        userInfo = JSON.parse(userInfo)
        console.log('userInfo',userInfo)
--- a/pages/festival/index.vue
+++ b/pages/festival/index.vue
@ -94,7 +94,6 @@ export default {
    }
  },
  onLoad(query){
-    console.log('query',query)
    //  获取手机参数对页面进行适配
    let systemInfo = uni.getSystemInfoSync()
    this.statusBarHeight = Number(systemInfo.statusBarHeight)
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -882,11 +882,8 @@ export default {
    user:{
        // 新用户刚进来的时候可能onLoad会执行不了 监听他的user变化确保能请求
      handler:function (value){
-        console.log('watch',value)
          let userInfo = uni.getStorageSync('vuex')
          userInfo = JSON.parse(userInfo)
-        console.log('userInfo',userInfo)
-        console.log('this.isReturn',this.isReturn)
          if (this.isReturn===true){
              // 无权限就会跳转到无数据的页面
              if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){
@ -902,14 +899,11 @@ export default {
              }
              // 拿到用户当前的经纬度位置
              this.seat = uni.getStorageSync('seatInfo')
-            console.log('this.seat',this.seat)
              if (!this.seat){
                  //获取用户的经纬度位置存在stroge里面
-                console.log('1111')
                if (wx.getPrivacySetting){
                  wx.getPrivacySetting({
                    success: res=>{
-                      console.log('res123123',res)
                      if (res.needAuthorization){
                        this.$util.toNextRoute('redirectTo', '/pages/register/register')
                      }else{
@ -917,7 +911,6 @@ export default {
                          type:'gcj02',
                          altitude:true,
                          success: (res) =>{
-                            console.log('res',res)
                            let seatInfo = {
                              latitude:res.latitude,
                              longitude:res.longitude
@ -940,7 +933,6 @@ export default {
                  //拿到最近服务区的数据
                  this.nearestService()
              }
-            console.log('this.isReturn',this.isReturn)
              if (!this.isReturn){
                  this.getData(this.option)
                  this.handleNoticeMonth()
@ -977,6 +969,7 @@ export default {
    ...mapGetters({'user':'getUser'})
  },
   onLoad(option){
+     const _this = this
     // 顶部显示的时间
     this.single = timestampToTimeMonth((new Date(this.lastDay).getTime()))
     // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置
@ -1032,6 +1025,7 @@ export default {
       // 在用户选择服务区之后就会有当前服务区
       // 用户的当前坐标,如果没有就重新请求坐标  有了就去调最近的服务区
       this.seat = uni.getStorageSync('seatInfo')
+       console.log('this.seat11',!this.seat)
       if (!this.seat){
         //获取用户的经纬度位置存在stroge里面
         wx.getFuzzyLocation({
@ -1043,7 +1037,8 @@ export default {
               longitude:res.longitude
             }
             uni.setStorageSync('seatInfo', seatInfo);
-             this.seat = seatInfo
+             _this.seat = seatInfo
+             _this.nearestService()
           }
         })
       }else{
@ -1096,7 +1091,6 @@ export default {
      const data = await request.$webGet('CommercialApi/BigData/GetBayonetGrowthAnalysis',req)
      this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.fmoney(Number((data.Result_Data.sumEntryCount / 10000).toFixed(2))):''
      this.nationalDayList[2].value = data.Result_Data.GrowthList[0].Entry_GrowthRate>0?'+' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%':'-' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%'
-      console.log('拿到国庆数据data',data)
    },
    goToNational(){
      this.$util.toNextRoute('navigateTo', `/pages/nationalPage/index?time=${this.lastDay}`)
@ -1140,7 +1134,6 @@ export default {
        ProvinceCode:'340000'
      }
      const data = await request.$webGet('CommercialApi/Suggestion/GetMemberUnreadData',req)
-      console.log('getSuggestion',data)
      if (data.Result_Data.data){
          if (data.Result_Data.data !== '0'){
              this.isShow = true
@ -1198,7 +1191,8 @@ export default {
            Province_Code:'340000',
            latitude:seat.latitude,
        }
-        // const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req)
+        const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req)
+        console.log('datanearestService',data)
        // let res = {
        //     SERVERPART_NAME:data.Result_Data.List[0].SERVERPART_NAME,//服务区
        //     SPREGIONTYPE_NAME:data.Result_Data.List[0].SPREGIONTYPE_NAME,//片区
@ -1207,16 +1201,18 @@ export default {
        //     longitude:data.Result_Data.List[0].SERVERPART_X,
        //     latitude:data.Result_Data.List[0].SERVERPART_Y,
        // }
-        let res = {
-          SERVERPART_NAME: '安徽驿达',//服务区
-          SPREGIONTYPE_NAME: '安徽驿达',//片区
-          Serverpart_ID: null,
-          SPRegionType_ID: null,
-          longitude:'117.200927',
-          latitude:'31.832905',
-        }
-        uni.setStorageSync('nearService',res)
-        this.nearServiceInfo = res
+
+
+        // let res = {
+        //   SERVERPART_NAME: '安徽驿达',//服务区
+        //   SPREGIONTYPE_NAME: '安徽驿达',//片区
+        //   Serverpart_ID: null,
+        //   SPRegionType_ID: null,
+        //   longitude:'117.200927',
+        //   latitude:'31.832905',
+        // }
+        // uni.setStorageSync('nearService',res)
+        // this.nearServiceInfo = res
    },
    handleShowNotice(){
      this.showNotice = true
@ -1727,19 +1723,16 @@ export default {
          this.showTableData.add = this.showTableData.add>0?'+'+this.showTableData.add:this.showTableData.add
        }
        if (this.showTableData.YearRevenueAmount){
-          console.log('result.MonthRevenueModel',result.MonthRevenueModel)
          // 不四舍五入的截取年度累计
          let index = (result.MonthRevenueModel.YearRevenueAmount / 100000000).toString().indexOf('.')
          this.showTableData.allRevenueYear = (result.MonthRevenueModel.YearRevenueAmount / 100000000).toString().substring(0,index+3)
          // 同比去年的年度累计
          let yearYoY = (((result.MonthRevenueModel.YearRevenueAmount - result.MonthRevenueModel.YearRevenueYOY) / result.MonthRevenueModel.YearRevenueYOY)*100).toFixed(2)
-          console.log('yearYoY',yearYoY)
          this.showTableData.yearYoY = Number(yearYoY)>0 ? '+' + Number(yearYoY) : Number(yearYoY)
        }
        if (this.showTableData.RevenueQOQ){
          // 对客的环比
          let customerQoQ = (((result.MonthRevenueModel.CashPay - result.MonthRevenueModel.RevenueQOQ) / result.MonthRevenueModel.RevenueQOQ)*100).toFixed(2)
-          console.log('customerQoQ',customerQoQ)
          this.showTableData.customerQoQ = Number(customerQoQ)>0?'+'+customerQoQ+'%':Number(customerQoQ)<0?customerQoQ+'%':''
        }

@ -1754,7 +1747,6 @@ export default {
          if (result.GrowthRate){
            this.yesObjCompared = result.GrowthRate
          }
-          console.log('this.showTableData',this.showTableData)
        }


@ -1806,13 +1798,11 @@ export default {
        }
        time = `${y}${m}`
      }
-      console.log('time',time)
      const req = {
        Province_Code:this.useInfo.userData.ProvinceCode || '340000',
        Statistics_Date:time
      }
      request.$webGet('CommercialApi/Revenue/GetProvinceAvgBayonetAnalysis',req).then(res=>{
-        console.log('res',res)
        res.Result_Data.List.forEach(item=>{
          if (item.Serverpart_Name==='QOQ'){
            this.trafficQOQObj = item
@ -1821,7 +1811,6 @@ export default {
          }else{
            this.trafficCurrentObj = item
          }
-          console.log('this.trafficCurrentObj',this.trafficCurrentObj)
        })
      })
    },
@ -1831,10 +1820,12 @@ export default {
      if (this.PushAuthority && this.PushAuthority.length > 1) {
        option = this.PushAuthority.find(n => n.ProvinceCode === _this.ProvinceCode)
      }else if(this.user.Membership_Id){
-        option = {GroupType: 1000,
+        option = {
+          GroupType: 1000,
          ProvinceCode: 340000,
          ServerpartIds: "",
-          ShopAnalysisType: 1}
+          ShopAnalysisType: 1
+        }
      }else {

      }
--- a/pages/nationalPage/components/entryCarNumber.vue
+++ b/pages/nationalPage/components/entryCarNumber.vue
@ -33,10 +33,8 @@ export default {
  },
  methods:{
    handleTap(e){
-      console.log('e',e)
      uChartsInstance[e.target.id].showToolTip(e, {
        formatter: (item, category, index, opts) => {
-          console.log('item',item)
          if (item.data){
            return item.name + ":" + this.$util.fmoney(item.data.value,2) + '万元';
          }else{
@ -75,7 +73,6 @@ export default {
      //     }
      //   ]
      // };
-      console.log('value22222222222',value)
      let config  = {
        max:this.getSplitNumber(value.max)
      }
--- a/pages/nationalPage/components/yearRevenue.vue
+++ b/pages/nationalPage/components/yearRevenue.vue
@ -35,7 +35,6 @@ export default {
  },
  methods:{
    handleTap(e){
-      console.log('e',e)
      uChartsInstance[e.target.id].showToolTip(e, {
        formatter: (item, category, index, opts) => {
          if (item.data){
@ -50,7 +49,6 @@ export default {
    // 处理传入的数据
    handleCarData(value) {
      let res = value
-      console.log('res',res)
      // let res = {
      //   categories: ["9.28","9.29","9.30","10.1","10.2","10.3","10.4","10.5","10.6","10.7"],
      //   series: [
--- a/pages/nationalPage/index.vue
+++ b/pages/nationalPage/index.vue
@ -262,7 +262,6 @@ export default {
    let userInfo = uni.getStorageSync('vuex')
    userInfo = JSON.parse(userInfo)
    this.useInfo = JSON.parse(JSON.stringify(userInfo))
-
    uni.showLoading({
      title: '正在加载...'
    })
@ -288,6 +287,7 @@ export default {
      // 车流排行
      this.handleGetCar(query.time)
    }else{
+      // 同比分析
      this.handleGetCarCompare()
      this.handleGetRevenueCompare()
    }
@ -306,11 +306,14 @@ export default {
    },
    // 切换标签卡
    changeTab(num){
+      // 因为同时需要调用两个方法 所以加载的效果 得加在外面
      this.selectTab = num
      if (num===2 && JSON.stringify(this.carCompareList)==='{}' || num===2 && JSON.stringify(this.compareRevenueList)==='{}'){
        uni.showLoading({
          title: '正在加载...'
        })
+        // 因为加载的效果放在外面 同时调用两个方法 需要看哪个后调用完 让他触发 接触加载
+        // 几个拿数据的方法 最后都有判断
        this.handleGetCarCompare()
        this.handleGetRevenueCompare()
      }else if (num===1) {
@ -342,6 +345,7 @@ export default {
      }
      const data = await request.$webGet('CommercialApi/Revenue/GetSPRevenueRank',req)
      this.revenueSum = data.Result_Data.OtherData
+      // 只展示前五
      this.revenueList = data.Result_Data.List.slice(0,5)
      this.flagGetRevenue = true
      if (this.flagGetRevenue && this.flagGetCar){
--- a/pages/operatingStatements/detail.vue
+++ b/pages/operatingStatements/detail.vue
@ -114,7 +114,6 @@ import request from '@/util/index.js'
 				this.$util.toNextRoute('navigateTo','/pages/operatingStatements/operatingTrend?name='+this.pageMsg.Serverpart_Name+'&time='+this.pageOption.et+'&id='+this.pageOption.id+'&ProvinceCode='+this.pageOption.pcode)
 			},
 			getDetail(obj){
-        console.log('obj',obj)
 				let _this = this
 				uni.showLoading({
 					title:'正在加载...',
@ -131,7 +130,6 @@ import request from '@/util/index.js'
          BusinessType:_this.pageOption.BusinessTypeValue>0?_this.pageOption.BusinessTypeValue:'',
          SettlementMode:_this.pageOption.SettlementModeValue>0?_this.pageOption.SettlementModeValue:'',
 				}).then(res=>{
-          console.log('res',res)
 					if(res.Result_Code==100) {
 						_this.pageMsg = res.Result_Data

@ -144,10 +142,9 @@ import request from '@/util/index.js'
 					_this.isLoading = false
 				})
 			},
-
 		},
+    // 拿到传入的数据
 		onLoad(op) {
-      console.log('op',op)
 			this.pageOption = op
      if (this.pageOption.st){
        this.pageData.searchTime[0] = this.pageOption.st
--- a/pages/operatingStatements/index.vue
+++ b/pages/operatingStatements/index.vue
@ -251,10 +251,8 @@
  import {wrapTreeNode} from "../../util/dateTime";
  import moment from "moment";
  export default {
-
 		data() {
 			let now = new Date()
-
 			let nowTime = this.$util.cutDate(now, 'YYYY-MM-DD',-1)
 			let sTime = this.$util.cutDate(now, 'YYYY-MM-DD', -1)
 			return {
@ -295,16 +293,16 @@
 			...mapState({'ProvinceCode':(state)=>{return state.userData.ProvinceCode}}),
 		},
 		methods: {
-      // 结算模式
+      // 是否显示结算模式的悬浮框
      handleShowNotice(){
        this.showNotice = !this.showNotice
      },
-      // 自定义时间选框里面的选择
+      // 自定义时间选框里面的选择 改变悬浮框的自定义时间 外面页面上的时间也要跟着改变 强刷
      handleChangeTimePopup(e,index){
        this.searchTimePopup[index] = e.detail.value
        this.$forceUpdate()
      },
-      // 自定义时间选框的确定
+      // 自定义时间选框的确定 赋值给页面上的时间
      handleTimePopup(){
        this.pageData.searchTime = this.searchTimePopup
        this.$refs.timePopup.close()
@ -324,6 +322,7 @@
        }
        this.BusinessTypeValue = value
      },
+      // 给悬浮框的自定义时间赋初始值
      // 选择了自定义时间
      handleTimeOther(){
        this.searchTimePopup = JSON.parse(JSON.stringify(this.pageData.searchTime))
@ -332,6 +331,7 @@
        this.selectTime = 0
      },
      // 改变选择的时间
+      // 选择的时间类型 moment 拿到时间
      handleChangeTime(value){
        this.selectTimeOther = false
        this.selectTime = value
@ -357,6 +357,7 @@
        }
        this.pageData.searchTime = searchTime
      },
+      // 拿到枚举的方法
      async handleEnumeration(text){
        const req ={
          FieldExplainField: text,
@ -364,15 +365,21 @@
          FieldEnumStatus:true
        }
        const data = await request.$webGet('EShangApiMain/FrameWork/GetFieldEnumTree',req)
+        // 变成label、value的数据格式
        let list = wrapTreeNode(data.Result_Data.List)
        return list
      },
      handleConfirmCheckChange(){
+        // 老的选类型的方法  暂时不让他改 已经写死
        this.checkBoxValue = this.checkChange
+        // 关闭悬浮框
        this.$refs.popup.close()
+        // 没用的东西
        this.isScreen= false
+        // 请求数据的方法
        this.getList()
      },
+      // 查询配置的关闭方法 暂时隐藏不用
      handleClosePopup(){
        this.checkChange = this.checkBoxValue
        this.$refs.popup.close()
@ -382,17 +389,20 @@
        this.selectTime = 0
        // this.getList()
      },
+      // 删除查询字段
      handleDelete(){
        this.searchText = ''
      },
+      // 更多筛选的点击打开悬浮框
      handleSelect(){
        this.$refs.popup.open()
        this.isScreen= true
      },
+      // 老的一个跳转方法 暂时用不到
 			toTrend(){
 				this.$util.toNextRoute('navigateTo','/pages/operatingStatements/operatingTrend?time='+this.pageData.searchTime[1])
-
 			},
+      // 改变时间的方法
 			bindDateChange(e,index){
 				let nowDate = this.pageData.searchTime[index]
 				if(e.detail.value != nowDate){
@ -401,17 +411,16 @@
 					this.searchList()
 				}
 			},
+      // 套一层方法 可以进行其他操作 只有有其他操作的 业务更改之后就没了 暂时保留
 			searchList(){
-				// uni.showLoading({
-				// 	title:'正在加载',
-				// 	mask:true
-				// })
 				this.getList()
 			},
+      // 老方法 显示具体条目
 			toggleRegion(item) {
 				item.show = !item.show ? true : false
 				this.$forceUpdate()
 			},
+      // 跳转详情带上参数
 			toDetail(item){
 				this.$util.toNextRoute('navigateTo', '/pages/operatingStatements/detail?pcode='+item.Province_Code+'&id=' +
            item.Serverpart_Id + '&st=' + this.pageData.searchTime[0]+ '&et=' + this.pageData.searchTime[1]+
@ -420,7 +429,9 @@
 				item.visited = true
 				this.$forceUpdate()
 			},
+      // 页面请求的主要方法
 			getList(){
+        // copySearchText 是要显示在经营报表下方的红色字 每次请求前要清空 不能和searchText同源 不然清空搜索框 显示的文字也会消失
        this.copySearchText= ''
        uni.showLoading({
          title:'正在加载',
@ -428,7 +439,7 @@
        })
 				let _this = this
        let searchTime = this.pageData.searchTime
-
+        // 接口要的查询字段类型 之前是可选的 用这样的方法写 暂时可以保留 不影响
        let searchName = ''
        this.checkBoxValue.forEach(item=>{
          if (searchName){
@ -445,10 +456,10 @@
          SearchKeyValue:this.searchText,
          BusinessType:this.searchText?'':this.BusinessTypeValue?this.BusinessTypeValue:'',
          SettlementMode:this.searchText?'':this.SettlementModeValue?this.SettlementModeValue:'',
-          // additionalCode: this.ProvinceCode=='330000' ? '451200,630000' :''
        }
 				// _this.$request.$webGet('WeChat/GetRevenueReport',{
        request.$webGet('CommercialApi/Revenue/GetRevenueReport',req).then(res=>{
+          // 拿到数据之后的一些处理方法 看看就明白了
 					if(res.Result_Code==100) {
 						_this.pageData.msg = res.Result_Data
            _this.pageData.msg.countave = (Number(_this.pageData.msg.Province_InsideAmount) / Number(_this.pageData.msg.TotalCount)).toFixed(2)
@ -463,6 +474,8 @@
 						}

            // _this.pageData.msg.SearchResult
+            // 判断一下 如果是有搜索框的值 就按照搜索框有的值显示
+            // 没有就出现结算模式 或者经营模式
            if (this.searchText){
              this.showModal = false
              if (res.Result_Data.SearchResult){
@ -497,10 +510,7 @@
 			}
 		},
 		async onLoad(query) {
-			// uni.showLoading({
-			// 	title:'正在加载...',
-			// 	mask:true
-			// })
+      // 拿时间和拿传入的数据
      this.lastDay = uni.getStorageSync('lastDay')
      if (query.time){
        this.queryTime = query.time
@ -528,9 +538,11 @@
          this.pageData.searchTime = time
        }
      }
+      // 用枚举方法拿到枚举数组
      this.BusinessTypeList = await this.handleEnumeration('BUSINESS_TYPE')
      this.SettlementModeList = await this.handleEnumeration('SETTLEMENT_MODES')
-			this.getList()
+			// 调用接口拿到页面数据的方法
+      this.getList()
 		}
 	}
 </script>
--- a/pages/revenue/incomeDetail.vue
+++ b/pages/revenue/incomeDetail.vue
@ -132,8 +132,6 @@ export default {
    }
  },
  onLoad(query){
-    console.log('query',query)
-    console.log('inComeData',inComeData)
    this.selectTab = Number(query.type)
    if (query.month){
      this.month = Number(query.month)
@ -157,7 +155,6 @@ export default {
    this.windowHeight = systemInfo.windowHeight
    this.statusBarHeight = Number(systemInfo.statusBarHeight)
    this.menu = uni.getMenuButtonBoundingClientRect()
-    console.log('this.menu',this.menu)
    let _this = this
    setTimeout(()=>{
      _this.number = 40
@ -171,18 +168,15 @@ export default {
      });
    },
    handleChangePageTab(value){
-      console.log('value',value)
      this.selectTab = value
      this.pageList = this.selectTab===1?this.pageData.supportList:this.pageData.otherList
    },
    // 改变类型的方法
    handleChangeType(e){
-      console.log('e',e)
      this.typeValue = Number(e.detail.value)
    },
    // 修改时间的事件
    bindDateChange(e){
-      console.log('e',e)
      this.single = e.detail.value
      const date = new Date(this.single)
      const y = date.getMonth() + 1
@ -193,8 +187,6 @@ export default {
          this.pageList = this.selectTab===1?item.supportList:item.otherList
        }
      })
-      console.log('pageData',this.pageData)
-      console.log('pageList',this.pageList)
    },
    // 显示提示框
    handleShowNotice(index){
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@ -30,7 +30,7 @@
      <view class="headerDetail" :style="{top: (menu.bottom+68) +'px'}">
        <swiper style="height: 220px" @change="handleChangeSwiper" :current="selectMonth" 	:indicator-dots="true">
          <block v-for="(item,index) in monthList" :key="index">
-            <swiper-item :item-id="index" :data-item-id="selectMonth" :style="{zIndex:index+1}">
+            <swiper-item :item-id="item" :data-item-id="selectMonth" :style="{zIndex:index+1}">
              <view class="detailBox" >
                <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/monthSum.png"/>

@ -347,8 +347,8 @@
          </view>
          <view class="inComeRateBox">
            <view class="inComeRate">
-              <view class="owner" :style="{background:'#FC7909',left: 0,width:`${(currentResult.selfThisYearRealNumber / (currentResult.selfThisYearRealNumber + currentResult.otherThisYearRealNumber))*100}%`}"></view>
-              <view class="otherRate" :style="{background:'#F9DCC2',right: 0,width:`${(currentResult.otherThisYearRealNumber / (currentResult.selfThisYearRealNumber + currentResult.otherThisYearRealNumber))*100}%`}"></view>
+              <view class="owner" :style="{background:'#FC7909',left: 0,width:`${(currentResult.inComeList[0].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100}%`}"></view>
+              <view class="otherRate" :style="{background:'#F9DCC2',right: 0,width:`${(currentResult.inComeList[1].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100}%`}"></view>
            </view>
            <view class="rateType">
              <view class="rateItem">
@ -367,7 +367,7 @@
 <!--          </view>-->
        </view>
        <view class="itemDetailSubtotal">
-          <view class="itemSmallBox">
+          <view class="itemSmallBox" v-for="(item,index) in currentResult.inComeList" :key="index">
 <!--            <view class="xian"></view>-->
            <view class="itemSmallTop">
              <view class="leftBox">
@ -375,15 +375,15 @@
                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/selfOperat.svg" />
                </view>
                <view style="display: flex;align-items: center">
-                  <view class="smallTitle">{{ '自营收入小计' }}</view>
+                  <view class="smallTitle">{{ item.name }}</view>
                  <view class="notice" @click="incomeChildrenShow('自营收入小计')">?
                    <view class="noticeBox" :style="{left: '10%',top:'20px'}" v-if="userRevenueSmallSum">
                      <view v-if="userRevenueSmallSum" @click.stop="handleShowNotice('userRevenueSmallSum')">
                        <view>便利店、餐饮及客房的累计数</view>
 <!--                        <view>完成率 = 本年累计自营收入 / 自营收入的年度预算<br/>{{ `(${$util.fmoney(item.ThisYearTotal,2)} / ${$util.fmoney(item.ThisYearBudget,2)})` }}</view>-->
 <!--                        <view>{{ `本月占比 = ${thisMonth}月自营收入 / 本年累计自营收入(${$util.fmoney(item.ThisMonthIncome,2)} / ${$util.fmoney(item.ThisYearTotal,2)}) `}}</view> -->
-                        <view>完成率 = 本年累计自营收入 / 自营收入的年度预算<br/>{{ `(${currentResult.selfThisYearReal||'-'} / ${currentResult.selfThisYearBudgetReal||'-'})` }}</view>
-                        <view>{{ `本月占比 = ${thisMonth}月自营收入 / 本年累计自营收入(${currentResult.selfThisMonthReal||'-'} / ${currentResult.selfThisYearReal||'-'}) `}}</view>
+                        <view>完成率 = 本年累计自营收入 / 自营收入的年度预算<br/>{{ `(${item.thisYearReal||'-'} / ${item.thisYearBudgetReal||'-'})` }}</view>
+                        <view>{{ `本月占比 = ${thisMonth}月自营收入 / 本年累计自营收入(${item.thisMonthReal||'-'} / ${item.thisYearReal||'-'}) `}}</view>
 <!--                        <view>服务区自营小计：完成率=服务区自营收入 / 自营收入的年度预算<br/>{{ `${$util.fmoney(item.ServerpartIncome,2)} / ${$util.fmoney(item.ThisYearBudget,2)}` }}</view>-->
                        <view>服务区自营小计：城市店、批发团购及通道费的累计数</view>
 <!--                        <view>分公司收入小计：完成率=分公司收入 / 自营收入的年度预算<br/>{{ `${$util.fmoney(item.FilialeIncome,2)} / ${$util.fmoney(item.ThisYearBudget,2)}` }}</view>-->
@ -400,20 +400,20 @@

            <view class="itemSmallDetail">
              <view class="itemSmallLeftBox" >
-                <OtherCharts :success="currentResult.selfRate" :colorList="['#FC7909', '#F9DCC2']" :name="'selfRate'" />
-                <text class="leftValue">{{ `${currentResult.selfRate||'-'}%` }}</text>
+                <OtherCharts :success="item.rate" :colorList="['#FC7909', '#F9DCC2']" :name="'selfRate'" />
+                <text class="leftValue">{{ `${item.rate||'-'}%` }}</text>
              </view>
              <view class="itemSmallRightBox">
                <view class="rightTopItem">
                  <view class="itemDetail">
 <!--                    <view class="detailValue" style="font-size: 26rpx">{{$util.fmoney(item.ThisYearTotal/10000,2)}}</view>-->
-                    <view class="detailValue" >{{currentResult.selfThisYear || '-'}}</view>
+                    <view class="detailValue" >{{item.thisYear || '-'}}</view>
                    <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
                  </view>
                  <view class="itemDetail">
                    <view class="detailValue"  style="text-align: right">
 <!--                      {{$util.fmoney(item.ThisMonthIncome/10000,2)}}-->
-                      {{currentResult.selfThisMonth || '-'}}
+                      {{item.thisMonth || '-'}}
                    </view>
                    <view class="detailTitle">
                      {{ `${thisMonth}月累计` }}
@ -424,12 +424,12 @@
                <view class="rightTopItem" style="margin-top: 32rpx">
                  <view class="itemDetail">
 <!--                    <view class="detailValue">{{$util.fmoney(item.ThisYearBudget/10000,2)}}</view>-->
-                    <view class="detailValue">{{currentResult.selfThisYearBudget || '-'}}</view>
+                    <view class="detailValue">{{item.thisYearBudget || '-'}}</view>
                    <view class="detailTitle">年度预算<text class="detailTitleUnit">/万元</text></view>
                  </view>
                  <view class="itemRight" style="text-align: right">
 <!--                    <view class="rightValue">{{ `${item.ThisMonthIncomeRate||''}%` }}</view>-->
-                    <view class="rightValue">{{ `${currentResult.selfThisMonthRate || '-'}%` }}</view>
+                    <view class="rightValue">{{ `${item.thisMonthRate || '-'}%` }}</view>
                    <view class="rightLabel">本月占比</view>
                  </view>
                </view>
@ -465,102 +465,7 @@
 <!--            </view>-->
          </view>

-          <view class="itemSmallBox">
-<!--            <view class="xian"></view>-->
-            <view class="itemSmallTop">
-              <view class="leftBox">
-                <view class="smallIcon">
-                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/selfOperat.svg" />
-                </view>
-                <view style="display: flex;align-items: center">
-                  <view class="smallTitle">{{ `其他收入` }}</view>
-                  <view class="notice" @click="incomeChildrenShow('其他收入')">?
-                    <view class="noticeBox" :style="{left: '10%',top:'20px'}" v-if="otherSmallSum">
-                      <view v-if="otherSmallSum" @click.stop="handleShowNotice('otherSmallSum')">
-                        <view>场地租赁、物业及受托代管、公共服务补贴、营业外收入的累计数</view>
-<!--                        <view>完成率=7月其他收入 / 其他收入的年度预算{{ `(${$util.fmoney(item.ThisYearTotal,2)}/ ${$util.fmoney(item.ThisYearBudget ,2)})` }}</view>-->
-<!--                        <view>本月占比=7月其他收入 / 本年累计其他收入{{ `(${$util.fmoney(item.ThisMonthIncome ,2)}/ ${$util.fmoney(item.ThisYearTotal  ,2)})` }}</view>    -->
-                        <view>{{ `完成率= ${thisMonth}月其他收入 / 其他收入的年度预算( ${currentResult.otherThisMonthReal||'-'}/${currentResult.otherThisYearBudgetReal||'-'} )` }}</view>
-                        <view>{{ `本月占比 = ${thisMonth}月其他收入 / 本年累计其他收入( ${currentResult.otherThisMonthReal||'-'}/${currentResult.otherThisYearReal||'-'} )` }}</view>
-                        <view>服务区租赁小计：商铺、充电桩、汽修、加油站的租赁累计收入</view>
-<!--                        <view>服务区租赁小计完成率=服务区租赁累计收入 / 本年累计其他收入<br/>{{ `(${$util.fmoney(item.ServerpartIncome  ,2)}/ ${$util.fmoney(item.ThisYearBudget,2)})` }}</view>-->
-                      </view>
-                    </view>

-                  </view>
-                </view>
-              </view>
-              <view class="leftRight" @click="handleGoInComeDetail(2)">
-                <text class="more">查看更多</text>
-                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg" />
-              </view>
-            </view>
-
-            <view class="itemSmallDetail">
-              <view class="itemSmallLeftBox" >
-                <OtherCharts :success="currentResult.otherRate" :colorList="['#FC7909', '#F9DCC2']" :name="'otherRate'" />
-<!--                <text class="leftValue">{{ `${item.CompleteRate || ''}%` }}</text>-->
-                <text class="leftValue">{{ `${currentResult.otherRate || '-'}%` }}</text>
-              </view>
-              <view class="itemSmallRightBox">
-                <view class="rightTopItem">
-                  <view class="itemDetail">
-<!--                    <view class="detailValue" style="font-size: 26rpx">{{$util.fmoney(item.ThisYearTotal/10000,2)}}</view>-->
-                    <view class="detailValue" >{{currentResult.otherThisYear || '-'}}</view>
-                    <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemDetail" >
-                    <view class="detailValue" style="text-align: right">
-<!--                      {{$util.fmoney(item.ThisMonthIncome/10000,2)}}-->
-                      {{currentResult.otherThisMonth || '-'}}
-                    </view>
-                    <view class="detailTitle" style="text-align: right">
-                      {{ `${thisMonth}月累计` }}
-                      <text class="detailTitleUnit">/万元</text>
-                    </view>
-                  </view>
-                </view>
-                <view class="rightTopItem" style="margin-top: 32rpx">
-                  <view class="itemDetail">
-<!--                    <view class="detailValue">{{$util.fmoney(item.ThisYearBudget/10000,2)}}</view>-->
-                    <view class="detailValue">{{currentResult.otherThisYearBudget || '-'}}</view>
-                    <view class="detailTitle">年度预算<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight" style="text-align: right">
-<!--                    <view class="rightValue">{{ `${item.ThisMonthIncomeRate||''}%` }}</view>-->
-                    <view class="rightValue" >{{ `${currentResult.otherThisMonthRate||'-'}%` }}</view>
-                    <view class="rightLabel" >本月占比</view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-<!--            <view class="smallSum">-->
-<!--              <view class="smallSumItem">-->
-<!--                <view class="smallSumLeft">-->
-<!--                  <view class="smallSumItemBox"></view>-->
-<!--                  <text class="smallTitle">{{ '场地租赁' }}</text>-->
-<!--                </view>-->
-
-<!--                <view class="smallSumRight" style="display: flex;align-items: center">-->
-<!--                  <text class="successText" style="margin-left: 4rpx">完成率</text>-->
-<!--                  <text class="successValue">{{ `${currentResult.leaseRate|| '-'}%`}}</text>-->
-<!--                </view>-->
-<!--              </view>-->
-
-<!--                            <view class="smallSumItem">-->
-<!--                              <view class="smallSumLeft" style="display: flex;align-items: center">-->
-<!--                                <view class="smallSumItemBox"></view>-->
-<!--                                <text class="smallTitle">物业及受托代管</text>-->
-<!--                              </view>-->
-
-<!--                              <view class="smallSumRight" style="display: flex;align-items: center">-->
-<!--                                <text class="successText" style="margin-left: 4rpx">完成率</text>-->
-<!--                                <text class="successValue">{{ `${currentResult.propertyRate|| '-'}%`}}</text>-->
-<!--                              </view>-->
-<!--                            </view>-->
-<!--            </view>-->
-          </view>
        </view>
      </view>

@ -942,29 +847,37 @@ export default {
          thisYearInComeBudgetReal:'726,870,000.00',// 年度收入预算详情
          costReal:'180,563,832.50',// 累计成本
          thisYearInComeYOY:'+48.54',// 年度收入同比
-          selfRate:71.70,// 自营收入小计完成率
-          selfThisYear:'33,978.75',// 自营收入小计本年累计
-          selfThisYearReal:'339,787,552.17',// 自营收入小计本年累计详情
-          selfThisYearRealNumber:339787552.17,// 自营收入小计本年累计详情
-          selfThisMonth:'5,070.82',// 自营收入小计本月
-          selfThisMonthReal:'50,708,267.25',// 自营收入小计本月详情
-          selfThisYearBudget:'47,392',// 自营收入小计年度预算
-          selfThisYearBudgetReal:'473,920,000.00',// 自营收入小计年度预算详情
-          selfThisMonthRate:'14.92',// 自营收入小计本月占比
          selfStoreRate:'',// 便利店完成率
          selfRoomRate:'',// 餐饮客房完成率
-          otherRate:'52.97',// 其他收入小计完成率
-          otherThisYear:'13,397.84',// 其他收入小计本年累计
-          otherThisYearReal:'133,978,469.54',// 其他收入小计本年累计详情
-          otherThisYearRealNumber:133978469.54,// 其他收入小计本年累计详情
-          otherThisMonth:'2,028.58',// 其他收入小计本月
-          otherThisMonthReal:'20,285,867.69',// 其他收入小计本月详情
-          otherThisYearBudget:'25,295.00',//其他收入小计年度预算
-          otherThisYearBudgetReal:'252,950,000.00',//其他收入小计年度预算详情
-          otherThisMonthRate:'15.14',//其他收入预算本月占比
          leaseRate:'35.99',// 租赁完成率
          propertyRate:'',//物业及受托代管
          showExpenditure:false,// 是否显示支出
+          inComeList:[
+            {
+              name:'自营收入小计',
+              rate:71.70,// 自营收入小计完成率
+              thisYear:'33,978.75',// 自营收入小计本年累计
+              thisYearReal:'339,787,552.17',// 自营收入小计本年累计详情
+              thisYearRealNumber:339787552.17,// 自营收入小计本年累计详情
+              thisMonth:'5,070.82',// 自营收入小计本月
+              thisMonthReal:'50,708,267.25',// 自营收入小计本月详情
+              thisYearBudget:'47,392',// 自营收入小计年度预算
+              thisYearBudgetReal:'473,920,000.00',// 自营收入小计年度预算详情
+              thisMonthRate:'14.92',// 自营收入小计本月占比
+            },
+            {
+              name:'其他收入',
+              rate:52.97,// 其他收入小计完成率
+              thisYear:'13,397.84',// 其他收入小计本年累计
+              thisYearReal:'133,978,469.54',// 其他收入小计本年累计详情
+              thisYearRealNumber:133978469.54,// 其他收入小计本年累计详情
+              thisMonth:'2,028.58',// 其他收入小计本月
+              thisMonthReal:'20,285,867.69',// 其他收入小计本月详情
+              thisYearBudget:'25,295.00',//其他收入小计年度预算
+              thisYearBudgetReal:'252,950,000.00',//其他收入小计年度预算详情
+              thisMonthRate:'15.14',//其他收入预算本月占比
+            }
+          ],// 收入合计
        },
        {
          month:8,// 月份
@ -997,26 +910,8 @@ export default {
          thisYearInComeBudgetReal:'800,500,000.00',// 年度收入预算详情
          costReal:'243,936,015.66',// 累计成本详情
          thisYearInComeYOY:'70.92',// 年度收入同比
-          selfRate:83.61,// 自营收入小计完成率
-          selfThisYear:'44,992.73',// 自营收入小计本年累计
-          selfThisYearReal:'449,927,347.31',// 自营收入小计本年累计详情
-          selfThisYearRealNumber:449927347.31,// 自营收入小计本年累计详情
-          selfThisMonth:'5,084.31',// 自营收入小计本月
-          selfThisMonthReal:'50,843,071.60',// 自营收入小计本月详情
-          selfThisYearBudget:'53,814.00',// 自营收入小计年度预算
-          selfThisYearBudgetReal:'538,140,000.00',// 自营收入小计年度预算详情
-          selfThisMonthRate:'11.3',// 自营收入小计本月占比
          selfStoreRate:'83.5',// 便利店完成率
          selfRoomRate:'84.17',// 餐饮客房完成率
-          otherRate:'64.46',// 其他收入小计完成率
-          otherThisYear:'16,910.60',// 其他收入小计本年累计
-          otherThisYearReal:'16,758,130.53',// 其他收入小计本年累计详情
-          otherThisYearRealNumber:16758130.53,// 其他收入小计本年累计详情
-          otherThisMonth:'1,675.81',// 其他收入小计本月
-          otherThisMonthReal:'169,106,018.63',// 其他收入小计本月详情
-          otherThisYearBudget:'26,236.00',//其他收入小计年度预算
-          otherThisYearBudgetReal:'262,360,000.00',//其他收入小计年度预算详情
-          otherThisMonthRate:'9.91',//其他收入预算本月占比
          leaseRate:'63.83',// 租赁完成率
          propertyRate:'67.83',//物业及受托代管
          showExpenditure:true,// 是否显示支出
@ -1024,6 +919,32 @@ export default {
          expenditureOutRatio:77.09,//支出比
          expenditureThisYear:'61,611.98',// 本年累计支出
          expenditureThisYearBudget:'79,924.00',// 本年预计支出
+          inComeList: [
+            {
+              name:'自营收入小计',
+              rate:83.61,// 自营收入小计完成率
+              thisYear:'44,992.73',// 自营收入小计本年累计
+              thisYearReal:'449,927,347.31',// 自营收入小计本年累计详情
+              thisYearRealNumber:449927347.31,// 自营收入小计本年累计详情
+              thisMonth:'5,084.31',// 自营收入小计本月
+              thisMonthReal:'50,843,071.60',// 自营收入小计本月详情
+              thisYearBudget:'53,814.00',// 自营收入小计年度预算
+              thisYearBudgetReal:'538,140,000.00',// 自营收入小计年度预算详情
+              thisMonthRate:'11.3',// 自营收入小计本月占比
+            },
+            {
+              name:'其他收入',
+              rate:64.46,// 其他收入小计完成率
+              thisYear:'16,910.60',// 其他收入小计本年累计
+              thisYearReal:'16,758,130.53',// 其他收入小计本年累计详情
+              thisYearRealNumber:16758130.53,// 其他收入小计本年累计详情
+              thisMonth:'1,675.81',// 其他收入小计本月
+              thisMonthReal:'169,106,018.63',// 其他收入小计本月详情
+              thisYearBudget:'26,236.00',//其他收入小计年度预算
+              thisYearBudgetReal:'262,360,000.00',//其他收入小计年度预算详情
+              thisMonthRate:'9.91',//其他收入预算本月占比
+            }
+          ],// 收入合计
          outList:[
            {
              name:'营业成本小计',// 名称
@ -1061,7 +982,7 @@ export default {
              expenditureCostThisYearBudget:'735.00',// 营业成本小计年度预计
              expenditureCostThisRate:'-8.24%',// 营业成本小计本月占比
            }
-          ]
+          ],// 支出合计
        },
        {
          month:10,// 月份
@ -1090,26 +1011,6 @@ export default {
          thisYearInComeBudgetReal:'800,500,000.00',// 年度收入预算详情
          costReal:'289,940,000.00',// 累计成本详情
          thisYearInComeYOY:'44.08',// 年度收入同比
-          selfRate:93.96,// 自营收入小计完成率
-          selfThisYear:'50,563.57',// 自营收入小计本年累计
-          selfThisYearReal:'505,635,722.50',// 自营收入小计本年累计详情
-          selfThisYearRealNumber:505635722.50,// 自营收入小计本年累计详情
-          selfThisMonth:'5,570.84',// 自营收入小计本月
-          selfThisMonthReal:'55,708,375.34',// 自营收入小计本月详情
-          selfThisYearBudget:'53,814',// 自营收入小计年度预算
-          selfThisYearBudgetReal:'538,140,000.00',// 自营收入小计年度预算详情
-          selfThisMonthRate:'11.02',// 自营收入小计本月占比
-          selfStoreRate:'93.24',// 便利店完成率
-          selfRoomRate:'97.81',// 餐饮客房完成率
-          otherRate:'71.94',// 其他收入小计完成率
-          otherThisYear:'18,874.81',// 其他收入小计本年累计
-          otherThisYearReal:'188,748,102.96',// 其他收入小计本年累计详情
-          otherThisYearRealNumber:188748102.96,// 其他收入小计本年累计详情
-          otherThisMonth:'196.21',// 其他收入小计本月
-          otherThisMonthReal:'19,642,084.33',// 其他收入小计本月详情
-          otherThisYearBudget:'26,236.00',//其他收入小计年度预算
-          otherThisYearBudgetReal:'262,360,000.00',//其他收入小计年度预算详情
-          otherThisMonthRate:'10.41',//其他收入预算本月占比
          leaseRate:'70.85',// 租赁完成率
          propertyRate:'75.36',//物业及受托代管
          showExpenditure:true,// 是否显示支出
@ -1117,6 +1018,34 @@ export default {
          expenditureOutRatio:86.72,//支出比
          expenditureThisYear:'69,089.29',// 本年累计支出
          expenditureThisYearBudget:'79,670.00',// 本年预计支出
+          selfStoreRate:'93.24',// 便利店完成率
+          selfRoomRate:'97.81',// 餐饮客房完成率
+          inComeList:[
+            {
+              name:'自营收入小计',
+              rate:93.96,// 自营收入小计完成率
+              thisYear:'50,563.57',// 自营收入小计本年累计
+              thisYearReal:'505,635,722.50',// 自营收入小计本年累计详情
+              thisYearRealNumber:505635722.50,// 自营收入小计本年累计详情
+              thisMonth:'5,570.84',// 自营收入小计本月
+              thisMonthReal:'55,708,375.34',// 自营收入小计本月详情
+              thisYearBudget:'53,814',// 自营收入小计年度预算
+              thisYearBudgetReal:'538,140,000.00',// 自营收入小计年度预算详情
+              thisMonthRate:'11.02',// 自营收入小计本月占比
+            },
+            {
+              name: '其他收入',
+              rate:'71.94',// 其他收入小计完成率
+              thisYear:'18,874.81',// 其他收入小计本年累计
+              thisYearReal:'188,748,102.96',// 其他收入小计本年累计详情
+              thisYearRealNumber:188748102.96,// 其他收入小计本年累计详情
+              thisMonth:'196.21',// 其他收入小计本月
+              thisMonthReal:'19,642,084.33',// 其他收入小计本月详情
+              thisYearBudget:'26,236.00',//其他收入小计年度预算
+              thisYearBudgetReal:'262,360,000.00',//其他收入小计年度预算详情
+              thisMonthRate:'10.41',//其他收入预算本月占比
+            }
+          ],// 收入合计
          outList:[
            {
              name:'营业成本小计',// 名称
@ -1154,7 +1083,7 @@ export default {
              expenditureCostThisYearBudget:'735.00',// 营业成本小计年度预计
              expenditureCostThisRate:'3.95%',// 营业成本小计本月占比
            }
-          ]
+          ],// 支出合计
        }
      ],// 78910月份的数据
      currentResult:{},// 选择的数据
@ -1195,7 +1124,12 @@ export default {
    // 请求的方法
    // this.handleGetData()
    // this.selectMonth = 0
-    this.handleChangeSwiper({target:{current:3}})
+
+    // 拿到页面数据的方法
+    this.handleGetPageData()
+    setTimeout(()=>{
+      this.handleChangeSwiper({target:{current:3}})
+    },500)
    // this.currentResult = this.monthResult[this.selectMonth]
  },
  methods:{
@ -1414,6 +1348,14 @@ export default {
      this.outSecond = (this.currentResult.outList[1].expenditureCostThisYearNumber/sum)*100
      this.outThird = (this.currentResult.outList[2].expenditureCostThisYearNumber/sum)*100
      this.outFourth = (this.currentResult.outList[3].expenditureCostThisYearNumber/sum)*100
+    },
+    // 拿到数据的方法
+    async handleGetPageData(){
+      // const req = {
+      //
+      // }
+      // const data = await request.$webGet('',req)
+
    }
  }
 }
--- a/pages/suggestion/suggestionDetail.vue
+++ b/pages/suggestion/suggestionDetail.vue
@ -195,7 +195,6 @@
 					let arr = []
 					_this.isLoadingDelPerson = false
 					uni.hideLoading()
-          console.log('res.Data.List',res.Data.List)
 					_this.dealerList = res.Data.List

 				})
--- a/pages/userCenter/components/userList.vue
+++ b/pages/userCenter/components/userList.vue
@ -73,13 +73,11 @@ export default {
    console.log(this.colorList,'colorList')
  },
  methods:{
-    // 根据数组信息判断是否能跳转   
+    // 根据数组信息判断是否能跳转
    handleGo(item){
-      console.log('item',item)
      if (item.value===2){
          if (item.value===2){
              let currentService = uni.getStorageSync('currentService')
-              console.log('currentService',currentService)
              this.$util.toNextRoute('navigateTo', `${item.homeUrl}?time=${this.lastDay}&serviceInfo=${JSON.stringify(currentService)}&type=userCenter`)
          } else{
              this.$util.toNextRoute('navigateTo', item.homeUrl)
--- a/pages/webview/webview.vue
+++ b/pages/webview/webview.vue
@ -2,7 +2,7 @@
 	<view>
 		<web-view :src="src" v-if="src"></web-view>
 		<view v-else>
-			
+
 			<noFound :nodata="true" text="抱歉.您暂无权限查看该页内容" > </noFound>
 		</view>
 	</view>
@ -19,7 +19,7 @@
 		computed:{
 			...mapGetters({
 				'user':'getUser' ,
-				
+
 			})
 		},
 		onUnload() {
@ -32,9 +32,8 @@
 						let mode = {} // this.userModules.find(u=>{return u.MODULE_GUID==='5733dfdd-29f6-4233-9ff0-6f077d80d778'})
 						mode.SERVERPART_IDS = ''
 						this.src = 'https://eshangtech.com/questionnarie/testType?mid=' + this.user.Membership_Id + '&sid='+(mode?mode.SERVERPART_IDS:'')+'&pcode='+this.user.ProvinceCode+'&phone=' + this.user.Membership_Phone+'&name='+encodeURIComponent(this.user.Membership_Name)
-						console.log(this.src)
 						break
-					case 'video':	
+					case 'video':
 						let  {sc,hd,bt,et,token} = option
 						this.src = `https://eshangtech.com/questionnarie/video?sc=${sc}&&hd=${hd}&bt=${bt}&et=${et}&token=${token}`
 						// this.src = `http://192.168.11.166:8080/video?sc=${sc}&&hd=${hd}&bt=${bt}&et=ss${et}&token=${token}`
@ -44,7 +43,7 @@
 						this.src = `https://eshangtech.com/questionnarie/customerAnaysis?sid=${sid}&pc=${pc}&tmp=${tmp}&sn=${sn}`
 						break
 				}
-				
+
 			}else if(option.src.indexOf('https')>-1){
 				this.src = option.src
 			}
@ -53,11 +52,11 @@
 			}else{
 				this.src = option.src
 			}
-			
+
 		}
 	}
 </script>

-<style>	
+<style>

 </style>
--- a/store/store.js
+++ b/store/store.js
@ -18,7 +18,6 @@ const state = {
 const getters = {

 	getUser(state) {
-		console.log('store',state.userData)
 		return state.userData
 	},
 	getMenu(state) {
@ -63,14 +62,12 @@ const actions = {
 	 getLoginCode({ dispatch, state} ){
 		uni.login({ // 登录
 			 success (res) {
-				console.log('re111s',res)
 				dispatch('memberLogin',res.code) // 获取用户数据
 			}
 		})
 	},
 	getTodoList({ dispatch, state,commit}){ // 获取用户待办事项
 		let _user = state.userData
-		console.log('getTodoList')
 		request.$get("ToDoList", {
 			userId: _user.UserId,
 			userName: _user.UserName || ''
@ -80,13 +77,11 @@ const actions = {
 	},
 	memberLogin({ dispatch, state,commit},_code) {
 		let _user = state.userData
-		console.log('_code',_code)
 		request.$get('WeChat_Login',{
 		// request.$webGet('WebAPI_Push/WeChat/Login',{
 			WeChat_Code: _code || '',

 		}).then(data=>{
-			console.log('data222',data)
 			if (data.Result_Code === 100) {
 				  let user = data.Result_Data
 				  if (user.Membership_Id) {
@ -122,7 +117,6 @@ const actions = {
 		if(!_id) return
 		// console.log(_user)
 		await request.$get('WeChat_GetBusinessMemberInfo',{Membership_Id:_id}).then(res=>{
-			console.log('res222',res)
 		// request.$webGet('WebAPI_Push/Member/GetMemberInfo',{Membership_Id:_id,memberShipId:_id}).then(res=>{
 			if(res.Result_Code==100) {
 				let data = res.Result_Data