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/cme/bind-card-button-share.vue

@@ -98,8 +98,8 @@ export default {
       font-weight: 700;
       text-align: center;
       &.left {
-        border: 1px solid rgba(255, 122, 75, 1);
-        border-right-style: none;
+        // border: 1px solid rgba(255, 122, 75, 1);
+        // border-right-style: none;
         color: #FFFFFF;
         background:linear-gradient(137deg,rgba(255,166,95,1) 0%,rgba(255,122,75,1) 100%);
         border-radius: 20px;

src/components/common/common-navbar.vue

@@ -83,6 +83,10 @@ export default {
     projectId: {
       type: String,
       default: ""
+    },
+    limitTimes: {
+      type: String | Number,
+      default: 0
     }
   },
   computed: {
@@ -116,11 +120,10 @@ export default {
       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
+          limitTimes: this.limitTimes || 0
         })
       } else {
         info = JSON.stringify({

src/views/merge-detail.vue

@@ -14,6 +14,7 @@
       :shareUrl="shareUrl"
       :burialPoint="pointStyle"
       :projectId="projectId"
+      :limitTimes="limitTimes"
       borderStyle="0px solid #fff"
       :backMethod="from"
     ></CommonNavbar>
@@ -300,7 +301,6 @@ export default {
     let _this = this;
     this.from = this.$route.query.from || this.from || "native";
     this.projectId = this.$route.query.id || 1;
-    // this.generateShareUrl();
     console.log('#######location', location);
 
     window.__getUserInfo64Comp = function(param) {
@@ -351,40 +351,6 @@ export default {
   methods: {
     ...mapActions(["setUserInfo"]),
 
-    // 生成分享的url
-    generateShareUrl() {
-      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;
-        }
-      }).catch( e => {
-        console.error(e);;
-      });      
-    },
-
     cancleChangeCard() {
       this.showChangeCard = false;
     },

src/views/share-merge-detail.vue

@@ -611,7 +611,8 @@ export default {
         token: _this.token,
         setEntry: true
       };
-      let videoUrl = this.$route.query.videoUrl || "";
+      // let videoUrl = this.$route.query.videoUrl || "";
+      let videoUrl = this.shareParam.videoUrl;
       if (videoUrl) {
         param.trySeeFlag = 0;
       } else {
@@ -623,10 +624,10 @@ export default {
         if (res.code == "000000") {
           this.showDownloadButton = true;
           if (videoUrl) {
-            _this.limitTimes = this.$route.query.trySeeTime || 0;
+            _this.limitTimes = this.shareParam.trySeeTime || 0;
             _this.videoOptions.mp4 = videoUrl;
             _this.videoOptions.trySeeTime =
-              this.$route.query.trySeeTime || 0;
+              this.shareParam.trySeeTime || 0;
           } else {
             _this.limitTimes = res.data.trySeeTime;
             _this.videoOptions.mp4 = res.data.attachmentUrl;