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/views/merge-detail.vue

@@ -351,11 +351,25 @@ export default {
     // 生成分享的url
     generateShareUrl() {
       let _this = this;
+      let videoUrl = this.$route.query.videoUrl || '';
+      let info = "";
+      if(videoUrl) {
+        let limitTimes = this.$route.query.limitTimes || 300000;
+        info = JSON.stringify({
+          projectId: this.projectId,
+          videoUrl: videoUrl,
+          limitTimes: limitTimes
+        })
+      } else {
+        info = JSON.stringify({
+          projectId: this.projectId,
+        })        
+      }   
       let param = {
         channel: 1, // 分享渠道 1：APP
-        info: `${_this.projectId}`,
+        info: info,
         type: 3     // 业务类型 1：教培项目 2：继教项目 3：职称考项目
-      };
+      };      
       _this.POST("portal/shareParam/save", param).then(res => {
         if (res.code == "000000") {
           let url = getWebPageUrl(`profexam/#/sharecoop?uuid=${res.data}`);

src/views/share-merge-detail.vue

@@ -381,7 +381,8 @@ export default {
       };
       this.GET(`portal/shareParam/queryByUuid`, param).then(res => {
         if (res.code == "000000") {
-          this.projectId = res.data;
+          this.shareParam = JSON.parse(res.data);
+          this.projectId = this.shareParam.projectId || 797;
           this.getProjectInfoById();
           console.log('queryByUuid', res);
         }