From 3514231ffa9007715224fd54a26d5f37ac7b5605 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 7 Oct 2023 15:05:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/addGoods/commodity.vue          |  2 +-
 pages/product/addGoods/index.vue              |  6 ++++--
 pages/product/addGoods/secound.vue            | 14 +++++++-------
 pages/product/components/inputGoodsDetils.vue |  7 ++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pages/product/addGoods/commodity.vue b/pages/product/addGoods/commodity.vue
index d7ba2dd..39eaa20 100644
--- a/pages/product/addGoods/commodity.vue
+++ b/pages/product/addGoods/commodity.vue
@@ -224,7 +224,7 @@
         if (this.product_id) {
           // editGoodsDetils = getStorage('editGoodsDetils');
           editGoodsDetils = this.$store.state.storage.storage;
-          console.log(editGoodsDetils);
+          //   console.log('ss',editGoodsDetils.content);
           // editGoodsDetils = getStorage('editGoodsDetils');
           // console.log('初始化商品详情',editGoodsDetils);
           Object.keys(this.addGoodsSecoundData).forEach(item => {
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 97e62b7..3d8aa8f 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -163,7 +163,7 @@
 				</view> -->
       </view>
 
-      <commodityComponent v-if="showCommodity" :key="showCommodity" :showCommodity="showCommodity" :resetKey="secoundModel" :product_id="product_id" :merId="merId"
+      <commodityComponent v-if="showCommodity" :key="showCommodity"  :showCommodity="showCommodity" :resetKey="secoundModel" :product_id="product_id" :merId="merId"
         :code="code" @lastStep="lastStep">
       </commodityComponent>
 
@@ -437,6 +437,8 @@
       // this.getDeliveryType();
       if (this.product_id) {
         this.initDataEditData();
+      }else {
+        setStorage('editCommodity',{});
       }
     },
     onBackPress() {
@@ -584,6 +586,7 @@
         }
         productDetail(this.merId, this.product_id).then(res => {
           setStorage('editGoodsDetils', res.data);
+          if(res.data.content_arr) res.data.content = res.data.content_arr;
           this.$store.commit('setStorage', res.data);
           let editGoodsDetils = res.data;
           Object.keys(this.setFormData).forEach(item => {
@@ -627,7 +630,6 @@
         let that = this;
         that.$util.uploadImageOne('upload/image', function(res) {
           that.setFormData.imageList.push(res.data.path);
-
         });
       },
       clk() {
diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue
index d51a1e0..bc78a48 100644
--- a/pages/product/addGoods/secound.vue
+++ b/pages/product/addGoods/secound.vue
@@ -264,15 +264,15 @@
           postData[key]=info[key];
         })
         postData.stock = postData.attrValue[0].stock;
-        console.log(postData);
-        if(postData.store_name.trim().length<=0)return Toast('请输入商品名称');
-        if(postData.imageList.length<=0)return Toast('请上传商品图片');
-        if(postData.cate_name.trim().length<=0)return Toast('请选择平台分类');
-        if(postData.unit_name.trim().length<=0)return Toast('请输入商品单位');
+        // console.log(postData);
+        if(!postData.store_name||postData.store_name?.trim().length<=0)return Toast('请输入商品名称');
+        if(!postData.imageList||postData.imageList.length<=0)return Toast('请上传商品图片');
+        if(postData.cate_name?.trim().length<=0)return Toast('请选择平台分类');
+        if(postData.unit_name?.trim().length<=0)return Toast('请输入商品单位');
         if(!postData.attrValue[0].price||postData.attrValue[0].price<0)return Toast('价格不能小于0');
         if(!postData.stock||postData.stock<0)return Toast('库存不能小于0');
-        if(postData.content.title.trim().length<=0)return Toast('请输入商品详情');
-        if(postData.content.image.length<=0)return Toast('请上传商品图片');
+        if(!postData.content.title||postData.content.title?.trim().length<=0)return Toast('请输入商品详情');
+        if(!postData.content.image||postData.content.image?.length<=0)return Toast('请上传商品图片');
         // return Toast('通过');
         if (getStorage('addGoodsFormData').spec_type == 0) {
           // postData.attr = [getStorage('singleSpecification')];
diff --git a/pages/product/components/inputGoodsDetils.vue b/pages/product/components/inputGoodsDetils.vue
index aecb998..c43097a 100644
--- a/pages/product/components/inputGoodsDetils.vue
+++ b/pages/product/components/inputGoodsDetils.vue
@@ -111,7 +111,7 @@
       }
     },
     mounted() {
-      console.log(this.$props.prodectContent);
+      // console.log(this.$props.prodectContent);
     },
     methods: {
       handleChooseImage() {
@@ -143,10 +143,11 @@
             [TOKENNAME]: 'Bearer ' + store.state.app.token
           },
           success: (uploadFileRes) => {
-            // console.log(uploadFileRes.data);
+            // console.log(JSON.parse(uploadFileRes.data));
             let imgData = JSON.parse(uploadFileRes.data)
             // that.prodectContent.imageList.push(imgData.data.path)
-            that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore}
+            if(!that.prodectContent.imageList)that.prodectContent.imageList=[];
+            that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore};
           },
           complete(res) {
             // console.log(res)