每日登录 bugfix

zhima1234 · zhima1234 · commit f84b96b1ddbc · 2017-06-11T23:42:57.000+08:00
diff --git a/src/http/controller/mission.go b/src/http/controller/mission.go
@@ -29,8 +29,10 @@ func (self MissionController) RegisterRoute(g *echo.Group) {
 func (MissionController) Daily(ctx echo.Context) error {
 	me := ctx.Get("user").(*model.Me)
 	userLoginMission := logic.DefaultMission.FindLoginMission(ctx, me)
+	userLoginMission.Uid = me.Uid
 
 	data := map[string]interface{}{"login_mission": userLoginMission}
+
 	if userLoginMission != nil && times.Format("Ymd") == strconv.Itoa(userLoginMission.Date) {
 		data["had_redeem"] = true
 	} else {
diff --git a/src/http/http.go b/src/http/http.go
@@ -187,7 +187,7 @@ func Render(ctx echo.Context, contentTpl string, data map[string]interface{}) er
 		// 每日登录奖励
 		hasLoginMisson = logic.DefaultMission.HasLoginMission(ctx, me)
 	}
-	data["login_mission"] = hasLoginMisson
+	data["has_login_misson"] = hasLoginMisson
 
 	return executeTpl(ctx, tpl, data)
 }
diff --git a/template/common/my_info.html b/template/common/my_info.html
@@ -73,7 +73,7 @@ <h3 class="title"><i class="glyphicon glyphicon-user"></i> 用户登录</h3>
 	{{end}}
 </div>
 
-{{if .login_mission}}
+{{if .has_login_misson}}
 <div class="row box_white sidebar">
 	<div class="box" style="padding: 5px; font-size: 13px;">
 		<div class="pull-left">
diff --git a/template/mission/daily.html b/template/mission/daily.html
@@ -28,7 +28,9 @@ <h1 style="margin-top: 10px;">每日登录奖励</h1>
 				<a class="btn btn-default btn-sm" href="/mission/daily/redeem">领取 X 铜币</a>
 			</div>
 			{{end}}
+			{{if .login_mission}}
 			<div class="cell">已连续登录领取 {{.login_mission.Days}} 天，总登录领取 {{.login_mission.TotalDays}} 天</div>
+			{{end}}
 		</div>
 	</div>
 	<div class="col-md-3 col-sm-6">

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func Render(ctx echo.Context, contentTpl string, data map[string]interface{}) er`
`187`	`187`	`// 每日登录奖励`
`188`	`188`	`hasLoginMisson = logic.DefaultMission.HasLoginMission(ctx, me)`
`189`	`189`	`}`
`190`		`- data["login_mission"] = hasLoginMisson`
	`190`	`+ data["has_login_misson"] = hasLoginMisson`
`191`	`191`
`192`	`192`	`return executeTpl(ctx, tpl, data)`
`193`	`193`	`}`