From 0ecb47584abdee63d69f378ac01dc2ed825cf14f Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 18 Mar 2024 16:43:12 +0800
Subject: [PATCH] update

---
 pages/index/index.vue | 78 ++++++++++++++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c098338..f5447a1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -117,12 +117,12 @@
 
 <!--      ,height:loadMore?'200px':'38px'-->
       <div class="storeDetail"  :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}">
-        <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx"  :style="{height: loadMore?`1460rpx`:`710rpx`}"  @change="handleChangeSelect" :current="selectDetail">
+        <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx"  :style="{height: loadMore?`1400rpx`:`720rpx`}"  @change="handleChangeSelect" :current="selectDetail">
           <block v-for="(item,index) in swiperList" :key="index">
             <swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'">
               <view class="bigBox"  v-if="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)">
                 <view class="box">
-                  <view  class="top" style="height: 710rpx;">
+                  <view  class="top" style="height: 640rpx;">
                     <view class="topTop">
                       <view class="statistics" @click="goToRevenueStatic">
                         <image class="staticImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg"/>
@@ -236,9 +236,17 @@
                               <rateCharts :success="moneyRateList" :colorList="1<=selectMonth && selectMonth<=3?['#1677FE','#456497','#97A9C6']:4<=selectMonth && selectMonth<=6?['#1677FE','#456497','#97A9C6']:7<=selectMonth && selectMonth<=9?['#1677FE','#456497','#97A9C6']:['#1677FE','#456497','#97A9C6']" :name="`${selectMonth}rate`"/>
                             </view>
                             <view class="haveNoticeBox" v-if="ydModal" @click.stop="handleShowYDModal">
-                              <text class="label">便利店:<text class="value">{{ydRate}}%</text></text>
-                              <text class="label">餐饮:<text class="value">{{shopRate}}%</text></text>
-                              <text class="label">商铺租赁:<text class="value">{{shopOutRate}}%</text></text>
+                              <view class="field">
+                                <view class="label">便利店:</view>
+                                <view class="value">{{ydRate}}%</view>
+                              </view>
+                              <view class="field">
+                                <view class="label">餐饮客房:</view>
+                                <view class="value">{{shopRate}}%</view></view>
+                              <view class="field">
+                                <view class="label">商铺租赁:</view>
+                                <view class="value">{{shopOutRate}}%</view>
+                              </view>
                             </view>
                           </view>
                           <view class="newRightBox">
@@ -320,10 +328,13 @@
                           </view>
                         </view>
                       </view>
-                      <view class="showMoreLoading" v-if="!loadMore">
-<!--                        <image @click="handleShowMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>-->
-                        <image @click="handleChangeLoadMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>
-                      </view>
+<!--                      3.18-->
+<!--                      <view class="showMoreLoading" v-if="!loadMore">-->
+<!--&lt;!&ndash;                        <image @click="handleShowMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>&ndash;&gt;-->
+<!--                        <image @click="handleChangeLoadMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>-->
+<!--                      </view>-->
+
+
 <!--                      <view class="goBusiness">-->
 <!--                        &lt;!&ndash;                        @click="handleGoProject"&ndash;&gt;-->
 <!--                        <view class="bussinessRight" >-->
@@ -401,7 +412,7 @@
                     </view>
                   </view>
                 </view>
-                <view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore">
+                <view class="bottom" style="height: 60rpx;" v-if="!loadMore" @click="handleChangeLoadMore">
 <!--                <view class="bottom" v-if="false" @click="handleChangeLoadMore">-->
                   <text class="searchText">查看更多</text>
                   <image class="searchIcon" :style="{height:'16px',transform: loadMore?'rotate(180deg)':''}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
@@ -3300,7 +3311,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
               //background: rgba(254, 192, 168,0.8);
               .top{
                 width: 100%;
-                background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 68%, #FFFFFF 100%);
+                background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 80%, #FFFFFF 100%);
                 border-bottom-right-radius: 32rpx;
                 border-bottom-left-radius: 32rpx;
                 box-sizing: border-box;
@@ -3639,8 +3650,18 @@ $iphoneHeight: env(safe-area-inset-bottom);
                           border-radius: 10rpx;
                           box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
                           z-index:9;
-                          .label{
-                            display: block;
+                          .field{
+                            display: flex;
+                            align-items: center;
+                            .label{
+                              width: 140rpx;
+                              text-align: left;
+                            }
+                            .value{
+                              width: 100rpx;
+                              font-family: DINAlternate-Bold, DINAlternate;
+                              text-align: right;
+                            }
                           }
                         }
                       }
@@ -3716,7 +3737,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                           .itemCenter{
                             display: inline-block;
                             width: 33%;
-                            font-family: DINAlternate, DINAlternate;
+                            font-family: DINAlternate-Bold, DINAlternate;
                             font-weight: bold;
                             font-size: 28rpx;
                             color: #160002;
@@ -3727,7 +3748,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                           .itemRight{
                             display: inline-block;
                             width: 33%;
-                            font-family: DINAlternate, DINAlternate;
+                            font-family: DINAlternate-Bold, DINAlternate;
                             font-weight: bold;
                             font-size: 28rpx;
                             color: #E83944;
@@ -3741,7 +3762,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                   }
                   .accountRevenue{
                     width: 100%;
-                    background: #F9FAFC;
+                    //background: #F9FAFC;
                     box-sizing: border-box;
                     padding: 28rpx 24rpx;
                     margin-top: 48rpx;
@@ -3790,18 +3811,18 @@ $iphoneHeight: env(safe-area-inset-bottom);
                         align-items: center;
                         justify-content: space-between;
                         .revenueNum{
-                          font-family: DINAlternate, DINAlternate;
+                          font-family: DINAlternate-Bold, DINAlternate;
                           font-weight: bold;
-                          font-size: 36rpx;
+                          font-size: 32rpx;
                           color: #160002;
                           line-height: 44rpx;
                           text-align: left;
                           font-style: normal;
                         }
                         .revenueAdd{
-                          font-family: DINAlternate, DINAlternate;
+                          font-family: DINAlternate-Bold, DINAlternate;
                           font-weight: bold;
-                          font-size: 36rpx;
+                          font-size: 32rpx;
                           color: #E83944;
                           line-height: 44rpx;
                           text-align: left;
@@ -4207,7 +4228,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                       display: flex;
                       align-items: center;
                       .revenueNumber{
-                        font-family: DINAlternate, DINAlternate;
+                        font-family: DINAlternate-Bold, DINAlternate;
                         font-weight: bold;
                         font-size: 56rpx;
                         color: #160002;
@@ -4249,7 +4270,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                         border-radius: 50%;
                       }
                       .addValue{
-                        font-family: DINAlternate, DINAlternate;
+                        font-family: DINAlternate-Bold, DINAlternate;
                         font-weight: bold;
                         font-size: 36rpx;
                         color: #E83944;
@@ -4438,8 +4459,17 @@ $iphoneHeight: env(safe-area-inset-bottom);
                           border-radius: 10rpx;
                           box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
                           z-index:9;
-                          .label{
-                            display: block;
+                          .field{
+                            display: flex;
+                            align-items: center;
+                            .label{
+                              width: 100rpx;
+                              text-align: left;
+                            }
+                            .value{
+                              font-family: DINAlternate-Bold, DINAlternate;
+                              text-align: right;
+                            }
                           }
                         }
                       }