bding 2 жил өмнө
parent
commit
7d10f7b2c7

+ 0 - 0
pages/index/components/morningDlg.vue


+ 90 - 45
pages/index/index.vue

@@ -1,25 +1,44 @@
 <template>
   <view class="container New-container">
-    <view class="top-content-box">
-      <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="55">
-        <template slot="content-left">
-          <view class="box-img" @click="goMyInfo">
-            <view class="content-img">
-              <image v-if="info.Headimgurl" :src="info.Headimgurl" alt=""></image>
-              <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/logo.png" class="avatar"></image>
+    <view class="banne-content">
+      <swiper autoplay :interval="4000" circular indicator-dots>
+        <block v-for="item in banerList" :key="item.name">
+          <swiper-item>
+            <image :src="item.img"></image>
+            <view class="banner-title">
+              {{ item.name }}
+              <text class="time"> 时间</text>
             </view>
-            <view class="content-my"> 我的 </view>
-          </view>
-        </template>
-      </search-bar>
+          </swiper-item>
+        </block>
+      </swiper>
+      <view class="top-content-box">
+        <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="55">
+          <template slot="content-left">
+            <view class="box-img" @click="goMyInfo">
+              <view class="content-img">
+                <image v-if="info.Headimgurl" :src="info.Headimgurl" alt=""></image>
+                <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/logo.png" class="avatar"></image>
+              </view>
+              <view class="content-my"> 我的 </view>
+            </view>
+          </template>
+        </search-bar>
+      </view>
     </view>
+
     <view class="content-ul">
       <view class="item-ul">
         <block v-for="(item, index) in newDataList" :key="index">
           <view v-if="index % 2 == 0">
             <block v-if="item.Source === 'article'"> <ReportItem :list="item.Article" /></block>
             <block v-if="item.Source === 'newchart'">
-              <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
+              <ChartItem
+                :list="item.Newchart"
+                :isMyChartCollection="isMyChartCollection"
+                @myChartIsTop="myChartIsTop"
+                @myChartCollect="myChartCollect"
+              />
             </block>
             <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
               <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
@@ -35,7 +54,12 @@
           <view v-if="index % 2 !== 0">
             <block v-if="item.Source === 'article'"> <ReportItem :list="item.Article" /></block>
             <block v-if="item.Source === 'newchart'">
-              <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
+              <ChartItem
+                :list="item.Newchart"
+                :isMyChartCollection="isMyChartCollection"
+                @myChartIsTop="myChartIsTop"
+                @myChartCollect="myChartCollect"
+              />
             </block>
             <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
               <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
@@ -49,7 +73,7 @@
     </view>
     <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="page_no > 1" />
     <view v-if="newDataList.length === 4" class="bind-btn" @click="goLogin">绑定联系方式后查看更多内容>></view>
-    <suspenButton :show.sync="wholeShowListData.IsShow" v-if="wholeShowListData.IsShow" />
+    <!-- <suspenButton :show.sync="wholeShowListData.IsShow" v-if="wholeShowListData.IsShow" /> -->
   </view>
 </template>
 
@@ -58,7 +82,6 @@ import { Home, Mine } from "@/config/api";
 import ChartItem from "@/components/ItemComponent/chartItem.vue";
 import ReportItem from "@/components/ItemComponent/reportItem.vue";
 import RoadshowItem from "@/components/ItemComponent/roadshowItem.vue";
-import suspenButton from "@/components/suspen_button.vue";
 import ActivityItem from "@/components/ItemComponent/activityItem.vue";
 import SearchBar from "@/components/search-bar/searchBar.vue";
 export default {
@@ -75,6 +98,20 @@ export default {
         nomore: "已经到底了",
       },
       info: {},
+      banerList: [
+        {
+          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20150.png",
+          name: "test1",
+        },
+        {
+          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20152.png",
+          name: "test2",
+        },
+        {
+          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20154.png ",
+          name: "test3",
+        },
+      ],
     };
   },
   components: {
@@ -82,7 +119,6 @@ export default {
     ReportItem,
     RoadshowItem,
     ActivityItem,
-    suspenButton,
     SearchBar,
   },
   methods: {
@@ -209,49 +245,58 @@ export default {
 <style lang="scss" scoped>
 .New-container {
   background-color: #f5f6fa;
-  .top-content-box {
+  .banne-content {
     position: sticky;
     top: 0;
     left: 0;
     width: 100%;
     z-index: 9;
+    height: 402rpx;
+    width: 100%;
+    overflow: hidden;
+    swiper {
+      height: 402rpx;
+    }
+    image {
+      width: 100%;
+      height: 100%;
+    }
+    .banner-title {
+      position: absolute;
+      bottom: 80rpx;
+      left: 20rpx;
+      color: #fff;
+      font-weight: 500;
+      font-size: 50rpx;
+      line-height: 70rpx;
+      .time {
+        font-size: 27rpx;
+        line-height: 38rpx;
+      }
+    }
+  }
+  .top-content-box {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 9;
   }
   /deep/ .nav-bar-wrap {
     padding-left: 35rpx;
+    background-color: transparent;
     .box-img {
-      position: relative;
-      height: 88rpx;
-      width: 165rpx;
       display: flex;
       align-items: center;
       justify-content: center;
+      width: 64rpx;
+      height: 64rpx;
       margin-right: 20rpx;
-      .content-img {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 80rpx;
-        height: 80rpx;
-        border-radius: 50%;
-        overflow: hidden;
-        z-index: 9;
-      }
-
+      border-radius: 50%;
+      overflow: hidden;
       image {
-        width: 80rpx;
-        height: 80rpx;
-      }
-      .content-my {
-        width: 165rpx;
-        height: 64rpx;
-        display: flex;
-        align-items: center;
-        background-color: #f7f7f7;
-        border-radius: 38rpx;
-        color: #333333;
-        font-size: 28rpx;
-        padding-right: 18rpx;
-        justify-content: flex-end;
+        width: 100%;
+        height: 100%;
       }
     }
   }

+ 23 - 5
reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -10,8 +10,11 @@
           <text>{{ detali.PublishDate }}</text>
         </view>
         <view class="content-statement">
-          <text>注:请务必阅读</text>
-          <text class="statement" @click="isShowStatement = true">免责声明 </text>
+          <view style="display: flex">
+            <text>注:请务必阅读</text>
+            <text class="statement" @click="isShowStatement = true">免责声明 </text>
+          </view>
+          <text class="statement" @click="goSecret">往期汇总>> </text>
         </view>
         <view class="audio-card">
           <view class="card-title text_oneLine">
@@ -46,13 +49,21 @@
             </view>
           </view>
           <view class="fast-reverse">
-            <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
+            <image
+              @click="speedReverseHandler('reverse')"
+              class="speed-img"
+              src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"
+            ></image>
             <block v-for="(item, index) in timesTheSpeed" :key="item.value">
               <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
                 {{ item.name }}
               </view>
             </block>
-            <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
+            <image
+              @click="speedReverseHandler('speed')"
+              class="speed-img"
+              src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"
+            ></image>
           </view>
         </view>
         <view v-if="detali.Abstract" class="content-abstract">
@@ -292,6 +303,12 @@ export default {
       isTime = isTime <= 0 ? 0 : isTime >= this.audioTime ? this.audioTime - 1 : isTime;
       this.globalBgAudioManager.seek(isTime);
     },
+    // 跳转往期汇总
+    goSecret() {
+      uni.navigateTo({
+        url: "/reportPages/secretDetails/secretDetails?type=" + this.isType,
+      });
+    },
   },
   components: {
     statement,
@@ -351,7 +368,8 @@ export default {
     .content-statement {
       display: flex;
       color: #707070;
-
+      justify-content: space-between;
+      align-items: center;
       .statement {
         margin-left: 10rpx;
         color: #3385ff;

+ 1 - 0
reportPages/secretDetails/secretDetails.vue

@@ -101,6 +101,7 @@ export default {
     },
   },
   onLoad(option) {
+    this.isType = option.type || 2;
     this.getList();
   },
   /* 触底 */