Skip to content

F
factory_front
Commit c2097860 by qinjianhui
Options

Merge branch 'dev' into release

parents e17c6a36 87593839
Showing with 56 additions and 21 deletions
src/types/api/podMakeOrder.ts
...@@ -54,6 +54,7 @@ export interface ProductList { ...@@ -54,6 +54,7 @@ export interface ProductList {
variantImage?: string variantImage?: string
podJomallUsNo?: string podJomallUsNo?: string
podJomallCnNo?: string podJomallCnNo?: string
thirdSkuCode?: string
previewImgs?: { sort?: string | number; title?: string; url: string }[] previewImgs?: { sort?: string | number; title?: string; url: string }[]
} }
......
src/views/order/podCN/PodMakeOrder.vue
...@@ -463,7 +463,18 @@ watch( ...@@ -463,7 +463,18 @@ watch(
(val) => { (val) => {
if (val && val.productList?.length) if (val && val.productList?.length)
val.productList.forEach((el) => { val.productList.forEach((el) => {
if (!el.previewImgs) el.previewImgs = JSON.parse(el.imageAry || '[]') if (!el.previewImgs) {
if (
el.productMark === 'custom_normal' ||
el.productMark === 'normal'
) {
el.previewImgs = [{ url: el.variantImage || '' }]
} else {
el.previewImgs = el.imageAry
? JSON.parse(el.imageAry)
: [{ url: el.variantImage }]
}
}
}) })
}, },
{ deep: true }, { deep: true },
...@@ -492,7 +503,13 @@ const renderItemBox = (bool: boolean) => { ...@@ -492,7 +503,13 @@ const renderItemBox = (bool: boolean) => {
if (!boxItem) boxItem = { data: { productList: [] } } if (!boxItem) boxItem = { data: { productList: [] } }
const { data } = boxItem const { data } = boxItem
data?.productList?.forEach((el) => { data?.productList?.forEach((el) => {
if (!el.previewImgs) el.previewImgs = JSON.parse(el.imageAry || '[]') if (!el.previewImgs || !el.previewImgs.length) {
if (el.productMark === 'custom_normal' || el.productMark === 'normal') {
el.previewImgs = [{ url: el.variantImage || '' }]
} else {
el.previewImgs = JSON.parse(el.imageAry || '[]')
}
}
}) })
if (!data) { if (!data) {
renderLock = false renderLock = false
...@@ -513,15 +530,23 @@ const renderItemBox = (bool: boolean) => { ...@@ -513,15 +530,23 @@ const renderItemBox = (bool: boolean) => {
} }
} }
if (currentCode) { if (currentCode) {
const parts = currentCode.split('_') if (!currentCode.startsWith('JM')) {
currentCode = const parts = currentCode.split('_')
parts.length > 3 && parts[3].startsWith('CNPSC') currentCode =
? parts[3] parts.length > 3 && parts[3].startsWith('CNPSC')
: parts.length > 1 ? parts[3]
? parts[1] : parts.length > 1
: parts[0] ? parts[1]
: parts[0]
}
console.log(540, currentCode)
for (const product of productList) { for (const product of productList) {
if (product.podJomallCnNo === currentCode) { if (
product.podJomallCnNo === currentCode ||
product.thirdSkuCode === currentCode
) {
coverImage.value = product.previewImgs?.[0]?.url || '' coverImage.value = product.previewImgs?.[0]?.url || ''
nextTick(() => { nextTick(() => {
tableRef.value?.setCurrentRow(product) tableRef.value?.setCurrentRow(product)
......
src/views/order/podUs/PodMakeOrder.vue
...@@ -435,7 +435,10 @@ watch( ...@@ -435,7 +435,10 @@ watch(
if (val && val.productList?.length) if (val && val.productList?.length)
val.productList.forEach((el) => { val.productList.forEach((el) => {
if (!el.previewImgs) { if (!el.previewImgs) {
if (el.productMark === 'custom_normal') { if (
el.productMark === 'custom_normal' ||
el.productMark === 'normal'
) {
el.previewImgs = [{ url: el.variantImage || '' }] el.previewImgs = [{ url: el.variantImage || '' }]
} else { } else {
el.previewImgs = el.imageAry el.previewImgs = el.imageAry
...@@ -468,11 +471,11 @@ const renderItemBox = (bool: boolean) => { ...@@ -468,11 +471,11 @@ const renderItemBox = (bool: boolean) => {
if (!boxItem) boxItem = { data: { productList: [] } } if (!boxItem) boxItem = { data: { productList: [] } }
const { data } = boxItem const { data } = boxItem
data?.productList?.forEach((el) => { data?.productList?.forEach((el) => {
if (!el.previewImgs) { if (!el.previewImgs || !el.previewImgs.length) {
if (el.productMark === 'custom_normal' || el.productMark === 'normal') { if (el.productMark === 'custom_normal' || el.productMark === 'normal') {
el.previewImgs = [{ url: el.variantImage || '' }] el.previewImgs = [{ url: el.variantImage || '' }]
} else { } else {
el.previewImgs = JSON.parse(el.imageAry) el.previewImgs = JSON.parse(el.imageAry || '[]')
} }
} }
}) })
...@@ -495,15 +498,21 @@ const renderItemBox = (bool: boolean) => { ...@@ -495,15 +498,21 @@ const renderItemBox = (bool: boolean) => {
} }
} }
if (currentCode) { if (currentCode) {
const parts = currentCode.split('_') if (!currentCode.startsWith('JM')) {
currentCode = const parts = currentCode.split('_')
parts.length > 3 && parts[3].startsWith('USPSC') currentCode =
? parts[3] parts.length > 3 && parts[3].startsWith('USPSC')
: parts.length > 1 ? parts[3]
? parts[1] : parts.length > 1
: parts[0] ? parts[1]
: parts[0]
}
console.log(540, currentCode)
for (const product of productList) { for (const product of productList) {
if (product.podJomallUsNo === currentCode) { if (
product.podJomallUsNo === currentCode ||
product.thirdSkuCode === currentCode
) {
coverImage.value = product.previewImgs?.[0]?.url || '' coverImage.value = product.previewImgs?.[0]?.url || ''
console.log(441, coverImage.value) console.log(441, coverImage.value)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment