diff --git a/pages/earlyWarning/detail.vue b/pages/earlyWarning/detail.vue
index 9836e22..2c26942 100644
--- a/pages/earlyWarning/detail.vue
+++ b/pages/earlyWarning/detail.vue
@@ -112,9 +112,8 @@
{{selectType===1?`${res.ServerpartName}${date || ''}度车流`:selectType===2?`${res.ServerpartName}${date || ''}车流`:selectType===3?`${res.ServerpartName}${date || ''}车流`:selectType===4?`${res.ServerpartName}${date || ''}车流`:''}}
{{res.BayonetINC.increaseRate>0?'增加':res.BayonetINC.increaseRate<0?'减少':''}}{{res.BayonetINC.increaseRate?`${Math.abs(res.BayonetINC.increaseRate)}%`:'-'}}
- {{selectType===1?'，营收':selectType===2?'，门店的营收减少':selectType===3?'，营收':selectType===4?'，营收':''}}
+ {{selectType===1?'，对客销售':selectType===2?'，门店的营收减少':selectType===3?'，对客销售':selectType===4?'，对客销售':''}}
{{res.RevenueINC.increaseRate>0?'增加':res.RevenueINC.increaseRate<0?'减少':''}}{{res.RevenueINC.increaseRate?`${Math.abs(res.RevenueINC.increaseRate)}%`:'-'}}
- {{selectType===1?'，请关注服务区整体营收呈现下降的情况！':selectType===2?'，请关注服务区部分门店营收呈现下降的情况！':selectType===3?'不匹配，请关注营收与车流增幅产生较大差异的服务区！':selectType===4?'不匹配，请关注营收与车流降幅产生较大差异的服务区！':''}}
@@ -132,6 +131,7 @@
同期商超营收增长
{{`${ownerShop.RevenueINC.increaseRate?ownerShop.RevenueINC.increaseRate+'%':''}`}}
+ {{selectType===1?'请关注服务区整体营收呈现下降的情况！':selectType===2?'请关注服务区部分门店营收呈现下降的情况！':selectType===3?'不匹配，请关注营收与车流增幅产生较大差异的服务区！':selectType===4?'不匹配，请关注营收与车流降幅产生较大差异的服务区！':''}}
diff --git a/pages/earlyWarning/index.vue b/pages/earlyWarning/index.vue
index d8e3ce8..b3fb05c 100644
--- a/pages/earlyWarning/index.vue
+++ b/pages/earlyWarning/index.vue
@@ -63,9 +63,12 @@
预警说明：
- {{'请重点'}}
+ {{'请重点关注带'}}
- {{selectTab===1?'关注入区车流增加自营商超营收同步增长，服务区整体营收呈现下降的情况！':selectTab===2?'关注入区车流增加自营商超营收同步增长，服务区部分门店营收呈现下降的情况！':selectTab===3?'关注营收与车流增幅产生较大差异的服务区！增幅差额=车流增幅-营收增幅，越大越不好，倒序排列':selectTab===4?'关注营收与车流降幅产生较大差异的服务区！增幅差额=销售增幅-车流降幅，越大越不好，倒序排列':''}}
+ {{selectTab===1?'标识的服务区，入区车流增加自营商超营收同步增长，服务区整体营收呈现下降的情况！':
+ selectTab===2?'标识的服务区，入区车流增加自营商超营收同步增长，服务区部分门店营收呈现下降的情况！':
+ selectTab===3?'标识的服务区，营收与车流增幅产生较大差异的服务区！增幅差额=车流增幅-营收增幅，越大越不好，倒序排列':
+ selectTab===4?'标识的服务区，营收与车流降幅产生较大差异的服务区！增幅差额=销售增幅-车流降幅，越大越不好，倒序排列':''}}
diff --git a/pages/earlyWarning/projectWarning.vue b/pages/earlyWarning/projectWarning.vue
index 7a524b6..d99ff0c 100644
--- a/pages/earlyWarning/projectWarning.vue
+++ b/pages/earlyWarning/projectWarning.vue
@@ -237,7 +237,14 @@
-
+
+
+
+
+
+
+ 关闭
+
@@ -250,10 +257,13 @@
- {{item.MERCHANTS_NAME || ''}}
+
+ {{item.MERCHANTS_NAME || ''}}
+
+ {{ businessTypeObj[item.BUSINESS_TYPE] }}
+
- {{ businessTypeObj[item.BUSINESS_TYPE] }}
- {{ `${item.ENDDATE}结束` }}
+ {{ `项目期数：${item.PERIOD_INDEX}， ${item.STARTDATE}-${item.ENDDATE}` }}
@@ -1013,14 +1023,37 @@ export default {
bottom: 0;
}
.listItemLeft{
- width: 96rpx;
- height: 96rpx;
- border-radius: 16rpx;
- margin-right: 16rpx;
- overflow: hidden;
- .shopLogo{
+ .picBox{
width: 96rpx;
height: 96rpx;
+ border-radius: 16rpx;
+ margin-right: 16rpx;
+ overflow: hidden;
+ .shopLogo{
+ width: 96rpx;
+ height: 96rpx;
+ }
+ }
+ .stateBox{
+ margin-top: 40rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 96rpx;
+ .stateIcon{
+ width: 12rpx;
+ height: 12rpx;
+ border-radius: 50%;
+ background: #ff4d4f;
+ margin-right: 12rpx;
+ }
+ .stateText{
+ font-size: 24rpx;
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ color: #9A9A9A;
+ line-height: 36rpx;
+ }
}
}
.listItemRight{
@@ -1078,24 +1111,46 @@ export default {
}
}
}
- .MERCHANTS_NAME{
- font-family: PingFangSC, PingFang SC;
- font-weight: 400;
- font-size: 24rpx;
- color: #571519;
- line-height: 44rpx;
- text-align: left;
- font-style: normal;
- padding: 4rpx 16rpx;
- background: #FCF1D3;
- border-radius: 4rpx;
- display: inline-block;
- max-width: calc(100% - 64rpx);
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
+ .MERCHANTS_NAMEBox{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .MERCHANTS_NAME{
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #571519;
+ line-height: 44rpx;
+ text-align: left;
+ font-style: normal;
+ padding: 4rpx 16rpx;
+ background: #FCF1D3;
+ border-radius: 4rpx;
+ display: inline-block;
+ max-width: 70%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ .type{
+ max-width: 25%;
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #1979FE;
+ line-height: 36rpx;
+ text-align: left;
+ font-style: normal;
+ display: inline-block;
+ padding: 2rpx 8rpx;
+ background: #E3EFFF;
+ border-radius: 4rpx;
+ }
}
+
.rightBottom{
+ margin-top: 12rpx;
.type{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
diff --git a/pages/earlyWarning/projectWarningDetail.vue b/pages/earlyWarning/projectWarningDetail.vue
index bb94fef..8c0320d 100644
--- a/pages/earlyWarning/projectWarningDetail.vue
+++ b/pages/earlyWarning/projectWarningDetail.vue
@@ -31,7 +31,7 @@
{{ businessTypeObj[detail.BUSINESS_TYPE] }}
- {{ `${detail.ENDDATE}结束` }}
+
@@ -65,7 +65,10 @@
- {{ `关闭日期：${detail.BUSINESS_ENDDATE}` }}
+
+ {{ `门店关闭：${detail.BUSINESS_ENDDATE}` }}
+ {{ `项目到期：${detail.ENDDATE}结束` }}
+
@@ -593,7 +596,7 @@ import {wrapTreeNode} from "../../util/dateTime";
padding: 24rpx 24rpx 0 24rpx;
.contentTop{
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-between;
.topLeft{
width: 96rpx;
@@ -754,7 +757,18 @@ import {wrapTreeNode} from "../../util/dateTime";
line-height: 36rpx;
text-align: left;
font-style: normal;
- padding: 16rpx 0 24rpx 0;
+ }
+ .type{
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #5E5A59;
+ line-height: 36rpx;
+ text-align: left;
+ font-style: normal;
+ padding: 2rpx 8rpx;
+ background: #FFFFFF;
+ border-radius: 4rpx;
}
}
}