Merge branch 'develop' of k.zhang/duoduo into test

apis/user/user.list.go

@@ -34,6 +34,15 @@ func UserList(c *gin.Context) {
 		app.Error(c, 500, err, err.Error())
 		return
 	}
+	for i := 0; i < len(userVal); i++ {
+		///pages/image/my_fill1.png
+		if userVal[i].AvatarUrl == "" {
+			userVal[i].AvatarUrl = "/pages/image/my_fill1.png"
+		}
+		if userVal[i].NickName == "" {
+			userVal[i].NickName = "用户暂未授权昵称获取"
+		}
+	}
 
 	app.PageOK(c, userVal, count, pageIndex, pageSize, app.Success)
 

models/mysql/user.go

@@ -107,7 +107,7 @@ func (u *User) GetOrderOpenIdList(pageSize int, pageIndex int, status int) ([]Us
 	//table = table.Where("open_id = ?  ", o.OpenId)
 
 	var count int
-	if err := table.Select("id,nick_name,avatar_url").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
+	if err := table.Select("id,nick_name,avatar_url,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') as create_time").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
 		return nil, 0, err
 	}
 	table.Count(&count)