页面修改

src/components/CommodityMan/goodsListEdit.vue

@@ -155,14 +155,14 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
-                  <el-form-item label="自动上架时间"  >
-                    <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime" placeholder="选择日期时间">
+                  <el-form-item label="自动上架时间">
+                    <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                   </el-form-item>
-                  <el-form-item label="自动下架时间"  >
-                    <el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime" placeholder="选择日期时间">
+                  <el-form-item label="自动下架时间">
+                    <el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
@@ -404,8 +404,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="发货仓库">
-                    <el-input v-model="addMsg.SendArea" size="small" placeholder="请输入内容"
-                              class="input-with-select">
+                    <el-input v-model="addMsg.SendArea" size="small" placeholder="请输入内容" class="input-with-select">
                     </el-input>
                   </el-form-item>
                   <el-form-item label="商品服务">
@@ -1162,7 +1161,7 @@
           },
           ShelvesDate: '', //自动上架时间
           DownDate: '', //自动下架时间
-          SendArea:'',//发货仓库
+          SendArea: '', //发货仓库
         },
         predefineColors: [
           '#000000',
@@ -1566,12 +1565,12 @@
             arr.push(item);
           }
         });
-        arr.forEach(x=>{
-          x.Id=0;
-          x.NewSpecList.forEach(j=>{
+        arr.forEach(x => {
+          x.Id = 0;
+          x.NewSpecList.forEach(j => {
             j.Id = 0
           });
-          x.SpecificationValueList.forEach(j=>{
+          x.SpecificationValueList.forEach(j => {
             j.Id = 0
           })
         });
@@ -2145,8 +2144,21 @@
               if (this.addMsg.PresentFXGrade == 0) {
                 this.addMsg.PresentFXGrade = ''
               }
-              if (!this.addMsg.MarketingLogo||this.addMsg.MarketingLogo == null) {
-
+              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 {
                 this.addMsg.MarketingLogo = {
                   iswords: 0,
                   words: "",
@@ -2154,10 +2166,6 @@
                   wordsBack: "",
                   ico: ""
                 }
-              } else {
-                let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
-                let obj=MarketingLogo
-                this.addMsg.MarketingLogo = obj
               }
               this.getSuggestPrice();
               this.getFXDGradeList2();