Merge branch 'dev/v4.8.63_yf' of qmx/jy into feature/v4.8.63

src/web/staticres/frontRouter/pc/solution/js/pc-collect-solution-info.js

@@ -406,7 +406,7 @@ var vmSolution = new Vue({
           //   } else {
           //     callback && callback()
           //   }
-          }
+          // }
         }
       })
     },

src/web/staticres/js/pc-collect-user-info.js

@@ -613,15 +613,15 @@ var vm = new Vue({
           }
           var result = checkRequiredKeys(checkKeys, res.info)
           if (result) {
-            _this.showForm = true
-            res.data.retainedCapital = false
-            callback && callback(res)
             // 包含这些source，不存记录
             // 非主动触发留资节点，每点击一次数据库不会记录
-            // if(!isCollect) {
-            //   _this.formAjax(_this.source, res.info)
-            // }
-            _this.setEchoInfo(res.info)
+            if(!isCollect) {
+              _this.showForm = true
+              _this.setEchoInfo(res.info)
+            } else {
+              res.data.retainedCapital = false
+              callback && callback(res)
+            }
             switch (source) {
               case 'member_freeuse': {
                 // _this.showSuccess = true

src/web/staticres/public-pc/js/article-content.js

@@ -609,7 +609,7 @@ if(adv_from=="中标公告"){
   adv=adv.concat(win_adv);
 }else if(adv_from=="招标公告"){
   adv=adv.concat(zb_adv);
-  $(".detail-nj-btn").text("立即解锁")
+  // $(".detail-nj-btn").text("立即解锁")
 }else if(adv_from=="拟建项目"){
   adv=adv.concat(nj_adv);
 }
@@ -617,7 +617,7 @@ var x = Math.floor(Math.random()*adv.length)
 $(".adv_tosieve").text(adv[x])
 var btn_text="立即体验"
 if(adv[x]== zb_adv){
-  btn_text="立即解锁"
+  // btn_text="立即解锁"
 }
 if (adv[x]==any_adv[0]){
   btn_text="立即查看";