From bfd3f07f22ba0eab90b50c5be1ea8c9c95b9af53 Mon Sep 17 00:00:00 2001
From: xh-pan1 <xh-pan1@hnair.com>
Date: Mon, 19 Feb 2024 03:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/commodity/commdityClass/Edit.vue         | 57 ++++++++++++----------
 .../commodity/commoditySystem/addCommodity.vue     |  3 +-
 src/views/commodity/commoditySystem/index.vue      |  2 +-
 src/views/liveMenu/liveProduct/index.vue           |  2 +-
 src/views/liveMenu/liveRoom/index.vue              |  2 +-
 src/views/marketing/channelActivity/form.vue       |  2 +-
 .../channelActivity/selectChannelCoupons.vue       |  4 +-
 src/views/marketing/channelManage/index.vue        |  4 +-
 src/views/marketing/coupon/index.vue               |  4 +-
 src/views/marketing/scene/add.vue                  |  2 +-
 src/views/setup/tabs/index.vue                     |  2 +-
 src/views/setup/user/index.vue                     |  2 +-
 src/views/shop/myshop/index.vue                    |  2 +-
 13 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/views/commodity/commdityClass/Edit.vue b/src/views/commodity/commdityClass/Edit.vue
index 1343e25..7b1359e 100644
--- a/src/views/commodity/commdityClass/Edit.vue
+++ b/src/views/commodity/commdityClass/Edit.vue
@@ -285,6 +285,16 @@ export default {
         oneClassifyId
       })
       const resData = res.data
+      this.initLangInfo(resData)
+      this.initImageArray(resData)
+      if (resData) {
+        this.treeData = [resData]
+      } else {
+        this.treeData = []
+      }
+      console.log(this.treeData)
+    },
+    initLangInfo(resData){
       if(resData && resData.langInfoMap && resData.langInfoMap['zh']){
         resData.classifyName_ZH = resData.langInfoMap['zh'].classifyName;
       }else{
@@ -295,13 +305,11 @@ export default {
       }else{
         resData.classifyName_EN = "";
       }
-      this.initImageArray(resData)
-      if (resData) {
-        this.treeData = [resData]
-      } else {
-        this.treeData = []
-      }
-      console.log(this.treeData)
+      if(resData.childs && resData.childs.length){
+          for (const index in resData.childs) {
+            this.initLangInfo(resData.childs[index])
+          }
+        }
     },
     initImageArray(treeData){
       if(treeData){
@@ -423,15 +431,7 @@ export default {
       }
       console.log(this.params)
       for (const index in params) {
-        let itemParams = params[index]
-        itemParams.classifyName = itemParams.classifyName_ZH;
-        itemParams.langInfoMap = {}
-        itemParams.langInfoMap["zh"] = {};
-        itemParams.langInfoMap["zh"].classifyName = itemParams.classifyName_ZH;
-        itemParams.langInfoMap["zh"].languageType = "zh";
-        itemParams.langInfoMap["en"] = {};
-        itemParams.langInfoMap["en"].classifyName = itemParams.classifyName_EN;
-        itemParams.langInfoMap["en"].languageType = "en";
+        this.resetLangInfo(params[index])
       }
       this.resetImage(this.treeData[0])
       const obj = {
@@ -455,15 +455,7 @@ export default {
         return
       }
       for (const index in params) {
-        let itemParams = params[index]
-        itemParams.classifyName = itemParams.classifyName_ZH;
-        itemParams.langInfoMap = {}
-        itemParams.langInfoMap["zh"] = {};
-        itemParams.langInfoMap["zh"].classifyName = itemParams.classifyName_ZH;
-        itemParams.langInfoMap["zh"].languageType = "zh";
-        itemParams.langInfoMap["en"] = {};
-        itemParams.langInfoMap["en"].classifyName = itemParams.classifyName_EN;
-        itemParams.langInfoMap["en"].languageType = "en";
+        this.resetLangInfo(params[index])
       }
       this.resetImage(this.treeData[0])
       const obj = {
@@ -481,6 +473,21 @@ export default {
         this.deleteArr = []
       }
     },
+    resetLangInfo(itemParams){
+      itemParams.classifyName = itemParams.classifyName_ZH;
+        itemParams.langInfoMap = {}
+        itemParams.langInfoMap["zh"] = {};
+        itemParams.langInfoMap["zh"].classifyName = itemParams.classifyName_ZH;
+        itemParams.langInfoMap["zh"].languageType = "zh";
+        itemParams.langInfoMap["en"] = {};
+        itemParams.langInfoMap["en"].classifyName = itemParams.classifyName_EN;
+        itemParams.langInfoMap["en"].languageType = "en";
+        if(itemParams.childs && itemParams.childs.length){
+          for (const index in itemParams.childs) {
+            this.resetLangInfo(itemParams.childs[index])
+          }
+        }
+    },
     setParams ({ id }) {
       console.log(id)
       this.queryOneCategory(id)
diff --git a/src/views/commodity/commoditySystem/addCommodity.vue b/src/views/commodity/commoditySystem/addCommodity.vue
index 80f6cad..7318933 100644
--- a/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/src/views/commodity/commoditySystem/addCommodity.vue
@@ -890,7 +890,7 @@ export default {
           attrItem.valueCode = attrItem.valueCode || code + '_value_' + index1
           const skuId = attrItem.skuId
           const attrId = attrItem.attrId
-          if (attrItem.skuValue) {
+          if (attrItem.skuValue_EN || attrItem.skuValue_ZH) {
             attrList.push({
               skuId,
               attrId,
@@ -941,6 +941,7 @@ export default {
       console.log('save')
       this.editSkuAttrDialogVisible = false;
       this.form.names = JSON.parse(JSON.stringify(this.newSkuAttrList))
+      console.log(this.form.names)
       this.skuFormat()
     }
   }
diff --git a/src/views/commodity/commoditySystem/index.vue b/src/views/commodity/commoditySystem/index.vue
index 8d48b00..1a3c9c6 100644
--- a/src/views/commodity/commoditySystem/index.vue
+++ b/src/views/commodity/commoditySystem/index.vue
@@ -79,7 +79,7 @@
           </el-table-column>
           <el-table-column prop="reject" :label="$t('product.causeofrejection')" show-overflow-tooltip />
           <el-table-column :formatter="row=>getBrandName(row)" :label="$t('product.brand')" show-overflow-tooltip />
-          <el-table-column prop="createTime" :label="$t('common.createTIme')" width="180" />
+          <el-table-column prop="createTime" :label="$t('common.createTime')" width="180" />
           <el-table-column :label="$t('common.operate')" width="200">
             <template slot-scope="scope">
               <div class="btnList">
diff --git a/src/views/liveMenu/liveProduct/index.vue b/src/views/liveMenu/liveProduct/index.vue
index fcd4f42..7136d5b 100644
--- a/src/views/liveMenu/liveProduct/index.vue
+++ b/src/views/liveMenu/liveProduct/index.vue
@@ -102,7 +102,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" :label="$t('common.createTIme')">
+        <el-table-column prop="createTime" :label="$t('common.createTime')">
           <!-- 暂无 -->
         </el-table-column>
         <el-table-column
diff --git a/src/views/liveMenu/liveRoom/index.vue b/src/views/liveMenu/liveRoom/index.vue
index 327e06a..b44bbaa 100644
--- a/src/views/liveMenu/liveRoom/index.vue
+++ b/src/views/liveMenu/liveRoom/index.vue
@@ -45,7 +45,7 @@
         <el-table-column prop="anchorWechat" label="主播微信号" />
         <el-table-column prop="startTime" label="直播开始时间" />
         <el-table-column prop="endTime" label="预计结束时间" />
-        <el-table-column prop="createTime" :label="$t('common.createTIme')" />
+        <el-table-column prop="createTime" :label="$t('common.createTime')" />
         <el-table-column label="审核状态" width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.state == 0" type="warning">
diff --git a/src/views/marketing/channelActivity/form.vue b/src/views/marketing/channelActivity/form.vue
index a9a452b..6fe94aa 100644
--- a/src/views/marketing/channelActivity/form.vue
+++ b/src/views/marketing/channelActivity/form.vue
@@ -54,7 +54,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="content" label="内容" show-overflow-tooltip />
-            <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+            <el-table-column prop="createTime" :label="$t('common.createTime')" show-overflow-tooltip />
             <el-table-column :label="$t('common.operate')" fixed="right">
               <template v-slot="scope">
                 <el-button :disabled="form.isLook" @click="handleDelSelectCoupon(scope.row)">{{ $t('common.delete') }}</el-button>
diff --git a/src/views/marketing/channelActivity/selectChannelCoupons.vue b/src/views/marketing/channelActivity/selectChannelCoupons.vue
index 05f96e0..6bc9e78 100644
--- a/src/views/marketing/channelActivity/selectChannelCoupons.vue
+++ b/src/views/marketing/channelActivity/selectChannelCoupons.vue
@@ -29,7 +29,7 @@
                 <el-option label="已结束" value="2" />
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('common.createTIme')">
+            <el-form-item :label="$t('common.createTime')">
               <el-date-picker v-model="formInline.dates" type="datetimerange" 
               :range-separator="$t('common.betweentime')"
               :start-placeholder="$t('common.startdate')"
@@ -69,7 +69,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="content" label="内容" show-overflow-tooltip />
-            <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+            <el-table-column prop="createTime" :label="$t('common.createTime')" show-overflow-tooltip />
           </el-table>
           <div class="fenye">
             <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
diff --git a/src/views/marketing/channelManage/index.vue b/src/views/marketing/channelManage/index.vue
index 9968283..e718037 100644
--- a/src/views/marketing/channelManage/index.vue
+++ b/src/views/marketing/channelManage/index.vue
@@ -62,7 +62,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('common.createTIme')">
+        <el-form-item :label="$t('common.createTime')">
           <el-date-picker
             v-model="formInline.dates"
             type="datetimerange"
@@ -148,7 +148,7 @@
         />
         <el-table-column
           prop="createTime"
-          :label="$t('common.createTIme')"
+          :label="$t('common.createTime')"
           show-overflow-tooltip
         />
         <el-table-column
diff --git a/src/views/marketing/coupon/index.vue b/src/views/marketing/coupon/index.vue
index 7889c32..a1fbc4e 100644
--- a/src/views/marketing/coupon/index.vue
+++ b/src/views/marketing/coupon/index.vue
@@ -20,7 +20,7 @@
             <el-option label="已结束" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('common.createTIme')">
+        <el-form-item :label="$t('common.createTime')">
           <el-date-picker
             v-model="formInline.dates"
             type="datetimerange"
@@ -64,7 +64,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="content" label="内容" show-overflow-tooltip />
-        <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+        <el-table-column prop="createTime" :label="$t('common.createTime')" show-overflow-tooltip />
         <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
           <template slot-scope="scope">
             <div class="btnList">
diff --git a/src/views/marketing/scene/add.vue b/src/views/marketing/scene/add.vue
index 63b305f..c8e63bc 100644
--- a/src/views/marketing/scene/add.vue
+++ b/src/views/marketing/scene/add.vue
@@ -217,7 +217,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="content" label="内容" show-overflow-tooltip />
-          <el-table-column prop="createTime" :label="$t('common.createTIme')" show-overflow-tooltip />
+          <el-table-column prop="createTime" :label="$t('common.createTime')" show-overflow-tooltip />
         </el-table>
         <div class="fenye">
           <el-pagination
diff --git a/src/views/setup/tabs/index.vue b/src/views/setup/tabs/index.vue
index 9889b5e..c5535f7 100644
--- a/src/views/setup/tabs/index.vue
+++ b/src/views/setup/tabs/index.vue
@@ -37,7 +37,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="permission" label="菜单标识" />
-        <el-table-column prop="createTime" :label="$t('common.createTIme')" />
+        <el-table-column prop="createTime" :label="$t('common.createTime')" />
         <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
           <template slot-scope="scope">
             <div class="btnList">
diff --git a/src/views/setup/user/index.vue b/src/views/setup/user/index.vue
index 2921507..1e4e1e0 100644
--- a/src/views/setup/user/index.vue
+++ b/src/views/setup/user/index.vue
@@ -43,7 +43,7 @@
             <span v-if="scope.row.state == 1">启用</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" :label="$t('common.createTIme')" />
+        <el-table-column prop="createTime" :label="$t('common.createTime')" />
         <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
           <template slot-scope="scope">
             <div class="btnList">
diff --git a/src/views/shop/myshop/index.vue b/src/views/shop/myshop/index.vue
index 1afe17c..5ad1d69 100644
--- a/src/views/shop/myshop/index.vue
+++ b/src/views/shop/myshop/index.vue
@@ -99,7 +99,7 @@
           </el-table-column> -->
           <el-table-column
             prop="createTime"
-            :label="$t('common.createTIme')"
+            :label="$t('common.createTime')"
           />
           <el-table-column
             :label="$t('common.operate')"