Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

shuishen

2022-02-19 99bbd2f96dfa2b4ff94c183d2eda3f1b740f3933

 pages/home/home.vue

@@ -71,7 +71,7 @@
      <!-- 头部按钮 end -->

      <!-- 公告 start -->
      <view class="notice-box">
      <!-- <view class="notice-box">
         <image src="/static/images/home/notice.png" class="img" mode="widthFix"></image>
         <view class="notice-info">
            <navigator hover-class="none" class="notice-cell" v-for="(item, index) in noticeList" :key="index">
@@ -80,14 +80,16 @@
               <u-icon name="arrow-right" size="12" color="#C9C9C9"></u-icon>
            </navigator>
         </view>
      </view> -->
      <view class="notice-class">
         <u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal" type="none" :list="gdlist"></u-notice-bar>
      </view>
      <!-- 公告 end -->


      <!-- 新闻模块 start -->
      <view class="news">
         <navigator hover-class="none" url="/pages/news/list" class="cell">
            <view class="ctitle">温馨提示</view>
            <view class="ctitle">资讯</view>
            <view hover-class="bg-light" class="more" @click="goArticle()">
               更多
               <u-icon name="arrow-right" color="#A6ABB5" size="16"></u-icon>
@@ -144,7 +146,10 @@
            newsList: [],
            navButton: [],
            serviceButton: [],
            tabbar:this.$store.state.tabbar
            tabbar:this.$store.state.tabbar,
            gdlist: [
               '国家发改委：防止和避免“放松防控”和“过度防控”'
            ]
         };
      },
      onShow() {
@@ -416,6 +421,13 @@
         }
      }
   }
	
   .notice-class{
      background: #ffffff;
      border-radius: 15px 15px 15px 15px;
      margin: 0 20rpx;
      padding: 20rpx 20rpx;
   }

   .notice-box {
      display: flex;
@@ -434,7 +446,6 @@

      .notice-info {
         flex: 1;

         .notice-cell:first-of-type {
            margin-bottom: 15rpx;
         }