Merge branch 'release4.7.10' of http://192.168.3.207:8080/qmx/jy into release4.7.10

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

@@ -622,7 +622,7 @@ var vm = new Vue({
           } else if (res.data) {
             window.isRetained = res.data.retainedCapital
             _this.isForce = res.data.fource
-            if (res.data.retainedCapital) {
+            if (res.data.retainedCapital || !result) {
               _this.showForm = true
               _this.getOldInfo(source)
               _this.curDom = dom

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

@@ -1220,15 +1220,19 @@ $(function(){
       openLoginDig()
       return
     }
-    console.log('三级页-阅读原文:article_original')
-    vm.dialogTitle = '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文'
-    vm.isNeedSubmit('article_original', function(res) {
-      if(this.source == 'article_original') {
-        // 如果是阅读原文点击的 留完用户资料执行原点击操作
-        $(".com-original").trigger('click')
-      }
+    if(window.isFree) {
+      console.log('三级页-阅读原文:article_original')
+      vm.dialogTitle = '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文'
+      vm.isNeedSubmit('article_original', function(res) {
+        if(this.source == 'article_original') {
+          // 如果是阅读原文点击的 留完用户资料执行原点击操作
+          $(".com-original").trigger('click')
+        }
+        window.open(originalhref)
+      })
+    } else {
       window.open(originalhref)
-    })
+    }
   })
 
   //var sds = goTemplateData.params.keywords;

src/web/templates/pc/supsearch.html

@@ -268,6 +268,12 @@
   margin-left: 40px;
 }
 .publish-button .el-button--primary {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1px;
+  width: 128px;
+  height: 40px;
   background-color: #2CB7CA;
   border: 1px solid #2CB7CA;
   color: #fff;
@@ -279,8 +285,8 @@
   justify-content: center;
   background: #FF3A20;
   padding: 1px 9px;
-  top: 3px;
-  right: 30px;
+  top: 4px;
+  right: 32px;
   border-radius: 9px 9px 9px 0;
   border: none;
 }