diff --git a/config/prod.js b/config/prod.js index 851b944..5cf01c7 100644 --- a/config/prod.js +++ b/config/prod.js @@ -25,7 +25,7 @@ module.exports = { terserOptions: { // compress: true, // 默认使用terser压缩 compress: { - drop_console: true, // 去掉打印 + drop_console: false, // 去掉打印 }, // 默认使用terser压缩 // mangle: false, keep_classnames: true, // 不改变class名称 diff --git a/src/pages/getColorCard/addColorCard/index.tsx b/src/pages/getColorCard/addColorCard/index.tsx index 814057d..da77c2b 100644 --- a/src/pages/getColorCard/addColorCard/index.tsx +++ b/src/pages/getColorCard/addColorCard/index.tsx @@ -82,9 +82,14 @@ const AddColorCard = () => { } // 添加色卡 const handleAddColorCard = () => { - Taro.setStorageSync('colorCardCache', JSON.stringify(order)) - - goLink('/pages/getColorCard/colorCardList/index', { isGoBack: true }) + Taro.setStorage({ + key: 'colorCardCache', + data: JSON.stringify(order), + success: () => { + goLink('/pages/getColorCard/colorCardList/index', { isGoBack: true }) + }, + }) + // Taro.setStorageSync('colorCardCache', JSON.stringify(order)) } const { fetchData } = SubmitColorCardOrder() @@ -276,13 +281,13 @@ const AddColorCard = () => { } setAddressInfo(val => ({ ...val, - province_name: defaultAddress.province_name || '', - address_id: defaultAddress.id || '', - city_name: defaultAddress.city_name || '', - address_detail: defaultAddress.address_detail || '', - district_name: defaultAddress.district_name || '', - target_user_name: defaultAddress.name || '', - purchaser_phone: defaultAddress.phone || '', + province_name: defaultAddress?.province_name || '', + address_id: defaultAddress?.id || '', + city_name: defaultAddress?.city_name || '', + address_detail: defaultAddress?.address_detail || '', + district_name: defaultAddress?.district_name || '', + target_user_name: defaultAddress?.name || '', + purchaser_phone: defaultAddress?.phone || '', })) currPage.data.addressObj = defaultAddress } diff --git a/src/pages/getColorCard/colorCardList/index.tsx b/src/pages/getColorCard/colorCardList/index.tsx index c1afa9f..f7935cd 100644 --- a/src/pages/getColorCard/colorCardList/index.tsx +++ b/src/pages/getColorCard/colorCardList/index.tsx @@ -83,13 +83,31 @@ const ColorCardList = () => { const selectedList = useRef([]) + const isAdd = useRef([]) + useDidShow(() => { - const cache = Taro.getStorageSync('colorCardCache') - if (cache) { - // 已选的列入 selectedList - selectedList.current = JSON.parse(cache).map(item => item.id) - setSearchField(val => ({ ...val, color_card_ids: selectedList.current })) - } + Taro.getStorage({ + key: 'colorCardCache', + success: (res) => { + console.log('cache', res.data) + if (res.data) { + const temp = JSON.parse(res.data).map(item => item.id) + // 已选的列入 selectedList + selectedList.current = temp + isAdd.current = temp + setSearchField(val => ({ ...val, color_card_ids: selectedList.current })) + } + }, + fail: () => { + console.log('colorCardCache fail') + }, + }) + // const cache = Taro.getStorageSync('colorCardCache') + // if (cache) { + // // 已选的列入 selectedList + // selectedList.current = JSON.parse(cache).map(item => item.id) + // setSearchField(val => ({ ...val, color_card_ids: selectedList.current })) + // } }) // 上拉加载数据 @@ -168,9 +186,9 @@ const ColorCardList = () => { }) const isDisabled = (currentId: number) => { - console.log('selectedList', selectedList.current) - if (selectedList.current.includes(currentId)) { - return false + console.log('selectedList, isAdd', selectedList.current, isAdd.current) + if (isAdd.current.includes(currentId)) { + return true } return selectedList.current.length >= limit } @@ -216,7 +234,7 @@ const ColorCardList = () => { {/* multipleSelection.current.some(mul => mul.id === item.id) 确保加载新数据时保持选中状态 */} mul.id === item.id)} + status={isAdd.current.includes(item.id) || item.status || multipleSelection.current.some(mul => mul.id === item.id)} onSelect={() => onSelect(item)} onClose={() => onUnSelect(item)} />