Browse Source

fix:移动端免费用户跳转留资、供应信息搜索参数修改

tsz 3 years ago
parent
commit
5cf6b47795

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -597,6 +597,7 @@ var vm = new Vue({
           dataType: "json",
           dataType: "json",
           success: function (res) {
           success: function (res) {
               if (res.data) {
               if (res.data) {
+                window.isFree = res.data.isFree
                 window.userNewType = res.data.isUpgrade // 原页面里的用户版本 变量赋值
                 window.userNewType = res.data.isUpgrade // 原页面里的用户版本 变量赋值
                 _this.rootInfo = res.data
                 _this.rootInfo = res.data
                 let switchProduct = sessionStorage.getItem('switch-product')
                 let switchProduct = sessionStorage.getItem('switch-product')

+ 3 - 3
src/jfw/modules/app/src/web/templates/common/baiducc.html

@@ -37,15 +37,15 @@ function adv_statistics(e){
     if ($(e).find("a").attr("openurl")!=undefined){//app三级页调用打开方法
     if ($(e).find("a").attr("openurl")!=undefined){//app三级页调用打开方法
       $.post('/salesLeads/retainedCapital'+ '?source=article_original').done(function (r) {
       $.post('/salesLeads/retainedCapital'+ '?source=article_original').done(function (r) {
         // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
         // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
-        var checkKeys = ['name', 'phone', 'company', 'branch', 'position']
+        var checkKeys = ['name', 'phone', 'company', 'branch', 'position', 'companyType']
         var result = checkRequiredKeys(checkKeys, r.info)
         var result = checkRequiredKeys(checkKeys, r.info)
-        if (result) {
+        if (result || !window.isFree) {
           JyObj.openExternalLink($(e).find("a").attr("openurl"),"查看原文");
           JyObj.openExternalLink($(e).find("a").attr("openurl"),"查看原文");
           return true
           return true
         }
         }
 
 
         if (r && r.error_msg === '' && r.data) {
         if (r && r.error_msg === '' && r.data) {
-          if (r.data.retainedCapital) {
+          if (r.data.retainedCapital || !result) {
             vKeepComponent.$dialog.confirm({
             vKeepComponent.$dialog.confirm({
               message: '为给您匹配精准的推荐信息,请完善个人信息,免费查看原文',
               message: '为给您匹配精准的推荐信息,请完善个人信息,免费查看原文',
               className: 'ent-search-dialog max-54 add-close-after',
               className: 'ent-search-dialog max-54 add-close-after',

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -753,7 +753,7 @@
       })
       })
   }
   }
       function checkFreeList (data) {
       function checkFreeList (data) {
-      if(!goTemplateData.params.isVip){
+      if(window.isFree){
         if (data.data.length > 10) {
         if (data.data.length > 10) {
           // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
           // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
           isNeedSales(function (res) {
           isNeedSales(function (res) {

+ 1 - 1
src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -3260,7 +3260,7 @@ window.vSupplySearch = new Vue({
       listInfo: {
       listInfo: {
         value: '',
         value: '',
         pageNum: 0,
         pageNum: 0,
-        pageSize: 10,
+        pageSize: 50,
         total: -1,
         total: -1,
         loading: true,
         loading: true,
         finished: false,
         finished: false,

+ 3 - 3
src/web/staticres/public-pc/js/baiducc.js

@@ -53,15 +53,15 @@ function adv_statistics(e) {
         data: {source: 'article_original'},
         data: {source: 'article_original'},
         success: function (r) {
         success: function (r) {
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
-          var checkKeys = ['name', 'phone', 'company', 'branch', 'position']
+          var checkKeys = ['name', 'phone', 'company', 'branch', 'position', 'companyType']
           var result = checkRequiredKeys(checkKeys, r.info)
           var result = checkRequiredKeys(checkKeys, r.info)
-          if (result) {
+          if (result || !window.isFree) {
             location.href = dataHref
             location.href = dataHref
             return true
             return true
           }
           }
 
 
           if (r && r.data) {
           if (r && r.data) {
-            if (r.data.retainedCapital) {
+            if (r.data.retainedCapital || !result) {
               vKeepComponent.$dialog.confirm({
               vKeepComponent.$dialog.confirm({
                 message: '为给您匹配精准的推荐信息,请完善个人信息,免费查看原文',
                 message: '为给您匹配精准的推荐信息,请完善个人信息,免费查看原文',
                 className: 'ent-search-dialog max-54 add-close-after',
                 className: 'ent-search-dialog max-54 add-close-after',

+ 2 - 1
src/web/templates/weixin/historypush.html

@@ -1040,6 +1040,7 @@
             type: 'POST',
             type: 'POST',
             success: function (res) {
             success: function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
+                  window.isFree = res.data.isFree
                     userNewType = res.data.isUpgrade
                     userNewType = res.data.isUpgrade
                     if (res.data.vipStatus > 0) {
                     if (res.data.vipStatus > 0) {
                         $.ajax({
                         $.ajax({
@@ -1056,7 +1057,7 @@
     }
     }
     getUserMsg()
     getUserMsg()
     function checkFreeList (data) {
     function checkFreeList (data) {
-      if(!goTemplateData.params.isVip){
+      if(window.isFree){
         if (data.data.length > 10) {
         if (data.data.length > 10) {
           // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
           // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
           isNeedSales(function (res) {
           isNeedSales(function (res) {