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

@@ -22,6 +22,7 @@
   </section>
 </template>
 <script>
+import { getWebPageUrl } from "@/utils/index";
 export default {
   name: "common-navbar",
   data() {
@@ -32,7 +33,8 @@ export default {
       fontSize: 37.5,
       content: "",
       shareImageUrl:
-        "https://file.yunqueyi.com/logo.png?version=" + new Date().getTime()
+        "https://file.yunqueyi.com/logo.png?version=" + new Date().getTime(),
+      shareUrl: ''
     };
   },
   props: {
@@ -77,7 +79,7 @@ export default {
       type: String,
       default: ""
     },
-    shareUrl: {
+    projectId: {
       type: String,
       default: ""
     }
@@ -105,8 +107,44 @@ export default {
     goBack() {
       rocNative.goBack();
     },
-    //分享
+
+    // 生成分享的url
     goShare() {
+      let _this = this;
+      let videoUrl = this.$route.query.videoUrl || '';
+      let info = "";
+      if(videoUrl) {
+        let limitTimes = this.$route.query.limitTimes || 0;
+        info = JSON.stringify({
+          projectId: this.projectId,
+          videoUrl: videoUrl,
+          limitTimes: limitTimes
+        })
+      } else {
+        info = JSON.stringify({
+          projectId: this.projectId,
+        })        
+      }   
+      let param = {
+        channel: 1, // 分享渠道 1：APP
+        info: info,
+        type: 3,     // 业务类型 1：教培项目 2：继教项目 3：职称考项目
+        token: _this.userInfo.userToken || this.token || '47993ED00ECB46CE8D31ECF3AE34B4AA',
+        setEntry: true
+      };      
+      _this.NEW_POST("portal/shareParam/save", param).then(res => {
+        if (res.code == "000000") {
+          let url = getWebPageUrl(`profexam/#/sharecoop?uuid=${res.data}`);
+          _this.shareUrl = url;
+          _this.goShareAction();
+        }
+      }).catch( e => {
+        console.error(e);;
+      });      
+    },
+
+    //分享
+    goShareAction() {
       // let url = location.href,
       let _this = this;
       rocNative.shareWechat({

src/views/merge-detail.vue

@@ -13,6 +13,7 @@
       :isFixNavbar="isFixNavbar"
       :shareUrl="shareUrl"
       :burialPoint="pointStyle"
+      :projectId="projectId"
       borderStyle="0px solid #fff"
       :backMethod="from"
     ></CommonNavbar>
@@ -299,7 +300,7 @@ export default {
     let _this = this;
     this.from = this.$route.query.from || this.from || "native";
     this.projectId = this.$route.query.id || 1;
-    this.generateShareUrl();
+    // this.generateShareUrl();
     console.log('#######location', location);
 
     window.__getUserInfo64Comp = function(param) {
@@ -356,7 +357,7 @@ export default {
       let videoUrl = this.$route.query.videoUrl || '';
       let info = "";
       if(videoUrl) {
-        let limitTimes = this.$route.query.limitTimes || 300000;
+        let limitTimes = this.$route.query.limitTimes || 0;
         info = JSON.stringify({
           projectId: this.projectId,
           videoUrl: videoUrl,

src/views/share-merge-detail.vue

@@ -24,7 +24,7 @@
       </div>
       <!-- banner视频 -->
       <div class="video-box" v-if="bannerType == 2">
-        <pica-video ref="picaVideo" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
+        <pica-video ref="picaVideo" :coverType="coverType" @onVideoEnd="onVideoEnd" @onReplay="onReplay">
           <!-- 试看结束 -->
           <div class="cover" v-if="logged && coverType === 1">
             <course-covers coverTips="试看结束<br />请来云鹊医App学习完整课程" :isSingle="true" rightBtnText="学习完整课程" @btnClick="btnClick" />