Browse Source

修复商品添加的问题

master
xh-pan1 1 year ago
parent
commit
bfd3f07f22
  1. 57
      src/views/commodity/commdityClass/Edit.vue
  2. 3
      src/views/commodity/commoditySystem/addCommodity.vue
  3. 2
      src/views/commodity/commoditySystem/index.vue
  4. 2
      src/views/liveMenu/liveProduct/index.vue
  5. 2
      src/views/liveMenu/liveRoom/index.vue
  6. 2
      src/views/marketing/channelActivity/form.vue
  7. 4
      src/views/marketing/channelActivity/selectChannelCoupons.vue
  8. 4
      src/views/marketing/channelManage/index.vue
  9. 4
      src/views/marketing/coupon/index.vue
  10. 2
      src/views/marketing/scene/add.vue
  11. 2
      src/views/setup/tabs/index.vue
  12. 2
      src/views/setup/user/index.vue
  13. 2
      src/views/shop/myshop/index.vue

57
src/views/commodity/commdityClass/Edit.vue

@ -285,6 +285,16 @@ export default {
oneClassifyId oneClassifyId
}) })
const resData = res.data 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']){ if(resData && resData.langInfoMap && resData.langInfoMap['zh']){
resData.classifyName_ZH = resData.langInfoMap['zh'].classifyName; resData.classifyName_ZH = resData.langInfoMap['zh'].classifyName;
}else{ }else{
@ -295,13 +305,11 @@ export default {
}else{ }else{
resData.classifyName_EN = ""; 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){ initImageArray(treeData){
if(treeData){ if(treeData){
@ -423,15 +431,7 @@ export default {
} }
console.log(this.params) console.log(this.params)
for (const index in 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]) this.resetImage(this.treeData[0])
const obj = { const obj = {
@ -455,15 +455,7 @@ export default {
return return
} }
for (const index in 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]) this.resetImage(this.treeData[0])
const obj = { const obj = {
@ -481,6 +473,21 @@ export default {
this.deleteArr = [] 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 }) { setParams ({ id }) {
console.log(id) console.log(id)
this.queryOneCategory(id) this.queryOneCategory(id)

3
src/views/commodity/commoditySystem/addCommodity.vue

@ -890,7 +890,7 @@ export default {
attrItem.valueCode = attrItem.valueCode || code + '_value_' + index1 attrItem.valueCode = attrItem.valueCode || code + '_value_' + index1
const skuId = attrItem.skuId const skuId = attrItem.skuId
const attrId = attrItem.attrId const attrId = attrItem.attrId
if (attrItem.skuValue) {
if (attrItem.skuValue_EN || attrItem.skuValue_ZH) {
attrList.push({ attrList.push({
skuId, skuId,
attrId, attrId,
@ -941,6 +941,7 @@ export default {
console.log('save') console.log('save')
this.editSkuAttrDialogVisible = false; this.editSkuAttrDialogVisible = false;
this.form.names = JSON.parse(JSON.stringify(this.newSkuAttrList)) this.form.names = JSON.parse(JSON.stringify(this.newSkuAttrList))
console.log(this.form.names)
this.skuFormat() this.skuFormat()
} }
} }

2
src/views/commodity/commoditySystem/index.vue

@ -79,7 +79,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="reject" :label="$t('product.causeofrejection')" show-overflow-tooltip /> <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 :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"> <el-table-column :label="$t('common.operate')" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btnList"> <div class="btnList">

2
src/views/liveMenu/liveProduct/index.vue

@ -102,7 +102,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </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>
<el-table-column <el-table-column

2
src/views/liveMenu/liveRoom/index.vue

@ -45,7 +45,7 @@
<el-table-column prop="anchorWechat" label="主播微信号" /> <el-table-column prop="anchorWechat" label="主播微信号" />
<el-table-column prop="startTime" label="直播开始时间" /> <el-table-column prop="startTime" label="直播开始时间" />
<el-table-column prop="endTime" 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"> <el-table-column label="审核状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.state == 0" type="warning"> <el-tag v-if="scope.row.state == 0" type="warning">

2
src/views/marketing/channelActivity/form.vue

@ -54,7 +54,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip /> <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"> <el-table-column :label="$t('common.operate')" fixed="right">
<template v-slot="scope"> <template v-slot="scope">
<el-button :disabled="form.isLook" @click="handleDelSelectCoupon(scope.row)">{{ $t('common.delete') }}</el-button> <el-button :disabled="form.isLook" @click="handleDelSelectCoupon(scope.row)">{{ $t('common.delete') }}</el-button>

4
src/views/marketing/channelActivity/selectChannelCoupons.vue

@ -29,7 +29,7 @@
<el-option label="已结束" value="2" /> <el-option label="已结束" value="2" />
</el-select> </el-select>
</el-form-item> </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" <el-date-picker v-model="formInline.dates" type="datetimerange"
:range-separator="$t('common.betweentime')" :range-separator="$t('common.betweentime')"
:start-placeholder="$t('common.startdate')" :start-placeholder="$t('common.startdate')"
@ -69,7 +69,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip /> <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> </el-table>
<div class="fenye"> <div class="fenye">
<el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10" <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"

4
src/views/marketing/channelManage/index.vue

@ -62,7 +62,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('common.createTIme')">
<el-form-item :label="$t('common.createTime')">
<el-date-picker <el-date-picker
v-model="formInline.dates" v-model="formInline.dates"
type="datetimerange" type="datetimerange"
@ -148,7 +148,7 @@
/> />
<el-table-column <el-table-column
prop="createTime" prop="createTime"
:label="$t('common.createTIme')"
:label="$t('common.createTime')"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column

4
src/views/marketing/coupon/index.vue

@ -20,7 +20,7 @@
<el-option label="已结束" value="2" /> <el-option label="已结束" value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('common.createTIme')">
<el-form-item :label="$t('common.createTime')">
<el-date-picker <el-date-picker
v-model="formInline.dates" v-model="formInline.dates"
type="datetimerange" type="datetimerange"
@ -64,7 +64,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip /> <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> <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btnList"> <div class="btnList">

2
src/views/marketing/scene/add.vue

@ -217,7 +217,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" show-overflow-tooltip /> <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> </el-table>
<div class="fenye"> <div class="fenye">
<el-pagination <el-pagination

2
src/views/setup/tabs/index.vue

@ -37,7 +37,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="permission" label="菜单标识" /> <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> <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btnList"> <div class="btnList">

2
src/views/setup/user/index.vue

@ -43,7 +43,7 @@
<span v-if="scope.row.state == 1">启用</span> <span v-if="scope.row.state == 1">启用</span>
</template> </template>
</el-table-column> </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> <el-table-column :label="$t('common.operate')" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="btnList"> <div class="btnList">

2
src/views/shop/myshop/index.vue

@ -99,7 +99,7 @@
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
prop="createTime" prop="createTime"
:label="$t('common.createTIme')"
:label="$t('common.createTime')"
/> />
<el-table-column <el-table-column
:label="$t('common.operate')" :label="$t('common.operate')"

Loading…
Cancel
Save