Merge branch 'master' into 2.0

src/views/cygx/index.scss

@@ -219,6 +219,7 @@
          height: 28px;
          background: #376CBB;
        }
+       
    @media screen and (min-width:790px) {
        margin: 20PX 0 10PX;
        padding-bottom: 20PX;
@@ -234,9 +235,15 @@
          height: 22PX;
          background: #2a65f5;
        }
- }
+    }
+
      }
    }
+   .container-abstract-yx {
+    &::before {
+      background: #F1A84A !important;
+    }
+ }
  }
  .report-link {
    font-size: 28px;

src/views/cygx/raiReportDtl.vue

@@ -30,13 +30,13 @@
                   <p class="time">{{ reportInfo.PublishDate }}</p>
                 </div>
               </div>
-              <div @click="attentionBtn" class="is-follow" :class="reportInfo.IsFollow ? 'follow-cancel' : ''" v-if="isBinding">
+              <div @click="attentionBtn" :style="{ 'background-color': isYanxuan ? '#F1A84A' : '#376CBB' }" class="is-follow" :class="reportInfo.IsFollow ? 'follow-cancel' : ''" v-if="isBinding">
                 {{ reportInfo.IsFollow ? "取消关注" : "+ 关注" }}
               </div>
             </div>
           </template>
           <!-- <div v-if="!reportInfo.IsSpecialArticle">注：请务必阅读<span class="tip" @click="showTips = true"> &nbsp;免责声明</span></div> -->
-          <div class="container-abstract">&nbsp;&nbsp;摘要:&nbsp;{{ reportInfo.Abstract }}</div>
+          <div :class="['container-abstract', isYanxuan && 'container-abstract-yx']">&nbsp;&nbsp;摘要:&nbsp;{{ reportInfo.Abstract }}</div>
         </div>
       </div>
       <template v-if="isBinding">
@@ -89,7 +89,8 @@
       本文章或会议未经本平台和作者的书面许可，任何机构和个人不得以任何形式转发、转载、翻版、复制、刊登、发表、修改、仿制或引用文章或会议的全部或部分内容。本平台对任何第三方的未经授权行为所产生的的影响不承担任何责任，同时保持实施法律行动的权利。
     </div>
     <div class="btn-returntop" v-if="isBinding">
-      <img src="~@/assets/cygx/returntop.png" @click="scrolltop" style="width: 40px" />
+      <img v-if="isYanxuan" src="~@/assets/cygx/returntop_yx.png" @click="scrolltop" style="width: 40px" />
+      <img v-else src="~@/assets/cygx/returntop.png" @click="scrolltop" style="width: 40px" />
     </div>
     <div class="btn-freecharge" v-if="isShowFreeBtn && from_type == 'mpwechat'">
       <img @click="toggle" class="image" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/free_icon.png" />
@@ -106,8 +107,12 @@
         <div>约访专家</div>
       </div>
       <div class="handle-item" @click="collectHandle">
-        <img src="@/assets/cygx/collect_act.png" class="img_ico" v-if="reportInfo.IsCollect" />
+        <template v-if="reportInfo.IsCollect">
+          <img v-if="isYanxuan" src="https://hzstatic.hzinsights.com/yx_xcx/collect_act.png" />
+          <img src="@/assets/cygx/collect_act.png" class="img_ico" v-else />
+        </template>
         <img src="@/assets/cygx/collect_ico.png" class="img_ico" v-else />
+
         <div v-if="reportInfo.IsResearch">
           {{ `${reportInfo.CollectionNum}  人收藏` }}
         </div>
@@ -139,6 +144,7 @@ const showTips = ref(false);
 const contentBox = ref(null);
 const isBinding = ref(true);
 const isSendWx = ref("");
+const isYanxuan = ref("");
 
 /* 访谈接口 */
 const interviewApi = () => {
@@ -155,7 +161,7 @@ const interviewApi = () => {
 //跳转到免费送月卡页面
 const toggle = () => {
   wx.miniProgram.navigateTo({
-    url: "/pageMy/freeTrial/freeTrial",
+    url: `/${isYanxuan.value ? "pages-user" : "pageMy"}/freeTrial/freeTrial`,
   });
 };
 const isShowFreeBtn = ref(false);
@@ -177,7 +183,7 @@ const userIsShowFreeButton = async () => {
 // 跳转到作者页面
 const goAuthorPages = () => {
   wx.miniProgram.navigateTo({
-    url: "/reportPages/authorPages/authorPages?id=" + state.reportInfo.DepartmentId,
+    url: `/${isYanxuan.value ? "pages-report" : "reportPages"}/authorPages/authorPages?id=` + state.reportInfo.DepartmentId,
   });
 };
 const downloadFile = async () => {
@@ -192,7 +198,7 @@ const downloadFile = async () => {
   if (res.Ret === 200) {
     Toast.clear();
     wx.miniProgram.navigateTo({
-      url: "/pageMy/downloadFile/downloadFile?url=" + res.Data.FileLink,
+      url: `/${isYanxuan.value ? "pages-user" : "pageMy"}/downloadFile/downloadFile?url=` + res.Data.FileLink,
     });
   }
 };
@@ -256,7 +262,7 @@ const attentionBtn = () => {
           })
             .then(() => {
               wx.miniProgram.navigateTo({
-                url: "/activityPages/accountsOfficial/accountsOfficial",
+                url: `/${isYanxuan.value ? "pages-activity" : "activityPages"}/accountsOfficial/accountsOfficial`,
               });
             })
             .catch(() => {
@@ -296,7 +302,7 @@ const collectHandle = () => {
 /* 文章相关热门跳转 */
 const goDetail = (item) => {
   wx.miniProgram.navigateTo({
-    url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId,
+    url: `/${isYanxuan.value ? "pages-user" : "pageMy"}/reportDetail/reportDetail?id=` + item.ArticleId,
   });
 };
 /* 文章相关热门收藏 */
@@ -329,20 +335,10 @@ const waterMark = (text) => {
   // 将容器的的背景图片设置为生成的base64图片,并平铺
   contentBox.value.style.background = "url(" + data + ") repeat";
 };
-//点击回到搜索页面
-const btnSearch = () => {
-  if (state.reportInfo.IsBelongSummary) {
-    wx.miniProgram.navigateTo({ url: "/pageMy/search/search" });
-  } else {
-    wx.miniProgram.navigateTo({
-      url: "/reportPages/reportSearch/reportSearch",
-    });
-  }
-};
 //点击到提问页面
 const quizBtn = () => {
   wx.miniProgram.navigateTo({
-    url: "/activityPages/generationAsk/generationAsk?id=" + state.reportInfo.ArticleId + "&type=文章",
+    url: `/${isYanxuan.value ? "pages-activity" : "activityPages"}/generationAsk/generationAsk?id=` + state.reportInfo.ArticleId + "&type=文章",
   });
 };
 // 约访专家
@@ -356,7 +352,7 @@ const appointment = (articleId) => {
     message: "约访专家的请求会提醒您的对口销售，确定要发起吗？",
     messageAlign: "left",
     showCancelButton: true,
-    confirmButtonColor: "blue",
+    confirmButtonColor: isYanxuan.value ? "#F1A84A" : "#3385FF",
   })
     .then(() => {
       RaiApi.appointmentExpert({ ArticleId: articleId }).then((res) => {
@@ -449,19 +445,20 @@ const pleaseGoLogin = () => {
   }).then((res) => {
     if (res == "confirm") {
       wx.miniProgram.navigateTo({
-        url: "/pageMy/login/login",
+        url: `/${isYanxuan.value ? "pages-user" : "pageMy"}/login/login`,
       });
     }
   });
 };
 onMounted(() => {
+  document.title = "报告详情";
   if (route.query.id) {
     rerportId.value = +route.query.id;
     isSendWx.value = route.query.IsSendWx || "";
     from_type.value = route.query.fromType;
     let access_token = route.query.token || "";
     isBinding.value = route.query.isBinding == "true" ? true : false;
-    console.log(isBinding.value);
+    isYanxuan.value = route.query.isYanxuan ? true : false;
     localStorage.setItem("access_token", access_token);
     getReport(rerportId.value, access_token, from_type.value);
     userIsShowFreeButton();