Merge branch 'master' into feature/v4.10.4

src/jfw/modules/app/src/web/staticres/jyapp/me/js/phone_bind.js

@@ -271,7 +271,9 @@ var vm = new Vue({
             var data = {
                 phone: _this.info.phone,
                 code: _this.info.picCode,
-                step: 1
+                step: 1,
+                from: utils.getParam('from'),
+                activity: utils.getParam('activity')
             }
             this.trackClick('绑定-发送验证码')
             $.ajax({
@@ -354,7 +356,9 @@ var vm = new Vue({
                 phone: this.info.phone,
                 code: this.info.code,
                 step: 2,
-                email: this.info.email
+                email: this.info.email,
+                from: utils.getParam('from'),
+                activity: utils.getParam('activity')
             }
 
             if (this.mode === 'mergeBind') {

src/jfw/modules/subscribepay/src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250211075100-eb5d7cd299f8
 	app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.32.3
+	app.yhyue.com/moapp/jypkg v1.32.6
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743

src/jfw/modules/subscribepay/src/go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916/go.mod h1:/HT/UZ4d
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.32.3 h1:84pjfCkhTfQ3fKeZyNOCpagp3M9hLDDBnoKsoNcef+E=
-app.yhyue.com/moapp/jypkg v1.32.3/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.32.6 h1:SXUCWJbCqANtf37eY+pQAt0cXajmOq4knNyUnWqsCXQ=
+app.yhyue.com/moapp/jypkg v1.32.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

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
+          }
         }
       }
     },

src/web/staticres/me/js/phone_bind.js

@@ -237,7 +237,9 @@ var vm = new Vue({
             var data = {
                 phone: _this.info.phone,
                 code: _this.info.picCode,
-                step: 1
+                step: 1,
+                from: utils.getParam('from'),
+                activity: utils.getParam('activity')
             }
             this.trackClick('绑定-发送验证码')
             $.ajax({
@@ -320,7 +322,9 @@ var vm = new Vue({
                 phone: this.info.phone,
                 code: this.info.code,
                 step: 2,
-                email: this.info.email
+                email: this.info.email,
+                from: utils.getParam('from'),
+                activity: utils.getParam('activity')
             }
 
             if (this.mode === 'mergeBind') {