diff --git a/pages/examine/index.vue b/pages/examine/index.vue index 39f64c8..998b2de 100644 --- a/pages/examine/index.vue +++ b/pages/examine/index.vue @@ -1,65 +1,115 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 0e0a282..7577736 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -11,12 +11,12 @@ {{ thisDay }} {{ single }} - + - + - +

对客营收

{{monthAmountAdd?monthAmountAdd:'-'}}({{thisMonth?thisMonth:'-'}}月累计) @@ -955,24 +955,24 @@ export default { yesterday = `${y}-${m}-${day}` } // 定义入参 除了改变时间 别的和老项目一致 - const data = { - Statistics_Date:yesterday, - Statistics_Month:this.theRequest.month, - Province_Code:this.theRequest.ProvinceCode, - pushProvinceCode:this.theRequest.ProvinceCode, - Serverpart_ID:this.theRequest.ServerpartIds?this.theRequest.ServerpartIds:'', - SPRegionType_ID:this.theRequest.GroupType==1020?this.theRequest.ServerpartIds:'' - } - request.$webGet('CommercialApi/Revenue/GetRevenuePushList',data).then(res=>{ - // 计算月总额 拿到昨日的全部对客营收 并拿到相对于昨日的增长比 - let cashPay = 0 - res.Result_Data.List.forEach(item=>{ - cashPay= Number(item.CashPay) + cashPay - }) - // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理 - _this.yesterdayAllPay = cashPay - flag1 = true - }) + // const data = { + // Statistics_Date:yesterday, + // Statistics_Month:this.theRequest.month, + // Province_Code:this.theRequest.ProvinceCode, + // pushProvinceCode:this.theRequest.ProvinceCode, + // Serverpart_ID:this.theRequest.ServerpartIds?this.theRequest.ServerpartIds:'', + // SPRegionType_ID:this.theRequest.GroupType==1020?this.theRequest.ServerpartIds:'' + // } + // request.$webGet('CommercialApi/Revenue/GetRevenuePushList',data).then(res=>{ + // // 计算月总额 拿到昨日的全部对客营收 并拿到相对于昨日的增长比 + // let cashPay = 0 + // res.Result_Data.List.forEach(item=>{ + // cashPay= Number(item.CashPay) + cashPay + // }) + // // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理 + // _this.yesterdayAllPay = cashPay + // flag1 = true + // }) //昨日的分润门店 // request.$webGet('CommercialApi/Revenue/GetMobileShare',data).then(res=>{ // // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理 @@ -1074,7 +1074,7 @@ export default { this.showTableData = result.RevenuePushModel this.showTableData.compared = result.GrowthRate // 只有接口全面通了 才可以处理数据显示 - if (flag1 && flag2 && flag3 ){ + if (flag2 && flag3 ){ this.todayAmount() } }) @@ -1134,18 +1134,18 @@ export default { } }, async initData() { // 初始化营收数据 - const data = { - pushProvinceCode:'340000', - Statistics_Date:this.lastDay - } + // const data = { + // pushProvinceCode:'340000', + // Statistics_Date:this.lastDay + // } - //获取服务区门店商家数量列表（根据省份、服务区、区域、统计日期查询） - const totalData = await request.$webGet('CommercialApi/BaseInfo/GetShopCountList',data) - let all = 0 - totalData.Result_Data.List.forEach(item=>{ - all+=item.SHOP_REVENUECOUNT - }) - // this.allShopCount = all + // //获取服务区门店商家数量列表（根据省份、服务区、区域、统计日期查询） + // const totalData = await request.$webGet('CommercialApi/BaseInfo/GetShopCountList',data) + // let all = 0 + // totalData.Result_Data.List.forEach(item=>{ + // all+=item.SHOP_REVENUECOUNT + // }) + // // this.allShopCount = all //获取移动支付分账数据 const shareData = { diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index f4b04c2..265fd27 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -233,9 +233,9 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; value: 4, }, { - id:'', + id:'30f0e7d0-4e01-4a63-a65b-613e1f427335', name: '考评考核', - homeUrl: '/siteManager/assessment/index', + homeUrl: '/pages/examine/index', imagePath: '/static/images/user/assessment.svg', isNotice:false, notice:0, @@ -287,9 +287,9 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; // 获取手机参数 对页面进行自适应 let systemInfo = uni.getSystemInfoSync() this.statusBarHeight = Number(systemInfo.statusBarHeight) - //拿到登录用户有权限的内容 this.menu = uni.getMenuButtonBoundingClientRect() + this.dataList[2].list.forEach(item=>{ for(let key in this.user.AuthorityInfo){ if (key === item.id){ @@ -335,6 +335,9 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; }) } }, + onShow(){ + uni.hideTabBar() + }, onUnload() { this.$util.addUserBehavior() }, diff --git a/static/images/examine/NS.svg b/static/images/examine/NS.svg new file mode 100644 index 0000000..1dcf6c0 --- /dev/null +++ b/static/images/examine/NS.svg @@ -0,0 +1,20 @@ + + + 图标/更多备份_4@2x + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/examine/time.svg b/static/images/examine/time.svg new file mode 100644 index 0000000..4380030 --- /dev/null +++ b/static/images/examine/time.svg @@ -0,0 +1,13 @@ + + + 图标/更多备份_8@2x + + + + + + + + + + \ No newline at end of file diff --git a/static/images/examine/user.svg b/static/images/examine/user.svg new file mode 100644 index 0000000..149e14a --- /dev/null +++ b/static/images/examine/user.svg @@ -0,0 +1,13 @@ + + + 图标/更多备份_7@2x + + + + + + + + + + \ No newline at end of file