Merge branch 'dev-purchase-0901' of...

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

src/components/business/cell-list-detail-share.vue

@@ -250,7 +250,7 @@ export default {
         Toast('请前往云鹊医APP学习课程');
         return;
       }
-      let jumpUrl = getWebPageUrl(`profexam/#/course-detail?courseId=${item.id}&projectId=${this.projectId}&token=${this.token}`);
+      let jumpUrl = getWebPageUrl(`profexam/#/course-detail?courseId=${item.id}&projectId=${this.projectId}&returnUrl=${encodeURIComponent(location.href)}`);
       window.location.href = jumpUrl;
     },
 

src/views/purchase-rezult.vue

@@ -8,10 +8,10 @@
       <p v-if="!projectId" class="msg-content-2">订单详情页打开/下载云鹊医APP查看</p>
     </div>
     <Button v-show="projectId" @handlerClick="gotoProject"></Button>
-    <Button v-show="projectId" :isPlain="!!projectId" buttonText="去云鹊医APP" @handlerClick="download"></Button>
+    <Button :isPlain="!!projectId" buttonText="去云鹊医APP" @handlerClick="download"></Button>
     
     <CourseDialog
-      subContent='1.请在微信内完成支付，如果您已支付成功，请点击“已完成支付”按钮`<br>2.如果您还未安装微信客户端，请点击“取消”，去下载微信客户端'
+      subContent='请在微信内完成支付，如果您已支付成功，请点击“已完成支付”按钮'
       confirmBtnText="已完成支付"
       needSubContent
       :isShowDialog="isShowDialog"
@@ -53,13 +53,14 @@ export default {
       showGoApp: true,
       hasShowed: false,
       isShowDialog: false,
+      returnUrl: "",
     }
   },
   created() {
     let { projectId, orderId, returnUrl } = this.$route.query;
     this.projectId = projectId || 0;
     this.orderId = orderId || 0;
-    this.returnUrl = sessionStorage.getItem('returnUrl') || decodeURIComponent(this.returnUrl);
+    this.returnUrl = sessionStorage.getItem('returnUrl') || decodeURIComponent(returnUrl);
     console.log('projectId', 'orderId', this.projectId, this.orderId, this.returnUrl, decodeURIComponent(this.returnUrl));
     // 直接从商品过来的
     // if(!this.projectId) {
@@ -91,11 +92,11 @@ export default {
     handlerAction(type) {
       this.isShowDialog = false;
       if(type == 1) {
-        if(this.projectId) {
-          this.gotoProject();
-        } else {
-          this.download();
-        }
+        // if(this.projectId) {
+        //   this.gotoProject();
+        // } else {
+        //   this.download();
+        // }
       } else {
         if(this.projectId) {
           this.getBindCardStatus();
@@ -164,7 +165,6 @@ export default {
         component_tag: `889#88901`
       });
       this.returnUrl && location.replace(this.returnUrl);
-      // this.returnUrl && (location.href = decodeURIComponent(this.returnUrl));
     },
 
     // 下载