Merge branch 'dev4.6.3.14' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.14

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

@@ -173,8 +173,8 @@
         .seeMore + .dropload-down {
             display: none;
         }
-        .seeMore-btn{           
-            font-size: .28rem;           
+        .seeMore-btn{
+            font-size: .28rem;
             color: #2ABED1;
             display: contents;
         }
@@ -493,11 +493,11 @@
                     <a onclick="tosetkeyspage()" style="text-decoration: none;">去设置</a>
                 </div>
             </div>
-            
+
         </div>
-        
+
     </div>
-    
+
 </div>
 
 <!-- 底部导航 -->
@@ -744,6 +744,25 @@
           }
       })
   }
+      function checkFreeList (data) {
+      if(!goTemplateData.params.isVip){
+        if (data.data.length > 10) {
+          // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
+          isNeedSales(function (res) {
+            // 推送列表 免费是否需要留资判断
+            var result = checkRequiredKeys(['name', 'phone', 'position', 'branch','company'], res.info)
+            if (!result && res.data && res.data.retainedCapital) {
+              data.data = data.data.slice(0, 10)
+              data.hasNextPage = false
+              $(".seeMore").show()
+              $(".seeMore-btn").on('click', function () {
+                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=jypush_see10_plus_wx'
+              })
+            }
+          })
+        }
+      }
+    }
   $(function () {
       setTimeout(function(){
         loadJS("{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js",function(){
@@ -993,6 +1012,16 @@
             }
             //appendList($(listCache),$(tableCache));
             $(".listcontent").scrollTop(scrollTop);
+            if (sessionStorage.getItem('hasFreeMore') === 'true') {
+                isNeedSales(function (res) {
+                  var result = checkRequiredKeys(['name', 'phone', 'position', 'branch','company'], res.info)
+                  if (!result && res.data && res.data.retainedCapital) {
+                    $(".seeMore").show()
+                  } else {
+                    location.reload()
+                  }
+                })
+              }
             removeSessionStorage();
         } else {
             if(historyVt == 's') {
@@ -1001,7 +1030,7 @@
             userId = sessionStorage.userId;
             // var isNeedSalesStatus = false
             // var isNeedSalesStatus = true
-            
+
             $.ajax({
                 type: 'post',
                 url: '/publicapply/subscribe/historyPush?t=' + new Date().getTime(),
@@ -1019,36 +1048,13 @@
                 async: false,
                 dataType: 'json',
                 success: function (data) {
-                    fullData = data.data
+
                   if(!data.data) {
                     data.data = []
                   }
-                //   留资判断
-                  var fullData = []
-                  fullData = data.data
-                if(r.userType== "free"){
-                    if (data.data.length > 10) {
-                        // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
-                        data.data = data.data.slice(0, 10)
-                        data.hasNextPage = false
-                        $(".seeMore").show()
-                        isNeedSales(function (res) {
-                            // 推送列表 是否需要留资判断
-                            if(res.info.branch && res.info.company && res.info.name && res.info.phone && res.info.position){
-                                $(".seeMore").remove()
-                             }
-                            if (res.data.retainedCapital) {
-                             // isNeedSalesStatus = true
-                                $(".seeMore-btn").on('click', function () {
-                                    location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=jypush_see10_plus_app'
-                                })
-                            } else {
-                                 $(".seeMore-btn").addClass("hidden")
-                                    data.data=fullData
-                                } 
-                        })
-                    }
-                }
+                  checkFreeList(data)
+
+
                      checkmerge(data.industry)
                     if (data.otherFlag){
                         localStorage.setItem({{.T.userId}}+"_otherFlag",data.otherFlag)
@@ -1787,6 +1793,7 @@ function hasNoData() {
           sessionStorage.historypushPageIndexCache = pageIndex;
           sessionStorage.historypushHasNextPage = hasNextPage;
           sessionStorage.superSearch_iosNoRefresh = 'detail'
+          sessionStorage.hasFreeMore = $(".seeMore").is(":visible").toString()
       }
   }
 
@@ -1796,6 +1803,7 @@ function hasNoData() {
       sessionStorage.removeItem("historypushScrollTop");
       sessionStorage.removeItem("historypushHasNextPage");
       sessionStorage.removeItem("closeAdvert");
+      sessionStorage.removeItem("hasFreeMore");
   }
 
   function setVisitedIndex(obj, eid) {

src/web/templates/weixin/historypush.html

@@ -630,8 +630,8 @@
         .seeMore + .dropload-down {
             display: none;
         }
-        .seeMore-btn{           
-            font-size: .28rem;           
+        .seeMore-btn{
+            font-size: .28rem;
             color: #2ABED1;
             display: contents;
         }
@@ -1055,6 +1055,25 @@
         })
     }
     getUserMsg()
+    function checkFreeList (data) {
+      if(!goTemplateData.params.isVip){
+        if (data.data.length > 10) {
+          // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
+          isNeedSales(function (res) {
+            // 推送列表 免费是否需要留资判断
+            var result = checkRequiredKeys(['name', 'phone', 'position', 'branch','company'], res.info)
+            if (!result && res.data && res.data.retainedCapital) {
+              data.data = data.data.slice(0, 10)
+              data.hasNextPage = false
+              $(".seeMore").show()
+              $(".seeMore-btn").on('click', function () {
+                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=jypush_see10_plus_wx'
+              })
+            }
+          })
+        }
+      }
+    }
       $(function () {
           var alert_other;
           alert_other=setInterval(function(){
@@ -1195,11 +1214,22 @@
                   structureHtml(dataCache, true);
               }
               $(window).scrollTop(scrollTop);
+              if (sessionStorage.getItem('hasFreeMore') === 'true') {
+                isNeedSales(function (res) {
+                  var result = checkRequiredKeys(['name', 'phone', 'position', 'branch','company'], res.info)
+                  if (!result && res.data && res.data.retainedCapital) {
+                    $(".seeMore").show()
+                  } else {
+                    location.reload()
+                  }
+                })
+              }
               sessionStorage.removeItem("historypushDataCache");
               sessionStorage.removeItem("historypushPageIndexCache");
               sessionStorage.removeItem("historypushScrollTop");
               sessionStorage.removeItem("historypushHasNextPage");
               sessionStorage.removeItem("historypushCount");
+              sessionStorage.removeItem("hasFreeMore");
               showPage();
           } else {
               userId = sessionStorage.userId;
@@ -1223,37 +1253,10 @@
                         localStorage.setItem({{.T.userId}}+"_otherFlag",data.otherFlag)
                     }
                      // 免费用户 & 需要留资的情况
-                    fullData = data.data
                     if(!data.data) {
-                    data.data = []
-                  }
-                  var fullData = []
-                if(r.userType== "free"){
-                    if (data.data.length > 10) {
-                                // sessionStorage.setItem('isNeedSalesStatus', isNeedSalesStatus)
-                                data.data = data.data.slice(0, 10)
-                                data.hasNextPage = false
-                                $(".seeMore").show()
-                                isNeedSales(function (res) {
-                // 推送列表 是否需要留资判断
-                if(res.info.branch && res.info.company && res.info.name && res.info.phone && res.info.position){
-                    $(".seeMore").remove()
-                }
-                
-                    if (res.data.retainedCapital) {
-                    
-                    // isNeedSalesStatus = true
-                    $(".seeMore-btn").on('click', function () {
-                       
-                        location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=jypush_see10_plus_app'
-                    })
-                }   else {
-                    $(".seeMore-btn").addClass("hidden")
-                    data.data=fullData
-                 } 
-            })
-                }
-                }
+                      data.data = []
+                    }
+                    checkFreeList(data)
                     checkmerge(data.industry)
                     pageIndex = 2;
                     isInTSguide = data.isInTSguide;
@@ -1494,6 +1497,7 @@
               sessionStorage.historypushHasNextPage = hasNextPage;
               sessionStorage.historypushCount = count;
               sessionStorage.point = "1";
+              sessionStorage.hasFreeMore = $(".seeMore").is(":visible").toString()
           }
       }
 
@@ -1911,6 +1915,7 @@
             success: function (data) {
                 _scrollTop = 0;//定位重置
                 pageIndex = 2;
+                checkFreeList(data)
                 lasttime = data.thistime;
                 firstPage = data.data;
                 hasNextPage = data.hasNextPage;