update

pages/earlyWarning/index.vue

@@ -219,14 +219,14 @@
                   item.RevenueINC.curYearData ? item.RevenueINC.curYearData > 0 ?
                     `+${$util.getMoney(item.RevenueINC.curYearData
                       / 10000)}` : item.RevenueINC.curYearData < 0 ? `${$util.getMoney(item.RevenueINC.curYearData /
-                        10000)}` : '0':'-' }}</view>
+                        10000)}` : '0' : '-' }}</view>
                     <view class="addRate" style="display: flex;align-items: center;justify-content: space-between">
                       <!--                  增长-->
                       <!--                    <text :class="item.RevenueINC.increaseData>0?'redValue':item.RevenueINC.increaseData<0?'greenValue':''" style="margin-right: 8rpx">{{item.RevenueINC.increaseData?item.RevenueINC.increaseData>0?`+${$util.getMoney(item.RevenueINC.increaseData / 10000)}`:item.RevenueINC.increaseData<0?`${$util.getMoney(item.RevenueINC.increaseData / 10000)}`:'0':'-'  }}</text>-->
                       <text class="normalValue" style="margin-right: 8rpx">{{ item.RevenueINC.increaseData ?
                         item.RevenueINC.increaseData > 0 ? `+${$util.getMoney(item.RevenueINC.increaseData
                           / 10000)}` : item.RevenueINC.increaseData < 0 ? `${$util.getMoney(item.RevenueINC.increaseData /
-                          10000)}`:'0':'-' }}</text>
+                            10000)}` : '0' : '-' }}</text>
                           <!--                  增幅-->
                           <text
                             :class="item.RevenueINC.increaseRate > 0 ? 'redValue' : item.RevenueINC.increaseRate < 0 ? 'greenValue' : ''">{{
@@ -254,14 +254,14 @@
                     item.BayonetINC.curYearData ? item.BayonetINC.curYearData > 0 ?
                       `+${$util.getMoney(item.BayonetINC.curYearData
                         / 10000)}` : item.BayonetINC.curYearData < 0 ? `${$util.getMoney(item.BayonetINC.curYearData /
-                          10000)}`:'0':'-' }}</view>
+                          10000)}` : '0' : '-' }}</view>
                       <view class="addRate" style="display: flex;align-items: center;justify-content: space-between">
                         <!--                  增长-->
                         <!--                    <text :class="item.BayonetINC.increaseData>0?'redValue':item.BayonetINC.increaseData<0?'greenValue':''" style="margin-right: 8rpx">{{item.BayonetINC.increaseData?item.BayonetINC.increaseData>0?`+${$util.getMoney(item.BayonetINC.increaseData / 10000)}`:item.BayonetINC.increaseData<0?`${$util.getMoney(item.BayonetINC.increaseData / 10000)}`:'0':'-'  }}</text>-->
                         <text class="normalValue" style="margin-right: 8rpx">{{ item.BayonetINC.increaseData ?
                           item.BayonetINC.increaseData > 0 ? `+${$util.getMoney(item.BayonetINC.increaseData
                             / 10000)}` : item.BayonetINC.increaseData < 0 ? `${$util.getMoney(item.BayonetINC.increaseData
-                              / 10000)}`:'0':'-' }}</text>
+                              / 10000)}` : '0' : '-' }}</text>
                             <!--                  增幅-->
                             <text
                               :class="item.BayonetINC.increaseRate > 0 ? 'redValue' : item.BayonetINC.increaseRate < 0 ? 'greenValue' : ''">{{
@@ -548,7 +548,8 @@ export default {
         // shopTrade: this.shopTrade || '',
         // showLevel: this.sorterType || '',
         waringType: this.selectTab,
-        ServerpartId: this.allServerPartId || ''
+        ServerpartId: this.allServerPartId || '',
+        solidType: true
       }
       let req = {}
       if (this.selectTab === 1) {

pages/earlyWarning/projectWarning.vue

@@ -558,7 +558,8 @@ export default {
         Business_Type: this.businessType || '',
         // SettlementMode:'',
         BusinessState: this.businessStatus || '',
-        WarningType: this.selectTab
+        WarningType: this.selectTab,
+        solidType: true
       }
       const data = await request.$webGet('EShangApiMain/BusinessProject/GetAccountWarningList', req)
       this.dataList = this.handleSortList(data.Result_Data.List)

pages/index/index.vue

@@ -3403,7 +3403,8 @@
                   <!--            <text class="funText">{{ isShowFestival==='spring'?'平安春运':isShowFestival==='qm'?'清明节':'' }}</text>-->
                 </view>
               </view>
-              <view v-if="businessWarning" class="funItem" style="margin-top: 32rpx" @click="goToOperateWarning">
+              <view v-if="businessWarning" class="funItem" :style="{ marginTop: projectWarning ? '32rpx' : '' }"
+                @click="goToOperateWarning">
                 <view class="funItemContent">
                   <view class="funIconBox">
                     <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/operateWarning.svg" />

pages/summaryOfPortraits/components/businessPortrait.vue

@@ -49,7 +49,7 @@
       </div>
       <div class="chartsItem" style="height:300px;margin-top: 32px">
         <p class="title">消费水平<text class="unit"></text></p>
-        <span class="notice">
+        <span class="notice" style="color: #FF5722;">
           {{ '注：低消费 < 30, 30 <=普通消费 <=60, 高消费> 60' }}
         </span>
         <div>
@@ -59,6 +59,9 @@
       </div>
       <div class="chartsItem" style="height:340px;margin-top: 32px">
         <p class="title">品牌消费水平<text class="unit"></text></p>
+        <span class="notice" style="color: #FF5722;">
+          {{ '注：低消费 < 30, 30 <=普通消费 <=60, 高消费> 60' }}
+        </span>
         <div v-if="bandLevelList && bandLevelList.length > 0">
           <band-level :data="bandLevelList" />
           <analyse :analyseInfo="{ analysisins_type: 1503, analysisins_format: 2000 }" />

pages/summaryOfPortraits/components/guestPortrait.vue

@@ -53,6 +53,9 @@
       </div>
       <div class="chartsItem" style="margin-top: 32px;height: 210px">
         <p class="title">客群消费水平</p>
+        <span class="notice" style="color: #FF5722;">
+          {{ '注：低消费 < 30, 30 <=普通消费 <=60, 高消费> 60' }}
+        </span>
         <div v-if="consumptionLevelList && consumptionLevelList.length > 0">
           <consumption-level :data="consumptionLevelList" />
           <analyse :analyseInfo="{ analysisins_type: 1205, analysisins_format: 2000 }" />
@@ -635,6 +638,11 @@ export default {
         line-height: 24px;
       }
 
+      .notice {
+        font-size: 12px;
+        color: #786B6C;
+      }
+
       .item {
         border-radius: 28rpx;
         padding: 12rpx 16rpx;