更新商品图片及商品图片集完成

liangdas · May 23, 2017 · 9e56c69 · 9e56c69
1 parent 24b89ab
commit 9e56c69
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/go/controller/product/product.go b/go/controller/product/product.go
@@ -287,6 +287,22 @@ func Info(ctx *iris.Context) {
 		return
 	}
 
+	if db.First(&product.Image, product.ImageID).Error != nil {
+		product.Image = model.Image{}
+	}
+
+	var imagesSQL []uint
+	if err := json.Unmarshal([]byte(product.ImageIDs), &imagesSQL); err == nil {
+		var images []model.Image
+		if db.Where("id in (?)",  imagesSQL).Find(&images).Error != nil {
+			product.Images = nil
+		} else {
+			product.Images = images
+		}
+	} else {
+		product.Images = nil	
+	}
+
 	if db.Model(&product).Related(&product.Categories, "categories").Error != nil {
 		ctx.JSON(iris.StatusOK, iris.Map{
 			"errNo" : model.ErrorCode.ERROR,

diff --git a/go/model/product.go b/go/model/product.go
@@ -15,8 +15,8 @@ type Product struct {
     Price          float64    `json:"price"`      
     OriginalPrice  float64    `json:"originalPrice"`
     Status         int        `json:"status"`
-    Image          Image      `json:"image"`
     ImageID        uint       `json:"imageID"`
+    Image          Image      `json:"image"`
     ImageIDs       string     `json:"imageIDs"`
     Images         []Image    `json:"images"`
     Remark         string     `json:"remark"`

diff --git a/nodejs/static/javascripts/admin/actions/product/requestSaveProduct.js b/nodejs/static/javascripts/admin/actions/product/requestSaveProduct.js
@@ -26,7 +26,7 @@ export default function(product) {
             categories    : categories,
             status        : parseInt(product.status),
             imageID       : product.imageID,
-            imageIDs      : JSON.stringify(product.imageIDs),
+            imageIDs      : product.imageIDs,
             originalPrice : product.originalPrice,
             price         : product.price,
             remark        : product.remark,

diff --git a/nodejs/static/javascripts/admin/containers/product/EditProduct.js b/nodejs/static/javascripts/admin/containers/product/EditProduct.js
@@ -53,9 +53,9 @@ class EditProduct extends Component {
             status         : '3', //等待上架
             imageID        : '',
             imageData      : '',
-            imageURL       : '',
             previewVisible : false,
             previewImage   : '',
+            imageIDs       : '[]',
             imageList      : [],
             ueditor        : null,
             loadCalled     : false, //是否已加载UEditor
@@ -117,6 +117,19 @@ class EditProduct extends Component {
                 categories.push(utils.parseTreeNodeKey(allCategories, id));
             }
 
+            var imageList  = [];
+            var pImageList = product.images || [];
+            for (var i = 0; i < pImageList.length; i++) {
+                imageList.push({
+                    uid    : pImageList[i].id,
+                    name   : pImageList[i].orignalTitle,
+                    status : 'done',
+                    url    : pImageList[i].url
+                });
+            }
+
+            var imageURL = product.image && product.image.url || '';
+
             this.setState({
                 productId     : product.id,
                 categories    : categories,
@@ -127,8 +140,9 @@ class EditProduct extends Component {
                 remark        : product.remark,
                 status        : product.status + '',
                 imageID       : product.imageID,
-                imageData     : product.imageURL,
-                imageURL      : product.imageURL,
+                imageData     : imageURL,
+                imageIDs      : product.imageIDs,
+                imageList     : imageList,
                 isLoading     : false
             });
             this.loadUEditor();
@@ -171,7 +185,6 @@ class EditProduct extends Component {
         var self = this;
         if (info.file.status === 'done') {
             self.setState({
-                imageURL : info.file.response.data.url,
                 imageID  : info.file.response.data.id
             });
             (function(originFileObj, callback) {
@@ -203,7 +216,7 @@ class EditProduct extends Component {
             } 
         }
         this.setState({
-            imageIDs  : imageIDs,
+            imageIDs  : JSON.stringify(imageIDs),
             imageList : data.fileList
         });
     }
@@ -329,7 +342,7 @@ class EditProduct extends Component {
                                                 onPreview={this.onPreview}
                                                 beforeUpload={this.onBeforeUpload}
                                                 onChange={this.onImageListChange}>
-                                            { imageList.length >= 3 ? null : uploadButton }
+                                            { imageList.length >= 6 ? null : uploadButton }
                                             </Upload>
                                             <Modal visible={previewVisible} onCancel={this.onCancelPreview}
                                                 footer={null}>