提交

src/components/CommodityMan/goodsListEdit.vue

@@ -2147,15 +2147,21 @@
                 this.addMsg.PresentFXGrade = ''
               }
 
-              if (!this.addMsg.MarketingLogo||this.addMsg.MarketingLogo == null  ) {
-                this.addMsg.MarketingLogo = {
-                  iswords: 0,
-                  words: "",
-                  wordsColor: "",
-                  wordsBack: "",
-                  ico: ""
+              if (this.addMsg.MarketingLogo) {
+                try {
+                  let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
+                  let obj = MarketingLogo
+                  this.addMsg.MarketingLogo = obj
+                } catch (err) {
+                  this.addMsg.MarketingLogo = {
+                    iswords: 0,
+                    words: "",
+                    wordsColor: "",
+                    wordsBack: "",
+                    ico: ""
+                  }
                 }
-              } else if(this.addMsg.MarketingLogo.indexOf('iswords')==-1){
+              } else {
                 this.addMsg.MarketingLogo = {
                   iswords: 0,
                   words: "",
@@ -2163,10 +2169,6 @@
                   wordsBack: "",
                   ico: ""
                 }
-              }else {
-                let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
-                let obj=MarketingLogo
-                this.addMsg.MarketingLogo = obj
               }
               this.getSuggestPrice();
               this.getFXDGradeList2();