Merge remote-tracking branch 'origin/feature/v4.8.40' into feature/v4.8.40

src/web/staticres/js/login.js

@@ -1906,32 +1906,35 @@ function openLoginDig(type, redirectUrl) {
 	    }
 	}
   $("#bidLogin").modal("show");
-  if (type) {
-    window.needToWork = true
-    try {
-      var injectLogic = logic
-      logic = function (data, num) {
-        if (data.result === 'ok') {
-        	//判断是否需要设置cookie
-			if(data.cValue){
-				afterLoginSetCookit(data.cName,data.cValue,data.expires)
-			}
-          // 检查是否需要新窗口打开<新用户兴趣偏好设置页面>
-          checkNeedGoNewUserSettingPage()
-          // 需要登陆后重定向的页面
-          if(redirectUrl){
-            location.href = redirectUrl
-            return
-          }
-          if (needToWork) {
-            location.href = '/page_workDesktop/'
-            return
-          }
+  try {
+    var injectLogic = logic
+    logic = function (data, num) {
+      if (type) {
+        window.needToWork = true
+      }
+      if (data.result === 'ok') {
+        //判断是否需要设置cookie
+        if(data.cValue){
+          afterLoginSetCookit(data.cName,data.cValue,data.expires)
+        }
+        // 检查是否需要新窗口打开<新用户兴趣偏好设置页面>
+        checkNeedGoNewUserSettingPage()
+        if (redirectUrl === 'reload') {
+          return location.reload()
+        }
+        // 需要登陆后重定向的页面
+        if(redirectUrl){
+          location.href = redirectUrl
+          return
+        }
+        if (needToWork) {
+          location.href = '/page_workDesktop/'
+          return
         }
-        injectLogic(data, num)
       }
-    } catch (e) {}
-  }
+      injectLogic(data, num)
+    }
+  } catch (e) {}
 }
 function openBindPhoneDig() {
     openLoginDigForWx(false);

src/web/templates/pc/tags/template/bottom-banner.html

@@ -28,10 +28,10 @@ $(function () {
     $('.login-node').on('click', function () {
         try {
             if (!loginflag) {
-                openLoginDig()
+                openLoginDig(false, 'reload')
             }
         } catch (error) {
-            openLoginDig()
+            openLoginDig(false, 'reload')
         }
     })