Merge remote-tracking branch 'origin/dev4.0' into dev4.0

src/web/staticres/js/login.js

@@ -328,6 +328,7 @@ function checkMenuForEnt () {
 //查询用户信息，响应页面登录信息
 var logic = function(data,num){
 	if(data.result=="ok"){
+	  clearLoginStorage(/-login-clear/)
 		//$(".QRLogin").hide();
 		$("#bidLogin").modal("hide")
 		$("#bidcommunity").modal("hide")
@@ -555,6 +556,21 @@ var processpage = function(shareid,num){
 	}
 }
 
+function clearObjKeyForRegFn (obj, reg) {
+  if (obj) {
+    for(var k in obj) {
+      if (reg.test(k)) {
+        obj.removeItem(k)
+      }
+    }
+  }
+}
+
+function clearLoginStorage (reg) {
+  clearObjKeyForRegFn(sessionStorage, reg)
+  clearObjKeyForRegFn(localStorage, reg)
+}
+
 
 //退出登录
 var signout = function(){
@@ -570,6 +586,7 @@ var signout = function(){
 	$(".superSearch").show();
 	$.post("/front/signOut",function(data){
 		if(data=="ok"){
+		  clearLoginStorage(/-login-clear/)
 			try{
 				$.cookie("userid_secure","",{expires:-1,path:"/",domain:document.domain.replace(/[^.]+/,"")});
 			}catch(e){

src/web/templates/big-member/pc/page_index.html

@@ -920,13 +920,15 @@
         memberTrial: {{.T.member_trial}} || false
     }
     // 修改底部横幅广告
-    if (pageUserInfo.memberTrial || pageUserInfo.memberStatus > 0) {
-        $('.footer-banner').hide()
+    if (pageUserInfo.memberTrial) {
         $(".footer-banner .w1200 img").attr('src', '/big-member/image/new_index/banner-buy.png')
         $(".footer-banner .w1200 map area[data-free-week]").remove()
 
-        $("*[data-go-buy]").text('立即使用')
-        $('.click-button-box.free').hide()
+    }
+    if (pageUserInfo.memberStatus > 0) {
+      $('.footer-banner').hide()
+      $("*[data-go-buy]").text('立即使用')
+      $('.click-button-box.free').hide()
     }
     var canBindPhone = false
     // 此时无法获取绑定状态和登陆状态，只能同步请求已保证跳转判断正常运行