提交 108ff473 authored 作者: 刘旭's avatar 刘旭

修改bug

上级 aa2028b1
...@@ -160,11 +160,13 @@ onBackPress((options: any) => { ...@@ -160,11 +160,13 @@ onBackPress((options: any) => {
return false; return false;
} }
uni.switchTab({ uni.switchTab({
url: './productLine', url: '../productLine1/index',
success() { success() {
store.$reset(); // 重置pinia数据 store.$reset(); // 重置pinia数据
let pages = getCurrentPages(); //获取所有页面的数组对象 let pages = getCurrentPages(); //获取所有页面的数组对象
let currPage: any = pages[pages.length - 1]; //当前页面 let currPage: any = pages[pages.length - 1]; //当前页面
console.log(currPage);
currPage.$vm.reload()
uni.reLaunch({ uni.reLaunch({
url: '/' + currPage.route, url: '/' + currPage.route,
}); });
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<u-navbar :is-back="false" title="产品线" :background="{ background: '#f8f8f8' }" title-bold title-color="#000"> <u-navbar :is-back="false" title="产品线" :background="{ background: '#f8f8f8' }" title-bold title-color="#000">
<template #default> <template #default>
<view style="display: flex; flex-direction: row; margin-left: 30rpx;"> <view style="display: flex; flex-direction: row; margin-left: 30rpx;">
<view style="margin-right: 30rpx" @tap="selectLineBody">{{ body ? '双轨' : '单轨' }}</view> <view style="margin-right: 30rpx" @tap="selectLineBody">{{ body ? '双线体' : '单线体' }}</view>
<view style="margin-right: 30rpx" @tap="selectFlowDirection">流向({{ flow ? '右到左' : '左到右' }})</view> <view style="margin-right: 30rpx" @tap="selectFlowDirection">流向({{ flow ? '右到左' : '左到右' }})</view>
</view> </view>
</template> </template>
...@@ -110,7 +110,7 @@ let lineDelete = ref([] as any); // 记录产品线删除数据 ...@@ -110,7 +110,7 @@ let lineDelete = ref([] as any); // 记录产品线删除数据
let lineEdit = ref(); // 记录产品线修改的数据 let lineEdit = ref(); // 记录产品线修改的数据
let flow = ref(false) // 流向 默认 左到右 let flow = ref(false) // 流向 默认 左到右
let flowFlag = ref(false) // 流向开关 let flowFlag = ref(false) // 流向开关
let body = ref(false) // 线体 默认 单 let body = ref(false) // 线体 默认 单线体
let options = ref([ let options = ref([
{ {
icon: star.value ? 'star-filled' : 'star', icon: star.value ? 'star-filled' : 'star',
...@@ -211,22 +211,31 @@ let addProduct = (data: any, productId: number, specifications: any, specificati ...@@ -211,22 +211,31 @@ let addProduct = (data: any, productId: number, specifications: any, specificati
status: 1, status: 1,
} }
if (typeof sheetData.value.delIndex != 'undefined') { if (typeof sheetData.value.delIndex != 'undefined') {
console.log(sheetData.value.delIndex, 'sheetData.value.delIndex'); let data = JSON.parse(JSON.stringify(lineList.value))
// let arr = [...lineList.value] // lineList.value.splice(sheetData.value.delIndex, 1, obj);
// arr.splice(sheetData.value.delIndex, 1, obj) data[sheetData.value.delIndex] = obj
// console.log(arr, 'arr'); console.log(sheetData.value.delIndex);
lineList.value.splice(sheetData.value.delIndex, 1, obj); // data.map((item: any, i: number) => {
if (JSON.stringify(res) != '{}') // console.log(i, sheetData.value.delIndex);
for (const k in res) // if (sheetData.value.delIndex === i) {
lineList.value[sheetData.value.delIndex][k] = res[k] // console.log(item);
sheetData.value.delIndex = undefined // item = obj
// }
// })
// nextTick(() => lineList.value = data)
console.log(data, 'data');
// if (JSON.stringify(res) != '{}')
// for (const k in res)
// lineList.value[sheetData.value.delIndex][k] = res[k]
// sheetData.value.delIndex = undefined
lineList.value = data
store.$patch({ store.$patch({
lineData: lineList.value, lineData: data,
}); });
console.log(lineList.value, 'store.lineData'); console.log(lineList.value, 'store.lineData');
goodsSkuRef.value.skuKey = false; goodsSkuRef.value.skuKey = false;
sheetData.value.delIndex = undefined
} else { } else {
// lineList.value = [...lineList.value, ...[obj]]
lineList.value.push(obj) lineList.value.push(obj)
if (JSON.stringify(res) != '{}') if (JSON.stringify(res) != '{}')
for (const k in res) for (const k in res)
...@@ -242,7 +251,7 @@ let addProduct = (data: any, productId: number, specifications: any, specificati ...@@ -242,7 +251,7 @@ let addProduct = (data: any, productId: number, specifications: any, specificati
}) })
}; };
// 匹配规格 SDTrack: 单轨/双轨 size: 长度(MM) Segs: 分段数 // 匹配规格 SDTrack: 单线体/双线体 size: 长度(MM) Segs: 分段数
let matchSpecifications = (specificationData: any, goodsId: any, specifications: any) => { let matchSpecifications = (specificationData: any, goodsId: any, specifications: any) => {
let arr = {} as any let arr = {} as any
let a = new Promise<void>((resolve, reject) => { let a = new Promise<void>((resolve, reject) => {
...@@ -337,9 +346,9 @@ let defaultSelection = (data: any) => { ...@@ -337,9 +346,9 @@ let defaultSelection = (data: any) => {
let arr = [] as any let arr = [] as any
let flag = false let flag = false
data.specificationList.map((item: any, i: number) => { data.specificationList.map((item: any, i: number) => {
if (item.name == '单轨/双轨') { if (item.name == '线体') {
if (body.value) arr.push('双') if (body.value) arr.push('双线体')
else arr.push('单') else arr.push('单线体')
flag = true flag = true
} else if (item.name == '流向') { } else if (item.name == '流向') {
if (flow.value) arr.push('右到左') if (flow.value) arr.push('右到左')
...@@ -444,9 +453,6 @@ let sheetEdit = (index: number) => { ...@@ -444,9 +453,6 @@ let sheetEdit = (index: number) => {
}) })
// 是否含有自定义规格 // 是否含有自定义规格
if (data.productId === 0) specStore.$patch({ specificationCustom: data.specificationCustom || [] }) if (data.productId === 0) specStore.$patch({ specificationCustom: data.specificationCustom || [] })
// store.$patch({ lineData: lineList.value.splice(index, 1) });
// lineList.value = JSON.parse(JSON.stringify(lineList.value))
console.log(lineList.value, 'lineList.value', store.lineData);
initDetails(data.goodsId); initDetails(data.goodsId);
}; };
...@@ -691,12 +697,15 @@ let handleClose = (val: Boolean) => { ...@@ -691,12 +697,15 @@ let handleClose = (val: Boolean) => {
if (store.lineData.length === 0) flowFlag.value = false if (store.lineData.length === 0) flowFlag.value = false
}; };
//拖拽开始事件 //拖拽结束事件
let onStart = () => { let onStart = () => {
} }
//拖拽结束事件 //拖拽结束事件
let onEnd = () => { let onEnd = () => {
// console.log(lineList.value); console.log(lineList.value, 'onend');
store.$patch({
lineData: lineList.value
});
} }
let uploadLine = () => { let uploadLine = () => {
uni.chooseFile({ uni.chooseFile({
...@@ -770,7 +779,7 @@ let uploadLine = () => { ...@@ -770,7 +779,7 @@ let uploadLine = () => {
// 处理要修改的数据 // 处理要修改的数据
let handleEditProductLineData = (editData: any, dataArr?: any[]) => { let handleEditProductLineData = (editData: any, dataArr?: any[]) => {
store.$patch({ store.$patch({
lineData: [], lineData: []
}); });
lineList.value = store.lineData; lineList.value = store.lineData;
// 处理子组件数据更新延迟问题 // 处理子组件数据更新延迟问题
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论