Merge branch 'feature/v4.7.20' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.20

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

@@ -561,7 +561,7 @@ var vm = new Vue({
       this.$refs['ruleForm'].clearValidate(['job','otherJob']);
     },
     // 是否留资
-    isNeedSubmit: function(source, callback, dom,infoid,type) {
+    isNeedSubmit: function(source, callback, dom,infoid,entranceType) {
       /*
         三级页-阅读原文	article_original
         三级页-收藏	article_collection
@@ -579,8 +579,8 @@ var vm = new Vue({
         },
         success:function (res) {
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
-          if(type=='freeDownload'){
-            var checkKeys = ['name', 'phone','companyType', 'company', 'branch', 'position']
+          if(entranceType=='freeDownload'){
+            var checkKeys = ['name', 'phone','companyType', 'company', 'position','branch']
           }else{
             var checkKeys = ['name', 'phone','companyType', 'company', 'branch', 'position']