Merge branch 'hotfix/v4.10.3.1' into hotfix/v4.10.3.2

src/web/staticres/common-module/pc-dialog/css/collect-user-info.css

@@ -113,7 +113,7 @@
   font-size: 18px;
 }
 #collectUserInfoDialog .dialog-header.mt-4{
-  margin-top: 4px;
+  margin-top: 4px!important;
 }
 #collectUserInfoDialog .dialog-content{
   margin-top: 20px;

src/web/staticres/common-module/pc-dialog/js/pc-collect-user-info.js

@@ -126,8 +126,8 @@ var temp = `
               <el-checkbox v-model="form.agreeChecked">&nbsp;我同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看</el-checkbox>
             </div>
             <div class="dialog-footer">
-              <el-button class="cancel-btn" @click="cancelForm">暂不提供</el-button>
-              <el-button class="submit-btn" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button class="cancel-btn" @click="cancelForm" v-text="ajaxSourceTitleInfo.cancelText"></el-button>
+              <el-button class="submit-btn" @click="submitForm('ruleForm')" v-text="ajaxSourceTitleInfo.submitText"></el-button>
             </div>
           </el-form>
         </div>
@@ -322,6 +322,10 @@ var vm = new Vue({
     return {
       dialogTitleTop: '为给您匹配精准的推荐信息，请完善个人信息',
       dialogTitle: '',
+      ajaxSourceTitleInfo: {
+        cancelText: '暂不提供',
+        submitText: '提交'
+      },
       jobData: jobData, // 职位数据
       branchData: branchData,
       industryData: industryData,
@@ -780,6 +784,39 @@ var vm = new Vue({
           }
         }
       })
+
+      this.getSourceTitle(source)
+    },
+    getSourceTitle: function(source) {
+      var _this = this
+      var payload = { codes: [source] }
+      $.ajax({
+        type: 'post',
+        url: '/salesLeads/getConfig',
+        contentType: 'application/json;charset=utf-8',
+        data: JSON.stringify(payload),
+        success: function(res) {
+          try {
+            var info = res.data[source]
+            if (info) {
+              if (info.title) {
+                _this.dialogTitleTop = info.title
+              }
+              if (info.subtitle) {
+                _this.dialogTitle = info.subtitle
+              }
+              if (info.button_cancel) {
+                _this.ajaxSourceTitleInfo.cancelText = info.button_cancel
+              }
+              if (info.button_confirm) {
+                _this.ajaxSourceTitleInfo.submitText = info.button_confirm
+              }
+            }
+          } catch (e) {
+            console.warn(e)
+          }
+        }
+      })
     },
     // 表单提交事件
     submitForm: function (formName) {

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

@@ -788,7 +788,7 @@ var vNode = {
       }
     },
     showCompanyType: true,  // 公司类型是否显示,所有source都需要展示，当前仅有一处source需要隐藏（原来moduleShow控制会默认都隐藏，通过moduleShow控制改动较大）
-    warmText: '温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务'
+    warmText: '温馨提示：请提供您的真实信息，以便为您提供精准的分析报告'
   },
   created() {
     // 大会员落地页免费体验
@@ -1201,6 +1201,12 @@ var vNode = {
             this.hideLabel(['email', 'class', 'position', 'workScope', 'partnerNeeds', 'agree'])
             break
           }
+
+          // 行业分析简报
+          if (source.indexOf('briefinghomepage_dzhfxbg') > -1 || source.indexOf('briefingdetails_dzhfxbg') > -1) {
+            this.showCompanyType = false
+            this.moduleShow.industry = true
+          }
         }
       }
     },