diff --git a/App.vue b/App.vue index 330480f..9871e57 100644 --- a/App.vue +++ b/App.vue @@ -95,7 +95,6 @@ --> diff --git a/pages/commercialBI/servicePlanMonth.vue b/pages/commercialBI/servicePlanMonth.vue deleted file mode 100644 index 21f397b..0000000 --- a/pages/commercialBI/servicePlanMonth.vue +++ /dev/null @@ -1,644 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pages/commercialBI/yearPlan.vue b/pages/commercialBI/yearPlan.vue index e15596e..8ae9698 100644 --- a/pages/commercialBI/yearPlan.vue +++ b/pages/commercialBI/yearPlan.vue @@ -1,600 +1,622 @@ - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +--> + .serviceList{ + width: 100%; + height: calc(100vh - 366px); + transform: translateY(-16px); + border-radius: 8px; + z-index: 6; + position: relative; + background: #fff; + box-sizing: border-box; + padding:16px 16px 0; + .list{ + width: 100%; + height: 100%; + ::-webkit-scrollbar {width: 0;height: 0;background-color: transparent;} + .item{ + width: 100%; + height: 178px; + background: linear-gradient(314deg, #EDF7FF 0%, #F3F5FF 32%, #F5FCFF 54%, #F0F7FF 70%, #D7DDFF 100%); + border-radius: 8px; + margin-bottom: 12px; + box-sizing: border-box; + padding: 16px; + .top{ + display: flex; + align-items: center; + .title{ + font-size: 18px; + font-family: Alimama ShuHeiTi; + color: #1A33BC; + line-height: 26px; + } + .icon{ + width: 15px; + height: 15px; + opacity: 0.8; + margin-left: 7px; + } + } + .detail{ + margin-top: 16px; + width: 100%; + display: flex; + justify-content: space-between; + .left{ + .money{ + display: flex; + align-items: center; + margin-bottom: 2px; + .num{ + font-size: 20px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 24px; + margin-right: 4px; + } + .icon{ + width: 16px; + height: 16px; + } + } + .text{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 20px; + .unit{ + color: #A69E9F; + margin-left: 2px; + } + } + } + .right{ + display: flex; + flex-direction: column; + align-items: flex-end; + .add{ + font-size: 24px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + line-height: 24px; + margin-bottom: 2px; + } + .text{ + font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 18px; + } + } + } + .progress{ + margin-top: 16px; + .box{ + width: 100%; + height: 10px; + border-radius: 5px; + background: #ccc; + overflow: hidden; + position: relative; + .have{ + position: absolute; + height: 100%; + background: rgba(87, 110, 255, 1); + border-radius: 5px; + left: 0;top: 0; + } + } + .other{ + width: 100%; + margin-top: 4px; + display: flex; + justify-content: space-between; + align-items: center; + .unit{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 20px; + } + .type{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 20px; + margin-left: 2px; + } + .money{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #160002; + line-height: 20px; + } + } + } + } + } + } +} + diff --git a/pages/index/index.vue b/pages/index/index.vue index 62cbccb..f74a88d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -7,7 +7,7 @@ - + {{ thisDay }} {{ single }} @@ -780,14 +780,15 @@ export default { this.showNoticeYear = false }, handlePlanPageGo(type){ - if (!this.isReturn){ - this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`) - }else{ - uni.showToast({ - title: '暂无权限请联系管理员', - icon: 'none' - }) - } + this.$util.toNextRoute('navigateTo', `/pages/commercialBI/yearPlan`) + // if (!this.isReturn){ + // this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`) + // }else{ + // uni.showToast({ + // title: '暂无权限请联系管理员', + // icon: 'none' + // }) + // } }, handlePage(){ if (!this.isReturn){ diff --git a/pages/plan/areaPlanMonth.vue b/pages/plan/areaPlanMonth.vue new file mode 100644 index 0000000..2a94339 --- /dev/null +++ b/pages/plan/areaPlanMonth.vue @@ -0,0 +1,626 @@ + + + + + diff --git a/pages/plan/servicePlanMonth.vue b/pages/plan/servicePlanMonth.vue new file mode 100644 index 0000000..e64b646 --- /dev/null +++ b/pages/plan/servicePlanMonth.vue @@ -0,0 +1,1045 @@ + + + diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue index f816bfc..2e2af28 100644 --- a/pages/projectWarning/detail.vue +++ b/pages/projectWarning/detail.vue @@ -123,6 +123,7 @@ export default { }, //页面关闭 onUnload() { + console.log('页面关闭') // 记录用户行为 this.$util.addUserBehaviorNew() },