From 2edc33468a24b04f976e5488300053dda8db72dd Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 2 Nov 2021 09:28:47 +0800
Subject: [PATCH] update

---
 business/jxstore/cms/sku.go | 52 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 9a3236377..5581cc3da 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -841,22 +841,22 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		}
 	}
 
-	picType := true
-	for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
-		if imgName != "" {
-			dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
-			if err = err2; err != nil {
-				return nil, err
-			}
-			if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
-				picType = false
-			}
-		}
-	}
+	//picType := true
+	//for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
+	//	if imgName != "" {
+	//		dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
+	//		if err = err2; err != nil {
+	//			return nil, err
+	//		}
+	//		if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
+	//			picType = false
+	//		}
+	//	}
+	//}
 
-	if picType {
-		return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片！")
-	}
+	//if picType {
+	//	return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片！")
+	//}
 
 	if skuNameExt.DescImg != "" {
 		dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name+"desc", skuNameExt.DescImg, model.ImgTypeDesc, false)
@@ -964,17 +964,17 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 				return 0, fmt.Errorf("upc:%s不合法，请仔细检查", upc)
 			}
 		}
-		globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
-		for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
-			if valid[imgName] != nil {
-				if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {
-					_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true)
-					if err = err2; err != nil {
-						return 0, err
-					}
-				}
-			}
-		}
+		//		globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
+		//		for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
+		//			if valid[imgName] != nil {
+		//				if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {
+		//					_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true)
+		//					if err = err2; err != nil {
+		//						return 0, err
+		//					}
+		//				}
+		//			}
+		//		}
 
 		if valid["descImg"] != nil {
 			descImg := valid["descImg"].(string)