diff --git a/manifest.json b/manifest.json index ac4bcc7..f6017e1 100644 --- a/manifest.json +++ b/manifest.json @@ -72,7 +72,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wx3c3f25187e6b6176", + "appid" : "wxe044603515ff2cb5", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages/index/index.vue b/pages/index/index.vue index 202a4bc..56d79af 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -128,9 +128,21 @@ - + 今日工作 + + + + 全部 + + + 首访 + + + 复访 + + @@ -190,10 +202,21 @@ - + {{choiceIndex}}累计 + + + 全部 + + + 首访 + + + 复访 + + @@ -499,6 +522,13 @@ export default { data() { return { + activeTotal: 4, + eharTab: { + active1: 0, + active2: 0, + active3: 0, + active4: 0, + }, // tabbar配置项 $domain: this.$domain, //--- end --- tabbar配置项 @@ -556,6 +586,7 @@ totalTimeShow: false, statDateStart: '', statDateEnd: '', + visitRecord: null, permissions: {}, // 权限菜单 paraphraseObj: {}, // 转写消费 }; @@ -784,6 +815,24 @@ taptimeisshow() { this.timeshow = true; }, + taptimeisshow1(idx) { + this.eharTab.active1 = idx + if(idx == 0){ + this.visitRecord = null + }else{ + this.visitRecord = idx + } + this.initrealTimeStatistics() + }, + taptimeisshow2(idx) { + this.eharTab.active2 = idx + if(idx == 0){ + this.visitRecord = null + }else{ + this.visitRecord = idx + } + this.initworkThisWeek() + }, //获取权限 getMenu() { uni.request({ @@ -833,7 +882,8 @@ houseId: this.buildingID, dateType: this.zhixingcenterindex == 7 ? null : this.zhixingcenterindex, statDateStart: this.statDateStart, - statDateEnd: this.statDateEnd + statDateEnd: this.statDateEnd, + visitRecord: this.visitRecord }, success: (data) => { if (data.data.data == null) { @@ -854,7 +904,8 @@ 'Authorization': 'Bearer ' + uni.getStorageSync('weapp_session_login_data').token }, data: { - houseId: this.buildingID + houseId: this.buildingID, + visitRecord: this.visitRecord }, success: (data) => { this.LOADING = false @@ -1413,6 +1464,46 @@ height: 20rpx; margin-right: 18rpx; } + .title1 { + flex: 3; + height: 90rpx; + display: flex; + align-items: center; + justify-content: flex-end; + padding-right: 30rpx; + + .title1-box { + display: flex; + align-items: center; + width: 25%; + justify-content: center; + + .activecltab1 { + color: #2671E2; + border-bottom: 4rpx solid #2671E2; + } + } + } + .title2 { + flex: 3; + height: 90rpx; + display: flex; + align-items: center; + justify-content: flex-end; + padding-right: 30rpx; + + .title2-box { + display: flex; + align-items: center; + width: 25%; + justify-content: center; + + .activecltab2 { + color: #2671E2; + border-bottom: 4rpx solid #2671E2; + } + } + } } .timeshow {