增加周报类型

src/api/ficc_yb/api.js

@@ -3,4 +3,9 @@ import {get,post} from './http'
 // 获取报告详情
 export const apiReportDetail=params=>{
     return get('/report/research_report',params)
+}
+
+// 获取晨报、周报详情
+export const apiReportDetailWeek=params=>{
+    return get('/report/research_report_chapter',params)
 }

src/view/ficc_yb/reportDetail.vue

@@ -135,7 +135,9 @@ export default {
             this.$router.push({
                 path:"/hzybReportWeekDetail",
                 query:{
-                    
+                    report_type_id:item.ResearchReportTypeId,
+                    token:this.$route.query.token,
+                    type:this.info.research_report_info.type
                 }
             })
         },

src/view/ficc_yb/weekDetail.vue

@@ -1,21 +1,25 @@
 <template>
 <div>
   <div class="report-detail" v-if="info">
-      <div class="top-wrap" :style="'backgroundImage:url('+topBgUrl+')'">
-          <h1 class="title">{{info.research_report_info.reportVariety}}</h1>
-          <h3 class="sub-title">{{info.research_report_info.researchReportName.substring(info.research_report_info.researchReportName.indexOf('】')+1)}}</h3>
-          <div class="time-box">
-				<div class="time-num">{{subval(info.research_report_info.researchReportDate,8,10)}}</div>
-                <div>
-                    <div>{{getWeek(info.research_report_info.researchReportDate)}}</div>
-				    <div>{{subval(info.research_report_info.researchReportDate,0,7)}}</div>
-                </div>
-			</div>
-            <div class="num">第{{info.research_report_info.periods}}期</div>
+      <div class="top-wrap">
+          <img :src="topBgUrl" alt="">
       </div>
       <div class="content-wrap">
-          <div v-for="item in info.ResearchReportTypeContentList" :key="item.sort">
-              <h2 style="font:600 0.76rem/1.2rem '思源黑体' !important; color:#000;margin:5px 0">{{item.content_type?item.content_type:'核心观点'}}</h2>
+          <div class="top-box">
+            <h2 style="font-size:0.8rem;font-weight:700;line-height:1.4;letter-spacing:1px;color:#000">{{info.research_report_type_info.research_report_type_title}}</h2>
+            <div style="margin-top:0.4rem; overflow:auto;">
+				<h1 style="float:left; display:inline-block; border:1px solid #6184bc; padding:0.1rem 0.4rem; border-radius:0.5rem; overflow:hidden;">
+					<img :src="info.research_report_type_info.banner_url" style="float:left; height:0.7rem; max-width:0.7rem; border-radius:100%; margin-right:0.2rem;" />
+					<b style="float:left; font:0.56rem/0.7rem '黑体'; color:#6184bc;">{{info.research_report_type_info.report_chapter_type_name}}</b>
+				</h1>
+                <p style="float:left; display:inline-block; height:1rem; font:0.56rem/1rem 'PingFangSC-Regular'; color:#C3C3C3; margin-left:0.4rem;">弘则研究</p>
+			</div>
+          </div>
+          <div v-for="item in info.research_report_type_content_list" :key="item.sort">
+              <p style="width:100%; min-height:1.2rem; padding-left:0.5rem; box-sizing:border-box; border-bottom:1px solid #fff; margin:0.8rem auto 0.3rem; position:relative;">
+					<span style="display:inline-block; width:0.2rem; height:0.8rem; background:#cf441f; position:absolute; top:0.2rem; left:0;"></span>
+					<span style="font:600 0.76rem/1.2rem '思源黑体' !important; color:#000;">{{item.content_type?item.content_type:'核心观点'}}</span>
+				</p>
               <div v-html="item.content" style="font:400 0.70rem/1.2rem '思源黑体'; color:#333;"></div>
           </div>
       </div>
@@ -41,26 +45,15 @@
 
 <script>
 // import CryptoJS from './utils/crypto' 
-import {apiReportDetail} from '@/api/ficc_yb/api.js'
+import {apiReportDetailWeek} from '@/api/ficc_yb/api.js'
 export default {
     computed: {
         topBgUrl(){
-            if(this.info){
-                if( this.info.research_report_info.type=='day' ){
-                    return require('@/assets/img/ficc_yb/daybanner.jpg');
-                }else if( this.info.research_report_info.type=='week' ){
-                    return require('@/assets/img/ficc_yb/weekbanner.jpg');
-                }else if( this.info.research_report_info.type=='two_week' ){
-                    return require('@/assets/img/ficc_yb/twoweekbanner.jpg');
-                }else if( this.info.research_report_info.type=='month' ){
-                    return require('@/assets/img/ficc_yb/monthbanner.jpg');
-                }else if( this.info.research_report_info.type=='other' ){
-                    return require('@/assets/img/ficc_yb/otherbanner.jpg');
-                }else{
-                    return require('@/assets/img/ficc_yb/daybanner.jpg');
-                }
+            if( this.$route.query.type=='week' ){
+                return require('@/assets/img/ficc_yb/weektop.jpg');
+            }else if( this.info.research_report_info.type=='week' ){
+                return require('@/assets/img/ficc_yb/daytop.jpg');
             }
-            
         }        
     },
     data () {
@@ -108,9 +101,9 @@ export default {
 			return "周" + "日一二三四五六".charAt(date.getDay());
 		},
         async getDetail(){
-            const res=await apiReportDetail({
+            const res=await apiReportDetailWeek({
                 Authorization:this.$route.query.token,
-                research_report_id:this.$route.query.research_report_id
+                research_report_type_id:this.$route.query.report_type_id,
             })
             if(res.code===200){
                 this.info=res.data
@@ -126,47 +119,17 @@ export default {
 <style lang="scss" scoped>
 .top-wrap{
     width: 100%;
-    height: 200px;
-    background-size: cover;
-    background-repeat: no-repeat;
+    height: 75px;
+    background-color: rgb(220, 222, 223);
     color: #fff;
     padding-top: 20px;
     position: relative;
-    h1,h3{
-        margin: 0;
-        padding: 0;
-    }
-    .title,.sub-title{
-        text-align: center;
-        width: 80%;
-        margin-left: auto;
-        margin-right: auto;
-        font-size: 26px;
-    }
-    .sub-title{
-        font-size: 18px;
-        margin-top: 40px;
-    }
-    .time-box{
-        display: flex;
-        position: absolute;
-        left: 20px;
-        bottom: 30px;
-        font-size: 12px;
-        .time-num{
-            font-size: 22px;
-            font-weight: bold;
-            border-right: 1px solid #fff;
-            margin-right: 5px;
-            padding-right: 3px;
-            line-height: 40px;
-        }
-    }
-    .num{
-        position: absolute;
-        bottom: 30px;
-        right: 20px;
-        font-size: 14px;
+    padding: 15px 15px 0 15px;
+    box-sizing: border-box;
+    img{
+        width: 100%;
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
     }
 }
 .footer-wrap{