diff --git a/pages/earlyWarning/projectWarning.vue b/pages/earlyWarning/projectWarning.vue index c1ce603..dc18e17 100644 --- a/pages/earlyWarning/projectWarning.vue +++ b/pages/earlyWarning/projectWarning.vue @@ -192,14 +192,14 @@ 门店名称 - + 营收金额 - + 盈利金额 @@ -618,7 +618,7 @@ export default { border-bottom-right-radius: 16rpx; border-bottom-left-radius: 16rpx; box-sizing: border-box; - padding: 24rpx; + padding: 32rpx; display: flex; flex-wrap: wrap; .errorItem{ @@ -647,7 +647,7 @@ export default { .itemValue{ font-family: DINAlternate, DINAlternate; font-weight: bold; - font-size: 36rpx; + font-size: 28rpx; color: #160002; line-height: 44rpx; text-align: left; @@ -656,8 +656,8 @@ export default { .itemLabel{ font-family: PingFangSC, PingFang SC; font-weight: 400; - font-size: 28rpx; - color: #786B6C; + font-size: 26rpx; + color: #160002; line-height: 40rpx; text-align: left; font-style: normal; @@ -670,12 +670,13 @@ export default { .servicepartContent{ width: 100%; - height: calc(100vh - 616rpx); + //height: calc(100vh - 616rpx); + margin-top: 24rpx; border-top-left-radius: 32rpx; border-top-right-radius: 32rpx; background: #fff; box-sizing: border-box; - padding: 32rpx 0 32rpx 32rpx; + padding: 24rpx 0 32rpx 32rpx; .contentTitle{ display: flex; align-items: center; @@ -705,10 +706,10 @@ export default { .fixedRight{ width: 138rpx; - height: 72rpx; + //height: 72rpx; background: #fff; box-sizing: border-box; - padding: 22rpx; + //padding: 22rpx; display: flex; align-items: center; font-family: PingFangSC, PingFang SC; diff --git a/pages/earlyWarning/projectWarningDetail.vue b/pages/earlyWarning/projectWarningDetail.vue index a4f2034..033190d 100644 --- a/pages/earlyWarning/projectWarningDetail.vue +++ b/pages/earlyWarning/projectWarningDetail.vue @@ -25,7 +25,7 @@ {{ detail.SERVERPARTSHOP_NAME || ''}} - + {{ detail.SERVERPART_NAME || '' }} @@ -64,7 +64,8 @@ - + + @@ -150,19 +151,19 @@ /万元 - + {{`${BusinessTradeIdsObj[firstTabDetail.BUSINESS_TRADE]}/${BusinessTradeIdsBigObj[firstTabDetail.BUSINESS_PTRADE]}`}} {{ firstTabDetail.SHOPSHORTNAME || '' }} - + {{ firstTabDetail.ACCOUNT_RATE>=80?'优于': firstTabDetail.ACCOUNT_RATE< 80 && firstTabDetail.ACCOUNT_RATE>= 50?'优于': firstTabDetail.ACCOUNT_RATE< 50?'租赁收入低于':'' }}{{ firstTabDetail.ACCOUNT_RATE?`${firstTabDetail.ACCOUNT_RATE}%`:'' }} 的经营业态项目 - + {{ @@ -181,7 +182,7 @@ - + {{SERVERPARTTYPEOBJ[firstTabDetail.SERVERPART_TYPE]}}口径下: @@ -196,7 +197,7 @@ /{{ firstTabDetail.TRADE_COUNT_TYPE }} - + 在所有 @@ -574,7 +575,9 @@ import {wrapTreeNode} from "../../util/dateTime"; .contentBox{ width: 100%; height: 480rpx; - background: linear-gradient( 180deg, #CDE1FF 0%, #FFFFFF 100%); + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/warning/detailBg.svg"); + background-repeat: no-repeat; + //background: linear-gradient( 180deg, #CDE1FF 0%, #FFFFFF 100%); border-radius: 14rpx; box-sizing: border-box; padding: 24rpx; @@ -665,9 +668,9 @@ import {wrapTreeNode} from "../../util/dateTime"; .value{ font-family: DINAlternate, DINAlternate; font-weight: bold; - font-size: 42rpx; + font-size: 36rpx; color: #160002; - line-height: 56rpx; + line-height: 42rpx; text-align: left; font-style: normal; } @@ -703,6 +706,7 @@ import {wrapTreeNode} from "../../util/dateTime"; background: #E3EFFF; border-radius: 4rpx; margin-right: 16rpx; + white-space: nowrap; } .messageDesc{ font-family: PingFangSC, PingFang SC; @@ -712,13 +716,14 @@ import {wrapTreeNode} from "../../util/dateTime"; line-height: 36rpx; text-align: left; font-style: normal; + white-space: nowrap; } } .line{ width: 100%; height: 2rpx; background: #F3F3F3; - margin: 32rpx 0 16rpx 0; + margin: 32rpx 0 0 0; } .overTime{ font-family: PingFangSC, PingFang SC; @@ -743,7 +748,7 @@ import {wrapTreeNode} from "../../util/dateTime"; margin-top: 32rpx; .contentBox{ width: 100%; - background: #fff; + //background: #fff; padding-bottom: 40rpx; .tabBox{ width: 100%; @@ -940,7 +945,7 @@ import {wrapTreeNode} from "../../util/dateTime"; line-height: 40rpx; text-align: left; font-style: normal; - margin-bottom: 20rpx; + margin-bottom: 16rpx; .date{ width: 32rpx; height: 32rpx; @@ -987,13 +992,14 @@ import {wrapTreeNode} from "../../util/dateTime"; border-radius: 4rpx; } .stateIcon{ - width: 40rpx; - height: 40rpx; + width: 35rpx; + height: 35rpx; + margin-right: 8rpx; } .stateText{ font-family: PingFangSC, PingFang SC; font-weight: 600; - font-size: 32rpx; + font-size: 26rpx; color: #FE7628; line-height: 44rpx; text-align: left; @@ -1051,7 +1057,7 @@ import {wrapTreeNode} from "../../util/dateTime"; .indexDesc{ background: #E1F3E6; border-radius: 4rpx; - padding: 2rpx 8rpx; + padding: 2rpx 16rpx; font-family: PingFangSC, PingFang SC; font-weight: 400; font-size: 28rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index 65ea5a8..8f835e1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -75,7 +75,7 @@ {{trafficCurrentObj.Stay_Times?trafficCurrentObj.Stay_Times:''}} - + {{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}} @@ -1055,7 +1055,7 @@ - + 经营预警 @@ -1063,7 +1063,7 @@ - + 项目预警