Merge branch 'master' of http://8.136.199.33:3000/Karsa/raiwechat_link_h5

src/api/htgj/api.js

@@ -28,10 +28,23 @@ export const RaiApi = {
   },
   /* 页面复制监听*/
   pageHistoryCopy: (params) => {
-    return post("/article/pageHistoryPublic", params, 1);
+    return post("/article/pageHistoryPublic", params);
   },
   /*上传文章阅读时间接口*/
   addStopTime: (params) => {
-    return post("/article/addStopTimePublic", params);
+    return post("/htgj/article/addStopTimePublic", params);
   },
+  /* 申请访谈 ArticleId*/
+  applyRpt: (params) => {
+    return post("/htgj/interview/apply", params);
+  },
+  /* 收藏 ArticleId*/
+  collectRpt: (params) => {
+    return post("/htgj/collect", params);
+  },
+  /* 提问 ArticleId*/
+  askAdd: (params) => {
+    return post("/htgj/askAdd", params);
+  },
+  
 };

src/api/htgj/http.js

@@ -22,14 +22,14 @@ _axios.interceptors.request.use(
   function (config) {
     // Do something before request is sent
     // 设置loading
-    if (LOADINGCOUNT === 0) {
-      LOADING = Toast.loading({
-        message: "loading...",
-        duration: 0,
-        forbidClick: true,
-      });
-    }
-    LOADINGCOUNT++;
+    // if (LOADINGCOUNT === 0) {
+    //   LOADING = Toast.loading({
+    //     message: "loading...",
+    //     duration: 0,
+    //     forbidClick: true,
+    //   });
+    // }
+    // LOADINGCOUNT++;
     let data = store.state.userData;
 
     if (config.method == "get") {
@@ -57,10 +57,10 @@ _axios.interceptors.response.use(
     // Do something with response data
 
     //关闭loading
-    LOADINGCOUNT--;
-    if (LOADINGCOUNT === 0) {
-      LOADING.clear();
-    }
+    // LOADINGCOUNT--;
+    // if (LOADINGCOUNT === 0) {
+    //   LOADING.clear();
+    // }
 
     return response.data;
   },

src/router/htgj/index.js

@@ -23,6 +23,11 @@ export const htgjRoutes=[
                 path:"search",
                 name:"htgjSearch",
                 component: () => import("@/views/htgj/search.vue"),
+            },
+            {
+                path:"quiz",
+                name:"htgjQuiz",
+                component: () => import("@/views/htgj/quiz.vue"),
             }
         ]
     }

src/router/index.js

@@ -28,7 +28,6 @@ const router = createRouter({
 
 router.beforeEach((to, from, next) => {
   if (to.fullPath.includes("htgj")) {
-    console.log(to.query);
     let data = {
       CompanyCode: to.query.CompanyCode, //编码
       CompanyName: to.query.CompanyName, // 名称

src/views/htgj/quiz.vue

@@ -0,0 +1,65 @@
+<script setup>
+import {  onMounted,  ref } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { Toast, Field, CellGroup } from "vant";
+import { RaiApi } from "@/api/htgj/api.js";
+import topbar from "./topbar.vue";
+
+const quizMessage = ref("");
+const articleId = ref(null)
+const route = useRoute()
+const router = useRouter()
+const submitQuiz =async () => {
+    if(!quizMessage.value) return Toast("请输入内容")
+    const res = await RaiApi.askAdd({
+        ArticleId:Number(articleId.value),
+        Content:quizMessage.value
+    })
+    if(res.Ret === 200) {
+        Toast("提交成功")
+        setTimeout(() => {
+            router.back()
+        })
+    }else {
+       Toast(res.Msg)
+    }
+}
+onMounted(()=>{
+    articleId.value =route.query.id
+})
+</script>
+
+<template>
+  <div class="container-quiz">
+    <topbar class="top-box-bar" showText="弘则研究" />
+    <CellGroup inset>
+      <Field v-model="quizMessage" type="textarea" maxlength="100" placeholder="请描述您的问题，销售会跟进问题，后期在线下为您解答" show-word-limit />
+    </CellGroup>
+    <div class="submit" @click="submitQuiz">提交</div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container-quiz {
+  .van-cell-group {
+    margin-top: 40px;
+    height: 420px;
+    border: 1px solid #d0cfd5;
+  }
+  :deep(.van-field__control--min-height) {
+    height: 350px !important;
+  }
+  .submit {
+    margin: 0 auto;
+    width: 368px;
+    height: 80px;
+    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+    border-radius: 4px;
+    line-height: 80px;
+    font-size: 34px;
+    color: #fff;
+    text-align: center;
+    margin-top: 300px;
+  }
+}
+</style>

src/views/htgj/report.vue

@@ -1,53 +1,68 @@
 <template>
-  <div class="container-cygx" @copy="copyMonitor" v-if="haveData == 1" :class="reportInfo.IsResearch ? 'no-cv' : ''">
-    <canvas id="tutorial" ref="tutorial"></canvas>
-   <topbar class="top-box-bar" showText="弘则研究" />
-    <div class="search">
-      <div class="search-box" @click="btnSearch">
-        <Icon name="search" color="#8D8D8D" />
-        <span>搜索您想要的纪要</span>
+  <div>
+    <div class="container-cygx" @copy="copyMonitor" v-if="haveData == 1" :class="reportInfo.IsResearch ? 'no-cv' : ''">
+      <canvas id="tutorial" ref="tutorial"></canvas>
+      <topbar class="top-box-bar" showText="弘则研究" />
+      <div class="search">
+        <div class="search-box" @click="btnSearch">
+          <Icon name="search" color="#8D8D8D" />
+          <span>搜索您想要的纪要</span>
+        </div>
       </div>
-    </div>
-    <div class="z-index-content">
-      <div class="content-top">
-        <div class="report-title">{{ reportInfo.Title }}</div>
-        <div class="report-text">
-          <div class="report_desc">
-            <span class="author">{{ reportInfo.Department }}</span>
-            <span>{{ reportInfo.PublishDate }}</span>
-          </div>
-          <div class="seller-list" v-if="!reportInfo.IsResearch">
-            <span>联系人:</span>
-            <span v-for="(item, index) in reportInfo.SellerList" :key="index"> {{ item.SellerName }}({{ item.SellerMobile }})&nbsp;&nbsp; </span>
+      <div class="z-index-content">
+        <div class="content-top">
+          <div class="report-title">{{ reportInfo.Title }}</div>
+          <div class="report-text">
+            <div class="report_desc">
+              <span class="author">{{ reportInfo.Department }}</span>
+              <span>{{ reportInfo.PublishDate }}</span>
+            </div>
+            <div class="seller-list" v-if="!reportInfo.IsResearch">
+              <span>联系人:</span>
+              <span v-for="(item, index) in reportInfo.SellerList" :key="index"> {{ item.SellerName }}({{ item.SellerMobile }})&nbsp;&nbsp; </span>
+            </div>
+            <div class="seller-list" v-else>
+              <span>作者:{{ reportInfo.SellerAndMobile }} </span>
+            </div>
+            <div>注：请务必阅读<span class="tip" @click="showTips = true"> &nbsp;免责声明</span></div>
+            <div class="container-abstract">&nbsp;&nbsp;摘要:&nbsp;{{ reportInfo.Abstract }}</div>
           </div>
-          <div class="seller-list" v-else>
-            <span>作者:{{ reportInfo.SellerAndMobile }} </span>
-          </div>
-          <div>注：请务必阅读<span class="tip" @click="showTips = true"> &nbsp;免责声明</span></div>
-          <div class="container-abstract">&nbsp;&nbsp;摘要:&nbsp;{{ reportInfo.Abstract }}</div>
+        </div>
+        <div class="detail-report">
+          <div id="report-content" v-html="reportInfo.Body"></div>
         </div>
       </div>
-      <div class="detail-report">
-        <div id="report-content" v-html="reportInfo.Body"></div>
+      <div class="btn-returntop">
+        <img src="~@/assets/cygx/returntop.png" @click="scrolltop" style="width: 40px" />
       </div>
+      <div class="fixed_cont">
+        <div class="handle-item" @click="quizBtn" v-if="reportInfo.IsResearch">
+          <img src="@/assets/cygx/quiz_ico.png" class="img_ico" />
+          <div>提问</div>
+        </div>
+        <div class="handle-item" @click="collectHandle">
+          <img src="@/assets/cygx/collect_act.png" class="img_ico" v-if="reportInfo.IsCollect" />
+          <img src="@/assets/cygx/collect_ico.png" class="img_ico" v-else />
+          <div v-if="reportInfo.IsResearch">
+            {{ `${reportInfo.CollectionNum}  人收藏` }}
+          </div>
+        </div>
+      </div>
+      <dlg :showTips="showTips" :reportInfo="reportInfo" @hideDlg="showTips = false" />
     </div>
-    <div class="btn-returntop">
-      <img src="~@/assets/cygx/returntop.png" @click="scrolltop" style="width: 40px" />
-    </div>
-    <dlg :showTips="showTips" :reportInfo="reportInfo" @hideDlg="showTips = false" />
-  </div>
-  <div v-else class="nodata">
-    <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
-    <div v-if="haveData == 2">
-      <p>您暂无权限查看报告</p>
-      <p>若想查看可联系销售开通试用权限</p>
-    </div>
-    <div v-else>
-      <p>您的试用权限已到期</p>
-      <p>若想继续试用，请联系销售</p>
+    <div v-else class="nodata">
+      <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
+      <div v-if="haveData == 2">
+        <p>您暂无权限查看报告</p>
+        <p>若想查看可联系销售开通试用权限</p>
+      </div>
+      <div v-else>
+        <p>您的试用权限已到期</p>
+        <p>若想继续试用，请联系销售</p>
+      </div>
     </div>
+    <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />
   </div>
-  <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />
 </template>
 
 <script setup>
@@ -130,7 +145,7 @@ const getReport = (id) => {
         state.reportInfo = res.Data.Detail;
         fileLink.value = res.Data.Detail.FileLink;
         if (state.reportInfo.IsResearch || state.reportInfo.IsBelongSummary) {
-          waterMark( res.Data.CompanyName);
+          waterMark(res.Data.CompanyName);
         }
         $(document).on("click", "#report-content img", function (event) {
           let imgArray = [];
@@ -152,6 +167,37 @@ const getReport = (id) => {
     }
   });
 };
+
+//点击到提问页面
+const quizBtn = () => {
+  // wx.miniProgram.navigateTo({
+  //   url: "/activityPages/generationAsk/generationAsk?id=" + state.reportInfo.ArticleId + "&type=文章",
+  // });
+  router.push({
+    path: "/htgj/quiz",
+    query: {
+      id: rerportId.value,
+    },
+  });
+};
+
+/* 收藏 */
+const collectHandle = () => {
+  RaiApi.collectRpt({
+    ArticleId: Number(rerportId.value),
+  }).then((res) => {
+    if (res.Ret === 200) {
+      state.reportInfo.IsCollect = !state.reportInfo.IsCollect;
+      if (res.Data.Status == 2) {
+        state.reportInfo.CollectionNum -= 1;
+      } else {
+        state.reportInfo.CollectionNum += 1;
+      }
+      Toast(res.Msg);
+    }
+  });
+};
+
 onMounted(() => {
   if (route.query.id) {
     rerportId.value = route.query.id;
@@ -180,6 +226,38 @@ const { reportInfo } = toRefs(state);
     position: relative;
     z-index: 5;
   }
+  .fixed_cont {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-around;
+    border-top: 1px solid #ddd;
+    padding-bottom: calc(5px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(5px + env(safe-area-inset-bottom));
+    background-color: #fff;
+    z-index: 9;
+    box-sizing: border-box;
+    .handle-item {
+      padding-top: 14px;
+      text-align: center;
+      line-height: 33px;
+      font-size: 20px;
+      color: #888888;
+      width: 130px;
+      img {
+        width: 44px;
+        height: 44px;
+        padding: 0;
+        margin: 0;
+      }
+      div {
+        padding: 0;
+        margin: 0;
+      }
+    }
+  }
   .top-box-bar {
     position: fixed;
     top: 0;
@@ -193,7 +271,7 @@ const { reportInfo } = toRefs(state);
     img {
       margin-top: 10px;
     }
-}
+  }
   .search {
     width: 100%;
     padding: 20px 20px;
@@ -351,14 +429,14 @@ const { reportInfo } = toRefs(state);
   user-select: none;
 }
 .top-box-bar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 40px;
-    background-color: #fff;
-    margin-top: 15px;
-    z-index: 10;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
+  background-color: #fff;
+  margin-top: 15px;
+  z-index: 10;
 }
 #tutorial {
   position: absolute;

src/views/htgj/strategyDetail.vue

@@ -43,6 +43,68 @@ const getReport = (id) => {
     }
   });
 };
+
+/* 访谈申请 */
+const applyHandle = () => {
+  !state.reportInfo.IsInterviewApply &&
+    Dialog.confirm({
+      title: "",
+      message: "专家访谈申请会提交给您的对口销售，销售会线下与您取得联系，确定申请吗？",
+      confirmButtonColor: "#fff",
+      cancelButtonColor: "#fff",
+      theme: "round-button",
+    }).then(() => {
+      interviewApi();
+    });
+  // 取消申请访谈 区分状态 '待邀请','待访谈','已完成','已取消'
+  if (state.reportInfo.IsInterviewApply) {
+    Dialog.confirm({
+      title: "",
+      message:
+        state.reportInfo.InterviewApplyStatus == "待访谈"
+          ? "当前无法取消访谈，若有疑问，请联系对口销售"
+          : state.reportInfo.InterviewApplyStatus == "待邀请"
+          ? "您要取消此次访谈申请吗？"
+          : "该访谈已完成",
+      confirmButtonColor: "#fff",
+      cancelButtonColor: "#fff",
+      theme: "round-button",
+    }).then(() => {
+      state.reportInfo.InterviewApplyStatus == "待邀请" ? interviewApi() : "";
+    });
+  }
+};
+
+/* 访谈接口 */
+const interviewApi = () => {
+  RaiApi.applyRpt({
+    ArticleId: Number(rerportId.value),
+  }).then((res) => {
+    if (res.Ret === 200) {
+      state.reportInfo.IsInterviewApply = !state.reportInfo.IsInterviewApply;
+      state.reportInfo.InterviewApplyStatus = state.reportInfo.IsInterviewApply ? "待邀请" : "";
+      Toast(res.Msg);
+    }
+  });
+};
+
+/* 收藏 */
+const collectHandle = () => {
+  RaiApi.collectRpt({
+    ArticleId: Number(rerportId.value),
+  }).then((res) => {
+    if (res.Ret === 200) {
+      state.reportInfo.IsCollect = !state.reportInfo.IsCollect;
+      if (res.Data.Status == 2) {
+        state.reportInfo.CollectionNum -= 1;
+      } else {
+        state.reportInfo.CollectionNum += 1;
+      }
+      Toast(res.Msg);
+    }
+  });
+};
+
 onMounted(() => {
   if (route.query.id) {
     rerportId.value = route.query.id;
@@ -63,29 +125,43 @@ const { reportInfo } = toRefs(state);
 </script>
 
 <template>
-  <div class="container-cygx-strategy" @copy="copyMonitor" v-if="haveData == 1" :class="reportInfo.IsResearch ? 'no-cv' : ''">
-    <topbar class="top-box-bar" showText="弘则研究" />
-    <div class="search">
-      <div class="search-box" @click="btnSearch">
-        <Icon name="search" color="#8D8D8D" />
-        <span>搜索您想要的纪要</span>
+  <div>
+    <div class="container-cygx-strategy" @copy="copyMonitor" v-if="haveData == 1" :class="reportInfo.IsResearch ? 'no-cv' : ''">
+      <topbar class="top-box-bar" showText="弘则研究" />
+      <div class="search">
+        <div class="search-box" @click="btnSearch">
+          <Icon name="search" color="#8D8D8D" />
+          <span>搜索您想要的纪要</span>
+        </div>
       </div>
+      <iframe class="details-iframe" :src="reportInfo.HttpUrl" frameborder="0" />
+      <div class="fixed_cont">
+        <div class="handle-item" @click="applyHandle" v-if="reportInfo.IsSummary == 1 && !reportInfo.IsResearch">
+          <img src="@/assets/cygx/apply_act.png" class="img_ico" v-if="reportInfo.IsInterviewApply" />
+          <img src="@/assets/cygx/apply_ico.png" class="img_ico" v-else />
+          <div>{{ reportInfo.IsInterviewApply ? "已申请访谈" : "申请访谈" }}</div>
+        </div>
+        <div class="handle-item" @click="collectHandle">
+          <img src="@/assets/cygx/collect_act.png" class="img_ico" v-if="reportInfo.IsCollect" />
+          <img src="@/assets/cygx/collect_ico.png" class="img_ico" v-else />
+          <div>{{ reportInfo.IsCollect ? "已收藏" : "收藏" }}</div>
+        </div>
+      </div>
+      <dlg :showTips="showTips" :reportInfo="reportInfo" @hideDlg="showTips = false" />
     </div>
-    <iframe class="details-iframe" :src="reportInfo.HttpUrl" frameborder="0" />
-    <dlg :showTips="showTips" :reportInfo="reportInfo" @hideDlg="showTips = false" />
-  </div>
-  <div v-else class="nodata">
-    <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
-    <div v-if="haveData == 2">
-      <p>您暂无权限查看报告</p>
-      <p>若想查看可联系销售开通试用权限</p>
-    </div>
-    <div v-else>
-      <p>您的试用权限已到期</p>
-      <p>若想继续试用，请联系销售</p>
+    <div v-else class="nodata">
+      <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
+      <div v-if="haveData == 2">
+        <p>您暂无权限查看报告</p>
+        <p>若想查看可联系销售开通试用权限</p>
+      </div>
+      <div v-else>
+        <p>您的试用权限已到期</p>
+        <p>若想继续试用，请联系销售</p>
+      </div>
     </div>
+    <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />
   </div>
-  <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />
 </template>
 
 <style lang="scss">
@@ -131,6 +207,39 @@ const { reportInfo } = toRefs(state);
   .details-iframe {
     width: 100%;
     height: calc(100vh - 100px);
+    padding-bottom: 50px;
+  }
+  .fixed_cont {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-around;
+    border-top: 1px solid #ddd;
+    padding-bottom: calc(5px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(5px + env(safe-area-inset-bottom));
+    background-color: #fff;
+    z-index: 9;
+    box-sizing: border-box;
+    .handle-item {
+      padding-top: 14px;
+      text-align: center;
+      line-height: 33px;
+      font-size: 20px;
+      color: #888888;
+      width: 130px;
+      img {
+        width: 44px;
+        height: 44px;
+        padding: 0;
+        margin: 0;
+      }
+      div {
+        padding: 0;
+        margin: 0;
+      }
+    }
   }
 }
 .nodata {

src/views/hzyb/chart/Detail.vue

@@ -393,6 +393,7 @@ const setSplineOpt=(data)=>{
                 align: 'high',
                 rotation: 0,
                 y: -15,
+                x: (item.IsAxis===0 && temYRightTwoIndex>-1) ? -newData[temYRightTwoIndex].Unit.length*12 : 0,
                 textAlign: item.IsAxis===1 ? 'left' : 'right',
                 reserveSpace: false
             },
@@ -591,6 +592,7 @@ const setStackOrCombinChart = data => {
                 align: 'high',
                 rotation: 0,
                 y: -15,
+                x: (item.IsAxis===0 && temYRightTwoIndex>-1) ? -newData[temYRightTwoIndex].Unit.length*12 : 0,
                 textAlign: item.IsAxis===1 ? 'left' : 'right',
                 reserveSpace: false
             },