Merge branch 'dev/v4.8.79_wmh' of qmx/jy into feature/v4.8.79

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -357,7 +357,7 @@
 </div>
 <div id="jyOriginalbox">
   <van-dialog v-model="show" title="查看原文链接" confirm-button-color='#2ABDD1'
-  cancel-button-color='#171826' class="custom-dialog Original-dialog"   @confirm="goLink" show-cancel-button>
+  cancel-button-color='#171826' class="custom-dialog Original-dialog" confirm-button-text="确定"   @confirm="goLink" show-cancel-button>
     <div class="text-content">
       <p class="con-text">确定消耗<span class="blue-color">1次</span>查看原文链接的机会吗？</p>
       <p class="con-desc">您当前是免费用户，有1次查看原文链接的机会，如需更多查看次数，您可点击<span class="blue-color" @click="membership">升级大会员＞</span></p>
@@ -1542,7 +1542,7 @@
                    } else {
                     if(res.data.status == '1'){
                       // 需要留资 留资提示即刻获得一次查看原文机会
-                      let url_ = utils.$envs.inH5?'/jyapp/frontPage/bigmember/free/perfect_info?source=h5_article_original_one&signId='+encodeURIComponent(id):'/jyapp/frontPage/bigmember/free/perfect_info?source=app_article_original_one&signId='+encodeURIComponent(id)
+                      let url_ = utils.$envs.inH5?'/jyapp/frontPage/bigmember/free/perfect_info?source=h5_article_original_one&signId=' + encodeURIComponent(id) + '&article='+ extractString_(location.href) :'/jyapp/frontPage/bigmember/free/perfect_info?source=app_article_original_one&signId=' + encodeURIComponent(id) + '&article='+ extractString_(location.href)
                       location.href = url_
                       
                     } else if(res.data.status == '2'){
@@ -1601,6 +1601,11 @@
              });
 
     }
+    function extractString_(str){
+          const regex = /\/article\/(.*?)\//;
+          const match = str.match(regex);
+          return match ? match[1] : null;
+    }
     // 大会员引流文案
     function getDrainInfo () {
         $.ajax({

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -1355,7 +1355,7 @@ var vNode = {
         type: "POST",
         url: "/publicapply/userbase/getOriginalText",
         contentType: 'application/json',
-        data:JSON.stringify({id:_this.signId}),
+        data:JSON.stringify({id:_this.signId,use:true}),
         success: function(res){
           if(!res.data){
             return

src/web/templates/weixin/wxinfocontent_rec.html

@@ -995,7 +995,7 @@ body .loading_ p span {
 </div>
 <div id="jyOriginalbox">
   <van-dialog v-model="show" title="查看原文链接" confirm-button-color='#2ABDD1'
-  cancel-button-color='#171826' class="custom-dialog Original-dialog" @confirm="goLink" show-cancel-button>
+  cancel-button-color='#171826' class="custom-dialog Original-dialog" confirm-button-text="确定"  @confirm="goLink" show-cancel-button>
     <div class="text-content">
       <p class="con-text">确定消耗<span class="blue-color">1次</span>查看原文链接的机会吗？</p>
       <p class="con-desc">您当前是免费用户，有1次查看原文链接的机会，如需更多查看次数，您可点击<span class="blue-color" @click="membership">升级大会员＞</span></p>
@@ -2159,7 +2159,7 @@ function setEntServiceInfo (res) {
                    } else {
                     if(res.data.status == '1'){
                       // 需要留资 留资提示即刻获得一次查看原文机会
-                      let url_ = '/weixin/frontPage/bigmember/free/perfect_info?source=wx_article_original_one&signId='+encodeURIComponent(id)
+                      let url_ = '/weixin/frontPage/bigmember/free/perfect_info?source=wx_article_original_one&signId='+encodeURIComponent(id) + '&article='+ extractString_(location.href)
                       location.href = url_
                       
                     } else if(res.data.status == '2'){
@@ -2219,6 +2219,11 @@ function setEntServiceInfo (res) {
              });
 
     }
+    function extractString_(str){
+          const regex = /\/article\/(.*?)\//;
+          const match = str.match(regex);
+          return match ? match[1] : null;
+    }
 // 大会员引流文案
 function getDrainInfo () {
 		$.ajax({