1

web/api/contract_api.go

@@ -509,12 +509,14 @@ func (c *ContractApi) GetSurvey() {
 
 	incomeData := c.ServiceContract.GetSurvey(bidsectionId, projectId, 1)
 	expenditureData := c.ServiceContract.GetSurvey(bidsectionId, projectId, 2)
-
-	c.Ctx.JSON(iris.Map{
-		"code":            0,
-		"msg":             "",
+	data := map[string]interface{}{
 		"incomeData":      incomeData,
 		"expenditureData": expenditureData,
+	}
+	c.Ctx.JSON(iris.Map{
+		"code": 0,
+		"msg":  "",
+		"data": data,
 	})
 
 }

web/api/project_account_api.go

@@ -212,26 +212,22 @@ func (c *ProjectAccountApi) PostChangePassword() {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": ErrMsg})
 		return
 	} else {
-
 		if AccountData.ConfirmPassword != AccountData.NewPassword {
 			c.Ctx.JSON(iris.Map{"code": -1, "msg": "新密码和确认密码不一致"})
 			return
 		}
-
 		// 获得项目ID
 		projectId, err := utils.GetProjectId(c.Ctx)
 		if err != nil {
 			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 			return
 		}
-
 		// 获得项目账号ID
 		projectAccountId, err := utils.GetProjectAccountId(c.Ctx)
 		if err != nil {
 			c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
 			return
 		}
-
 		err = c.ServiceProjectAccount.ChangePassword(AccountData, projectId, projectAccountId)
 		if err != nil {
 			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})