change shop area rank

go/gopath/src/fohow.com/apps/init.go

@@ -535,22 +535,22 @@ func (self *BaseController) Prepare() {
 		}
 	}
 	/*
-	<<<<<<< HEAD
-			// FIXME : userId 与 wxUserId已统一,故不做userid登录check
-	=======
-			// FIXME : userId 与 wxUserId已统一
-	>>>>>>> b24580bdd09b3e2b6278d2deb8d368bb9c21d652
-			if len(self.ExceptCheckUserLoginAction) > 0 {
-				for _, an := range self.ExceptCheckUserLoginAction {
-					if strings.ToLower(an) == "*" || strings.ToLower(an) == strings.ToLower(actionName) {
-						needChkUserLogin = false
-						break
+		<<<<<<< HEAD
+				// FIXME : userId 与 wxUserId已统一,故不做userid登录check
+		=======
+				// FIXME : userId 与 wxUserId已统一
+		>>>>>>> b24580bdd09b3e2b6278d2deb8d368bb9c21d652
+				if len(self.ExceptCheckUserLoginAction) > 0 {
+					for _, an := range self.ExceptCheckUserLoginAction {
+						if strings.ToLower(an) == "*" || strings.ToLower(an) == strings.ToLower(actionName) {
+							needChkUserLogin = false
+							break
+						}
 					}
 				}
-			}
-			if needChkUserLogin {
-				checkUserLogin(self.Ctx)
-			}
+				if needChkUserLogin {
+					checkUserLogin(self.Ctx)
+				}
 	*/
 
 	if needChkWxUserLogin {
@@ -580,7 +580,7 @@ func (self *BaseController) ReturnError(status int, code []string, redirect stri
 	// if err != nil {
 	// 	beego.BeeLogger.Error("json encode error=[%s]", err)
 	// }
-	self.Ctx.Output.SetStatus(status)
+	//self.Ctx.Output.SetStatus(status)
 	// self.Ctx.Output.Header("Content-Type", "application/json; charset=utf-8")
 	self.Ctx.Output.JSON(errCode, true, true)
 	self.StopRun()