1

app/custom/svc/svc_project.go

@@ -104,7 +104,7 @@ func ProjectComm(c *gin.Context, args md.ProjectReq) []map[string]interface{} {
 	cate := make([]models.CampTaskProjectCate, 0)
 	svc.MasterDb(c).Where("1=1").Find(&cate)
 	user, _ := svc.GetDefaultUser(c, c.GetHeader("Authorization"))
-
+	instructions := svc.SysCfgGet(c, "camp_instructions")
 	for _, v := range data {
 		enterpriseInfo := make(map[string]string)
 		json.Unmarshal([]byte(v.EnterpriseInfo), &enterpriseInfo)
@@ -138,6 +138,7 @@ func ProjectComm(c *gin.Context, args md.ProjectReq) []map[string]interface{} {
 			"adv_word":        v.AdvWord,
 			"label":           label,
 			"is_like":         "0",
+			"instructions":    instructions,
 		}
 		if user != nil {
 			count, _ := svc.MasterDb(c).Where("uid=? and project_id=?", user.Info.Uid, v.Id).Count(&models.CampTaskProjectUserLike{})

app/operator/svc/svc_index.go

@@ -14,12 +14,15 @@ import (
 func UserInfo(c *gin.Context) {
 	user := svc.GetUser(c)
 	operator := "0"
+	role := []string{"comm"}
 	if user.Info.Level == 3 {
 		operator = "1"
+		role = append(role, "operator")
 	}
-	res := map[string]string{
+	res := map[string]interface{}{
 		"phone":       user.Info.Phone,
 		"is_operator": operator,
+		"role":        role,
 	}
 	e.OutSuc(c, res, nil)
 	return

app/store/svc/svc_index.go

@@ -11,8 +11,19 @@ import (
 
 func UserInfo(c *gin.Context) {
 	store := svc.GetCampStore(c)
-
+	role := []string{"comm"}
+	user := store
+	if store.Pid > 0 {
+		NewCampTaskStoreUserDb := implement.NewCampTaskStoreUserDb(svc.MasterDb(c))
+		user, _ = NewCampTaskStoreUserDb.GetCampTaskStoreUser(store.Pid)
+	} else {
+		role = append(role, "director")
+	}
+	if user.IsShowProject == 1 {
+		role = append(role, "project")
+	}
 	res := map[string]interface{}{
+		"role":  role,
 		"phone": store.Phone,
 	}
 	e.OutSuc(c, res, nil)
@@ -20,6 +31,7 @@ func UserInfo(c *gin.Context) {
 }
 func Index(c *gin.Context) {
 	storeId := svc.GetCampStoreId(c)
+	//TODO 要根据账号
 	allTaskCount, _ := svc.MasterDb(c).Where("store_id=? and is_delete=0", storeId).Count(&models.CampTaskList{})
 	orderCount, _ := svc.MasterDb(c).Where("store_id=? and state=1", storeId).Count(&models.CampTaskUserPromotionOrder{})
 	settleCount, _ := svc.MasterDb(c).Where("store_id=? and settle_time is not null", storeId).Sum(&models.CampTaskUserPromotionOrder{}, "payment")

app/store/svc/svc_login.go

@@ -47,6 +47,8 @@ func Login(c *gin.Context) {
 	role := []string{"comm"}
 	if user.Pid > 0 {
 		user, _ = NewCampTaskStoreUserDb.GetCampTaskStoreUser(user.Pid)
+	} else {
+		role = append(role, "director")
 	}
 	if user.IsShowProject == 1 {
 		role = append(role, "project")

app/store/svc/svc_task.go

@@ -276,6 +276,11 @@ func TaskSave(c *gin.Context) {
 		taskDetail, _ = taskDetailDb.GetCampTaskDetailByIdSess(sess, args.Id)
 		taskNoticeDb := implement.NewCampTaskNoticeDb(svc.MasterDb(c))
 		taskNotice, _ = taskNoticeDb.GetCampTaskNoticeByTaskIdSess(sess, args.Id)
+		if task.State == 0 {
+			sess.Rollback()
+			e.OutErr(c, 400, e.NewErr(400, "任务审核中"))
+			return
+		}
 	} else {
 		task = &models.CampTaskList{
 			CreateTime: time.Now(),
@@ -317,6 +322,7 @@ func TaskSave(c *gin.Context) {
 			return
 		}
 	}
+
 	cb, err := svc.HandleCampTaskLockDistributedLock(c.GetString("mid"), utils.IntToStr(task.Id), "camp_task")
 	if err != nil {
 		sess.Rollback()