jwyu 2 years ago
parent
commit
c44b6d229a

+ 1 - 1
src/api/user.js

@@ -17,7 +17,7 @@ export const apiUserInfo=()=>{
  * @param permission 选择的权限
  * @param real_name 姓名
  * @param source 来源:我的1、活动2、图库3、研报4
- * @param source_agent 来源平台:1:小程序、2:小程序(pc)、3:公众号、4:web(pc)
+ * @param source_agent 来源平台:1:小程序、2:小程序(pc)、3:公众号、4:官网web(pc)
  * @param from_page 来源页面: '活动列表'、'活动详情'等
  */
 export const apiApplyPermission=params=>{

+ 6 - 2
src/components/SelfList.vue

@@ -6,6 +6,10 @@ const props=defineProps({
     loading:false,
     finished:false,//是否加载完
     isEmpty:false,//是否为空数据
+    emptyMsg:{
+        type:String,
+        default:'暂无数据'
+    },//为空时描述文字
 })
 const emit=defineEmits(['listOnload'])
 const handleClickLoadMore=()=>{
@@ -19,7 +23,7 @@ const handleClickLoadMore=()=>{
         <slot></slot>
         <div class="empty-box" v-if="props.isEmpty">
             <img :src="$store.state.globalImgUrls.chartEmpty" alt="">
-            <p>暂无数据</p>
+            <p>{{props.emptyMsg}}</p>
         </div>
         <div class="bot-load" v-if="!props.finished&&!props.loading&&!props.isEmpty">
             <div class="btn" @click="handleClickLoadMore">加载更多</div>
@@ -35,7 +39,7 @@ const handleClickLoadMore=()=>{
 .self-list-wrap{
     .empty-box{
         text-align: center;
-        color: #F3A52F;
+        // color: #F3A52F;
         img{
             width: 315px;
         }

+ 5 - 0
src/layout/Index.vue

@@ -36,6 +36,11 @@ import LoginPop from '@/components/LoginPop.vue'
       </el-container>
     </el-container>
 
+    <!-- 回到顶部 -->
+    <el-backtop :bottom="100" visibility-height="900" style="z-index:1000">
+      <img src="@/assets/icon-back-top.png" alt="" style="width: 60px;">
+    </el-backtop>
+
     <!-- 音频模块 -->
     <AudioBox></AudioBox>
 

+ 3 - 3
src/views/report/ChapterDetail.vue

@@ -114,7 +114,7 @@ const getChapterReportDetail=async ()=>{
         }
 
         // 获取侧边更多推荐
-        if(res.data.auth_ok){
+        if(res.data.auth_ok&&frompage.value=='reportdetail'){
             getAsideMoreRecmd(res.data.report_chapter_item)
             getAsideBanner(res.data.report_chapter_item)
         }
@@ -324,14 +324,14 @@ let showDisclaimers=ref(false)//显示免责声明
                             :key="item.report_chapter_id"
                             @click="handleChangeChapter(item)"
                         >
-                            <img :src="item.report_chapter_type_thumb" alt="">
+                            <img :src="item.report_chapter_id==chapterId?item.pc_selected_thumb:item.pc_unselected_thumb" alt="">
                             <span>{{item.report_chapter_type_name}}</span>
                         </div>
                     </div>
                 </div>
 
             </div>
-            <div class="right-aside-box" v-if="info.auth_ok">
+            <div class="right-aside-box" v-if="info.auth_ok&&frompage=='reportdetail'">
                 <div class="fix-top">
                 <div class="share-box">
                     <div class="label">分享</div>

+ 2 - 1
src/views/report/Classify.vue

@@ -72,7 +72,7 @@ onMounted(()=>{
                 <el-col :span="6" v-for="item in list" :key="item.classify_name_first">
                     <div class="item" @click="goNext(item)" :style="'background-image:url('+item.back_img_url+')'">
                         <div class="con">
-                            <div style="font-size: 18px;font-weight: bold;margin-bottom: 5px;">{{item.classify_name_first}}</div>
+                            <div style="font-size: 18px;font-weight: bold;margin-bottom: 10px;">{{item.classify_name_first}}</div>
                             <span style="margin-left: -7px;font-size: 14px;color: #666;">【FICC | {{item.latest}} 期】</span>
                         </div>
                     </div>
@@ -91,6 +91,7 @@ onMounted(()=>{
         display: block;
     }
     .list-wrap{
+        margin-top: 30px;
         .item{
             padding-top: 42%;
             border: 1px solid #ECECEC;

+ 3 - 3
src/views/report/Detail.vue

@@ -47,9 +47,9 @@ const getReportDetail=async ()=>{
             reportId:res.data.report_info.report_id
         }
         document.title = res.data.report_info.classify_name_first
-        if(['晨报','周报'].includes(res.data.report_info.classify_name_first)){
+        // if(['晨报','周报'].includes(res.data.report_info.classify_name_first)){
             store.commit('modifyBreadCrumb',res.data.report_info.classify_name_first)
-        }
+        // }
         
         // 获取详情如果为联系销售根据判断条件是否主动申请一次
         if(!res.data.auth_ok){
@@ -276,7 +276,7 @@ let showDisclaimers=ref(false)//显示免责声明
                         </div>
                         <div class="apply-box" v-else>
                             <div>您暂无权限查看报告 </div>
-                            <div>若想查看请联系对口销售:{{info.permission_check.name}}</div>
+                            <div>若想查看请联系对口销售:{{info.permission_check.name}}--{{info.permission_check.mobile}}</div>
                         </div>
                     </div>
                 </div>

+ 4 - 7
src/views/report/Index.vue

@@ -139,7 +139,8 @@ const clickSubType = (item) => {
 const handleShowAuthData=(e)=>{
   if(authData.isBuy){
     if(!e.auth_ok){
-      const  htmlStr=`您暂无该品种权限,若想查看请联系对口销售--${authData.contactInfo.name}:${authData.contactInfo.mobile}`
+      const  htmlStr=`<p>您暂无该品种权限,若想查看请联系对口销售</p>
+                      <p>${authData.contactInfo.name}:<span style="color:#F3A52F">${authData.contactInfo.mobile}</span></p>`
       ElMessageBox({
         title:'温馨提醒',
         message:htmlStr,
@@ -290,8 +291,8 @@ onActivated(()=>{
             <div class="item-time">{{ formatDate(item.date) }}</div>
             <div class="content-list">
               <div class="content-item" v-for="citem in item.sub_list" :key="citem.report_id">
-                <div class="content-box">
-                  <div class="all-btn" @click="handleGoReportDetail(citem)">查看全部</div>
+                <div class="content-box" @click="handleGoReportDetail(citem)">
+                  <div class="all-btn">查看全部</div>
                   <div class="c-time">{{ moment(citem.publish_time).format('HH:mm:ss')  }}</div>
                   <div class="c-title">{{ citem.title }}</div>
                   <div class="desc" v-html="citem.content_sub"></div>
@@ -335,10 +336,6 @@ onActivated(()=>{
       </div>
     </div>
   </div>
-  <!-- 回到顶部 -->
-  <el-backtop :bottom="100" visibility-height="500">
-    <img src="@/assets/icon-back-top.png" alt="" style="width: 60px;">
-  </el-backtop>
 </template>
 
 <style lang="scss" scoped>

+ 6 - 0
src/views/report/List.vue

@@ -196,6 +196,7 @@ onActivated(()=>{
             :isEmpty="reportState.list.length === 0 && reportState.finished" 
             :loading="reportState.loading" 
             @listOnload="onLoad"
+            emptyMsg="找不到对应报告,试试别的搜索词吧"
         >
         <div class="flex list-wrap">
             <div class="flex item" v-for="item in reportState.list" :key="item.report_id" @click="goReportDetail(item)">
@@ -298,6 +299,11 @@ onActivated(()=>{
                 color: #F3A52F;
                 padding: 4px 0;
             }
+            .title{
+                :deep(span){
+                    color:#F3A52F !important;
+                }
+            }
             .des{
                 color: #999;
             }

+ 1 - 0
src/views/report/Search.vue

@@ -101,6 +101,7 @@ onBeforeRouteLeave((to,from)=>{
             :isEmpty="listState.list.length === 0 && listState.finished" 
             :loading="listState.loading" 
             @listOnload="onLoad"
+            emptyMsg="找不到对应报告,试试别的搜索词吧"
         >
         <div class="search-list-wrap">
             <div 

+ 3 - 0
src/views/report/specialColumn/List.vue

@@ -208,6 +208,9 @@ onActivated(()=>{
                 font-size: 14px;
                 color: #666;
             }
+            &:hover{
+                
+            }
         }
         .item:nth-child(odd){
             padding-right: 25px;