Merge branch 'dev-coursedetail-0817' of...

Merge branch 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-coursedetail-0817

src/components/common/common-navbar.vue

@@ -23,6 +23,7 @@
 </template>
 <script>
 import { getWebPageUrl } from "@/utils/index";
+import { mapGetters } from 'vuex';
 export default {
   name: "common-navbar",
   data() {
@@ -85,6 +86,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(["userInfo"]),
     navHeight() {
       if (this.isFixNavbar) {
         return 0;
@@ -129,7 +131,7 @@ export default {
         channel: 1, // 分享渠道 1：APP
         info: info,
         type: 3,     // 业务类型 1：教培项目 2：继教项目 3：职称考项目
-        token: _this.userInfo.userToken || this.token || '47993ED00ECB46CE8D31ECF3AE34B4AA',
+        token: _this.userInfo.userToken,
         setEntry: true
       };      
       _this.NEW_POST("portal/shareParam/save", param).then(res => {

src/components/course/download-button.vue

@@ -30,7 +30,7 @@ export default {
 .download-button-wrapper {
   display: flex;
   // width: 100%;
-  position: absolute;
+  position: fixed;
   z-index: 1000;
   top: 15px;
   right: 0;

src/components/course/pica-video.vue

@@ -453,7 +453,7 @@ export default {
   height: 100%;
   background-color: #333;
   overflow: hidden;
-  z-index: 999;
+  z-index: 1000;
   video{
     position: absolute;
     left: 50%;

src/views/share-merge-detail.vue

 <template>
   <!-- 组件详情页面：模块列表及其下面的元件列表 -->
-  <div class="page-container-merge">
+  <div class="page-container-merge" >
     <CommonNavbar
       id="header"
       :bgColor="bgColor"