From 783bcae1c4cf388c0c0826d1cc3aa84ba3d55643 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Wed, 22 Feb 2023 20:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E4=BF=AE=E5=A4=8D=E8=89=B2?= =?UTF-8?q?=E5=8D=A1=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 9 +++-- .../cutProductItem/index.module.scss | 12 ++++++ .../components/cutProductItem/index.tsx | 4 +- .../components/productItem/index.module.scss | 8 +++- .../components/productItem/index.module.scss | 9 ++++- .../components/productItem/index.tsx | 2 + src/pages/colorCardList/index.module.scss | 5 ++- src/pages/colorCardList/index.tsx | 23 ++++++++---- .../components/productCard/index.module.scss | 15 ++++++-- src/pages/colorCardOrder/index.tsx | 37 +++++++++++-------- .../components/productCard/index.module.scss | 30 +++++++++++++-- .../components/productCard/index.tsx | 10 ++++- .../components/productItem/index.module.scss | 1 + .../components/productItem/index.tsx | 4 +- src/pages/cutSampleList/index.module.scss | 5 ++- src/pages/cutSampleList/index.tsx | 18 ++++++--- .../components/productCard/index.module.scss | 3 ++ src/pages/cutSampleListOrder/index.tsx | 37 +++++++++++-------- .../components/productCard/index.module.scss | 10 ++++- .../components/productCard/index.tsx | 6 ++- src/use/useHttp.ts | 4 +- src/use/useLoginRequest.ts | 4 +- 22 files changed, 182 insertions(+), 74 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 26695db..8baa0f7 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -5,14 +5,14 @@ // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 -export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 +// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 @@ -39,8 +39,9 @@ export const getCDNSource = (suffix: string) => { export const CDN_UPLOAD_IMG = `${UPLOAD_CDN_URL || ''}` // appid -// export const WX_APPID = 'wx68d92d7cbf0b6963' -export const WX_APPID = 'wx714eaf2dfdb9c6bb' +export const WX_APPID = 'wx68d92d7cbf0b6963' +// export const WX_APPID = 'wx714eaf2dfdb9c6bb' +export const Platform = 6 // 招商银行小程序appid export const BANk_WX_APPID = 'wx65934ee32a88d726' diff --git a/src/pages/colorCardClipping/components/cutProductItem/index.module.scss b/src/pages/colorCardClipping/components/cutProductItem/index.module.scss index 6f68caf..fad73ef 100644 --- a/src/pages/colorCardClipping/components/cutProductItem/index.module.scss +++ b/src/pages/colorCardClipping/components/cutProductItem/index.module.scss @@ -42,6 +42,12 @@ justify-content: space-between; padding-left: 24px; box-sizing: border-box; + text { + &:nth-child(1) { + flex: 1; + @include common_ellipsis; + } + } } .item_con_color_list { padding-left: 24px; @@ -50,6 +56,12 @@ display: flex; justify-content: space-between; color: rgba(0, 0, 0, 0.6); + text { + &:nth-child(1) { + flex: 1; + @include common_ellipsis; + } + } } } .item_con_count { diff --git a/src/pages/colorCardClipping/components/cutProductItem/index.tsx b/src/pages/colorCardClipping/components/cutProductItem/index.tsx index 71c7f54..25999ba 100644 --- a/src/pages/colorCardClipping/components/cutProductItem/index.tsx +++ b/src/pages/colorCardClipping/components/cutProductItem/index.tsx @@ -54,8 +54,8 @@ export default (props: Param) => { const labAndImgObj = useMemo( () => { - const res = value.cut_sample_order_product_list[0] - return { lab: res.lab, rgb: res.rgb, texture_url: res.texture_url } + const res = value.cut_sample_order_product_list?.[0] + return { lab: res?.lab, rgb: res?.rgb, texture_url: res?.texture_url } }, [value], ) diff --git a/src/pages/colorCardClipping/components/productItem/index.module.scss b/src/pages/colorCardClipping/components/productItem/index.module.scss index ea6474c..0866e28 100644 --- a/src/pages/colorCardClipping/components/productItem/index.module.scss +++ b/src/pages/colorCardClipping/components/productItem/index.module.scss @@ -37,11 +37,17 @@ justify-content: space-between; font-size: 28px; .item_con_name { - width: 100%; display: flex; justify-content: space-between; padding-left: 24px; box-sizing: border-box; + + text { + &:nth-child(1) { + flex: 1; + @include common_ellipsis(2); + } + } } .item_con_count { text-align: right; diff --git a/src/pages/colorCardList/components/productItem/index.module.scss b/src/pages/colorCardList/components/productItem/index.module.scss index f663fb2..ace6868 100644 --- a/src/pages/colorCardList/components/productItem/index.module.scss +++ b/src/pages/colorCardList/components/productItem/index.module.scss @@ -27,13 +27,18 @@ .card_info_name { font-size: 28px; color: rgba(0, 0, 0, 0.8); + @include common_ellipsis(2); } .card_info_label { - display: grid; - grid-template-columns: repeat(3, 100px); + display: flex; + flex-wrap: wrap; grid-gap: 10px 10px; margin-top: 10px; + + box-sizing: border-box; text { + display: inline-block; + padding: 2px 6px; font-size: 24px; color: #4581ff; height: 34px; diff --git a/src/pages/colorCardList/components/productItem/index.tsx b/src/pages/colorCardList/components/productItem/index.tsx index d115b61..0e691b3 100644 --- a/src/pages/colorCardList/components/productItem/index.tsx +++ b/src/pages/colorCardList/components/productItem/index.tsx @@ -25,10 +25,12 @@ export default memo((props: ParamType) => { const { affiliation_product, color_card_name = '', texture_url = '', lab, rgb } = props const [checkStatus, setCheckStatus] = useState(false) const changeSelect = () => { + if (props.is_add) { return false } setCheckStatus(!checkStatus) props.onSelect?.(props, !checkStatus) } const onSelect = () => { + if (props.is_add) { return false } props.onSelect?.(props, true) setCheckStatus(true) } diff --git a/src/pages/colorCardList/index.module.scss b/src/pages/colorCardList/index.module.scss index bc0b9b1..0c97513 100644 --- a/src/pages/colorCardList/index.module.scss +++ b/src/pages/colorCardList/index.module.scss @@ -39,11 +39,14 @@ text { width: 702px; height: 80px; - background: #4581ff; + background: #8aaefa; border-radius: 40px; text-align: center; line-height: 80px; color: #fff; } + .selected { + background: #4581ff !important; + } } } diff --git a/src/pages/colorCardList/index.tsx b/src/pages/colorCardList/index.tsx index 9ac17b8..5c99071 100644 --- a/src/pages/colorCardList/index.tsx +++ b/src/pages/colorCardList/index.tsx @@ -34,7 +34,6 @@ export default () => { // 获取数据 const getGetColorCard = async() => { - console.log('getShopId():::', getShopId()) const { data } = await fetchData(getFilterData({ ...searchData, color_card_ids: getShopId() })) setColorCardData(() => ({ list: data.list, total: data.total })) setRefresherTriggeredStatus(() => false) @@ -43,6 +42,7 @@ export default () => { useEffect(() => { if (Taro.getStorageSync('colorCard') && shopColorCardData.current.length <= 0) { shopColorCardData.current = Taro.getStorageSync('colorCard') ? JSON.parse(Taro.getStorageSync('colorCard')) : [] + setSelectList(e => ([...e, ...shopColorCardData.current])) // Taro.removeStorageSync('colorCard') } getGetColorCard() @@ -76,7 +76,8 @@ export default () => { // 列表下拉刷新 const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 + pageNum.current.size = 10 setRefresherTriggeredStatus(true) setSearchData(val => ({ ...val, size: 10 })) } @@ -86,10 +87,18 @@ export default () => { selectList?.map((item) => { item.count = 1 }) - Taro.setStorageSync('colorCard', JSON.stringify([...selectList, ...shopColorCardData.current])) - Taro.redirectTo({ - url: '/pages/colorCardOrder/index', - }) + Taro.setStorageSync('colorCard', JSON.stringify([...selectList])) + const pages = getCurrentPages() + const current = pages[pages.length - 2] + console.log('current:::', current) + if (current?.route === 'pages/colorCardOrder/index') { + Taro.navigateBack() + } + else { + Taro.redirectTo({ + url: '/pages/colorCardOrder/index', + }) + } } const onSelectData = (val, status) => { @@ -127,7 +136,7 @@ export default () => { - 确认 + 0 ? styles.selected : '')}>确认 } diff --git a/src/pages/colorCardOrder/components/productCard/index.module.scss b/src/pages/colorCardOrder/components/productCard/index.module.scss index 9b4f2b3..a2aa718 100644 --- a/src/pages/colorCardOrder/components/productCard/index.module.scss +++ b/src/pages/colorCardOrder/components/productCard/index.module.scss @@ -1,5 +1,5 @@ .card_item { - height: 140px; + min-height: 140px; display: flex; padding-top: 24px; color: rgba(0, 0, 0, 0.8); @@ -15,15 +15,23 @@ font-size: 28px; border-bottom: 1px solid rgba(0, 0, 0, 0.1); display: flex; + padding-bottom: 10px; + .name_con { + flex: 1; + text { + @include common_ellipsis; + } + } .card_info_label { - display: grid; + display: flex; + flex-wrap: wrap; grid-template-columns: repeat(3, 100px); grid-gap: 10px 10px; margin-top: 10px; text { + padding: 2px 6px; font-size: 24px; color: #4581ff; - height: 34px; text-align: center; line-height: 34px; background-color: rgba(69, 129, 255, 0.15); @@ -31,7 +39,6 @@ } } .btns { - width: 100%; display: flex; justify-content: flex-end; } diff --git a/src/pages/colorCardOrder/index.tsx b/src/pages/colorCardOrder/index.tsx index a098ab1..4575e34 100644 --- a/src/pages/colorCardOrder/index.tsx +++ b/src/pages/colorCardOrder/index.tsx @@ -53,9 +53,7 @@ export default () => { const onAddCard = () => { Taro.setStorageSync('colorCard', JSON.stringify(list)) Taro.setStorageSync('colorCardOther', JSON.stringify({ address: addressInfo || {}, remark: submitData.current.remark })) - Taro.navigateTo({ - url: '/pages/colorCardList/index', - }) + goLink('/pages/colorCardList/index', {}) } const onDelData = useCallback((id) => { @@ -91,20 +89,27 @@ export default () => { const { fetchData: submitFetchData } = SubmitColorCardApi() const onSubmitData = async() => { - submitData.current.color_card_infos = [] - list?.map((item) => { - submitData.current.color_card_infos.push({ - count: item.count || 0, - id: item.id, - }) + Taro.showModal({ + title: '确定提交订单？', + async success(val) { + if (val.confirm) { + submitData.current.color_card_infos = [] + list?.map((item) => { + submitData.current.color_card_infos.push({ + count: item.count || 0, + id: item.id, + }) + }) + if (!submitData.current.address_id) { return alert.none('请选择收货地址') } + await openSubscriptionMessage({ scenes: ColorCard.value }) + const res = await submitFetchData(getFilterData(submitData.current)) + if (res.success) { + alert.success('提交成功') + goLink('/pages/colorCardOrderDetail/index', { id: res.data.id }, 'redirectTo') + } + } + }, }) - if (!submitData.current.address_id) { return alert.none('请选择收货地址') } - await openSubscriptionMessage({ scenes: ColorCard.value }) - const res = await submitFetchData(getFilterData(submitData.current)) - if (res.success) { - alert.success('提交成功') - goLink('/pages/colorCardOrderDetail/index', { id: res.data.id }) - } } const [remarkData, setRemarkData] = useState('') diff --git a/src/pages/colorCardOrderDetail/components/productCard/index.module.scss b/src/pages/colorCardOrderDetail/components/productCard/index.module.scss index eb4fa32..f7a6713 100644 --- a/src/pages/colorCardOrderDetail/components/productCard/index.module.scss +++ b/src/pages/colorCardOrderDetail/components/productCard/index.module.scss @@ -14,7 +14,7 @@ } .card_list { .card_item { - height: 140px; + min-height: 140px; display: flex; padding-top: 24px; color: rgba(0, 0, 0, 0.8); @@ -29,13 +29,35 @@ flex: 1; font-size: 28px; border-bottom: 1px solid rgba(0, 0, 0, 0.1); - display: flex; - justify-content: space-between; width: 100%; + padding-bottom: 10px; + display: flex; + flex-direction: column; + .name_con { + width: 100%; + display: flex; + justify-content: space-between; + } + .card_info_label { + display: grid; + grid-template-columns: repeat(3, 100px); + grid-gap: 10px 10px; + margin-top: 10px; + text { + font-size: 24px; + color: #4581ff; + height: 34px; + text-align: center; + line-height: 34px; + background-color: rgba(69, 129, 255, 0.15); + border-radius: 8px; + } + } text { &:nth-child(1) { + padding-right: 10px; flex: 1; - @include common_ellipsis(); + @include common_ellipsis(2); } } .btns { diff --git a/src/pages/colorCardOrderDetail/components/productCard/index.tsx b/src/pages/colorCardOrderDetail/components/productCard/index.tsx index 862e8d5..589b920 100644 --- a/src/pages/colorCardOrderDetail/components/productCard/index.tsx +++ b/src/pages/colorCardOrderDetail/components/productCard/index.tsx @@ -33,8 +33,14 @@ export default (props: Param) => { return - {item.name} - x{item.count}本 + + {item.name} + x{item.count}本 + + + {item.affiliation_product?.map(item => {item.code})} + + })} diff --git a/src/pages/cutSampleList/components/productItem/index.module.scss b/src/pages/cutSampleList/components/productItem/index.module.scss index a8d7116..c1918f9 100644 --- a/src/pages/cutSampleList/components/productItem/index.module.scss +++ b/src/pages/cutSampleList/components/productItem/index.module.scss @@ -26,6 +26,7 @@ .card_info_name { font-size: 28px; color: rgba(0, 0, 0, 0.8); + @include common_ellipsis(2); } .card_info_label { display: grid; diff --git a/src/pages/cutSampleList/components/productItem/index.tsx b/src/pages/cutSampleList/components/productItem/index.tsx index 5719ee8..9433463 100644 --- a/src/pages/cutSampleList/components/productItem/index.tsx +++ b/src/pages/cutSampleList/components/productItem/index.tsx @@ -67,9 +67,9 @@ export default memo((props: ParamType) => { {formatHashTag(productItem?.code, productItem?.name)} - {new Array(2).fill('').map(item => 170CM)} + {/* {new Array(2).fill('').map(item => )} */} - {productItem?.craft} + {productItem?.component} e.stopPropagation()}> onSelect()}>{selected ? '继续添加' : '添加'} diff --git a/src/pages/cutSampleList/index.module.scss b/src/pages/cutSampleList/index.module.scss index bc0b9b1..0c97513 100644 --- a/src/pages/cutSampleList/index.module.scss +++ b/src/pages/cutSampleList/index.module.scss @@ -39,11 +39,14 @@ text { width: 702px; height: 80px; - background: #4581ff; + background: #8aaefa; border-radius: 40px; text-align: center; line-height: 80px; color: #fff; } + .selected { + background: #4581ff !important; + } } } diff --git a/src/pages/cutSampleList/index.tsx b/src/pages/cutSampleList/index.tsx index 7bfe012..b630e6b 100644 --- a/src/pages/cutSampleList/index.tsx +++ b/src/pages/cutSampleList/index.tsx @@ -77,7 +77,8 @@ export default () => { // 列表下拉刷新 const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.size = 10 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchData(val => ({ ...val, size: 10 })) } @@ -85,9 +86,16 @@ export default () => { const onSubmit = () => { if (selectProcutColors.length <= 0) { return alert.none('请选择剪样') } Taro.setStorageSync('cutSample', JSON.stringify([...selectProcutColors])) - Taro.redirectTo({ - url: '/pages/cutSampleListOrder/index', - }) + const pages = getCurrentPages() + const current = pages[pages.length - 2] + if (current?.route === 'pages/cutSampleListOrder/index') { + Taro.navigateBack() + } + else { + Taro.redirectTo({ + url: '/pages/cutSampleListOrder/index', + }) + } } const [showColorList, setShowColorList] = useState(false) @@ -158,7 +166,7 @@ export default () => { - 确认 + 0 ? styles.selected : '')}>确认 diff --git a/src/pages/cutSampleListOrder/components/productCard/index.module.scss b/src/pages/cutSampleListOrder/components/productCard/index.module.scss index 3d975ba..131c900 100644 --- a/src/pages/cutSampleListOrder/components/productCard/index.module.scss +++ b/src/pages/cutSampleListOrder/components/productCard/index.module.scss @@ -14,6 +14,9 @@ flex: 1; font-size: 28px; border-bottom: 1px solid rgba(0, 0, 0, 0.1); + text { + @include common_ellipsis; + } .btns { width: 100%; display: flex; diff --git a/src/pages/cutSampleListOrder/index.tsx b/src/pages/cutSampleListOrder/index.tsx index 90aa81a..fb7e9ca 100644 --- a/src/pages/cutSampleListOrder/index.tsx +++ b/src/pages/cutSampleListOrder/index.tsx @@ -149,22 +149,29 @@ export default () => { const { fetchData: submitFetchData } = submitCutSampleOrderApi() const onSubmitData = async() => { - submitData.current.cut_sample_order_product_color_list = [] - list?.map((item) => { - item.colors?.map((citem) => { - submitData.current.cut_sample_order_product_color_list.push({ - color_num: citem.count || 0, - product_color_id: citem.id, - }) - }) + Taro.showModal({ + title: '确定提交订单？', + async success(val) { + if (val.confirm) { + submitData.current.cut_sample_order_product_color_list = [] + list?.map((item) => { + item.colors?.map((citem) => { + submitData.current.cut_sample_order_product_color_list.push({ + color_num: citem.count || 0, + product_color_id: citem.id, + }) + }) + }) + if (!submitData.current.address_id) { return alert.none('请选择收货地址') } + await openSubscriptionMessage({ scenes: ColorCard.value }) + const res = await submitFetchData(getFilterData(submitData.current)) + if (res.success) { + alert.success('提交成功') + goLink('/pages/cutSampleListOrderDetail/index', { id: res.data.id }, 'redirectTo') + } + } + }, }) - if (!submitData.current.address_id) { return alert.none('请选择收货地址') } - await openSubscriptionMessage({ scenes: ColorCard.value }) - const res = await submitFetchData(getFilterData(submitData.current)) - if (res.success) { - alert.success('提交成功') - goLink('/pages/cutSampleListOrderDetail/index', { id: res.data.id }, 'redirectTo') - } } const [remarkData, setRemarkData] = useState('') diff --git a/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss b/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss index eb4fa32..7e28419 100644 --- a/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss +++ b/src/pages/cutSampleListOrderDetail/components/productCard/index.module.scss @@ -29,9 +29,15 @@ flex: 1; font-size: 28px; border-bottom: 1px solid rgba(0, 0, 0, 0.1); - display: flex; - justify-content: space-between; width: 100%; + .name_con { + flex: 1; + display: flex; + text { + padding-right: 10px; + @include common_ellipsis; + } + } text { &:nth-child(1) { flex: 1; diff --git a/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx b/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx index b9b3f02..7120df7 100644 --- a/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx +++ b/src/pages/cutSampleListOrderDetail/components/productCard/index.tsx @@ -47,8 +47,10 @@ export default (props: Param) => { return - {formatHashTag(citem.code, citem.name)} - x{citem.color_num}份 + + {formatHashTag(citem.code, citem.name)} + x{citem.color_num}份 + })} diff --git a/src/use/useHttp.ts b/src/use/useHttp.ts index f3a6b63..4680a40 100644 --- a/src/use/useHttp.ts +++ b/src/use/useHttp.ts @@ -4,7 +4,7 @@ import qs from 'qs' import useUserInfo from './useUserInfo' import useLogin from './useLogin' import useLoginRequest from './useLoginRequest' -import { BASE_URL, WX_APPID } from '@/common/constant' +import { BASE_URL, Platform, WX_APPID } from '@/common/constant' import { getFilterData } from '@/common/util' interface Params { @@ -148,7 +148,7 @@ export const useRequest = ( ...{ header: { // Platform: 6, - Platform: 9, + Platform, Appid: WX_APPID, Authorization: token || stateRef.current.token, }, diff --git a/src/use/useLoginRequest.ts b/src/use/useLoginRequest.ts index 2679014..7e536ec 100644 --- a/src/use/useLoginRequest.ts +++ b/src/use/useLoginRequest.ts @@ -3,7 +3,7 @@ import { useRef, useState } from 'react' import qs from 'qs' import useUserInfo from './useUserInfo' import useLogin from './useLogin' -import { BASE_URL, WX_APPID } from '@/common/constant' +import { BASE_URL, Platform, WX_APPID } from '@/common/constant' // 开这个hook 主要是为了让useHttp 能够调用 @@ -26,7 +26,7 @@ export default () => { url: `${BASE_URL}/v1/mall/login`, header: { // Platform: 6, - Platform: 9, + Platform, Appid: WX_APPID, }, method: 'post',