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

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -1015,7 +1015,8 @@
             'ent-manage-app': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！',
             "jypush_see10_plus_app":"请完善个人信息，为您匹配更多精准项目信息",
             "jyarticle_see3_plus_app":"请完善个人信息，获取更多免费查看公告权限",
-            peugeot_supplier_regist:"请完善您的个人信息，抢先对接采购单位"
+            peugeot_supplier_regist:"请完善您的个人信息，抢先对接采购单位",
+            peugeot_view_infor: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           }
 
           // 提示语
@@ -1552,8 +1553,8 @@
           this.ajaxParams.mail = this.infoMap.email
           this.ajaxParams.companyType = this.infoMap.companyType
           this.ajaxParams.company = this.infoMap.company
-          if (getParam('source') === 'peugeot_supplier_regist'){
-            this.ajaxParams.publish_id = getParam('infoid')
+          if (this.ajaxParams.source === 'peugeot_supplier_regist' || this.ajaxParams.source === 'peugeot_view_infor'){
+            this.ajaxParams.publish_id = utils.getParam('infoid')
           }
           this.ajaxParams.position = this.infoMap.position
           if (this.infoMap.position === '其他') {

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -2866,7 +2866,7 @@
       // 用户发布信息。点击去查看，留资
       $('.app-layout-content-b .content').on('click', '.freeView', function () {
         var info = {
-          source: 'peugeot_supplier_regist',
+          source: 'peugeot_view_infor',
           infoid: id
         }
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + info.source + '&infoid=' + info.infoid

src/web/staticres/common-module/keep-tags/keep-ent-tags-template.js

@@ -558,7 +558,12 @@ function checkBackSuccess () {
   sessionStorage.removeItem('salesBackStatus')
   sessionStorage.removeItem('salesBackData')
 }
-$(function () {
+
+// 没注册过，注册。注册过，则不用再次注册
+window.registerCheckBack = false
+if (!window.registerCheckBack) {
+  $(function () {
+    window.registerCheckBack = true
     checkBackSuccess()
     if (utils.isWeiXinBrowser) {
       var aTime = new Date().getTime()
@@ -571,4 +576,6 @@ $(function () {
         }
       }, false);
     }
-})
+  })
+}
+

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -408,7 +408,7 @@ Vue.component('keep-component', {
       }
       if (type) {
         $.post('/salesLeads/retainedCapital' + '?source=article_collection', { source: 'article_collection' }).done(function (r) {
-          var checkKeys = ['name', 'phone', 'company', 'mail', 'branch', 'position', 'companyType']
+          var checkKeys = ['name', 'phone', 'company', 'branch', 'position', 'companyType']
           var result = checkRequiredKeys(checkKeys, r.info)
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
           if (result || !window.isFree) {
@@ -632,7 +632,12 @@ function checkBackSuccess () {
   sessionStorage.removeItem('salesBackStatus')
   sessionStorage.removeItem('salesBackData')
 }
-$(function () {
+
+// 没注册过，注册。注册过，则不用再次注册
+window.registerCheckBack = false
+if (!window.registerCheckBack) {
+  $(function () {
+    window.registerCheckBack = true
     checkBackSuccess()
     if (utils.isWeiXinBrowser) {
       var aTime = new Date().getTime()
@@ -645,4 +650,5 @@ $(function () {
         }
       }, false);
     }
-})
+  })
+}

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

@@ -396,7 +396,8 @@ var vm = new Vue({
         "jyarticle_see3_plus_pc":"请完善个人信息，获取更多免费查看公告权限",
         'activity_free_plan': '请完善信息，免费获取200剑鱼币',
         super_membership_day: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
-        peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位'
+        peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位',
+        peugeot_view_infor: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
       },
       isRefresh: false // 留完资是否需要刷新页面
     }

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

@@ -2536,14 +2536,11 @@ $(function() {
   // 用户发布信息。点击去查看，留资
   $('.main-content').on('click', '.freeView', function () {
     var info = {
-      source: 'peugeot_supplier_regist',
+      source: 'peugeot_view_infor',
       infoid: id
     }
-    console.log(info)
     vm.isNeedSubmit(info.source, function () {
       vm.showSuccess = true
     },"", info.infoid)
-    vm.dialogTitleTop='供应商报名'
-    vm.dialogTitle = '请完善您的个人信息，抢先对接采购单位'
   })
 })

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -668,7 +668,8 @@
          'ent-manage-wx': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！',
          "jypush_see10_plus_wx":"请完善个人信息，为您匹配更多精准项目信息",
          "jyarticle_see3_plus_wx":"请完善个人信息，获取更多免费查看公告权限",
-          peugeot_supplier_regist:"请完善您的个人信息，抢先对接采购单位"
+          peugeot_supplier_regist:"请完善您的个人信息，抢先对接采购单位",
+          peugeot_view_infor: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
         }
 
         // 提示语
@@ -1249,7 +1250,7 @@
         this.ajaxParams.mail = this.infoMap.email
         this.ajaxParams.company = this.infoMap.company
         this.ajaxParams.companyType = this.infoMap.companyType
-        if (this.getParam('source') === 'peugeot_supplier_regist'){
+        if (this.getParam('source') === 'peugeot_supplier_regist' || this.ajaxParams.source === 'peugeot_view_infor'){
           this.ajaxParams.publish_id = this.getParam('infoid')
         }
         this.ajaxParams.position = this.infoMap.position

src/web/templates/weixin/wxinfocontent_rec.html

@@ -2959,7 +2959,7 @@ $(function(){
   // 用户发布信息。点击去查看，留资
   $('.info .content').on('click', '.freeView', function () {
     var info = {
-      source: 'peugeot_supplier_regist',
+      source: 'peugeot_view_infor',
       infoid: id
     }
     location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + info.source + '&infoid=' + info.infoid