xingzai 1 سال پیش
والد
کامیت
02311f4c6b
2فایلهای تغییر یافته به همراه15 افزوده شده و 9 حذف شده
  1. 13 8
      controllers/article.go
  2. 2 1
      controllers/yanxuan_special.go

+ 13 - 8
controllers/article.go

@@ -252,13 +252,7 @@ func (this *ArticleNoLoginController) Detail() {
 			detail.Seller.SellerMobile = sellerItem.Mobile
 			detail.Seller.SellerName = sellerItem.RealName
 		}
-		//作者头像
-		if detail.DepartmentId > 0 {
-			departmentDetail, err := models.GetArticleDepartmentDateilById(detail.DepartmentId)
-			if err == nil {
-				detail.DepartmentDetail = departmentDetail
-			}
-		}
+
 	} else { //潜在客户
 		mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
 		if mfyxUserPermissionTotal == 1 {
@@ -340,7 +334,18 @@ Loop:
 			return
 		}
 	}
-	detail.ShareImg = services.GetArticleShareImg(articleId)
+	//作者头像
+	if detail.DepartmentId > 0 {
+		departmentDetail, err := models.GetArticleDepartmentDateilById(detail.DepartmentId)
+		if err == nil {
+			detail.DepartmentDetail = departmentDetail
+			detail.ShareImg = departmentDetail.ImgUrl
+		}
+	}
+	if detail.ShareImg == "" {
+		detail.ShareImg = services.GetArticleShareImg(articleId)
+	}
+
 	resp.HasPermission = hasPermission
 	resp.IsSpecialArticle = detail.IsSpecialArticle
 	resp.Detail = detail

+ 2 - 1
controllers/yanxuan_special.go

@@ -275,7 +275,8 @@ func (this *YanxuanSpecialNoLoginController) Detail() {
 	//if resp.HasPermission != 1 || sysUser.UserId == 0 {
 	//	resp.Content = utils.InterceptHtmlLength(resp.Content, 240)
 	//}
-	resp.ShareImg = utils.YANXUAN_SPECIAL_SHARE_IMG
+	//resp.ShareImg = utils.YANXUAN_SPECIAL_SHARE_IMG
+	resp.ShareImg = resp.HeadImg
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true